From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 19 Mar 2021 11:01:17 +0000 (+0100)
Subject: ref #9523: check secundum references of all homotypical synonyms
X-Git-Tag: 5.22.0^2~70
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/84ff066f6d2a405e1b3c9bfd35fd7e481231c018

ref #9523: check secundum references of all homotypical synonyms
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
index a966be338..09066f491 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
@@ -75,7 +75,7 @@ RefreshPolytomousKeyNodesHandler_REFRESHING=Refreshing Polytomous Key Nodes
 RemotingChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Choose the accepted taxon
 RemotingChangeAcceptedTaxonToSynonymOperation_CHANGE_OP=Change Accepted Taxon to Synonym operation
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title=Select secundum reference
-RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_message=The secundum reference of the new and the old accepted taxa are not the same. Please select which reference should be used for the new synonym
+RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_message=The secundum reference of the new and the old accepted taxa or the synonyms of the homotypical group are not the same. Please select which reference should be used for the new synonym
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Keep=Keep
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Parent=From accepted taxon
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Select=Select new
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
index 82ac5d42a..be4bdb0cb 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
@@ -75,7 +75,7 @@ RefreshPolytomousKeyNodesHandler_REFRESHING=Polytome Schl
 RemotingChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Wählen Sie das akzeptierte Taxon
 RemotingChangeAcceptedTaxonToSynonymOperation_CHANGE_OP=Akzeptiertes Taxon in Synonym umwandeln
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title=Auswahl der Secundum Referenz
-RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_message=Die Secundum Referenzen des neuen und des alten akzeptierten Taxons unterscheiden sich, bitte wählen Sie welche Secundum Referenz für das neue Synonym verwendet werden soll
+RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_message=Die Secundum Referenzen des neuen und des alten akzeptierten Taxons oder der Synonyme der Homotypischen Gruppe unterscheiden sich, bitte wählen Sie welche Secundum Referenz für das neue Synonym verwendet werden soll
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Keep=Beibehalten
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Parent=Vom akzeptierten Taxon
 RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Select=Neue auswählen
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java
index 37c8504f3..801c0d6f8 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java
@@ -129,7 +129,7 @@ public class ChangeAcceptedTaxonToSynonymHandlerE4 extends CdmHandlerE4 {
         for (TaxonNodeDto oldNode:oldTaxonNodes){
         	excludeTaxa.add(oldNode.getTaxonUuid());
         	secUuids.add(oldNode.getSecUuid());
-//        	for (oldNode.)
+        	secUuids.addAll(oldNode.getHomotypicalGroupDto().getUuidsOfSecundumReferences());
         	nodeUuids.add(oldNode.getUuid());
 
         }