[PATCH] Purge RiverUtils from ATExporter

Wald Commits scm-commit at wald.intevation.org
Mon Oct 6 14:49:03 CEST 2014


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1412599740 -7200
# Node ID 6350abaf2a7eddac6c6330edcd1839e5adcc19de
# Parent  2fa4c00f9461e40a35318885db3f7f09c4bbf970
Purge RiverUtils from ATExporter.

diff -r 2fa4c00f9461 -r 6350abaf2a7e artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java	Mon Oct 06 13:41:14 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java	Mon Oct 06 14:49:00 2014 +0200
@@ -31,7 +31,7 @@
 import org.dive4elements.river.model.River;
 import org.dive4elements.river.model.TimeInterval;
 import org.dive4elements.river.themes.ThemeDocument;
-import org.dive4elements.river.utils.RiverUtils;
+import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.access.RangeAccess;
 
 public class ATExporter
@@ -93,9 +93,8 @@
             return;
         }
 
-        River river = RiverUtils.getRiver(master);
-        RangeAccess rangeAccess = new RangeAccess(master);
-        double[] kms = rangeAccess.getLocations();
+        River river = new RiverAccess(master).getRiver();
+        double[] kms = new RangeAccess(master).getLocations();
 
         Gauge gauge = river.determineGaugeByPosition(kms[0]);
         if (Math.abs(kms[0] - gauge.getStation().doubleValue()) < 1e-4) {


More information about the Dive4Elements-commits mailing list