- DerivateView and BulkEditor trigger selection change event for MediaViewPart ...

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 48e604b2dfa5827112b73199ebd58b4c68cb387a..364dcdf72fbe1c59416a1d528febc125e6ac5c8b 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
@@ -44,7 +44,6 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
 import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
-import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -57,7 +56,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 07.07.2009
  * @version 1.0
  */
-public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDetails, IPartContentHasMedia,
+public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDetails,
         IDirtyMarkable {
 
        /** Constant <code>ID="bulkeditor.editor"</code> */
@@ -267,7 +266,8 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
            }
        }
 
-       public void forceDirty(){
+       @Override
+    public void forceDirty(){
            isDirty = true;
            firePropertyChange(PROP_DIRTY);
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 13778a6dcdf26386576c55b152dbc34a93e1fbf6..66eff4ca5514d777fb87f21a99147a3fc6f168ce 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -42,7 +42,6 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 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.model.IPartContentHasSupplementalData;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -53,7 +52,7 @@ import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
  *
  */
 public class DerivateView extends EditorPart implements IPartContentHasFactualData, IDirtyMarkable,
-        IConversationEnabled, IPartContentHasDetails, IPartContentHasMedia, IPartContentHasSupplementalData,
+        IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData,
         ISelectionChangedListener, IPostOperationEnabled {
 
     public static final String ID = "eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView";
@@ -110,7 +109,9 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
             Set<UUID> derivateUUIDs = ((DerivateViewEditorInput) editorInput).getDerivateUUIDs();
             if(derivateUUIDs.size()==1){
                 SpecimenOrObservationBase<?> specimen = CdmStore.getService(IOccurrenceService.class).load(derivateUUIDs.iterator().next());
-                viewer.setSelection(new StructuredSelection(new TreeNode(specimen)));
+                if(specimen!=null){
+                    viewer.setSelection(new StructuredSelection(new TreeNode(specimen)));
+                }
             }
         }
 
@@ -125,7 +126,12 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
      */
     @Override
     public void doSave(IProgressMonitor monitor) {
-        monitor.beginTask("Saving Derivates", 3);
+        String taskName = "Saving hierarchy";
+        if(getEditorInput() instanceof DerivateViewEditorInput){
+            DerivateViewEditorInput derivateViewEditorInput = (DerivateViewEditorInput) getEditorInput();
+            taskName += " "+derivateViewEditorInput.getName();
+        }
+        monitor.beginTask(taskName, 3);
         if (!conversation.isBound()) {
             conversation.bind();
         }
@@ -299,13 +305,14 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
         this.selection  = event.getSelection();
     }
 
-    /**
-     * @return the selection
-     */
     public ISelection getSelection() {
         return selection;
     }
 
+    public DerivateLabelProvider getLabelProvider() {
+        return labelProvider;
+    }
+
     /* (non-Javadoc)
      * @see eu.etaxonomy.taxeditor.operation.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
      */
@@ -314,9 +321,8 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
         refreshTree();
         if(objectAffectedByOperation!=null){
             changed(objectAffectedByOperation);
-            return true;
         }
-        return false;
+        return true;
     }
 
     /* (non-Javadoc)