Add toggle button for link with editor

 - search bar will be disabled when linked to editor
 - also fixed tree initialization when listening to selection changes

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 f8eeb6fb46db96559b522004d6a16e247d53fdf7..33acf9faefae9cf401d5029470aa204fb2094155 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
@@ -441,7 +441,11 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
             Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
             if(selectedElement instanceof Taxon){
                 Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon((Taxon) selectedElement, null, null);
-                viewer.setInput(fieldUnits);
+                Collection<UUID> uuids = new HashSet<UUID>();
+                for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
+                    uuids.add(specimenOrObservationBase.getUuid());
+                }
+                updateRootEntities(uuids);
             }
         }
     }
@@ -464,5 +468,7 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
 
     public void toggleListenToSelectionChange() {
         listenToSelectionChange = !listenToSelectionChange;
+        derivateSearchCompositeController.setEnabled(listenToSelectionChange);
     }
+
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchComposite.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchComposite.java
index c4e8fe32517262df5a4daa69fa66bd2ae1497e21..36d23173ffb72ae5fe5807cf0c8c7ad032533404 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchComposite.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchComposite.java
@@ -127,9 +127,13 @@ public class DerivateSearchComposite extends Composite {
         super.setEnabled(enabled);
         searchField.setEnabled(enabled);
         comboDerivateType.setEnabled(enabled);
+        comboTaxonAssignment.setEnabled(enabled);
         buttonSearch.setEnabled(enabled);
         btnBrowseTaxa.setEnabled(enabled);
+        btnClearTaxon.setEnabled(enabled);
         lblTaxon.setEnabled(enabled);
+        lblTitleCache.setEnabled(enabled);
+        lbltaxonAssignment.setEnabled(enabled);
         lblDerivateType.setEnabled(enabled);
     }