diff flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java @ 4448:9425b7c51b73

Use new WOutProcessor for generating charts Use WOutProcessor in DischargeLongitudinalSectionGenerator and LongitudinalSectionGenerator.
author Björn Ricks <bjoern.ricks@intevation.de>
date Wed, 07 Nov 2012 15:56:28 +0100
parents 1fcaeced48f2
children fc0cdcae8f07
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Wed Nov 07 15:52:25 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Wed Nov 07 15:56:28 2012 +0100
@@ -12,7 +12,8 @@
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.WQCKms;
 import de.intevation.flys.artifacts.model.WQKms;
-import de.intevation.flys.artifacts.model.WKms;
+import de.intevation.flys.exports.process.Processor;
+import de.intevation.flys.exports.process.WOutProcessor;
 
 import de.intevation.flys.jfree.FLYSAnnotation;
 import de.intevation.flys.jfree.StyledXYSeries;
@@ -53,14 +54,7 @@
 
         Facet facet = artifactFacet.getFacet();
 
-        if (IS.WQ_KM(name)) {
-            doWOut(
-                (WQKms) artifactFacet.getData(context),
-                artifactFacet,
-                attr,
-                visible);
-        }
-        else if (name.equals(DISCHARGE_LONGITUDINAL_Q)) {
+        if (name.equals(DISCHARGE_LONGITUDINAL_Q)) {
             doQOut(
                 (WQKms) artifactFacet.getData(context),
                 artifactFacet,
@@ -74,12 +68,6 @@
                 attr,
                 visible);
         }
-        else if (IS.W_KM(name)) {
-            doWOut(
-                (WKms) artifactFacet.getData(context),
-                artifactFacet,
-                attr, visible);
-        }
         else if (name.equals(LONGITUDINAL_ANNOTATION)) {
             doAnnotations((FLYSAnnotation) artifactFacet.getData(context),
                  artifactFacet, attr, visible);
@@ -90,7 +78,13 @@
                 attr, visible, YAXIS.W.idx);
         }
         else {
-            logger.warn("Unknown facet name: " + name);
+            Processor processor = new WOutProcessor();
+            if (processor.canHandle(name)) {
+                processor.doOut(this, artifactFacet, attr, visible, YAXIS.W.idx);
+            }
+            else {
+                logger.warn("Unknown facet name: " + name);
+            }
         }
     }
 

http://dive4elements.wald.intevation.org