diff artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java @ 7059:f9d5020af0af generator-refactoring

Remove AxisProcessor "glue" class and extend Processor interface
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 20 Sep 2013 10:30:03 +0200
parents 7056fa3b1f75
children 726d998dce29
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Fri Sep 20 10:29:14 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Fri Sep 20 10:30:03 2013 +0200
@@ -41,6 +41,7 @@
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
+import org.dive4elements.river.exports.process.Processor;
 import org.dive4elements.river.jfree.AxisDataset;
 import org.dive4elements.river.jfree.AnnotationHelper;
 import org.dive4elements.river.jfree.Bounds;
@@ -53,15 +54,6 @@
 
 import org.w3c.dom.Element;
 
-/* TODO remove after hackish testing */
-import org.dive4elements.river.exports.process.Processor;
-import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor;
-import org.dive4elements.river.exports.process.BedDiffYearProcessor;
-import org.dive4elements.river.exports.process.BedheightProcessor;
-import org.dive4elements.river.exports.process.QOutProcessor;
-import org.dive4elements.river.exports.process.WOutProcessor;
-/* end TODO*/
-
 /**
  * The main diagram creation class.
  *
@@ -1010,16 +1002,10 @@
 
         logger.debug("DoOut for facet: " + facetName);
 
-        for (DiagramAttributes.AxisProcessor ap:
-            diagramAttributes.getAxesProcessors()) {
-
-            Processor pr = ap.getProcessor();
-
+        for (Processor pr: diagramAttributes.getProcessors()) {
             if (pr.canHandle(facetName)) {
-            //    pr.doOut(this, bundle, theme, visible, 0);
+//                pr.doOut(this, bundle, theme, visible, 0);
             }
         }
     }
-
-
 }

http://dive4elements.wald.intevation.org