--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineExporter.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineExporter.java	Fri Jun 29 14:52:54 2018 +0200
@@ -9,60 +9,24 @@
  */
 package org.dive4elements.river.artifacts.uinfo.salix;
 
-import java.io.OutputStream;
-
-import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 import org.dive4elements.river.artifacts.common.AbstractCommonExporter;
 import org.dive4elements.river.artifacts.common.ExportContextCSV;
+import org.dive4elements.river.artifacts.common.ExportContextPDF;
 import org.dive4elements.river.artifacts.common.I18NStrings;
-import org.dive4elements.river.artifacts.common.JasperReporter;
 import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
-import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
-
-import au.com.bytecode.opencsv.CSVWriter;
-import net.sf.jasperreports.engine.JRException;
 
 /**
  * @author Domenico Nardi Tironi
  *
  */
-public class SalixLineExporter extends AbstractCommonExporter<SalixLineCalculationResults> {
+public class SalixLineExporter extends AbstractCommonExporter<SalixLineCalculationResult, SalixLineCalculationResults> {
 
     @Override
-    protected void doWritePdf(final OutputStream out, final SalixLineCalculationResults results) {
-        // TODO: Move to super
-        try {
-            final ExportContextCSV exportContextCSV = new ExportContextCSV(this.context, null);
-
-            final JasperReporter reporter = new JasperReporter();
-
-            for (final AbstractCalculationExportableResult<SalixLineCalculationResults> result : results.getResults()) {
-                final MetaAndTableJRDataSource source = new MetaAndTableJRDataSource();
-                getHelper().addJRMetaDataUSINFO(source, results);
-
-                result.addReport(exportContextCSV, results, reporter, source);
-            }
+    protected void writeCSVGlobalMetadata(final ExportContextCSV exportContextCSV, final SalixLineCalculationResults results) {
+        /* write as csv */
+        exportContextCSV.writeCSVGlobalMetadataDefaults(); // ggf auslagern innerhalb dieser Klasse
 
-            reporter.exportPDF(out);
-        }
-        catch (final JRException je) {
-            getLog().warn("Error generating PDF Report!", je);
-        }
-    }
-
-    @Override
-    protected void doWriteCSVData(final CSVWriter writer, final SalixLineCalculationResults results) {
-        // TODO: Diesen Ablauf in super? - ist etwas anders bei den globalen metadaten
-
-        // TODO: move results into context?
-        final ExportContextCSV exportContextCSV = new ExportContextCSV(this.context, writer);
-
-        getLog().info("writeCSVData");
-
-        /* write as csv */
-        exportContextCSV.writeCSVGlobalMetadataDefaults(results); // ggf auslagern innerhalb dieser Klasse
-
-        // writer.writeNext(new String[] { "" }); // break line HERE to avoid redundance
+        // break line ?
 
         // "# Höhensystem des Flusses: "
         exportContextCSV.writeCSVMetaEntry(I18NStrings.CSV_META_HEIGHT_UNIT_RIVER, results.getRiver().getWstUnit());
@@ -79,22 +43,11 @@
         // if (year > 0)
         exportContextCSV.writeCSVMetaEntry("uinfo.export.salix_line.csv.meta.header.waterlevel.year", "Integer.toString(year)");
 
-        final RiverInfo river = results.getRiver();
-
-        final Class<?> lastResultType = null;
-
-        for (final AbstractCalculationExportableResult<SalixLineCalculationResults> result : results.getResults()) {
+    }
 
-            final Class<?> resultType = result.getClass();
-            if (lastResultType == null || lastResultType != resultType) {
-                exportContextCSV.writeBlankLine();
-                result.writeCSVHeader(exportContextCSV, results, river);
-                exportContextCSV.writeBlankLine();
-            } else
-                exportContextCSV.writeCSVLine(new String[] { "#" });
-
-            result.writeCsv(exportContextCSV, results);
-        }
+    @Override
+    protected void writePDFGlobalMetadata(final ExportContextPDF exportContext, final MetaAndTableJRDataSource source) {
+        exportContext.addJRMetaDataUSINFO(source);
     }
 
 }
\ No newline at end of file