Merge branch 'release/5.8.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / description / detail / CategoricalDataDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
index 9f6ceb849e09d2c8ca3420c20dc0c11359300174..c01d79a02991cf9fe8127a124101f05d738e985e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
@@ -3,9 +3,8 @@
  */
 package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-
 import eu.etaxonomy.cdm.model.description.CategoricalData;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -40,17 +39,17 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
        @Override
        protected void createControls(ICdmFormElement formElement,
                        CategoricalData entity, int style) {
+
                checkbox_orderRelevant = formFactory.createCheckbox(formElement, "Order Relevant", entity.getOrderRelevant(), style);
-               section_stateData = formFactory.createStateDataSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+               section_stateData = formFactory.createStateDataSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(StateDataSection.class, entity.getClass().getCanonicalName(), true));
                section_stateData.setEntity(entity);
                section_stateData.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-       }
-
-       /** {@inheritDoc} */
-       @Override
-       public void setEntity(CategoricalData entity) {
-//             section_stateData.setEntity(entity);
-               super.setEntity(entity);
+               createTimePeriod(formElement, entity, style);
+               if (entity.getFeature().getRecommendedModifierEnumeration() != null && !entity.getFeature().getRecommendedModifierEnumeration().isEmpty()){
+                   createModifier(formElement, entity, style);
+               }else{
+                   createFreetextModifier(formElement, entity, style);
+               }
        }
 
        /* (non-Javadoc)
@@ -59,6 +58,7 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
+           super.handleEvent(eventSource);
                if(eventSource == checkbox_orderRelevant){
                        getEntity().setOrderRelevant(checkbox_orderRelevant.getSelection());
                }