--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodDurationProcessor.java	Mon Jul 02 07:33:53 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodDurationProcessor.java	Mon Jul 02 13:00:59 2018 +0200
@@ -13,12 +13,15 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
 
 /**
  * Processor to generate the facet and data series of infrastructure flood durations
@@ -26,7 +29,7 @@
  * @author Matthias Schäfer
  *
  */
-public final class FloodDurationProcessor extends AbstractSInfoLineProcessor<AbstractCalculationResult> {
+public final class FloodDurationProcessor extends AbstractSInfoProcessor {
 
     public static final String FACET_FLOOD_DURATION = "sinfo_facet_flood_duration";
 
@@ -55,35 +58,52 @@
         super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
+    // @Override TODO: REMOVE (has been replaced by doGetType
+    // protected double[][] doGetPoints(final AbstractCalculationResult data, final String facetName) {
+    //
+    // if (FACET_FLOOD_DURATION.contentEquals(facetName))
+    // return ((FloodDurationCalculationResult) data).fetchInfrastructurePoints(SInfoResultType.floodDuration);
+    //
+    // if (FACET_MAIN_VALUE_1_DURATION.contentEquals(facetName))
+    // return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue1Duration);
+    //
+    // if (FACET_MAIN_VALUE_2_DURATION.contentEquals(facetName))
+    // return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue2Duration);
+    //
+    // if (FACET_MAIN_VALUE_3_DURATION.contentEquals(facetName))
+    // return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue3Duration);
+    //
+    // final String error = String.format("Unknown facet name: %s", facetName);
+    // throw new UnsupportedOperationException(error);
+    // }
 
-    @Override
-    protected double[][] doGetPoints(final AbstractCalculationResult data, final String facetName) {
+    public static Facet createFloodDurationFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
+            final int index) {
+
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, I18N_AXIS_LABEL, FACET_FLOOD_DURATION, FACET_FLOOD_DURATION_DESCRIPTION);
+    }
+
+    private SInfoResultType doGetType(final String facetName) {
 
         if (FACET_FLOOD_DURATION.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchInfrastructurePoints(SInfoResultType.floodDuration);
+            return SInfoResultType.floodDuration;
 
         if (FACET_MAIN_VALUE_1_DURATION.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue1Duration);
+            return SInfoResultType.mainValue1Duration;
 
         if (FACET_MAIN_VALUE_2_DURATION.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue2Duration);
+            return SInfoResultType.mainValue2Duration;
 
         if (FACET_MAIN_VALUE_3_DURATION.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue3Duration);
+            return SInfoResultType.mainValue3Duration;
 
         final String error = String.format("Unknown facet name: %s", facetName);
         throw new UnsupportedOperationException(error);
+
     }
 
-    public static Facet createFloodDurationFacet(final CallContext context, final String hash, final String id,
-            final AbstractCalculationResult result, final int index) {
-
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, I18N_AXIS_LABEL,
-                FACET_FLOOD_DURATION, FACET_FLOOD_DURATION_DESCRIPTION);
-    }
-
-    public static Facet createMainValueDurationFacet(final CallContext context, final String hash, final String id,
-            final FloodDurationCalculationResult result, final int index) {
+    public static Facet createMainValueDurationFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
+            final int index) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_MAIN_VALUE_DURATION_DESCRIPTION, FACET_MAIN_VALUE_DURATION_DESCRIPTION,
                 result.getMainValueLabel(index));
@@ -91,4 +111,10 @@
         final String facetName = new String[] { FACET_MAIN_VALUE_1_DURATION, FACET_MAIN_VALUE_2_DURATION, FACET_MAIN_VALUE_3_DURATION }[index];
         return new SInfoResultFacet(0, facetName, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
     }
+
+    @Override
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+
+        return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), GAP_DISTANCE);
+    }
 }
\ No newline at end of file