--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java	Tue Jul 03 14:26:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java	Tue Jul 03 17:00:48 2018 +0200
@@ -11,11 +11,7 @@
 package org.dive4elements.river.artifacts.sinfo.collision;
 
 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.model.CalculationResult;
-import org.dive4elements.river.artifacts.model.DataFacet;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultFacet;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 /**
@@ -23,32 +19,25 @@
  *
  * @author Matthias Schäfer
  */
-// FIXME: remove
-public class CollisionCalcFacet extends DataFacet {
+public class CollisionCalcFacet extends SInfoResultFacet {
 
     private static final long serialVersionUID = 1;
+    private int year;
 
-    public CollisionCalcFacet() {
+    private CollisionCalcFacet() {
+        super();
         // required for clone operation deepCopy()
     }
 
-    public CollisionCalcFacet(final int idx, final String name, final String description, final String yAxisLabelKey, final ComputeType type,
-            final String stateId, final String hash) {
-        super(idx, name, description, type, hash, stateId);
-        this.metaData.put("X", "sinfo.chart.km.xaxis.label");
-        this.metaData.put("Y", yAxisLabelKey);
+    public CollisionCalcFacet(final int facetIndex, final int resultIndex, final int year, final String name, final String description,
+            final String yAxisLabelKey, final ComputeType type, final String hash, final String stateId) {
+        super(facetIndex, resultIndex, name, description, yAxisLabelKey, type, stateId, hash);
+
+        this.year = year;
     }
 
-    @Override
-    public Object getData(final Artifact artifact, final CallContext context) {
-
-        final D4EArtifact flys = (D4EArtifact) artifact;
-
-        final CalculationResult res = (CalculationResult) flys.compute(context, this.hash, this.stateId, this.type, false);
-
-        final CollisionCalculationResults data = (CollisionCalculationResults) res.getData();
-
-        return data.getResults().get(0); // first result is always the one and only CollisionCalcOverviewResult
+    public int getYear() {
+        return this.year;
     }
 
     /** Copy deeply. */
@@ -61,6 +50,7 @@
         copy.type = this.type;
         copy.hash = this.hash;
         copy.stateId = this.stateId;
+        copy.year = this.year;
         return copy;
     }
 }
\ No newline at end of file