merge-update of trunk and disabling GUI-Control separation

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / occurrence / DerivedUnitFacadeDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
index 03daf4a9d884ac15cb0ace21d0b01f7fb47c08a8..aa939d85e4d9dfdafb144ceb0775022ec27ea983 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
@@ -36,10 +36,10 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
 
        private final DerivedUnitFacadeConfigurator configurator;
 
-       private GeneralDetailSection section_general;
+       private DerivedUnitGeneralDetailSection section_general;
        private GatheringEventDetailSection section_gatheringEvent;
        private DerivedUnitBaseDetailSection section_derivedUnitBase;
-       private FieldObservationDetailSection section_fieldObservation;
+       private FieldUnitDetailSection section_fieldUnit;
 
        /**
         * <p>Constructor for DerivedUnitFacadeDetailElement.</p>
@@ -65,7 +65,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
                        section_general.setEntity(facade);
                        section_derivedUnitBase.setEntity(facade);
                        section_gatheringEvent.setEntity(facade);
-                       section_fieldObservation.setEntity(facade);
+                       section_fieldUnit.setEntity(facade);
 
                } catch (DerivedUnitFacadeNotSupportedException e) {
                        AbstractUtility.errorDialog("Error", this, "SpecimenFacadeNotSupportedException while inititating SpecimenFacade", e);
@@ -91,10 +91,10 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
                        section_gatheringEvent.dispose();
                        section_gatheringEvent = null;
                }
-               if(section_fieldObservation != null){
-                       removeControl(section_fieldObservation);
-                       section_fieldObservation.dispose();
-                       section_fieldObservation = null;
+               if(section_fieldUnit != null){
+                       removeControl(section_fieldUnit);
+                       section_fieldUnit.dispose();
+                       section_fieldUnit = null;
                }
        }
 
@@ -118,7 +118,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
        protected void createControls(ICdmFormElement formElement,
                        DerivedUnit entity, int style) {
 
-               section_general = formFactory.createGeneralDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+               section_general = formFactory.createDerivedUnitGeneralDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
                section_general.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                addControl(section_general);
                addElement(section_general);
@@ -128,10 +128,10 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
                addControl(section_gatheringEvent);
                addElement(section_gatheringEvent);
 
-               section_fieldObservation = formFactory.createFieldObservationDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE);
-               section_fieldObservation.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-               addControl(section_fieldObservation);
-               addElement(section_fieldObservation);
+               section_fieldUnit = formFactory.createFieldUnitDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE);
+               section_fieldUnit.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+               addControl(section_fieldUnit);
+               addElement(section_fieldUnit);
 
                section_derivedUnitBase = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE);
                section_derivedUnitBase.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
@@ -142,7 +142,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               if(eventSource == section_derivedUnitBase || eventSource == section_gatheringEvent || eventSource == section_fieldObservation){
+               if(eventSource == section_derivedUnitBase || eventSource == section_gatheringEvent || eventSource == section_fieldUnit){
                        if(getParentElement() instanceof AbstractCdmDetailSection) {
                 ((AbstractCdmDetailSection) getParentElement()).updateTitle();
             }