diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java @ 3461:1481322efc02

FixA: Removed instanceof hack to fetch the WQKms of the fix realizations. flys-artifacts/trunk@5129 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 25 Jul 2012 15:07:14 +0000
parents d625f4d06b6a
children 13855a555d3b
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java	Wed Jul 25 12:58:52 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java	Wed Jul 25 15:07:14 2012 +0000
@@ -1,24 +1,29 @@
 package de.intevation.flys.artifacts.states.fixation;
 
-import java.util.List;
-
-import org.apache.log4j.Logger;
+import de.intevation.artifactdatabase.state.Facet;
 
-import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifacts.CallContext;
+
 import de.intevation.flys.artifacts.FLYSArtifact;
+
 import de.intevation.flys.artifacts.access.FixRealizingAccess;
+
 import de.intevation.flys.artifacts.model.CalculationResult;
 import de.intevation.flys.artifacts.model.DataFacet;
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.ReportFacet;
 import de.intevation.flys.artifacts.model.WQCKms;
 import de.intevation.flys.artifacts.model.WQKms;
-import de.intevation.flys.artifacts.model.WaterlevelFacet;
+
 import de.intevation.flys.artifacts.model.fixings.FixRealizingCalculation;
 import de.intevation.flys.artifacts.model.fixings.FixRealizingResult;
+import de.intevation.flys.artifacts.model.fixings.FixWaterlevelFacet;
+
 import de.intevation.flys.artifacts.states.DefaultState;
 
+import java.util.List;
+
+import org.apache.log4j.Logger;
 
 /**
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
@@ -61,6 +66,10 @@
             return res;
         }
 
+        if (res.getReport().hasProblems()) {
+            facets.add(new ReportFacet());
+        }
+
         FixRealizingResult fixRes = (FixRealizingResult) res.getData();
         WQKms [] wqkms = fixRes != null ? fixRes.getWQKms() : new WQKms[0];
 
@@ -77,10 +86,10 @@
                 nameQ = "Q(" + nameW + ")";
             }
 
-            Facet w = new WaterlevelFacet(
+            Facet w = new FixWaterlevelFacet(
                 i, LONGITUDINAL_W, nameW);
 
-            Facet q = new WaterlevelFacet(
+            Facet q = new FixWaterlevelFacet(
                 i, LONGITUDINAL_Q, nameQ);
 
             facets.add(w);
@@ -91,7 +100,7 @@
                     "benutzerdefiniert",
                     "benutzerdefiniert [korrigiert]");
 
-                Facet c = new WaterlevelFacet(
+                Facet c = new FixWaterlevelFacet(
                     i, DISCHARGE_LONGITUDINAL_C, nameC);
 
                 facets.add(c);
@@ -103,10 +112,6 @@
             facets.add(new DataFacet(WST, "WST data"));
         }
 
-        if (res.getReport().hasProblems()) {
-            facets.add(new ReportFacet());
-        }
-
         return res;
     }
 }

http://dive4elements.wald.intevation.org