# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1338063180 0
# Node ID f9e62e76ee1f352e1b30696fc6449d944d6c658a
# Parent  f87fcedbfa821e0627dc249b21ae16cb8a511054
FixA: Return correct data structure from calculation.

flys-artifacts/trunk@4525 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r f87fcedbfa82 -r f9e62e76ee1f flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Sat May 26 19:20:59 2012 +0000
+++ b/flys-artifacts/ChangeLog	Sat May 26 20:13:00 2012 +0000
@@ -1,3 +1,14 @@
+2012-05-26	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java:
+	  Removed. Obsolete.
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java:
+	  New. Stores the result of the fixing analysis.
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java:
+	  Return the right structure (FixResult) from the calculation.
+
 2012-05-26	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/Parameters.java:
diff -r f87fcedbfa82 -r f9e62e76ee1f flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java	Sat May 26 19:20:59 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-package de.intevation.flys.artifacts.model.fixings;
-
-import de.intevation.flys.artifacts.model.Parameters;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-public class FitResult
-implements   Serializable
-{
-    protected Parameters    parameters;
-    protected List<DeltaWT> deltaWTs;
-
-    public FitResult() {
-    }
-
-    public FitResult(Parameters parameters, List<DeltaWT> deltaWTs) {
-        this.parameters = parameters;
-        this.deltaWTs   = deltaWTs;
-    }
-
-    public Parameters getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(Parameters parameters) {
-        this.parameters = parameters;
-    }
-
-    public List<DeltaWT> getDeltaWTs() {
-        return deltaWTs;
-    }
-
-    public void setDeltaWTs(List<DeltaWT> deltaWTs) {
-        this.deltaWTs = deltaWTs;
-    }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r f87fcedbfa82 -r f9e62e76ee1f flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java	Sat May 26 19:20:59 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java	Sat May 26 20:13:00 2012 +0000
@@ -38,7 +38,7 @@
 public class FixCalculation
 extends      Calculation
 {
-    private static Logger logger = Logger.getLogger(FixCalculation.class);
+    private static Logger log = Logger.getLogger(FixCalculation.class);
 
     protected String    river;
     protected double    from;
@@ -228,7 +228,9 @@
             overview,
             results);
 
-        return new CalculationResult(deltaWTsKM, this);
+        FixResult fr = new FixResult(results, deltaWTsKM);
+
+        return new CalculationResult(fr, this);
     }
 
     public DeltaWTsKM calculateDeltaWTs(
diff -r f87fcedbfa82 -r f9e62e76ee1f flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java	Sat May 26 20:13:00 2012 +0000
@@ -0,0 +1,39 @@
+package de.intevation.flys.artifacts.model.fixings;
+
+import de.intevation.flys.artifacts.model.Parameters;
+
+import java.io.Serializable;
+
+import java.util.List;
+
+public class FixResult
+implements   Serializable
+{
+    protected Parameters parameters;
+    protected DeltaWTsKM deltaWTsKM;
+
+    public FixResult() {
+    }
+
+    public FixResult(Parameters parameters, DeltaWTsKM deltaWTsKM) {
+        this.parameters = parameters;
+        this.deltaWTsKM = deltaWTsKM;
+    }
+
+    public Parameters getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(Parameters parameters) {
+        this.parameters = parameters;
+    }
+
+    public DeltaWTsKM getDeltaWTsKM() {
+        return deltaWTsKM;
+    }
+
+    public void setDeltaWTsKM(DeltaWTsKM deltaWTsKM) {
+        this.deltaWTsKM = deltaWTsKM;
+    }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :