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

index 05909e196a53e5a02d5381a1788c7cb5e53aa767..1519bb598076a722e6972cffbf61a6a423730e05 100644 (file)
@@ -72,36 +72,21 @@ public class DeleteConceptRelationOperation 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 Concept Relationship", taxon.getTaxonRelations().size() + 2);\r
-        \r
-        // Do one step\r
-        newMonitor.worked(1);\r
-\r
-        try {\r
-               // Operation steps\r
-       \r
-                       // Find relation, save citation information\r
-                       for (TaxonRelationship relationship : taxon.getTaxonRelations()) {\r
-                               if (relationship.getType().equals(relationshipType)\r
-                                               && relationship.getFromTaxon().equals(relatedTaxon)) {\r
-                                       citation = relationship.getCitation();\r
-                                       microcitation = relationship.getCitationMicroReference();\r
-                                       taxonRelationship = relationship; \r
-                                       StoreUtil.isCanceled(newMonitor, 1);\r
-                               }\r
+               // Find relation, save citation information\r
+               for (TaxonRelationship relationship : taxon.getTaxonRelations()) {\r
+                       if (relationship.getType().equals(relationshipType)\r
+                                       && relationship.getFromTaxon().equals(relatedTaxon)) {\r
+                               citation = relationship.getCitation();\r
+                               microcitation = relationship.getCitationMicroReference();\r
+                               taxonRelationship = relationship; \r
                        }\r
-                       \r
-                       // Remove relation from taxon\r
-                       taxon.removeTaxonRelation(taxonRelationship);\r
-                       StoreUtil.isCanceled(newMonitor, 1);\r
-        }\r
-        finally {\r
-               \r
-               // Stop the progress monitor.\r
-            newMonitor.done();\r
-        }\r
-                               \r
+               }\r
+               monitor.worked(20);\r
+               \r
+               // Remove relation from taxon\r
+               taxon.removeTaxonRelation(taxonRelationship);\r
+               monitor.worked(40);\r
+\r
                return postExecute(taxon);\r
        }\r
 \r