--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java	Wed Jul 25 12:58:52 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java	Wed Jul 25 15:07:14 2012 +0000
@@ -5,16 +5,12 @@
 import de.intevation.artifacts.Artifact;
 import de.intevation.artifacts.CallContext;
 
-import de.intevation.flys.artifacts.FixationArtifact;
 import de.intevation.flys.artifacts.FLYSArtifact;
 
 import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
 
-import de.intevation.flys.artifacts.model.fixings.FixRealizingResult;
-
 import org.apache.log4j.Logger;
 
-
 /**
  * Facet of a Waterlevel (WQKms).
  */
@@ -33,7 +29,6 @@
         ComputeType type,
         String      stateID,
         String      hash
-
     ) {
         super(index, name, description, type, hash, stateID);
     }
@@ -41,6 +36,9 @@
     public WaterlevelFacet() {
     }
 
+    protected WQKms [] getWQKms(CalculationResult res) {
+        return (WQKms [])res.getData();
+    }
 
     /**
      * Get waterlevel data.
@@ -68,18 +66,9 @@
             return null;
         }
 
-        if (winfo instanceof FixationArtifact) {
-            FixRealizingResult fr = (FixRealizingResult) res.getData();
-            if (fr == null || fr.getWQKms() == null) {
-                logger.error("WaterlevelFacet.getData: " +
-                    " corrupted FixationArtifact result.");
-            }
-            return fr.getWQKms()[index];
-        }
+        WQKms [] wqkms = getWQKms(res);
 
-        WQKms [] wqkms = (WQKms []) res.getData();
-
-        return wqkms[index];
+        return wqkms != null ? wqkms[index] : null;
     }