From 79327e54227c30fbf323cd6853ce54f43caa8422 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Fri, 16 Jan 2015 10:01:15 +0000 Subject: [PATCH] - close Derivate Editor if all elements are deleted --- .../view/derivate/operation/DeleteDerivateOperation.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java index 78afd7c0a..8f65f7c96 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java @@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView; +import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -79,7 +80,12 @@ public class DeleteDerivateOperation extends AbstractPostOperation { DerivateView derivateView = (DerivateView) getPostOperationEnabled(); //update DerivateView derivateView.getConversationHolder().commit(); - return postExecute(null); + IStatus returnStatus = postExecute(null); + //close if no more items left + if(derivateView.getViewer().getTree().getItemCount()<1){ + AbstractUtility.close(derivateView); + } + return returnStatus; } } else{ -- 2.34.1