From: Katja Luther Date: Tue, 31 Mar 2020 09:04:05 +0000 (+0200) Subject: fix #8918: setBasionym also for accepted taxon X-Git-Tag: 5.14.0^2~27 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2bef172d75871c83d777b56b7bc5d552f4fcea2e?hp=efd5530a08f475114b948ccc86cd76742ef62096 fix #8918: setBasionym also for accepted taxon --- diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandlerE4.java index c394534e4..d1b013fac 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandlerE4.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandlerE4.java @@ -57,7 +57,7 @@ public class SetBasionymHandlerE4 { boolean canExecute = false; if(selection.size()==1){ Object selectedElement = selection.getFirstElement(); - canExecute = NameEditorMenuPropertyTester.isSynonymInHomotypicalGroupWithMoreSynonyms(selectedElement); + canExecute = NameEditorMenuPropertyTester.isSynonymOrTaxonInHomotypicalGroupWithMoreSynonyms(selectedElement); } menuItem.setVisible(canExecute); return canExecute; 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 466dce18c..d99c7f0a5 100755 --- 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 @@ -111,7 +111,7 @@ public class NameEditorMenuPropertyTester extends PropertyTester { return isNotHomotypicSynonymOfAcceptedTaxon(selectedElement); } else if (SYNONYM_WITH_HOMOTYPIC_SYNONYMS.equals(property)){ - return isSynonymInHomotypicalGroupWithMoreSynonyms(selectedElement); + return isSynonymOrTaxonInHomotypicalGroupWithMoreSynonyms(selectedElement); } else if (IS_ORPHANED.equals(property)){ return isOrphaned(selectedElement); @@ -141,9 +141,9 @@ public class NameEditorMenuPropertyTester extends PropertyTester { return !isMisapplication(selectedElement); } - public static boolean isSynonymInHomotypicalGroupWithMoreSynonyms(Object selectedElement) { - if (isSynonym(selectedElement)){ - Synonym synonym = (Synonym) selectedElement; + public static boolean isSynonymOrTaxonInHomotypicalGroupWithMoreSynonyms(Object selectedElement) { + if (isSynonym(selectedElement) || isAccepted(selectedElement)){ + TaxonBase synonym = (TaxonBase) selectedElement; return synonym.getHomotypicGroup().getTypifiedNames().size()>1; } return false;