Hide SearchBar when linking to taxon editor

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 6c7d81cd11865c72f4e3cbeda7cc82046289a9cd..c8ded530213c597be8ba167739cb4485e0cd33a7 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
@@ -154,11 +154,11 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
 
         //---search and filter---
         derivateSearchCompositeController = new DerivateSearchCompositeController(parent, this);
 
         //---search and filter---
         derivateSearchCompositeController = new DerivateSearchCompositeController(parent, this);

-        derivateSearchCompositeController.setEnabled(CdmStore.isActive());

         GridData gridDataSearchBar = new GridData();
         gridDataSearchBar.horizontalAlignment = GridData.FILL;
         gridDataSearchBar.grabExcessHorizontalSpace = true;
         derivateSearchCompositeController.setLayoutData(gridDataSearchBar);
         GridData gridDataSearchBar = new GridData();
         gridDataSearchBar.horizontalAlignment = GridData.FILL;
         gridDataSearchBar.grabExcessHorizontalSpace = true;
         derivateSearchCompositeController.setLayoutData(gridDataSearchBar);

+        derivateSearchCompositeController.setEnabled(CdmStore.isActive());

 
         //---tree viewer---
         viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION));
 
         //---tree viewer---
         viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION));


@@ -174,6 +174,7 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
         labelProvider.setConversation(conversation);
         viewer.setLabelProvider(labelProvider);
         viewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
         labelProvider.setConversation(conversation);
         viewer.setLabelProvider(labelProvider);
         viewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);

+        viewer.getTree().setEnabled(CdmStore.isActive());

         // Propagate selection from viewer
         getSite().setSelectionProvider(viewer);
 
         // Propagate selection from viewer
         getSite().setSelectionProvider(viewer);
 


@@ -463,12 +464,8 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
                     uuids.add(specimenOrObservationBase.getUuid());
                 }
                 updateRootEntities(uuids);
                     uuids.add(specimenOrObservationBase.getUuid());
                 }
                 updateRootEntities(uuids);

-                derivateSearchCompositeController.setTaxon(selectedTaxon);

                 setPartName("Derivative Editor: " + selectedTaxon.getName());
             }
                 setPartName("Derivative Editor: " + selectedTaxon.getName());
             }

-//            if(part instanceof MultiPageTaxonEditor){
-//                Taxon taxon = ((MultiPageTaxonEditor) part).getTaxon();
-//            }

         }
     }
 
         }
     }
 


@@ -499,7 +496,6 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
     public void toggleListenToSelectionChange() {
         listenToSelectionChange = !listenToSelectionChange;
         derivateSearchCompositeController.setEnabled(!listenToSelectionChange);
     public void toggleListenToSelectionChange() {
         listenToSelectionChange = !listenToSelectionChange;
         derivateSearchCompositeController.setEnabled(!listenToSelectionChange);

-        derivateSearchCompositeController.setTaxon(null);

         if(!listenToSelectionChange){
             selectedTaxon = null;
             setPartName("Derivative Editor");
         if(!listenToSelectionChange){
             selectedTaxon = null;
             setPartName("Derivative Editor");


@@ -526,6 +522,7 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
         derivateSearchCompositeController.setEnabled(false);
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
         derivateSearchCompositeController.setEnabled(false);

+        viewer.getTree().setEnabled(false);

         viewer.setInput(null);
     }
 
         viewer.setInput(null);
     }
 


@@ -536,6 +533,7 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
     public void contextStart(IMemento memento, IProgressMonitor monitor) {
         init();
         derivateSearchCompositeController.setEnabled(!listenToSelectionChange);
     public void contextStart(IMemento memento, IProgressMonitor monitor) {
         init();
         derivateSearchCompositeController.setEnabled(!listenToSelectionChange);

+        viewer.getTree().setEnabled(true);

         refreshTree();
     }
 
         refreshTree();
     }
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
index 153bc2974fb696ff108304ad8db5053600ad504d..74d74db844b0d4df94700562b8b611935c061fed 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.eclipse.swt.SWT;
 import java.util.UUID;
 
 import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;


@@ -68,10 +69,6 @@ public class DerivateSearchCompositeController implements Listener{
     }
 
     private void searchDerivates(){
     }
 
     private void searchDerivates(){

-//        if(!conversation.isBound()){
-//            conversation.bind();
-//        }
-

         String queryString = derivateSearchComposite.getSearchField().getText();
         SpecimenOrObservationType specimenType = comboSpecimenTypeController.getSelection();
 
         String queryString = derivateSearchComposite.getSearchField().getText();
         SpecimenOrObservationType specimenType = comboSpecimenTypeController.getSelection();
 


@@ -154,7 +151,10 @@ public class DerivateSearchCompositeController implements Listener{
      */
     public void setEnabled(boolean enabled) {
         if(!derivateSearchComposite.isDisposed()){
      */
     public void setEnabled(boolean enabled) {
         if(!derivateSearchComposite.isDisposed()){

-            derivateSearchComposite.setEnabled(enabled);
+            GridData layoutData = (GridData) derivateSearchComposite.getLayoutData();
+            layoutData.exclude = !enabled;
+            derivateSearchComposite.setVisible(enabled);
+            derivateSearchComposite.getParent().layout(true);

         }
     }
 
         }
     }
 


@@ -178,18 +178,4 @@ public class DerivateSearchCompositeController implements Listener{
         labelProvider.setConversation(conversationHolder);
     }
 
         labelProvider.setConversation(conversationHolder);
     }
 

-    /**
-     * @param taxon
-     */
-    public void setTaxon(Taxon taxon) {
-        if(taxon==null){
-            derivateSearchComposite.getTextTaxonName().setText("");
-            derivateSearchComposite.getComboTaxonAssignment().select(DerivateSearchComposite.ALL_SPECIMENS);
-        }
-        else{
-            derivateSearchComposite.getTextTaxonName().setText(taxon.getTitleCache());
-            derivateSearchComposite.getComboTaxonAssignment().select(DerivateSearchComposite.ASSIGNED_SPECIMENS);
-        }
-    }
-

 }
 }