merge-update from trunk

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
index 1b9cf9b88febc1392ad6207a3ca9bab6e21f362a..73af807ee5d6cb342285672fd45d1379466f9443 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
@@ -13,9 +13,9 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -39,8 +39,6 @@ public class GatheringEventDetailElement extends
        
        private GatheringEventUnitElement element_distToWater;
        
-       private MinMaxTextSection section_minMaxText;
-
        private TextWithLabelElement text_collectingMethod;
 
        private TextWithLabelElement text_gatheringEventDescription;
@@ -76,16 +74,17 @@ public class GatheringEventDetailElement extends
 
 
                // exactLocation
-        text_gatheringEventDescription = formFactory.createTextWithLabelElement(formElement, "Gathering Event Description", entity.getGatheringEventDescription(), style);
-               element_elevation = formFactory.createGatheringEventUnitElement(
-                               formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
+        text_gatheringEventDescription = formFactory.createTextWithLabelElement(
+                       formElement, "Gathering Event Description", entity.getGatheringEventDescription(), style);
+//             element_elevation = formFactory.createGatheringEventUnitElement(
+//                             formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
                
                
                element_distToGround = formFactory.createGatheringEventUnitElement(
                                formElement, "Dist. To Ground : ", entity, MinMaxTextSection.UnitType.DIST_TO_GROUND,  style);
                
                element_distToWater = formFactory.createGatheringEventUnitElement(
-                               formElement, "Dist. To Water : ", entity, MinMaxTextSection.UnitType.DIST_TO_WATER,  style);
+                               formElement, "Dist. To Watersurface : ", entity, MinMaxTextSection.UnitType.DIST_TO_WATER,  style);
                
         section_collectingAreas = formFactory.createCollectingAreasDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
         section_collectingAreas.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));