import org.eclipse.ui.texteditor.AbstractDocumentProvider;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
+import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
}
if (annotation.isMarkedAsMerged()) {
persistenceService.merge(annotation.getEntity(), annotation.getMergeTarget()); // merge
- } else {
+ } if (annotation.isMarkedAsDeleted()) {
+ try {
+ persistenceService.delete(annotation.getEntity(), annotation.getDeleteConfigurator());
+ } catch (ReferencedObjectUndeletableException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } // merge
+ }
+
+ else {
// TODO clarify w AM whether this needs to be executed on merged objects
//persistenceService.delete(annotation.getEntity()); // delete
}
int length = position.getLength();
Object entity = annotation.getEntity();
- annotation.markAsDeleted();
+ //annotation.markAsDeleted(configurator);
model.removeAnnotation(annotation);
-
+
// Immediately followed by a delimiter?
int annotationEnd = offset + length;
try {
}
try {
+
document.replace(offset, length, "");
+
} catch (BadLocationException e) {
MessagingUtils.error(getClass(), "Problems removing annotated line", e);
}
updateLineFromAnnotation(annotation);
}
}
+
+
}