Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
7058:5c07024cdc24 | 7059:f9d5020af0af |
---|---|
39 import org.json.JSONArray; | 39 import org.json.JSONArray; |
40 import org.json.JSONException; | 40 import org.json.JSONException; |
41 | 41 |
42 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; | 42 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; |
43 import org.dive4elements.artifactdatabase.state.Facet; | 43 import org.dive4elements.artifactdatabase.state.Facet; |
44 import org.dive4elements.river.exports.process.Processor; | |
44 import org.dive4elements.river.jfree.AxisDataset; | 45 import org.dive4elements.river.jfree.AxisDataset; |
45 import org.dive4elements.river.jfree.AnnotationHelper; | 46 import org.dive4elements.river.jfree.AnnotationHelper; |
46 import org.dive4elements.river.jfree.Bounds; | 47 import org.dive4elements.river.jfree.Bounds; |
47 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; | 48 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; |
48 import org.dive4elements.river.jfree.DoubleBounds; | 49 import org.dive4elements.river.jfree.DoubleBounds; |
50 import org.dive4elements.river.jfree.StyledAreaSeriesCollection; | 51 import org.dive4elements.river.jfree.StyledAreaSeriesCollection; |
51 import org.dive4elements.river.jfree.StyledXYSeries; | 52 import org.dive4elements.river.jfree.StyledXYSeries; |
52 import org.dive4elements.river.themes.ThemeDocument; | 53 import org.dive4elements.river.themes.ThemeDocument; |
53 | 54 |
54 import org.w3c.dom.Element; | 55 import org.w3c.dom.Element; |
55 | |
56 /* TODO remove after hackish testing */ | |
57 import org.dive4elements.river.exports.process.Processor; | |
58 import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor; | |
59 import org.dive4elements.river.exports.process.BedDiffYearProcessor; | |
60 import org.dive4elements.river.exports.process.BedheightProcessor; | |
61 import org.dive4elements.river.exports.process.QOutProcessor; | |
62 import org.dive4elements.river.exports.process.WOutProcessor; | |
63 /* end TODO*/ | |
64 | 56 |
65 /** | 57 /** |
66 * The main diagram creation class. | 58 * The main diagram creation class. |
67 * | 59 * |
68 * This class is the glue between output processors and facets. | 60 * This class is the glue between output processors and facets. |
1008 return; | 1000 return; |
1009 } | 1001 } |
1010 | 1002 |
1011 logger.debug("DoOut for facet: " + facetName); | 1003 logger.debug("DoOut for facet: " + facetName); |
1012 | 1004 |
1013 for (DiagramAttributes.AxisProcessor ap: | 1005 for (Processor pr: diagramAttributes.getProcessors()) { |
1014 diagramAttributes.getAxesProcessors()) { | |
1015 | |
1016 Processor pr = ap.getProcessor(); | |
1017 | |
1018 if (pr.canHandle(facetName)) { | 1006 if (pr.canHandle(facetName)) { |
1019 // pr.doOut(this, bundle, theme, visible, 0); | 1007 // pr.doOut(this, bundle, theme, visible, 0); |
1020 } | 1008 } |
1021 } | 1009 } |
1022 } | 1010 } |
1023 | |
1024 | |
1025 } | 1011 } |