- fixed selection of DerivateSearch result table

 - double-click now opens DerivateView

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 24154d93b2ce380ab973e189117e0b04fd00eaf5..ba4baf6e940bc8b9d65b842426b4410106feb854 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
@@ -13,6 +13,8 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
 
+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 
@@ -27,6 +29,8 @@ public class DerivateView extends EditorPart implements IPartContentHasDetails,
 
        protected TreeViewer viewer;
 
+       private SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy> derivate;
+
     /* (non-Javadoc)
      * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
      */
@@ -49,6 +53,8 @@ public class DerivateView extends EditorPart implements IPartContentHasDetails,
 
         control.setMenu(menu);
 
+
+        viewer.setInput(derivate);
     }
 
     /* (non-Javadoc)
@@ -69,12 +75,28 @@ public class DerivateView extends EditorPart implements IPartContentHasDetails,
 
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.part.EditorPart#getTitleToolTip()
+     */
+    @Override
+    public String getTitleToolTip() {
+        // TODO Auto-generated method stub
+        return "Derivate View";
+    }
+
     /* (non-Javadoc)
      * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
      */
     @Override
     public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-        viewer.setInput(input);
+        setSite(site);
+        setInput(input);
+        if(input instanceof DerivateViewEditorInput){
+            derivate = ((DerivateViewEditorInput) input).getDerivate();
+        }
+        else{
+            throw new PartInitException("Invalid Input: Must be DerivateViewEditorInput");
+        }
     }
 
     /* (non-Javadoc)
@@ -105,58 +127,4 @@ public class DerivateView extends EditorPart implements IPartContentHasDetails,
 
     }
 
-//     @Override
-//     public void createViewer(Composite parent) {
-//             viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION));
-//             viewer.setContentProvider(new DerivateContentProvider());
-//             viewer.setLabelProvider(new DerivateLabelProvider());
-//             viewer.setAutoExpandLevel(2);
-//        // Propagate selection from viewer
-//        getSite().setSelectionProvider(viewer);
-//
-//        //create context menu
-//        MenuManager menuManager = new MenuManager();
-//
-//        getSite().registerContextMenu(menuManager, viewer);
-//
-//        Control control = viewer.getControl();
-//        Menu menu = menuManager.createContextMenu(control);
-//
-//        control.setMenu(menu);
-//     }
-//
-//     @Override
-//     public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-//         if(AbstractUtility.getActiveEditor()==null || !(AbstractUtility.getActiveEditor() instanceof BulkEditor)){
-//             showEmptyPage();
-//             return;
-//         }
-//         else if(part instanceof BulkEditor){
-//             this.part = part;
-//
-//             getViewer().setInput(selection);
-//
-//             showViewer();
-//             return;
-//         }
-//     }
-//
-//     @Override
-//     public boolean onComplete() {
-//             // TODO Auto-generated method stub
-//             return false;
-//     }
-//
-//     @Override
-//     public Viewer getViewer() {
-//             return viewer;
-//     }
-//
-//
-//     @Override
-//    public boolean postOperation(CdmBase objectAffectedByOperation) {
-//             return super.postOperation(objectAffectedByOperation);
-//     }
-
-
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
index bf09a14caf228af20887cb9f613c065bb126f083..08960026e0cafe68f8e4388581f2cffe5e3b668e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
@@ -15,6 +15,11 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
 /**
  * @author pplitzner
  * @date 25.11.2013
@@ -46,7 +51,6 @@ public class DerivateViewEditorInput implements IEditorInput {
      */
     @Override
     public boolean exists() {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -64,8 +68,7 @@ public class DerivateViewEditorInput implements IEditorInput {
      */
     @Override
     public String getName() {
-        // TODO Auto-generated method stub
-        return null;
+        return uuid.toString();
     }
 
     /* (non-Javadoc)
@@ -81,8 +84,12 @@ public class DerivateViewEditorInput implements IEditorInput {
      */
     @Override
     public String getToolTipText() {
-        // TODO Auto-generated method stub
-        return null;
+        return uuid.toString();
+    }
+
+    public SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy> getDerivate(){
+        IOccurrenceService service = CdmStore.getService(IOccurrenceService.class);
+        return service.find(uuid);
     }
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java
index 3513d823271e424ee44eda0d48d647a6c9f1756d..a8854c7786698566d9635882c9bdbdcc3fa910f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
@@ -42,10 +43,10 @@ public class DerivateSearchCompositeController {
     private IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>> configurator;
 
     /**
-     * @param derivateSearchComposite
+     * @param parent
      */
-    public DerivateSearchCompositeController(DerivateSearchComposite derivateSearchComposite) {
-        this.derivateSearchComposite = derivateSearchComposite;
+    public DerivateSearchCompositeController(Composite parent) {
+        this.derivateSearchComposite = new DerivateSearchComposite(parent, SWT.NONE);
         init();
     }
 
@@ -97,4 +98,12 @@ public class DerivateSearchCompositeController {
         derivateSearchComposite.getResultViewer().setInput(results);
     }
 
+
+    /**
+     * @return the derivateSearchComposite
+     */
+    public DerivateSearchComposite getDerivateSearchComposite() {
+        return derivateSearchComposite;
+    }
+
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java
index 0fc50f8a80586466a8a1cffed16c3342410ebca9..15d2e9008f0947e48f48f2597a1529aec352bae8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java
@@ -9,7 +9,6 @@
 */
 package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
@@ -27,7 +26,8 @@ public class DerivateSearchView extends ViewPart {
      */
     @Override
     public void createPartControl(Composite parent) {
-        new DerivateSearchCompositeController(new DerivateSearchComposite(parent, SWT.NONE));
+        DerivateSearchCompositeController derivateSearchCompositeController = new DerivateSearchCompositeController(parent);
+        getSite().setSelectionProvider(derivateSearchCompositeController.getDerivateSearchComposite().getResultViewer());
     }
 
     /* (non-Javadoc)