Mercurial > dive4elements > river
changeset 7082:3dc740c51f9b generator-refactoring
Remove generator2 hacks
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 20 Sep 2013 17:58:30 +0200 |
| parents | 3c4efd4b2c19 |
| children | 74ebe5e7fa69 |
| files | artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper.java |
| diffstat | 1 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper.java Fri Sep 20 17:36:11 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper.java Fri Sep 20 17:58:30 2013 +0200 @@ -47,18 +47,11 @@ Logger.getLogger(InfoGeneratorHelper.class); protected ChartGenerator generator; - protected ChartGenerator2 generator2; - public InfoGeneratorHelper(ChartGenerator generator) { this.generator = generator; } - public InfoGeneratorHelper(ChartGenerator2 generator) { - this.generator2 = generator2; - } - - /** * Triggers the creation of the chart info document. * @@ -191,7 +184,7 @@ cr.addAttr(e, "to", String.valueOf(range.getUpperBound()), true); cr.addAttr(e, "axistype", "number", true); - Range[] rs = generator2 == null ? generator.getRangesForAxis(pos) : generator2.getRangesForAxis(pos); + Range[] rs = generator.getRangesForAxis(pos); Range r = null; if (type.equals("range")) { @@ -221,10 +214,10 @@ Bounds bounds = null; if (type.equals("range")) { - bounds = generator2 == null ? generator.getYBounds(pos) : generator2.getYBounds(pos); + bounds = generator.getYBounds(pos); } else { - bounds = generator2 == null ? generator.getXBounds(pos) : generator2.getXBounds(pos); + bounds = generator.getXBounds(pos); } cr.addAttr(e, "axistype", "date", true);