--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java	Tue Jul 31 15:48:35 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java	Tue Jul 31 16:04:01 2018 +0200
@@ -16,18 +16,12 @@
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.D4EArtifact;
-import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.common.AbstractProcessor;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType;
 import org.dive4elements.river.exports.DiagramGenerator;
-import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.process.DefaultProcessor;
 import org.dive4elements.river.exports.process.WOutProcessor;
-import org.dive4elements.river.jfree.StyledXYSeries;
 import org.dive4elements.river.themes.ThemeDocument;
-import org.dive4elements.river.utils.RiverUtils;
-import org.jfree.data.xy.XYSeries;
 
 /**
  * Processor to generate the facets and data series of salix line
@@ -35,7 +29,7 @@
  * @author Matthias Schäfer
  *
  */
-public final class SalixLineProcessor extends DefaultProcessor {
+public final class SalixLineProcessor extends AbstractProcessor {
 
     private static final String FACET_SALIX_LINE = "uinfo_facet_salix_line";
 
@@ -57,70 +51,61 @@
         HANDLED_FACET_TYPES.add(FACET_SALIX_SCENARIO);
     }
 
-    public static Facet createSalixLineFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int facetIndex, final int resultIndex) {
+    public static Facet createSalixLineFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_LINE_DESCRIPTION, FACET_SALIX_LINE_DESCRIPTION);
-        return new SalixLineResultFacet(FACET_SALIX_LINE, description);
+        return new SalixLineResultFacet(facetIndex, resultIndex, FACET_SALIX_LINE, description, WOutProcessor.I18N_AXIS_LABEL, id, hash);
     }
 
-    public static Facet createSalixMnwMwFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int facetIndex, final int resultIndex) {
+    public static Facet createSalixMnwMwFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_MNWMW_DESCRIPTION, FACET_SALIX_MNWMW_DESCRIPTION);
-        return new SalixMnwMwResultFacet(FACET_SALIX_MNWMW, description);
+        return new SalixMnwMwResultFacet(facetIndex, resultIndex, FACET_SALIX_MNWMW, description, WOutProcessor.I18N_AXIS_LABEL, id, hash);
     }
 
-    public static Facet createSalixScenarioFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int facetIndex, final int resultIndex, final String subLabel) {
+    public static Facet createSalixScenarioFacet(final CallContext context, final String hash, final String id, final int dataIndex, final int resultIndex,
+            final int facetIndex, final String subLabel) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_SCENARIO_DESCRIPTION, FACET_SALIX_SCENARIO_DESCRIPTION, subLabel);
-        return new SalixScenarioResultFacet(FACET_SALIX_SCENARIO, description, facetIndex, hash, id);
+        return new SalixScenarioResultFacet(facetIndex, resultIndex, dataIndex, FACET_SALIX_SCENARIO, description, WOutProcessor.I18N_AXIS_LABEL, hash, id);
+    }
+
+    public SalixLineProcessor() {
+        super(WOutProcessor.I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
     @Override
-    public final String getAxisLabel(final DiagramGenerator generator) {
-
-        final D4EArtifact flys = (D4EArtifact) generator.getMaster();
-        final String unit = RiverUtils.getRiver(flys).getWstUnit().getName();
-        return generator.msg(WOutProcessor.I18N_AXIS_LABEL, WOutProcessor.I18N_AXIS_LABEL_DEFAULT, unit);
-    }
-
-    @Override
-    public final boolean canHandle(final String facettype) {
-        return HANDLED_FACET_TYPES.contains(facettype);
-    }
-
-    @Override
-    public void doOut(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
 
         // log.debug("Processing facet: " + bundle.getFacetName());
         final CallContext context = generator.getContext();
         final Object data = bundle.getData(context);
 
-        final XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme);
-        final SalixLineCalculationNoScenarioResult result = (SalixLineCalculationNoScenarioResult) data;
-
         if (bundle.getFacetName().equals(FACET_SALIX_LINE)) {
-            StyledSeriesBuilder.addPoints(series, result.getStationPoints(UInfoResultType.salixline), true);
-            generator.addAxisSeries(series, this.axisName, visible);
-            return;
+            return buildSeriesForType(generator, bundle, theme, visible, UInfoResultType.salixline, GAP_DISTANCE);
         }
 
         if (bundle.getFacetName().equals(FACET_SALIX_MNWMW)) {
-            StyledSeriesBuilder.addPoints(series, result.getStationPoints(UInfoResultType.salix_delta_mw), true);
-            generator.addAxisSeries(series, this.axisName, visible);
-            return;
+            return buildSeriesForType(generator, bundle, theme, visible, UInfoResultType.salix_delta_mw, GAP_DISTANCE);
         }
 
         if (bundle.getFacetName().equals(FACET_SALIX_SCENARIO)) {
             // TODO Differenzieren, Scenario 1 bis max. 5 bei Regional
-            if (data instanceof SalixLineCalculationRegionalResult)
-                StyledSeriesBuilder.addPoints(series, ((SalixLineCalculationRegionalResult) data).getScenarioPoints(bundle.getFacet().getIndex()), true);
-            else
-                StyledSeriesBuilder.addPoints(series, result.getStationPoints(UInfoResultType.salix_line_scenario), false);
-            generator.addAxisSeries(series, this.axisName, visible);
-            return;
+
+            // FIXME: warum so unterscheiden? bei den anderen beiden szenarien einfach nur ein szenario-ergebnis in die liste
+            // packen!
+
+            if (data instanceof SalixLineCalculationRegionalResult) {
+
+                final int dataIndex = ((SalixScenarioResultFacet) bundle.getFacet()).getDataIndex();
+
+                final double[][] scenarioPoints = ((SalixLineCalculationRegionalResult) data).getScenarioPoints(dataIndex);
+                return buildSeriesForPoints(scenarioPoints, generator, bundle, theme, visible, GAP_DISTANCE);
+
+            } else
+                return buildSeriesForType(generator, bundle, theme, visible, UInfoResultType.salix_line_scenario, GAP_DISTANCE);
         }
+
+        throw new UnsupportedOperationException();
     }
 }
\ No newline at end of file