Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/InfoGeneratorHelper.java @ 7082:3dc740c51f9b generator-refactoring
Remove generator2 hacks
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 20 Sep 2013 17:58:30 +0200 |
| parents | 9b52c501c57e |
| children | e4606eae8ea5 |
comparison
equal
deleted
inserted
replaced
| 7081:3c4efd4b2c19 | 7082:3dc740c51f9b |
|---|---|
| 45 /** Private logging instance. */ | 45 /** Private logging instance. */ |
| 46 private static final Logger logger = | 46 private static final Logger logger = |
| 47 Logger.getLogger(InfoGeneratorHelper.class); | 47 Logger.getLogger(InfoGeneratorHelper.class); |
| 48 | 48 |
| 49 protected ChartGenerator generator; | 49 protected ChartGenerator generator; |
| 50 protected ChartGenerator2 generator2; | |
| 51 | |
| 52 | 50 |
| 53 public InfoGeneratorHelper(ChartGenerator generator) { | 51 public InfoGeneratorHelper(ChartGenerator generator) { |
| 54 this.generator = generator; | 52 this.generator = generator; |
| 55 } | 53 } |
| 56 | |
| 57 public InfoGeneratorHelper(ChartGenerator2 generator) { | |
| 58 this.generator2 = generator2; | |
| 59 } | |
| 60 | |
| 61 | 54 |
| 62 /** | 55 /** |
| 63 * Triggers the creation of the chart info document. | 56 * Triggers the creation of the chart info document. |
| 64 * | 57 * |
| 65 * @param chart The JFreeChart chart. | 58 * @param chart The JFreeChart chart. |
| 189 | 182 |
| 190 cr.addAttr(e, "from", String.valueOf(range.getLowerBound()), true); | 183 cr.addAttr(e, "from", String.valueOf(range.getLowerBound()), true); |
| 191 cr.addAttr(e, "to", String.valueOf(range.getUpperBound()), true); | 184 cr.addAttr(e, "to", String.valueOf(range.getUpperBound()), true); |
| 192 cr.addAttr(e, "axistype", "number", true); | 185 cr.addAttr(e, "axistype", "number", true); |
| 193 | 186 |
| 194 Range[] rs = generator2 == null ? generator.getRangesForAxis(pos) : generator2.getRangesForAxis(pos); | 187 Range[] rs = generator.getRangesForAxis(pos); |
| 195 Range r = null; | 188 Range r = null; |
| 196 | 189 |
| 197 if (type.equals("range")) { | 190 if (type.equals("range")) { |
| 198 r = rs[1]; | 191 r = rs[1]; |
| 199 } | 192 } |
| 219 Date from = axis.getMinimumDate(); | 212 Date from = axis.getMinimumDate(); |
| 220 Date to = axis.getMaximumDate(); | 213 Date to = axis.getMaximumDate(); |
| 221 | 214 |
| 222 Bounds bounds = null; | 215 Bounds bounds = null; |
| 223 if (type.equals("range")) { | 216 if (type.equals("range")) { |
| 224 bounds = generator2 == null ? generator.getYBounds(pos) : generator2.getYBounds(pos); | 217 bounds = generator.getYBounds(pos); |
| 225 } | 218 } |
| 226 else { | 219 else { |
| 227 bounds = generator2 == null ? generator.getXBounds(pos) : generator2.getXBounds(pos); | 220 bounds = generator.getXBounds(pos); |
| 228 } | 221 } |
| 229 | 222 |
| 230 cr.addAttr(e, "axistype", "date", true); | 223 cr.addAttr(e, "axistype", "date", true); |
| 231 cr.addAttr(e, "from", String.valueOf(from.getTime()), true); | 224 cr.addAttr(e, "from", String.valueOf(from.getTime()), true); |
| 232 cr.addAttr(e, "to", String.valueOf(to.getTime()), true); | 225 cr.addAttr(e, "to", String.valueOf(to.getTime()), true); |