From a52835b4dc8f60f74be81a1661a41c180f9266dd Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Mon, 26 Oct 2015 15:12:52 +0100
Subject: [PATCH] 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
---
.../taxeditor/editor/view/derivate/DerivateView.java | 8 +++++++-
.../derivate/searchFilter/DerivateSearchComposite.java | 4 ++++
2 files changed, 11 insertions(+), 1 deletion(-)
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 f8eeb6fb4..33acf9fae 100644
--- 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 fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon((Taxon) selectedElement, null, null);
- viewer.setInput(fieldUnits);
+ Collection uuids = new HashSet();
+ 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 c4e8fe325..36d23173f 100644
--- 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);
}
--
2.34.1