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 96f68d751aee2202b5f490377b6413f85e16a07b..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
@@ -30,7 +30,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.location.Point;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;\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
@@ -150,7 +150,7 @@ public class EditGeoService implements IEditGeoService {
             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
@@ -160,8 +160,8 @@ public class EditGeoService implements IEditGeoService {
             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 DerivedUnit) {\r
@@ -169,7 +169,7 @@ public class EditGeoService implements IEditGeoService {
             }\r
         }\r
 \r
-        return EditGeoServiceUtilities.getOccurrenceServiceRequestParameterString(fieldObservationPoints,\r
+        return EditGeoServiceUtilities.getOccurrenceServiceRequestParameterString(fieldUnitPoints,\r
                 derivedUnitPoints, specimenOrObservationTypeColors, doReturnImage, width, height, bbox, backLayer);\r
 \r
     }\r
@@ -183,9 +183,9 @@ public class EditGeoService implements IEditGeoService {
         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