--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineResultFacet.java	Tue Jul 31 15:48:35 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineResultFacet.java	Tue Jul 31 16:04:01 2018 +0200
@@ -10,45 +10,25 @@
 
 import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.artifacts.Artifact;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.D4EArtifact;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResults;
-import org.dive4elements.river.artifacts.model.CalculationResult;
-import org.dive4elements.river.artifacts.model.DataFacet;
+import org.dive4elements.river.artifacts.common.ResultFacet;
+import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 /**
  * Facet of the U-Info salix line curve.
  */
-public class SalixLineResultFacet extends DataFacet {
+public class SalixLineResultFacet extends ResultFacet {
 
     private static final long serialVersionUID = 1L;
 
     private static Logger log = Logger.getLogger(SalixLineResultFacet.class);
 
-    private int resultIndex;
-
     public SalixLineResultFacet() {
         // required for clone operation deepCopy()
     }
 
-    public SalixLineResultFacet(final String name, final String description) {
-        super(name, description);
-    }
-
-    @Override
-    public final Object getData(final Artifact artifact, final CallContext context) {
-
-        log.debug("Get data for result at index: " + this.resultIndex);
-
-        final D4EArtifact flys = (D4EArtifact) artifact;
-
-        final CalculationResult res = (CalculationResult) flys.compute(context, this.hash, this.stateId, this.type, false);
-
-        final AbstractCalculationResults<AbstractCalculationResult> data = (AbstractCalculationResults<AbstractCalculationResult>) res.getData();
-
-        return data.getResults().get(this.resultIndex);
+    public SalixLineResultFacet(final int facetIndex, final int resultIndex, final String name, final String description, final String yAxisLabelKey,
+            final String stateId, final String hash) {
+        super(facetIndex, resultIndex, name, description, yAxisLabelKey, ComputeType.ADVANCE, stateId, hash);
     }
 
     /** Copy deeply. */