From: Andreas Müller <a.mueller@bgbm.org>
Date: Fri, 7 Feb 2014 11:55:09 +0000 (+0000)
Subject: move elevation back to first page  #4037
X-Git-Tag: 3.6.0~804
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/629b5079e5ae08ff375caec6feab06fcb09b0476?ds=sidebyside

move elevation back to first page  #4037
---

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 8828346fa..00c732c4d 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
@@ -18,8 +18,10 @@ import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 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.LanguageStringWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.PointElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -47,6 +49,8 @@ public class DerivedUnitGeneralDetailElement extends
 	private TextWithLabelElement text_collectingNumber;
 	private EntitySelectionElement<Collection> selection_collection;
 	private TextWithLabelElement text_accessionNumber;
+	private GatheringEventUnitElement element_elevation;
+
 	
 
 	/**
@@ -83,6 +87,9 @@ public class DerivedUnitGeneralDetailElement extends
 						entity.getLocality(), style);
 		element_point = formFactory.createPointElement(formElement,
 				entity.getExactLocation(), style);
+		element_elevation = formFactory.createGatheringEventUnitElement(
+				formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
+		
 		element_date = formFactory.createTimePeriodElement(formElement, "Date",
 				entity.getGatheringPeriod(), style);
 		selection_collector = formFactory
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
index 21d3d1e68..d73d9ae5c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
@@ -16,8 +16,10 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 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.LanguageStringWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.PointElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -42,6 +44,7 @@ public class FieldUnitGeneralDetailElement extends AbstractCdmDetailElement<Deri
     private TimePeriodElement element_date;
     private EntitySelectionElement<AgentBase> selection_collector;
     private TextWithLabelElement text_collectingNumber;
+    private GatheringEventUnitElement element_elevation;
 
     /**
      * @param formFactory
@@ -69,6 +72,9 @@ public class FieldUnitGeneralDetailElement extends AbstractCdmDetailElement<Deri
         languageText_locality = formFactory.createLanguageStringWithLabelElement(formElement, "Locality",
                 entity.getLocality(), style);
         element_point = formFactory.createPointElement(formElement, entity.getExactLocation(), style);
+        element_elevation = formFactory.createGatheringEventUnitElement(
+				formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
+		
         element_date = formFactory.createTimePeriodElement(formElement, "Date", entity.getGatheringPeriod(), style);
         selection_collector = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement,
                 "Collector", entity.getCollector(), EntitySelectionElement.ALL, style);
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 6121366cd..73af807ee 100644
--- 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
@@ -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,9 +74,10 @@ 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(