[PATCH 2 of 2] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1412602432 -7200
# Node ID 15f4e4785288fde51b12af4b984ed69c8a6b895d
# Parent  592df582e462f8cce92cc2695b1f4a1344ee0028
# Parent  6350abaf2a7eddac6c6330edcd1839e5adcc19de
merged.

diff -r 592df582e462 -r 15f4e4785288 artifacts/doc/conf/generators/discharge-diagram-defaults.xml
--- a/artifacts/doc/conf/generators/discharge-diagram-defaults.xml	Mon Oct 06 15:27:20 2014 +0200
+++ b/artifacts/doc/conf/generators/discharge-diagram-defaults.xml	Mon Oct 06 15:33:52 2014 +0200
@@ -11,4 +11,5 @@
     <processor class="org.dive4elements.river.exports.process.FixWQProcessor" axis="W"/>
     <processor class="org.dive4elements.river.exports.process.FixDerivedProcessor" axis="W"/>
     <processor class="org.dive4elements.river.exports.process.SQRelationProcessor" axis="Transport"/>
+    <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
 </discharge-defaults>
diff -r 592df582e462 -r 15f4e4785288 artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java	Mon Oct 06 15:27:20 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ATExporter.java	Mon Oct 06 15:33:52 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) {