ref #9340: check for different sec in homotypic group

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
index baf10289fa623370cb61821643d34adf110e3515..2e4172af9a1a97f60c910f490507820807c4ff83 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
@@ -312,4 +312,4 @@ ChangeSynonymToAcceptedHandler_Select_Sec_Reference_Select=Select new
 ChangeSynonymToAcceptedHandler_Select_Sec_Reference_Keep=Keep secundum
 ChangeSynonymToAcceptedHandler_Different_Publish_Flag=The selected parent taxon and the new taxon have different publish flags. Maybe one of them should be adapted.
 SwapSynonymToAcceptedHandler_Different_Publish_Flag=The selected parent taxon, the new taxon and the new synonym have different publish flags. Maybe one of them should be adapted.
-MoveSynonymToAcceptedHandler_Select_Sec_Reference_Handling_message= Secundum reference of synonym and new accepted taxon are different. Please select the reference used as secundum.
\ No newline at end of file
+MoveSynonymToAcceptedHandler_Select_Sec_Reference_Handling_message= Secundum reference of synonym (or synonyms of the homotypic group) and new accepted taxon are different. Please select the reference used as secundum.
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
index 079f8f5b5ff95a2f5a993f0acbc040a1c4652f73..550d9e6925f1d67ff15478f6ffbf7fe5dd7eaca8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
@@ -311,4 +311,4 @@ ChangeSynonymToAcceptedHandler_Select_Sec_Reference_Select=Neue ausw
 ChangeSynonymToAcceptedHandler_Select_Sec_Reference_Keep=Secundum beibehalten
 ChangeSynonymToAcceptedHandler_Different_Publish_Flag=Das gewählte Elterntaxon und das neue Taxon haben unterschiedliche Publikationsstatus. Eventuell sollten sie angepasst werden.
 SwapSynonymToAcceptedHandler_Different_Publish_Flag=Das gewählte Elterntaxon, das neue Taxon und das Synonym haben unterschiedliche Publikationsstatus. Eventuell sollten sie angepasst werden.
-MoveSynonymToAcceptedHandler_Select_Sec_Reference_Handling_message=Die Secundum Referenz des Synonyms und des neuen akzeptierten Taxons unterscheiden sich, bitte wählen Sie, welche Referenz verwendet werden soll.6
\ No newline at end of file
+MoveSynonymToAcceptedHandler_Select_Sec_Reference_Handling_message=Die Secundum Referenz des Synonyms oder der Synonyme der homotypischen Gruppe und des neuen akzeptierten Taxons unterscheiden sich, bitte wählen Sie, welche Referenz verwendet werden soll.
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java
index 68127e2a98e4049c56f7bdb1c59691a315f227ce..87eacfb5d0247afb4112d100ed965bf28f4130d4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java
@@ -110,6 +110,8 @@ public class MoveSynonymToAnotherAcceptedTaxonHandlerE4 implements IPostOperatio
             }
 
         }
+        boolean homotypicGroupPublish = true;
+//        for (synonym.getName().getHomotypicalGroup().getTypifiedNames())
                if (synonym.isPublish() != newParentNode.getTaxon().isPublish()){
             MessagingUtils.warningDialog("Publish flag", this,Messages.ChangeSynonymToAcceptedHandler_Different_Publish_Flag);
         }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
index 5ebaef6bc9131219d1186541ff6ee15e3d89db09..a49db582aedc744de279a58acaf6f3586e2f23de 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
@@ -9,7 +9,6 @@
 
 package eu.etaxonomy.taxeditor.editor.name.operation;
 
-import java.util.Set;
 import java.util.UUID;
 
 import org.eclipse.core.commands.ExecutionException;
@@ -23,7 +22,6 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
 import eu.etaxonomy.cdm.model.metadata.SecReferenceHandlingEnum;
-import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -68,7 +66,6 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
                        Taxon taxon,
                        ITaxonTreeNode parentNode,
                        Synonym synonym,
-                       Set<TaxonName> namesInHomotypicalGroup,
                        UUID newSecUuid,
                SecReferenceHandlingEnum secHandling,
                        IPostOperationEnabled postOperationEnabled,