Merge branch 'develop' into remoting-4.0

[taxeditor.git] / eu.etaxonomy.taxeditor.bulkeditor / src / main / java / eu / etaxonomy / taxeditor / annotatedlineeditor / AnnotatedLineDocumentProvider.java

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
index af7d40c9f9eb56ca838ce40cc67e4dbae0b58da6..3243ffbe49299cddaee36b43327ac5139893df83 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
@@ -26,8 +26,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.texteditor.AbstractDocumentProvider;
 
 import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
-import eu.etaxonomy.taxeditor.dataimport.DerivedUnitEditorInput;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 
 
 
@@ -58,7 +57,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
 
        private ILineDisplayStrategy lineDisplayStrategy;
 
-       private IEditorInput input;
+       private final IEditorInput input;
 
        /**
         * <p>Constructor for AnnotatedLineDocumentProvider.</p>
@@ -114,7 +113,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                                        try {
                                                createAnnotatedLine(input, entity);
                                        } catch (BadLocationException e) {
-                                               AbstractUtility.error(getClass(), "Problems creating annotated line: ", e);
+                                               MessagingUtils.error(getClass(), "Problems creating annotated line: ", e);
                                        }
                                }
                        }
@@ -207,7 +206,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                        }
                        document.replace(offset, lineLength, text);
                } catch (BadLocationException e) {
-                       AbstractUtility.error(getClass(), "Problem updating annotated line: " ,e);
+                       MessagingUtils.error(getClass(), "Problem updating annotated line: " ,e);
                }
        }
 
@@ -219,9 +218,6 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                if (element instanceof AbstractBulkEditorInput) {
                        return ((AbstractBulkEditorInput)element).getModel();
                }
-               else if(element instanceof DerivedUnitEditorInput){
-                   return ((DerivedUnitEditorInput) element).getResults();
-               }
                return null;
        }
 
@@ -241,7 +237,8 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                                if (annotation instanceof IEntityContainer<?>) {
                                        IEntityContainer<?> container = (IEntityContainer<?>) annotation;
                                        if (container.isMarkedAsNew() || container.isDirty()) {
-                                               persistenceService.save(container.getEntity()); // save
+                                               Object entity = persistenceService.save(container.getEntity()); // save
+                                               container.setEntity(entity);
                                                container.setDirty(false);
                                                container.markAsNew(false);
                                        }
@@ -367,13 +364,13 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
                                        length += 2;
                                }
                        } catch (BadLocationException e1) {
-                               AbstractUtility.error(getClass(), "Problems removing annotated line", e1);
+                               MessagingUtils.error(getClass(), "Problems removing annotated line", e1);
                        }
 
                        try {
                                document.replace(offset, length, "");
                        } catch (BadLocationException e) {
-                               AbstractUtility.error(getClass(), "Problems removing annotated line", e);
+                               MessagingUtils.error(getClass(), "Problems removing annotated line", e);
                        }
                }
        }