X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/77807d8d54940dbf827216b833254bddd2aab1ce..HEAD:/eu.etaxonomy.taxeditor.editor/plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 27ef9933f..4c9c3904a 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -165,87 +165,6 @@
          </toolbar>
       </menuContribution>
    </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.ui.internal.handlers.NewEditorHandler"
-            commandId="org.eclipse.ui.window.newEditor">
-         <activeWhen>
-            <not>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor">
-               </instanceof>
-            </not>
-         </activeWhen>
-         <enabledWhen>
-            <count
-                  value="-1">
-            </count>
-         </enabledWhen>
-      </handler>
-   </extension>
-   <extension
-         name="%extension.name"
-         point="org.eclipse.ui.commands">
-      <category
-            id="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            name="%category.name.0">
-      </category>
-    <!--  <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.MoveTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.moveTaxon"
-            name="Move Taxon">
-      </command>-->
-     <!-- <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeAcceptedTaxonToSynonymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
-            name="Change Accepted Taxon to Synonym">
-      </command>-->
-      <category
-            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            name="%category.name.1">
-      </category>
-      <category
-            id="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
-            name="%category.name.2">
-      </category>
-      <category
-            id="eu.etaxonomy.taxeditor.editor.media.category"
-            name="%category.name.3">
-      </category>
-      
-      <category
-            id="eu.etaxonomy.taxeditor.editor.new.category"
-            name="%category.name.4">
-      </category>
-      <category
-            id="eu.etaxonomy.taxeditor.editor.view.concept.category"
-            name="%category.name.6">
-      </category>
-      <category
-            id="eu.etaxonomy.taxeditor.bulkeditor.group.category"
-            name="%category.name.7">
-      </category>
-       
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
-            id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
-            name="%command.name.OPEN_DERIVATIVE_EDITOR">
-         <commandParameter
-               id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor.uuid"
-               name="Specimen Uuids"
-               optional="true"
-               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
-         </commandParameter>
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
-            id="eu.etaxonomy.taxeditor.editor.openSpecimenEditorFromMenu"
-            name="%command.name.OPEN_DERIVATIVE_EDITOR">
-      </command>
-        
-   </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
@@ -274,6 +193,15 @@
                   property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotHomotypicSynonymOfAcceptedTaxon">
             </test>
          </with>
+      </definition>
+          <definition
+            id="isNotAcceptedTaxon">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotAcceptedTaxon">
+            </test>
+         </with>
       </definition>
        <definition
             id="isSynonymInHomotypicalGroupWithMoreSynonyms">
@@ -293,6 +221,15 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isNotSynonym">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotSynonym">
+            </test>
+         </with>
+      </definition>
       <definition
             id="isMisapplication">
          <with
@@ -301,6 +238,33 @@
                   property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isMisapplication">
             </test>
          </with>
+      </definition>
+       <definition
+            id="isProparteSynonym">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isProparteSynonym">
+            </test>
+         </with>
+      </definition>
+       <definition
+            id="isNotProparteSynonym">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotProparteSynonym">
+            </test>
+         </with>
+      </definition>
+           <definition
+            id="isNotMisapplication">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotMisapplication">
+            </test>
+         </with>
       </definition>
       <definition
             id="isTaxonBase">
@@ -505,7 +469,7 @@
             class="eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester"
             id="eu.etaxonomy.taxeditor.editor.name.propertyTester"
             namespace="eu.etaxonomy.taxeditor.editor.name.propertyTester"
-            properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon,isSynonymInHomotypicalGroupWithMoreSynonyms,isOrphaned"
+            properties="isAcceptedTaxon,isSynonym,isNotSynonym,isMisapplication,isProparteSynonym,isNotProparteSynonym,isNotMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon,isNotAcceptedTaxon,isSynonymInHomotypicalGroupWithMoreSynonyms,isOrphaned"
             type="java.lang.Object">
       </propertyTester>
       <propertyTester
@@ -570,12 +534,12 @@
             viewerName="%viewCommandMapping.viewerName.NAME_EDITOR">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForIndividualsAssociation"
             selection="eu.etaxonomy.cdm.model.description.IndividualsAssociation"
             viewerName="%viewCommandMapping.viewerName.SPECIMEN_EDITOR">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForTaxonNode"
             selection="eu.etaxonomy.cdm.model.taxon.TaxonNode"
             viewerName="%viewCommandMapping.viewerName.SPECIMEN_EDITOR">
       </viewCommandMapping>
@@ -592,7 +556,7 @@
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
             selection="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"
-            viewerName="Name Editor">
+            viewerName="Taxon Editor">
       </viewCommandMapping>
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.openBulkEditorForTaxonRelationship"
@@ -600,24 +564,29 @@
             viewerName="Bulk Editor">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForSpecimenOrObservation"
             selection="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"
-            viewerName="Specimen Editor">
+            viewerName="Specimen Editor (tree)">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.command.workingSet.openWorkingSetEditor"
-            selection="eu.etaxonomy.cdm.model.description.WorkingSet"
-            viewerName="Working Set Editor">
+            commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
+            selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
+            viewerName="Descriptive Dataset Editor">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.command.workingSet.openCharacterMatrix"
-            selection="eu.etaxonomy.cdm.model.description.WorkingSet"
+            commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openCharacterMatrix"
+            selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
             viewerName="Character Matrix">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.command.workingSet.openWorkingSetEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
             selection="eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache"
-            viewerName="Working Set Editor">
+            viewerName="Descriptive Dataset Editor">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.openSpecimenEditorForGatheringEvent"
+            selection="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"
+            viewerName="%viewCommandMapping.viewerName.SPECIMEN_EDITOR">
       </viewCommandMapping>
     </extension>
    <extension