From 8ef15f4168ce46b4c1e04cfd49513b1506f5cba8 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Wed, 28 Oct 2015 09:41:27 +0100 Subject: [PATCH] last changes for #5325 --- .../handler/ChangeSynonymToAcceptedTaxonHandler.java | 4 +++- .../MoveSynonymToAnotherAcceptedTaxonHandler.java | 12 +++++++++--- .../TransientClassificationService.java | 7 +++++++ .../handler/ChangeAcceptedTaxonToSynonymHandler.java | 2 +- .../RemotingChangeAcceptedTaxonToSynonymHandler.java | 2 +- .../handler/RemotingMoveTaxonNodeHandler.java | 2 +- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java index d0eca25f8..c6a9a0cd8 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java @@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.editor.name.handler; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; @@ -87,7 +88,8 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme TaxonNode parentNode = (TaxonNode) HibernateProxyHelper.deproxy(((TaxonEditorInput) input).getTaxonNode().getParent()); - List excludeTaxa = null; + List excludeTaxa = new ArrayList(); + excludeTaxa.add(taxon.getUuid()); TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null, ((TaxonEditorInput) input).getTaxonNode().getClassification()); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java index b2c7b6453..281e83df6 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java @@ -9,6 +9,10 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.handlers.HandlerUtil; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; @@ -48,11 +52,13 @@ public class MoveSynonymToAnotherAcceptedTaxonHandler extends AbstractHandler im } Synonym synonym = (Synonym) selection.getFirstElement(); + Taxon oldParent = ((TaxonEditorInput)input).getTaxon(); + List excludeTaxa = new ArrayList(); + excludeTaxa.add(oldParent.getUuid()); + TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select new accepted taxon", null, null, ((TaxonEditorInput)input).getTaxonNode().getClassification()); if(newParentNode!=null){ - Taxon oldParent = ((TaxonEditorInput)input).getTaxon(); - - MoveSynonymToAnotherAcceptedTaxonOperation operation = new MoveSynonymToAnotherAcceptedTaxonOperation("Change accepted Taxon of Synonym", EditorUtil.getUndoContext(), + MoveSynonymToAnotherAcceptedTaxonOperation operation = new MoveSynonymToAnotherAcceptedTaxonOperation("Change accepted Taxon of Synonym", EditorUtil.getUndoContext(), oldParent.getUuid(), synonym.getUuid(), newParentNode.getTaxon(), editor); AbstractUtility.executeOperation(operation); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index f9051e871..c708ca558 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -975,5 +975,12 @@ public class TransientClassificationService implements IClassificationService { return defaultService.loadWithUpdate(arg0); } + @Override + public List> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification( + UUID classificationUuid, List excludeTaxa) { + + return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, excludeTaxa); + } + } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java index f79c91fac..a60bd2e32 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java @@ -108,7 +108,7 @@ public class ChangeAcceptedTaxonToSynonymHandler extends DeleteHandler }*/ List excludeTaxa = new ArrayList(); - excludeTaxa.add(oldAcceptedTaxonNode.getUuid()); + excludeTaxa.add(((TaxonNode)oldAcceptedTaxonNode).getTaxon().getUuid()); TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), taxonNavigator.getConversationHolder(), "Choose the accepted taxon", diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java index a42c6dfb0..c4f6df32c 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java @@ -97,7 +97,7 @@ public class RemotingChangeAcceptedTaxonToSynonymHandler extends RemotingCdmHand @Override public AbstractOperation prepareOperation(ExecutionEvent event) { List excludeTaxa = new ArrayList(); - excludeTaxa.add(oldTaxonNode.getUuid()); + excludeTaxa.add(((TaxonNode)oldTaxonNode).getTaxon().getUuid()); TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), new ConversationHolderMock(), "Choose the accepted taxon", diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java index 288211858..9152461c3 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java @@ -85,7 +85,7 @@ public class RemotingMoveTaxonNodeHandler extends RemotingCdmHandler { TaxonNode parentTaxonNode; List excludeTaxa = new ArrayList(); - excludeTaxa.add(oldTaxonNode.getUuid()); + excludeTaxa.add(((TaxonNode)oldTaxonNode).getTaxon().getUuid()); boolean moveToNewParent = true; -- 2.34.1