From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Mon, 22 Sep 2014 08:03:54 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~393^2~32
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d394a7ecf6f49f67f05d7a959f1457772d771025

merge-update from trunk
---

d394a7ecf6f49f67f05d7a959f1457772d771025
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 6731b675c,1cc320d33..6f67454f4
--- 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
@@@ -9,9 -9,11 +9,12 @@@ import org.eclipse.core.runtime.IProgre
  import org.eclipse.jface.action.MenuManager;
  import org.eclipse.jface.util.LocalSelectionTransfer;
  import org.eclipse.jface.viewers.AbstractTreeViewer;
+ import org.eclipse.jface.viewers.ISelection;
+ import org.eclipse.jface.viewers.ISelectionChangedListener;
+ import org.eclipse.jface.viewers.SelectionChangedEvent;
  import org.eclipse.jface.viewers.StructuredSelection;
  import org.eclipse.jface.viewers.TreeNode;
 +import org.eclipse.jface.viewers.TreeSelection;
  import org.eclipse.jface.viewers.TreeViewer;
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.dnd.DND;
@@@ -31,9 -34,9 +34,8 @@@ import eu.etaxonomy.cdm.api.conversatio
  import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
  import eu.etaxonomy.cdm.model.molecular.Sequence;
  import eu.etaxonomy.cdm.model.molecular.SingleRead;
- import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
  import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 -import eu.etaxonomy.taxeditor.model.IContextListener;
  import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
  import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
  import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
@@@ -46,7 -50,8 +49,8 @@@ import eu.etaxonomy.taxeditor.view.deri
   *
   */
  public class DerivateView extends EditorPart implements IPartContentHasFactualData, IDirtyMarkableSelectionProvider,
-         IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData {
+         IConversationEnabled, IPartContentHasDetails, IPartContentHasMedia, IPartContentHasSupplementalData,
 -        IContextListener, ISelectionChangedListener {
++        ISelectionChangedListener {
  
  	/**
       * Key used for storing a single DerivateView in a memento
@@@ -273,4 -269,77 +281,19 @@@
          return this.multiLinkSingleReads;
      }
  
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextStop(IMemento memento, IProgressMonitor monitor) {
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextStart(IMemento memento, IProgressMonitor monitor) {
 -//        if(memento == null){
 -//            return;
 -//        }
 -//        IMemento editorMementos = memento.getChild(DERIVATE_VIEW_MEMENTO_KEY);
 -//            DerivateViewEditorInput input = new DerivateViewEditorInput(UUID.fromString(editorInput.getString(DerivateViewEditorInput.UUID_MEMENTO_KEY)));
 -//                try {
 -//                    EditorUtil.open(input);
 -//                } catch (PartInitException e) {
 -//                    AbstractUtility.error(getClass(), "Error opening an editor window", e);
 -//                }
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextRefresh(org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextRefresh(IProgressMonitor monitor) {
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#workbenchShutdown(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
 -//        if (!conversation.isBound()) {
 -//            conversation.bind();
 -//        }
 -//        conversation.close();
 -//        if(memento == null){
 -//            return;
 -//        }
 -//
 -//        IEditorInput input = getEditorInput();
 -//        if(input instanceof IPersistable){
 -//            memento.createChild(DERIVATE_VIEW_MEMENTO_KEY);
 -//            ((IPersistable) input).saveState(memento);
 -//        }
 -    }
 -
+     /* (non-Javadoc)
+      * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
+      */
+     @Override
+     public void selectionChanged(SelectionChangedEvent event) {
+         this.selection  = event.getSelection();
+     }
+ 
+     /**
+      * @return the selection
+      */
+     public ISelection getSelection() {
+         return selection;
+     }
+ 
  }