fix #5524

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index a2287eda7ae2c61d616aec6def07f5005258f8ed..993ee94f1b91905b7e8cddb3a5e3ae56386e2f32 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -499,6 +499,7 @@
                   label="%command.label.12"
                   style="push">
                <visibleWhen>
                   label="%command.label.12"
                   style="push">
                <visibleWhen>

+               <and>

                   <not>
                      <or>
                         <reference
                   <not>
                      <or>
                         <reference


@@ -507,11 +508,12 @@
                         <reference
                               definitionId="isMisapplication">
                         </reference>
                         <reference
                               definitionId="isMisapplication">
                         </reference>

-                        <reference
-                              definitionId="isHomotypicSynonymOfAcceptedTaxon">
-                        </reference>

                      </or>
                      </or>

-                  </not>
+                     </not>
+                       <reference
+                              definitionId="isNotHomotypicSynonymOfAcceptedTaxon">
+                        </reference>
+                  </and>

                </visibleWhen>
             </command>
             <command
                </visibleWhen>
             </command>
             <command


@@ -614,9 +616,14 @@
                   label="%command.label.56"
                   style="push">
                <visibleWhen>
                   label="%command.label.56"
                   style="push">
                <visibleWhen>

+                  <and>

                    <reference
                          definitionId="isSynonym">
                    </reference>
                    <reference
                          definitionId="isSynonym">
                    </reference>

+                   <reference
+                         definitionId="isNotHomotypicSynonymOfAcceptedTaxon">
+                   </reference>
+                   </and>

                 </visibleWhen>
           </command>
          <separator
                 </visibleWhen>
           </command>
          <separator


@@ -1692,7 +1699,7 @@
          <with
                variable="selection">
             <test
          <with
                variable="selection">
             <test

-                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isHomotypicSynonymOfAcceptedTaxon">
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotHomotypicSynonymOfAcceptedTaxon">

             </test>
          </with>
       </definition>
             </test>
          </with>
       </definition>


@@ -1898,7 +1905,7 @@
             class="eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester"
             id="eu.etaxonomy.taxeditor.editor.name.propertyTester"
             namespace="eu.etaxonomy.taxeditor.editor.name.propertyTester"
             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"
+            properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon"

             type="org.eclipse.jface.viewers.IStructuredSelection">
       </propertyTester>
       <propertyTester
             type="org.eclipse.jface.viewers.IStructuredSelection">
       </propertyTester>
       <propertyTester

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
index 270d9aa2dc3b01bb73ecd504624230f5bc087ac1..85693469820c39d88c4993f5a16f9ef0d5ada961 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
@@ -35,8 +35,8 @@ public class NameEditorMenuPropertyTester extends org.eclipse.core.expressions.P
        private static final String CONCEPT = "isConceptRelation";
        private static final String EMPTY_NAMES = "hasEmptyNames";
        private static final String ACCEPTED_AND_NO_HOMOTYPIC_SYNONYMS = "isAcceptedAndHasNoHomotypicSynonyms";
        private static final String CONCEPT = "isConceptRelation";
        private static final String EMPTY_NAMES = "hasEmptyNames";
        private static final String ACCEPTED_AND_NO_HOMOTYPIC_SYNONYMS = "isAcceptedAndHasNoHomotypicSynonyms";

-       private static final String HOMOTYPIC_SYNONYM_OF_ACCEPTED = "isHomotypicSynonymOfAcceptedTaxon";
-       
+       private static final String NOT_HOMOTYPIC_SYNONYM_OF_ACCEPTED = "isNotHomotypicSynonymOfAcceptedTaxon";
+

 
        /**
         * <p>Constructor for NameEditorMenuPropertyTester.</p>
 
        /**
         * <p>Constructor for NameEditorMenuPropertyTester.</p>


@@ -78,10 +78,10 @@ public class NameEditorMenuPropertyTester extends org.eclipse.core.expressions.P
                        }
                        else if(ACCEPTED_AND_NO_HOMOTYPIC_SYNONYMS.equals(property)){
                                return isAcceptedAndHasNoHomotypicSynonyms(selectedElement);
                        }
                        else if(ACCEPTED_AND_NO_HOMOTYPIC_SYNONYMS.equals(property)){
                                return isAcceptedAndHasNoHomotypicSynonyms(selectedElement);

-                       }else if (HOMOTYPIC_SYNONYM_OF_ACCEPTED.equals(property)){
-                               return isHomotypicSynonymOfAcceptedTaxon(selectedElement);
+                       }else if (NOT_HOMOTYPIC_SYNONYM_OF_ACCEPTED.equals(property)){
+                               return isNotHomotypicSynonymOfAcceptedTaxon(selectedElement);

                        }
                        }

-                       
+

                }
 
                return false;
                }
 
                return false;


@@ -95,8 +95,8 @@ public class NameEditorMenuPropertyTester extends org.eclipse.core.expressions.P
                }
                return false;
        }
                }
                return false;
        }

-       
-       private boolean isHomotypicSynonymOfAcceptedTaxon(Object selectedElement) {
+
+       private boolean isNotHomotypicSynonymOfAcceptedTaxon(Object selectedElement) {

                if (isSynonym(selectedElement)){
                        Synonym synonym = (Synonym) selectedElement;
                        for (Taxon taxon:synonym.getAcceptedTaxa()){
                if (isSynonym(selectedElement)){
                        Synonym synonym = (Synonym) selectedElement;
                        for (Taxon taxon:synonym.getAcceptedTaxa()){