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

index 3d42e4bce14aa1882332790bf227c3aaa8687983..536d787e4140e42fb2f417b2d320e484fbca4257 100644 (file)
@@ -48,34 +48,19 @@ public class DeleteMisapplicationOperation extends AbstractPostOperation {
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
 \r
-               // Start the main progress monitor.\r
-        IProgressMonitor newMonitor = StoreUtil.startMainMonitor(monitor,"Deleting Misapplication", taxon.getTaxonRelations().size() + 2);\r
-        \r
-        // Do one step\r
-        newMonitor.worked(1);\r
-\r
-        try {\r
-               // Operation steps\r
-       \r
-                       // Find misapplication relation, save citation information\r
-                       for (TaxonRelationship relationship : taxon.getTaxonRelations()) {\r
-                               if (relationship.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR())\r
-                                               && relationship.getFromTaxon().equals(misapplication)) {\r
-                                       citation = relationship.getCitation();\r
-                                       microcitation = relationship.getCitationMicroReference();\r
-                                       StoreUtil.isCanceled(newMonitor, 1);\r
-                               }\r
+               // Find misapplication relation, save citation information\r
+               for (TaxonRelationship relationship : taxon.getTaxonRelations()) {\r
+                       if (relationship.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR())\r
+                                       && relationship.getFromTaxon().equals(misapplication)) {\r
+                               citation = relationship.getCitation();\r
+                               microcitation = relationship.getCitationMicroReference();\r
                        }\r
-                       \r
-                       // Remove misapplied name relation from taxon\r
-                       taxon.removeTaxon(misapplication, TaxonRelationshipType.MISAPPLIED_NAME_FOR());\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 misapplied name relation from taxon\r
+               taxon.removeTaxon(misapplication, TaxonRelationshipType.MISAPPLIED_NAME_FOR());\r
+               monitor.worked(40);\r
 \r
                return postExecute(null);\r
        }\r