From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Mon, 23 Mar 2015 13:52:17 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~79
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9a5799d4074a2ac719f4a91021139f33ebd7f571

merge-update from trunk
---

9a5799d4074a2ac719f4a91021139f33ebd7f571
diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index 41a7f1b31,2cc9dede1..e84b6d824
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -194,22 -194,22 +194,22 @@@
  	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar"/>
--	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.0-SNAPSHOT.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index 8a8db7b12,83b8d25e3..5775ab4f5
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -737,28 -716,10 +733,32 @@@
                 label="Delete (with children)"
                 style="push">
           </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.editSequence"
 +               label="Edit Sequence"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSequence">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.showPherogram"
 +               label="Show Pherogram"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSingleRead">
 +               </reference>
 +            </visibleWhen>
 +         </command>
+          <dynamic
+                class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
+                id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
+          </dynamic>
        </menuContribution>
        <menuContribution
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">