--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java	Sat Jun 18 20:20:34 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java	Mon Jun 20 12:32:32 2011 +0000
@@ -14,6 +14,7 @@
 import de.intevation.flys.artifacts.model.WaterlevelFacet;
 import de.intevation.flys.artifacts.model.WQKms;
 import de.intevation.flys.artifacts.model.WQCKms;
+import de.intevation.flys.artifacts.model.CalculationResult;
 
 import de.intevation.flys.artifacts.model.DataFacet;
 
@@ -33,36 +34,33 @@
         List<Facet>  facets, 
         Object       old
     ) {
-        WQKms [] res;
+        CalculationResult res;
 
         WINFOArtifact winfo = (WINFOArtifact)artifact;
 
-        if (old instanceof WQCKms []) {
-            res = (WQCKms [])old;
+        if (old instanceof CalculationResult) {
+            res = (CalculationResult)old;
         }
         else {
             res = winfo.getDischargeLongitudinalSectionData();
-
-            if (res == null) {
-                logger.debug("No results given.");
-                return null;
-            }
         }
 
         if (facets == null) {
             return res;
         }
 
-        for (int i = 0; i < res.length; i++) {
+        WQKms [] wqkms = (WQKms [])res.getData();
+
+        for (int i = 0; i < wqkms.length; i++) {
             String nameW = null;
             String nameQ = null;
 
             if (winfo.isQ()) {
-                nameQ = res[i].getName();
+                nameQ = wqkms[i].getName();
                 nameW = "W(" + nameQ + ")";
             }
             else {
-                nameW = res[i].getName();
+                nameW = wqkms[i].getName();
                 nameQ = "Q(" + nameQ + ")";
             }
 
@@ -75,7 +73,7 @@
             facets.add(w);
             facets.add(q);
 
-            if (res[i] instanceof WQCKms) {
+            if (wqkms[i] instanceof WQCKms) {
                 // TODO DO i18n
 
                 String nameC = nameW.replace(
@@ -89,7 +87,7 @@
             }
         }
 
-        if (res.length > 0) {
+        if (wqkms.length > 0) {
             facets.add(new DataFacet(CSV, "CSV data"));
             facets.add(new DataFacet(WST, "WST data"));
         }