(no commit message)
authorKatja Luther <k.luther@bgbm.org>
Tue, 14 Apr 2015 12:02:41 +0000 (12:02 +0000)
committerKatja Luther <k.luther@bgbm.org>
Tue, 14 Apr 2015 12:02:41 +0000 (12:02 +0000)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java

index bffd426f4580349313698229574f412a016a1ee0..2f0d0900f091e885044e2e2186ecbd59263d292a 100644 (file)
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;\r
-import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
@@ -51,12 +50,11 @@ public class MoveSynonymToAnotherAcceptedTaxonOperation extends
                        UUID oldTaxonUUID, UUID synonymUUID, Taxon taxon, IPostOperationEnabled postOperationEnabled) {\r
                \r
                super(label, undoContext, taxon, postOperationEnabled);\r
-       \r
                List<String> propertyPaths =  new ArrayList<String>();\r
                propertyPaths.add("synonymRelations");\r
-               this.element = (Taxon) CdmStore.getService(ITaxonService.class).load(taxon.getUuid(), propertyPaths);\r
+               this.element = (Taxon) CdmStore.getService(ITaxonService.class).load(taxon.getUuid(),propertyPaths);\r
                this.oldTaxon = (Taxon) CdmStore.getService(ITaxonService.class).load(oldTaxonUUID);\r
-               this.synonym = (Synonym) CdmStore.getService(ITaxonService.class).load(synonymUUID, propertyPaths);\r
+               this.synonym = (Synonym) CdmStore.getService(ITaxonService.class).load(synonymUUID);\r
                if(synonym == null){\r
                        throw new IllegalArgumentException(\r
                                        "A null synonym was provided.");\r
@@ -87,8 +85,8 @@ public class MoveSynonymToAnotherAcceptedTaxonOperation extends
                try {\r
                        synRel = CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synRel, this.element, true, synRel.getType(), null, null, true);\r
                } catch (HomotypicalGroupChangeException e) {\r
-                       MessagingUtils.warningDialog("Operation cancelled", getClass(), e.getMessage());\r
-                       return postExecute(null);\r
+                       // TODO Auto-generated catch block\r
+                       e.printStackTrace();\r
                }\r
                ((TaxonNameEditor)EditorUtil.getActiveMultiPageTaxonEditor().getActiveEditor()).getConversationHolder().commit();\r
                \r