[Dive4elements-commits] [PATCH 14 of 19] ChartGenerator, DurationCurveExporter: Updated to use RangeAccess instead of FLYSUtils

Wald Commits scm-commit at wald.intevation.org
Thu Jan 24 14:14:26 CET 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1358942605 -3600
# Node ID 56fbdcdb7ff23d4bd550161cc6d5cb07b11a31ce
# Parent  c7133c1f8edec633f9dd481688d079c444be855a
ChartGenerator, DurationCurveExporter: Updated to use RangeAccess instead of FLYSUtils.

diff -r c7133c1f8ede -r 56fbdcdb7ff2 flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Wed Jan 23 13:02:27 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Wed Jan 23 13:03:25 2013 +0100
@@ -8,6 +8,7 @@
 import de.intevation.artifacts.CallMeta;
 import de.intevation.artifacts.PreferredLocale;
 import de.intevation.artifacts.common.utils.XMLUtils;
+import de.intevation.flys.artifacts.access.RangeAccess;
 import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.resources.Resources;
 import de.intevation.flys.collections.FLYSArtifactCollection;
@@ -1423,7 +1424,8 @@
     protected double[] getRange() {
         FLYSArtifact flys = (FLYSArtifact) master;
 
-        return FLYSUtils.getKmRange(flys);
+        RangeAccess rangeAccess = new RangeAccess(flys, null);
+        return rangeAccess.getKmRange();
     }
 
 
diff -r c7133c1f8ede -r 56fbdcdb7ff2 flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveExporter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveExporter.java	Wed Jan 23 13:02:27 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveExporter.java	Wed Jan 23 13:03:25 2013 +0100
@@ -27,6 +27,7 @@
 
 import de.intevation.flys.artifacts.FLYSArtifact;
 
+import de.intevation.flys.artifacts.access.RangeAccess;
 import de.intevation.flys.artifacts.model.WQDay;
 import de.intevation.flys.artifacts.model.CalculationResult;
 import de.intevation.flys.artifacts.model.WKmsJRDataSource;
@@ -218,7 +219,8 @@
 
         source.addMetaData("date", df.format(new Date()));
 
-        double[] kms = FLYSUtils.getKmRange(flys);
+        RangeAccess rangeAccess = new RangeAccess(flys, null);
+        double[] kms = rangeAccess.getKmRange();
         source.addMetaData("range", String.valueOf(kms[0]));
 
         source.addMetaData("calculation", Resources.getMsg(


More information about the Dive4elements-commits mailing list