- delete description CDM entity when invoking Delete*DescriptionOperation (fixes...

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java
index dcb01fd74f0d67a08a2feab62e0ef82f3b984aff..6b5b7f6ecd5c9f38985d63d553823499d89999b5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java
@@ -15,10 +15,12 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 

+import eu.etaxonomy.cdm.api.service.IDescriptionService;

 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;

+import eu.etaxonomy.taxeditor.store.CdmStore;

 
 /**
  *
 
 /**
  *


@@ -47,6 +49,7 @@ public class DeleteSpecimenDescriptionOperation extends AbstractPostOperation<Sp
                monitor.worked(20);
                element.removeDescription(description);
                monitor.worked(40);
                monitor.worked(20);
                element.removeDescription(description);
                monitor.worked(40);

+               CdmStore.getService(IDescriptionService.class).delete(description);

 
                return postExecute(description);
        }
 
                return postExecute(description);
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
index daa0394da86657dbd3e1e415358c7b98ceef4b1c..fabd4d9358a0119eeab07cdc506b224eca737e05 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
@@ -15,9 +15,11 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 

+import eu.etaxonomy.cdm.api.service.IDescriptionService;

 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;

+import eu.etaxonomy.taxeditor.store.CdmStore;

 
 /**
  * <p>DeleteTaxonDescriptionOperation class.</p>
 
 /**
  * <p>DeleteTaxonDescriptionOperation class.</p>


@@ -58,6 +60,7 @@ public class DeleteTaxonDescriptionOperation extends AbstractPostTaxonOperation
                monitor.worked(20);
                element.removeDescription(description);
                monitor.worked(40);
                monitor.worked(20);
                element.removeDescription(description);
                monitor.worked(40);

+               CdmStore.getService(IDescriptionService.class).delete(description);

 
                return postExecute(description);
        }
 
                return postExecute(description);
        }