From bd10f42ba10cf9aaeb8224b2835110d6c8e8ea15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 9 Oct 2015 15:41:09 +0200 Subject: [PATCH] Cleanup DeleteOperation --- .../navigator/operation/DeleteOperation.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java index cd0fbef49..ee5880e96 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java @@ -105,33 +105,33 @@ public class DeleteOperation extends AbstractPersistentPostOperation{ monitor.worked(20); ICdmApplicationConfiguration controller = CdmStore.getCurrentApplicationConfiguration(); ITaxonNodeService service = controller.getTaxonNodeService(); - if(taxonNode != null && taxonNode instanceof TaxonNode){ - //((TaxonNode) treeNode).delete(); - - element = ((TaxonNode)taxonNode).getTaxon(); - - DeleteResult result = service.deleteTaxonNode((TaxonNode)taxonNode, config); - if (result.isError() && !result.getExceptions().isEmpty()){ - - DeleteResultMessagingUtils.messageDialogWithDetails(result, "TaxonNode could not be deleted.", TaxeditorNavigationPlugin.PLUGIN_ID); - } else if (!result.getExceptions().isEmpty()){ - String separator = ", "; - String exceptionString = ""; - for (Exception exception : result.getExceptions()) { - exceptionString += exception.getLocalizedMessage()+separator; - } - DeleteResultMessagingUtils.messageDialogWithDetails(result, "TaxonNode was successfully deleted, but related object(s) could not be deleted", TaxeditorNavigationPlugin.PLUGIN_ID); - } + if(taxonNode != null && taxonNode instanceof TaxonNode){ + //((TaxonNode) treeNode).delete(); + + element = ((TaxonNode)taxonNode).getTaxon(); + + DeleteResult result = service.deleteTaxonNode((TaxonNode)taxonNode, config); + if (result.isError() && !result.getExceptions().isEmpty()){ + + DeleteResultMessagingUtils.messageDialogWithDetails(result, "TaxonNode could not be deleted.", TaxeditorNavigationPlugin.PLUGIN_ID); + } else if (!result.getExceptions().isEmpty()){ + String separator = ", "; + String exceptionString = ""; + for (Exception exception : result.getExceptions()) { + exceptionString += exception.getLocalizedMessage()+separator; + } + DeleteResultMessagingUtils.messageDialogWithDetails(result, "TaxonNode was successfully deleted, but related object(s) could not be deleted", TaxeditorNavigationPlugin.PLUGIN_ID); + } - }else if(taxonNode != null && taxonNode instanceof Classification){ - Classification taxonomicTree = (Classification) taxonNode; + }else if(taxonNode != null && taxonNode instanceof Classification){ + Classification taxonomicTree = (Classification) taxonNode; - DeleteResult result = CdmStore.getService(IClassificationService.class).delete(taxonomicTree.getUuid()); - if (result.isError() && !result.getExceptions().isEmpty()){ - //TODO:Error message! - DeleteResultMessagingUtils.messageDialogWithDetails(result, "TaxonNode could not be deleted.", TaxeditorNavigationPlugin.PLUGIN_ID); - } + DeleteResult result = CdmStore.getService(IClassificationService.class).delete(taxonomicTree.getUuid()); + if (result.isError() && !result.getExceptions().isEmpty()){ + //TODO:Error message! + DeleteResultMessagingUtils.messageDialogWithDetails(result, "TaxonNode could not be deleted.", TaxeditorNavigationPlugin.PLUGIN_ID); + } } else { Set treeNodeUuids = new HashSet(); ITaxonTreeNode entity = null; -- 2.34.1