Merge branch 'move-to-luna' into remoting-4.0

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

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index c05e3483c3c164e4b3de53ff0a795e3ac1030c69..bbd7e4d2025753158b41e538665acdcb46c50013 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@ -48,6 +48,8 @@ import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsVi
 import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
+import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
+import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -61,7 +63,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDetails,
-        IDirtyMarkable, IDerivedUnitFacadePart {
+        IDirtyMarkable, IDerivedUnitFacadePart, IPartContentHasFactualData, IPartContentHasMedia {
 
        /** Constant <code>ID="bulkeditor.editor"</code> */
        public static final String ID = "bulkeditor.editor";
@@ -174,6 +176,7 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
                super.dispose();
        }
 
+
        /* (non-Javadoc)
         * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#isEditable()
         */
@@ -189,6 +192,7 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
        /** {@inheritDoc} */
        @Override
        public void setFocus() {
+           conversation.bind();
                searchBar.setFocus();
 
                // TODO find a better place to put this - this dialog should be shown after initial contents of
@@ -282,18 +286,11 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
        @Override
        public void doSave(IProgressMonitor progressMonitor) {
            isDirty = false;
-           IViewPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-                           .findView("eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects");
-           if (part != null){
-                       ((ReferencingObjectsView)part).dispose();
-               }
+          
            super.doSave(progressMonitor);
 
            selectFirstItem();
-           if (part != null){
-                       ((ReferencingObjectsView)part).refresh();
-
-               }
+          
                getSourceViewer().getTextWidget().setFocus();
 
        }