From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 8 Nov 2013 13:18:18 +0000 (+0000)
Subject: fix the deletion of SpecimenOrObservationBase objects in bulk editor
X-Git-Tag: 3.6.0~880
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c58a8daa204c5508fcbda779c9bfe90b33c9ad06

fix the deletion of SpecimenOrObservationBase objects in bulk editor
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index 3ba11e54d..d1c0c6445 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -20,6 +20,11 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
@@ -27,6 +32,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * @author n.hoffmann
@@ -65,7 +71,16 @@ public class DeleteHandler extends AbstractHandler {
 					LineAnnotation annotation = (LineAnnotation) model.getAnnotation(object);
 							
 					try {
-						persistenceService.delete(object);
+						//persistenceService.delete(object);
+						if (object instanceof SpecimenOrObservationBase){
+							CdmApplicationController controller;
+							
+							controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();
+							
+							IOccurrenceService service = controller.getOccurrenceService();
+							service.delete((SpecimenOrObservationBase)object);
+						}
+						
 					} catch (Exception e){
 						BulkEditorUtil.errorDialog("Could not delete", getClass(), e.getMessage(), null);
 					}