From 44001f3159e6c7dc877dc80fa459079d09327b23 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 14 Apr 2015 12:02:41 +0000 Subject: [PATCH] --- .../MoveSynonymToAnotherAcceptedTaxonOperation.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java index bffd426f4..2f0d0900f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java @@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; -import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -51,12 +50,11 @@ public class MoveSynonymToAnotherAcceptedTaxonOperation extends UUID oldTaxonUUID, UUID synonymUUID, Taxon taxon, IPostOperationEnabled postOperationEnabled) { super(label, undoContext, taxon, postOperationEnabled); - List propertyPaths = new ArrayList(); propertyPaths.add("synonymRelations"); - this.element = (Taxon) CdmStore.getService(ITaxonService.class).load(taxon.getUuid(), propertyPaths); + this.element = (Taxon) CdmStore.getService(ITaxonService.class).load(taxon.getUuid(),propertyPaths); this.oldTaxon = (Taxon) CdmStore.getService(ITaxonService.class).load(oldTaxonUUID); - this.synonym = (Synonym) CdmStore.getService(ITaxonService.class).load(synonymUUID, propertyPaths); + this.synonym = (Synonym) CdmStore.getService(ITaxonService.class).load(synonymUUID); if(synonym == null){ throw new IllegalArgumentException( "A null synonym was provided."); @@ -87,8 +85,8 @@ public class MoveSynonymToAnotherAcceptedTaxonOperation extends try { synRel = CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synRel, this.element, true, synRel.getType(), null, null, true); } catch (HomotypicalGroupChangeException e) { - MessagingUtils.warningDialog("Operation cancelled", getClass(), e.getMessage()); - return postExecute(null); + // TODO Auto-generated catch block + e.printStackTrace(); } ((TaxonNameEditor)EditorUtil.getActiveMultiPageTaxonEditor().getActiveEditor()).getConversationHolder().commit(); -- 2.34.1