From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 21 Apr 2016 12:06:44 +0000 (+0200)
Subject: fix #5524
X-Git-Tag: 4.0.0^2~13
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9f983dae12f24e124a9f06d2211a2e55d143e370

fix #5524
---

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index a2287eda7..993ee94f1 100644
--- 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>
+               <and>
                   <not>
                      <or>
                         <reference
@@ -507,11 +508,12 @@
                         <reference
                               definitionId="isMisapplication">
                         </reference>
-                        <reference
-                              definitionId="isHomotypicSynonymOfAcceptedTaxon">
-                        </reference>
                      </or>
-                  </not>
+                     </not>
+                       <reference
+                              definitionId="isNotHomotypicSynonymOfAcceptedTaxon">
+                        </reference>
+                  </and>
                </visibleWhen>
             </command>
             <command
@@ -614,9 +616,14 @@
                   label="%command.label.56"
                   style="push">
                <visibleWhen>
+                  <and>
                    <reference
                          definitionId="isSynonym">
                    </reference>
+                   <reference
+                         definitionId="isNotHomotypicSynonymOfAcceptedTaxon">
+                   </reference>
+                   </and>
                 </visibleWhen>
           </command>
          <separator
@@ -1692,7 +1699,7 @@
          <with
                variable="selection">
             <test
-                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isHomotypicSynonymOfAcceptedTaxon">
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotHomotypicSynonymOfAcceptedTaxon">
             </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"
-            properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms"
+            properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon"
             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 270d9aa2d..856934698 100644
--- 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 HOMOTYPIC_SYNONYM_OF_ACCEPTED = "isHomotypicSynonymOfAcceptedTaxon";
-	
+	private static final String NOT_HOMOTYPIC_SYNONYM_OF_ACCEPTED = "isNotHomotypicSynonymOfAcceptedTaxon";
+
 
 	/**
 	 * <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 (HOMOTYPIC_SYNONYM_OF_ACCEPTED.equals(property)){
-				return isHomotypicSynonymOfAcceptedTaxon(selectedElement);
+			}else if (NOT_HOMOTYPIC_SYNONYM_OF_ACCEPTED.equals(property)){
+				return isNotHomotypicSynonymOfAcceptedTaxon(selectedElement);
 			}
-			
+
 		}
 
 		return false;
@@ -95,8 +95,8 @@ public class NameEditorMenuPropertyTester extends org.eclipse.core.expressions.P
 		}
 		return false;
 	}
-	
-	private boolean isHomotypicSynonymOfAcceptedTaxon(Object selectedElement) {
+
+	private boolean isNotHomotypicSynonymOfAcceptedTaxon(Object selectedElement) {
 		if (isSynonym(selectedElement)){
 			Synonym synonym = (Synonym) selectedElement;
 			for (Taxon taxon:synonym.getAcceptedTaxa()){