From f089f86e563bf7c78d077c254c10afdbb76fe1a7 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 2 Nov 2015 14:55:56 +0100 Subject: [PATCH] Fix some labels and handle toggle states --- eu.etaxonomy.taxeditor.editor/plugin.xml | 2 +- .../editor/view/derivate/DerivateView.java | 14 +++++++++----- .../contextMenu/CreateFieldUnitContextMenu.java | 2 +- .../searchFilter/DerivateSearchComposite.java | 4 ++++ .../DerivateSearchCompositeController.java | 8 ++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml index e27ca38db..97d534dec 100644 --- a/eu.etaxonomy.taxeditor.editor/plugin.xml +++ b/eu.etaxonomy.taxeditor.editor/plugin.xml @@ -1038,7 +1038,7 @@ 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 f63569495..6c7d81cd1 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 @@ -48,7 +48,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.Messages; -import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; import eu.etaxonomy.taxeditor.editor.view.derivate.searchFilter.DerivateSearchCompositeController; import eu.etaxonomy.taxeditor.model.IContextListener; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; @@ -464,11 +463,12 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas uuids.add(specimenOrObservationBase.getUuid()); } updateRootEntities(uuids); + derivateSearchCompositeController.setTaxon(selectedTaxon); + setPartName("Derivative Editor: " + selectedTaxon.getName()); } - if(part instanceof MultiPageTaxonEditor){ - Taxon taxon = ((MultiPageTaxonEditor) part).getTaxon(); - derivateSearchCompositeController.setTaxon(taxon); - } +// if(part instanceof MultiPageTaxonEditor){ +// Taxon taxon = ((MultiPageTaxonEditor) part).getTaxon(); +// } } } @@ -502,6 +502,10 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas derivateSearchCompositeController.setTaxon(null); if(!listenToSelectionChange){ selectedTaxon = null; + setPartName("Derivative Editor"); + } + else if(selectedTaxon==null){ + setPartName("Derivative Editor [no taxon selected]"); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java index 589869ab4..838e5c081 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java @@ -49,7 +49,7 @@ public class CreateFieldUnitContextMenu extends CompoundContributionItem { if(selectionInput instanceof CdmBase && ((CdmBase) selectionInput).isInstanceOf(Taxon.class)){ final Taxon taxon = HibernateProxyHelper.deproxy(selectionInput, Taxon.class); MenuItem item = new MenuItem(menu, SWT.NONE); - item.setText("Create FieldUnit (attach to "+taxon.getTitleCache()+")"); + item.setText("Create FieldUnit for "+taxon.getName()); item.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { 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 36d23173f..b34b7ab19 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 @@ -152,4 +152,8 @@ public class DerivateSearchComposite extends Composite { public Combo getComboTaxonAssignment() { return comboTaxonAssignment; } + + public Label getLbltaxonAssignment() { + return lbltaxonAssignment; + } } 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 b70fec260..153bc2974 100644 --- 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 @@ -135,10 +135,16 @@ public class DerivateSearchCompositeController implements Listener{ if(selectedTaxon!=null){ derivateSearchComposite.getTextTaxonName().setText(selectedTaxon.getTitleCache()); } + derivateSearchComposite.getComboTaxonAssignment().select(DerivateSearchComposite.ASSIGNED_SPECIMENS); + derivateSearchComposite.getComboTaxonAssignment().setEnabled(false); + derivateSearchComposite.getLbltaxonAssignment().setEnabled(false); } else if(eventSource==derivateSearchComposite.getBtnClearTaxon()){ selectedTaxon = null; derivateSearchComposite.getTextTaxonName().setText(""); + derivateSearchComposite.getComboTaxonAssignment().select(DerivateSearchComposite.ALL_SPECIMENS); + derivateSearchComposite.getComboTaxonAssignment().setEnabled(true); + derivateSearchComposite.getLbltaxonAssignment().setEnabled(true); } } @@ -178,9 +184,11 @@ public class DerivateSearchCompositeController implements Listener{ 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); } } -- 2.34.1