#823 fixed.

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
index cd7af237ca929e53c48e2314eae55c1577b446ad..190d340f815948d7880b7d1085e23c43456d2b9b 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
@@ -48,42 +48,27 @@ public class CreateSynonymInExisitingHomotypicalGroupOperation extends
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                \r
-               // Start the main progress monitor.\r
-        IProgressMonitor newMonitor = StoreUtil.startMainMonitor(monitor,"Creating Synonym in existing Homotypic Group", 4);\r
-        \r
-        // Do one step\r
-        newMonitor.worked(1);\r
-\r
-        try {\r
-               // Operation steps\r
-                       \r
-                       // Add name to given homotypic group\r
-                       group.addTypifiedName(newSynonymName);\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-                       \r
-                       // Create a new synonym for the taxon\r
-                       // TODO add citations\r
-                       if(group.equals(taxon.getHomotypicGroup())){\r
-                               synonymRelationship = taxon.addHomotypicSynonymName(newSynonymName, null, null);\r
-                       }else{\r
-                               synonymRelationship = taxon.addHeterotypicSynonymName(newSynonymName);\r
-                       }\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-                       \r
-       //              Synonym affectedSynonym = null;\r
-       //              \r
-       //              for(Synonym synonym : group.getSynonymsInGroup(taxon.getSec())){\r
-       //                      if(synonym.getName() == synonymName){\r
-       //                              affectedSynonym = synonym;\r
-       //                              break;\r
-       //                      }\r
-       //              }\r
-        }\r
-        finally {\r
-               \r
-               // Stop the progress monitor.\r
-            newMonitor.done();\r
-        }\r
+               // Add name to given homotypic group\r
+               group.addTypifiedName(newSynonymName);\r
+               monitor.worked(20);\r
+               \r
+               // Create a new synonym for the taxon\r
+               // TODO add citations\r
+               if(group.equals(taxon.getHomotypicGroup())){\r
+                       synonymRelationship = taxon.addHomotypicSynonymName(newSynonymName, null, null);\r
+               }else{\r
+                       synonymRelationship = taxon.addHeterotypicSynonymName(newSynonymName);\r
+               }\r
+               monitor.worked(40);\r
+               \r
+//             Synonym affectedSynonym = null;\r
+//             \r
+//             for(Synonym synonym : group.getSynonymsInGroup(taxon.getSec())){\r
+//                     if(synonym.getName() == synonymName){\r
+//                             affectedSynonym = synonym;\r
+//                             break;\r
+//                     }\r
+//             }\r
                \r
                return postExecute(synonymRelationship.getSynonym());\r
        }\r