refactoring taxon controllers, reducing code duplication

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / remote / controller / OccurrencePortalController.java

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrencePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrencePortalController.java
index 7c3ea4932f28cb5a2e235aef5d6421d0cdbede4c..a95112bc75862aa9bc771399c9be40bd3ab46205 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrencePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrencePortalController.java
@@ -27,7 +27,7 @@ import org.springframework.web.servlet.ModelAndView;
 \r
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;\r
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;\r
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 \r
 /**\r
@@ -51,7 +51,12 @@ public class OccurrencePortalController extends BaseController<SpecimenOrObserva
             "derivedFrom.gatheringEvent.exactLocation.$",\r
             "specimenTypeDesignations.*",\r
             "specimenTypeDesignations.citation.*",\r
-            "specimenTypeDesignations.homotypicalGroup.*"\r
+            "specimenTypeDesignations.homotypicalGroup.*",\r
+            "sequences.$",\r
+            "sequences.annotations",\r
+            "markers.markerType",\r
+            "gatheringEvent.$",\r
+            "descriptions"\r
     });\r
 \r
 \r
@@ -85,8 +90,8 @@ public class OccurrencePortalController extends BaseController<SpecimenOrObserva
         List<String> initStrategy = DEFAULT_INIT_STRATEGY;\r
 \r
         SpecimenOrObservationBase sob = getCdmBaseInstance(uuid, response, initStrategy);\r
-        if(sob instanceof DerivedUnitBase){\r
-            DerivationEvent derivationEvent = ((DerivedUnitBase)sob).getDerivedFrom();\r
+        if(sob instanceof DerivedUnit){\r
+            DerivationEvent derivationEvent = ((DerivedUnit)sob).getDerivedFrom();\r
             mv.addObject(derivationEvent);\r
         }\r
         return mv;\r