refactoring taxon controllers, reducing code duplication

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

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java
index fa09eb6c0dcf93077191b3071d572949ce71b1d7..351a774681e84a8132ef9bdec51413d407980792 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.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
@@ -67,12 +67,12 @@ public class OccurrenceController extends BaseController<SpecimenOrObservationBa
             @PathVariable("uuid") UUID uuid, HttpServletRequest request,\r
             HttpServletResponse response) throws IOException {\r
 \r
-        logger.info("doGetDerivedFrom()" + request.getServletPath());\r
+        logger.info("doGetDerivedFrom()" + request.getRequestURI());\r
 \r
         ModelAndView mv = new ModelAndView();\r
         SpecimenOrObservationBase sob = getCdmBaseInstance(uuid, response, DERIVED_UNIT_INIT_STRATEGY);\r
-        if(sob instanceof DerivedUnitBase){\r
-            DerivationEvent derivationEvent = ((DerivedUnitBase)sob).getDerivedFrom();\r
+        if(sob instanceof DerivedUnit){\r
+            DerivationEvent derivationEvent = ((DerivedUnit)sob).getDerivedFrom();\r
             if (derivationEvent != null) {\r
                 mv.addObject(derivationEvent);\r
             }\r