From bba5f99127e81b5249d152f4e9d274a314630383 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 20 Apr 2015 11:22:37 +0000 Subject: [PATCH 1/1] - added collecting area section to general section DerivedUnit DetailsView (fixes #4473) --- .../occurrence/DerivedUnitGeneralDetailElement.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java index 25f24e317..1ac5b58de 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java @@ -10,18 +10,23 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence; +import org.eclipse.ui.forms.widgets.ExpandableComposite; + import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.cdm.model.occurrence.Collection; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; +import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; +import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.CheckboxElement; import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement; +import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection; import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement; import eu.etaxonomy.taxeditor.ui.element.PointElement; @@ -44,6 +49,7 @@ public class DerivedUnitGeneralDetailElement extends private ToggleableTextElement toggleableText_titleCache; private EnumComboElement combo_specorobstype; private EntitySelectionElement selection_country; + private CollectingAreasDetailSection section_collectingAreas; private LanguageStringWithLabelElement languageText_locality; private PointElement element_point; private NumberWithLabelElement number_elevation; @@ -88,6 +94,12 @@ public class DerivedUnitGeneralDetailElement extends selection_country = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(), formElement, "Country", entity.getCountry(), EntitySelectionElement.NOTHING, style); + + if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION)){ + section_collectingAreas = formFactory.createCollectingAreasDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE); + section_collectingAreas.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); + section_collectingAreas.setEntity(entity); + } languageText_locality = formFactory .createLanguageStringWithLabelElement(formElement, "Locality", entity.getLocality(), style); -- 2.34.1