--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java	Tue May 15 12:00:26 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java	Tue May 15 18:04:36 2018 +0200
@@ -14,7 +14,6 @@
 
 import org.apache.commons.lang.math.DoubleRange;
 import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.common.GeneralResultType;
 import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.model.Calculation;
@@ -44,12 +43,11 @@
         final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name());
         final String user = CalculationUtils.findArtifactUser(this.context, uinfo);
 
-        final RiverAccess access = new RiverAccess(uinfo);
-        final River river = access.getRiver();
-        final DoubleRange calcRange = null;
+        final SalixLineAccess accessSalix = new SalixLineAccess(uinfo);
+
+        final River river = accessSalix.getRiver();
         final RiverInfo riverInfo = new RiverInfo(river);
 
-        final SalixLineAccess accessSalix = new SalixLineAccess(uinfo);
         final DoubleRange range = accessSalix.getRange();
         final boolean useScenario = accessSalix.getUseScenario();
         final String selectedScenario = accessSalix.getScenario();
@@ -61,7 +59,9 @@
         // ld_from_part; ld_to_part
         // scenario_selection (mögliche Werte:"scenarioType.option1" "scenarioType.option2" "scenarioType.option3"
 
-        final SalixLineCalculationResults results = new SalixLineCalculationResults(calcModeLabel, user, riverInfo, calcRange);
+        // FIXME: real calculation
+
+        final SalixLineCalculationResults results = new SalixLineCalculationResults(calcModeLabel, user, riverInfo, range);
 
         final Collection<ResultRow> rows = new ArrayList<>();