rename FieldObservation -> FieldUnit #3351

[cdmlib.git] / cdmlib-ext / src / main / java / eu / etaxonomy / cdm / ext / geo / EditGeoService.java

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
index 340c18011a258353718c8cd74004c6b0d871fbe2..5b55b14d7f947ab67ed96f6d2c43073c516ff8ce 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
@@ -29,9 +29,10 @@ import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.location.Point;\r
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;\r
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;\r
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;\r
 import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao;\r
 import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao;\r
@@ -146,29 +147,29 @@ public class EditGeoService implements IEditGeoService {
      */\r
     @Override\r
     public String getOccurrenceServiceRequestParameterString(List<SpecimenOrObservationBase> specimensOrObersvations,\r
-            Map<Class<? extends SpecimenOrObservationBase>, Color> specimenOrObservationTypeColors,\r
+            Map<SpecimenOrObservationType, Color> specimenOrObservationTypeColors,\r
             Boolean doReturnImage, Integer width, Integer height, String bbox, String backLayer) {\r
 \r
-        List<Point> fieldObservationPoints = new ArrayList<Point>();\r
+        List<Point> fieldUnitPoints = new ArrayList<Point>();\r
         List<Point> derivedUnitPoints = new ArrayList<Point>();\r
 \r
         IndividualsAssociation individualsAssociation;\r
-        DerivedUnitBase derivedUnit;\r
+        DerivedUnit derivedUnit;\r
 \r
         for (SpecimenOrObservationBase specimenOrObservationBase : specimensOrObersvations) {\r
             SpecimenOrObservationBase<?> specimenOrObservation = occurrenceDao\r
                     .load(specimenOrObservationBase.getUuid());\r
 \r
-            if (specimenOrObservation instanceof FieldObservation) {\r
-                fieldObservationPoints.add(((FieldObservation) specimenOrObservation).getGatheringEvent()\r
+            if (specimenOrObservation instanceof FieldUnit) {\r
+                fieldUnitPoints.add(((FieldUnit) specimenOrObservation).getGatheringEvent()\r
                         .getExactLocation());\r
             }\r
-            if (specimenOrObservation instanceof DerivedUnitBase<?>) {\r
-                registerDerivedUnitLocations((DerivedUnitBase) specimenOrObservation, derivedUnitPoints);\r
+            if (specimenOrObservation instanceof DerivedUnit) {\r
+                registerDerivedUnitLocations((DerivedUnit) specimenOrObservation, derivedUnitPoints);\r
             }\r
         }\r
 \r
-        return EditGeoServiceUtilities.getOccurrenceServiceRequestParameterString(fieldObservationPoints,\r
+        return EditGeoServiceUtilities.getOccurrenceServiceRequestParameterString(fieldUnitPoints,\r
                 derivedUnitPoints, specimenOrObservationTypeColors, doReturnImage, width, height, bbox, backLayer);\r
 \r
     }\r
@@ -177,14 +178,14 @@ public class EditGeoService implements IEditGeoService {
      * @param derivedUnit\r
      * @param derivedUnitPoints\r
      */\r
-    private void registerDerivedUnitLocations(DerivedUnitBase<?> derivedUnit, List<Point> derivedUnitPoints) {\r
+    private void registerDerivedUnitLocations(DerivedUnit derivedUnit, List<Point> derivedUnitPoints) {\r
 \r
         Set<SpecimenOrObservationBase> originals = derivedUnit.getOriginals();\r
         if (originals != null) {\r
             for (SpecimenOrObservationBase original : originals) {\r
-                if (original instanceof FieldObservation) {\r
-                    if (((FieldObservation) original).getGatheringEvent() != null) {\r
-                        Point point = ((FieldObservation) original).getGatheringEvent().getExactLocation();\r
+                if (original instanceof FieldUnit) {\r
+                    if (((FieldUnit) original).getGatheringEvent() != null) {\r
+                        Point point = ((FieldUnit) original).getGatheringEvent().getExactLocation();\r
                         if (point != null) {\r
                             // FIXME: remove next statement after\r
                             // DerivedUnitFacade or ABCD import is fixed\r
@@ -195,7 +196,7 @@ public class EditGeoService implements IEditGeoService {
                         }\r
                     }\r
                 } else {\r
-                    registerDerivedUnitLocations((DerivedUnitBase) original, derivedUnitPoints);\r
+                    registerDerivedUnitLocations((DerivedUnit) original, derivedUnitPoints);\r
                 }\r
             }\r
         }\r