#823 fixed.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / operations / DeleteDescriptionElementOperation.java

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java
index ed59f06aa4c814949b4e6821c6b86889c65c79f5..f2315686c3e15cb8ef8e5dce7d36da44b62ba6ee 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java
@@ -46,40 +46,25 @@ public class DeleteDescriptionElementOperation extends AbstractPostOperation {
        @Override\r
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
-                               \r
-               // Start the main progress monitor.\r
-        IProgressMonitor newMonitor = StoreUtil.startMainMonitor(monitor,"Deleting Description Element", 3);\r
-        \r
-        // Do one step\r
-        newMonitor.worked(1);\r
 \r
-        try {\r
-               // Operation steps\r
-       \r
-                       // Find description to which element belongs\r
-                       for (TaxonDescription descr : taxon.getDescriptions()) {\r
-                               for (DescriptionElementBase elem : descr.getElements()) {\r
-                                       if (elem.equals(element)) {\r
-                                               description = descr;\r
-                                               break;\r
-                                       }\r
+               // Find description to which element belongs\r
+               for (TaxonDescription descr : taxon.getDescriptions()) {\r
+                       for (DescriptionElementBase elem : descr.getElements()) {\r
+                               if (elem.equals(element)) {\r
+                                       description = descr;\r
+                                       break;\r
                                }\r
                        }\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-                       \r
-                       // Remove element from description\r
-                       if (description == null) {\r
-                               logger.error("Couldn't find element's description!");\r
-                       } else {\r
-                               description.removeElement(element);\r
-                       }\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-        }\r
-        finally {\r
-               \r
-               // Stop the progress monitor.\r
-            newMonitor.done();\r
-        }\r
+               }\r
+               monitor.worked(20);\r
+               \r
+               // Remove element from description\r
+               if (description == null) {\r
+                       logger.error("Couldn't find element's description!");\r
+               } else {\r
+                       description.removeElement(element);\r
+               }\r
+               monitor.worked(40);\r
 \r
         // Redraw editor if exists\r
                return postExecute(null);\r