#823 fixed.

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java
index ed3b84dd5a46b216829d96ea8dad3e74201f2814..5e5d7c5bd5b438d44f9c3df0f848019200cb4224 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java
@@ -49,39 +49,24 @@ public class ChangeSynonymToConceptOperation extends AbstractPostOperation {
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
 \r
-               Taxon fromTaxon;\r
-               // Start the main progress monitor.\r
-        IProgressMonitor newMonitor = StoreUtil.startMainMonitor(monitor,"Changing Synonym to Concept Relationship", 2);\r
-        \r
-        // Do one step\r
-        newMonitor.worked(1);\r
+//             // Get name from synonym\r
+//             TaxonNameBase<?, ?> synonymName = synonym.getName();\r
+//             \r
+//             // remove synonym from taxon\r
+//             taxon.removeSynonym(synonym);\r
+//             \r
+//             // Create a taxon with synonym name\r
+//             Taxon fromTaxon = Taxon.NewInstance(synonymName, null);\r
+//             \r
+//             // Add taxon relation \r
+//             fromTaxon.addTaxonRelation(taxon, taxonRelationshipType, null, null);\r
 \r
-        try {\r
-               // Operation steps\r
-\r
-       //              // Get name from synonym\r
-       //              TaxonNameBase<?, ?> synonymName = synonym.getName();\r
-       //              \r
-       //              // remove synonym from taxon\r
-       //              taxon.removeSynonym(synonym);\r
-       //              \r
-       //              // Create a taxon with synonym name\r
-       //              Taxon fromTaxon = Taxon.NewInstance(synonymName, null);\r
-       //              \r
-       //              // Add taxon relation \r
-       //              fromTaxon.addTaxonRelation(taxon, taxonRelationshipType, null, null);\r
-                       \r
-                       fromTaxon = CdmStore.getTaxonService().changeSynonymToRelatedTaxon(synonym, taxon, taxonRelationshipType, null, null);\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-                       \r
-       //              TaxonRelationshipType.\r
-       //              logger.warn("Not yet implemented.");\r
-        }\r
-        finally {\r
-               \r
-               // Stop the progress monitor.\r
-            newMonitor.done();\r
-        }\r
+               monitor.worked(20);\r
+       Taxon fromTaxon = CdmStore.getTaxonService().changeSynonymToRelatedTaxon(synonym, taxon, taxonRelationshipType, null, null);\r
+               monitor.worked(40);\r
+               \r
+//             TaxonRelationshipType.\r
+//             logger.warn("Not yet implemented.");\r
 \r
                return postExecute(fromTaxon);\r
        }\r