#823 fixed.
authorem.lee <em.lee@localhost>
Wed, 27 Jan 2010 14:50:59 +0000 (14:50 +0000)
committerem.lee <em.lee@localhost>
Wed, 27 Jan 2010 14:50:59 +0000 (14:50 +0000)
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java

index 2dc825dfe297e0d47d117dd874923271483c84a5..5c7c99c3528f8e44d617cb4feda8724d80830f81 100644 (file)
@@ -64,32 +64,17 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                bind();\r
-               TaxonNode newTaxonNode;\r
+               monitor.worked(20);\r
                \r
-               // Start the main progress monitor.\r
-        IProgressMonitor newMonitor = StoreUtil.startMainMonitor(monitor,"Moving Taxon", 2);\r
-        \r
-        // Do one step\r
-        newMonitor.worked(1);\r
-\r
-        try {\r
-               // Operation steps\r
-       \r
-                               try{\r
-                                       newTaxonNode = newParentTreeNode.addChildNode(taxonNode, \r
-                                                       newParentTreeNode.getReference(), newParentTreeNode.getMicroReference(), \r
-                                                       taxonNode.getSynonymToBeUsed());\r
-                                       return postExecute(newTaxonNode);\r
-                               }catch(IllegalAncestryException e){\r
-                                       StoreUtil.warningDialog("Illegal ancestry", e.getMessage());\r
-                               }\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-        }\r
-        finally {\r
-               \r
-               // Stop the progress monitor.\r
-            newMonitor.done();\r
-        }\r
+               try {\r
+                       TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode, \r
+                                               newParentTreeNode.getReference(), newParentTreeNode.getMicroReference(), \r
+                                               taxonNode.getSynonymToBeUsed());\r
+                               return postExecute(newTaxonNode);\r
+               } catch(IllegalAncestryException e) {\r
+                       StoreUtil.warningDialog("Illegal ancestry", e.getMessage());\r
+               }\r
+               monitor.worked(40);\r
                \r
                return null;\r
        }\r