- adapted detail views to new cdm3.3 model

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / campanula / detailViews / fieldObservation / FieldObservationGeneralElementController.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java
index ad3f9cac26a22e2c629b759170c0537d22b681ca..d4f7d74045fa8510d64328f66ac83af1feff0e42 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java
@@ -9,10 +9,10 @@
  */
 package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation;
 
-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.FieldUnit;
 import eu.etaxonomy.taxeditor.ui.campanula.basicFields.EntitySelectionFieldController;
 import eu.etaxonomy.taxeditor.ui.campanula.basicFields.LanguageTextFieldController;
 import eu.etaxonomy.taxeditor.ui.campanula.basicFields.NumberFieldController;
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @date 13.08.2013
  *
  */
-public class FieldObservationGeneralElementController extends AbstractCdmDetailElement<DerivedUnitFacade> {
+public class FieldObservationGeneralElementController extends AbstractCdmDetailElement<FieldUnit> {
 
     private FieldObservationGeneralElement fieldObservationGeneralElement;
 
@@ -62,15 +62,15 @@ public class FieldObservationGeneralElementController extends AbstractCdmDetailE
      * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
      */
     @Override
-    protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
+    protected void createControls(ICdmFormElement formElement, FieldUnit entity, int style) {
         toggleableText_titleCache = new ToggleableTextFieldController(fieldObservationGeneralElement.getToggleableTextField(), getFormFactory(), formElement, entity.getTitleCache(), entity.isProtectedTitleCache(), style);
 
-        selection_country = new EntitySelectionFieldController<NamedArea>(fieldObservationGeneralElement.getCountrySelectionField(), getFormFactory(), getConversationHolder(), formElement, NamedArea.class, entity.getCountry(), EntitySelectionElement.NOTHING);
-        languageText_locality = new LanguageTextFieldController(fieldObservationGeneralElement.getTextLocality(), getFormFactory(), formElement, entity.getLocality());
-        element_point = new PointFieldController(fieldObservationGeneralElement.getPointField(),getFormFactory(), formElement, entity.getExactLocation(), style);
-        number_elevation = new NumberFieldController(fieldObservationGeneralElement.getTextElevation(), getFormFactory(), formElement, entity.getAbsoluteElevation());
+        selection_country = new EntitySelectionFieldController<NamedArea>(fieldObservationGeneralElement.getCountrySelectionField(), getFormFactory(), getConversationHolder(), formElement, NamedArea.class, entity.getGatheringEvent().getCountry(), EntitySelectionElement.NOTHING);
+        languageText_locality = new LanguageTextFieldController(fieldObservationGeneralElement.getTextLocality(), getFormFactory(), formElement, entity.getGatheringEvent().getLocality());
+        element_point = new PointFieldController(fieldObservationGeneralElement.getPointField(),getFormFactory(), formElement, entity.getGatheringEvent().getExactLocation(), style);
+        number_elevation = new NumberFieldController(fieldObservationGeneralElement.getTextElevation(), getFormFactory(), formElement, entity.getGatheringEvent().getAbsoluteElevation());
 //        element_date = formFactory.createTimePeriodElement(formElement, "Date", entity.getGatheringPeriod(), style);
-        selection_collector = new EntitySelectionFieldController<AgentBase>(fieldObservationGeneralElement.getCollectorSelectionField(), getFormFactory(), getConversationHolder(), formElement, AgentBase.class, entity.getCollector(), EntitySelectionElement.ALL);
+        selection_collector = new EntitySelectionFieldController<AgentBase>(fieldObservationGeneralElement.getCollectorSelectionField(), getFormFactory(), getConversationHolder(), formElement, AgentBase.class, entity.getGatheringEvent().getCollector(), EntitySelectionElement.ALL);
         text_collectingNumber = new TextFieldController(fieldObservationGeneralElement.getTextCollectingNumber(), getFormFactory(), formElement, entity.getFieldNumber(), null);
     }
 
@@ -86,18 +86,18 @@ public class FieldObservationGeneralElementController extends AbstractCdmDetailE
         if (eventSource == toggleableText_titleCache) {
             getEntity().setTitleCache(toggleableText_titleCache.getText(), toggleableText_titleCache.getState());
         } else if (eventSource == selection_country) {
-            getEntity().setCountry(selection_country.getSelection());
+            getEntity().getGatheringEvent().setCountry(selection_country.getSelection());
         } else if (eventSource == languageText_locality) {
             LanguageString locality = languageText_locality.getLanguageString();
-            getEntity().setLocality(locality);
+            getEntity().getGatheringEvent().setLocality(locality);
         } else if (eventSource == element_point) {
-            getEntity().setExactLocation(element_point.getPoint());
+            getEntity().getGatheringEvent().setExactLocation(element_point.getPoint());
         } else if (eventSource == number_elevation) {
-            getEntity().setAbsoluteElevation(number_elevation.getInteger());
-        } else if (eventSource == element_date) {
-            getEntity().setGatheringPeriod(element_date.getTimePeriod());
+            getEntity().getGatheringEvent().setAbsoluteElevation(number_elevation.getInteger());
+//        } else if (eventSource == element_date) {
+//            getEntity().setGatheringPeriod(element_date.getTimePeriod());
         } else if (eventSource == selection_collector) {
-            getEntity().setCollector(selection_collector.getSelection());
+            getEntity().getGatheringEvent().setCollector(selection_collector.getSelection());
         } else if (eventSource == text_collectingNumber) {
             getEntity().setFieldNumber(text_collectingNumber.getText());
         }