--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractCalculationExportableResult.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractCalculationExportableResult.java	Fri Jun 29 14:52:54 2018 +0200
@@ -18,7 +18,7 @@
 /**
  * @author Domenico Nardi Tironi
  */
-public abstract class AbstractCalculationExportableResult<RESULTS extends AbstractCalculationResults<?>> extends AbstractCalculationResult {
+public abstract class AbstractCalculationExportableResult extends AbstractCalculationResult {
 
     private static final long serialVersionUID = 1L;
 
@@ -26,11 +26,11 @@
         super(label, rows);
     }
 
-    public abstract void writeCSVHeader(ExportContextCSV exportContextCSV, final RESULTS results, final RiverInfo river);
+    public abstract void writeCSVHeader(ExportContextCSV exportContextCSV, final RiverInfo river);
 
-    public final void writeCsv(final ExportContextCSV exportContextCSV, final RESULTS results) {
+    public final void writeCsv(final ExportContextCSV exportContextCSV) {
 
-        writeCSVResultMetadata(exportContextCSV, results);
+        writeCSVResultMetadata(exportContextCSV);
         // wenn resultsmetadata null sind!? keine neue zeile
         // writer.writeNext(new String[] { "" }); // break line in den Implementationen,
         // weil es sein kann, dass KEINE ResultMetadata geschrieben werden; dann wäre eine Leerzeile überflüssig
@@ -38,41 +38,40 @@
         /* now the value rows */
         final Collection<ResultRow> rows = getRows();
         for (final ResultRow row : rows)
-            writeCSVRow(exportContextCSV, results, row);
+            writeCSVRow(exportContextCSV, row);
     }
 
-    protected abstract void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final RESULTS results);
+    protected abstract void writeCSVResultMetadata(final ExportContextCSV exportContextCSV);
 
-    protected void writeCSVRow(final ExportContextCSV exportContextCSV, final RESULTS results, final ResultRow row) {
-        final String[] formattedRow = formatCSVRow(exportContextCSV, results, row);
+    protected void writeCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
+        final String[] formattedRow = formatCSVRow(exportContextCSV, row);
         exportContextCSV.writeCSVLine(formattedRow);
-
     }
 
-    protected abstract String[] formatCSVRow(ExportContextCSV exportContextCSV, final RESULTS results, final ResultRow row);
+    protected abstract String[] formatCSVRow(ExportContextCSV exportContextCSV, final ResultRow row);
 
-    protected abstract String[] formatPDFRow(ExportContextCSV exportContextPDF, RESULTS results, ResultRow row);
+    protected abstract String[] formatPDFRow(ExportContextPDF exportContextPDF, ResultRow row);
 
-    public JasperDesigner addReport(final ExportContextCSV exportContextPDF, final RESULTS results, final JasperReporter reporter,
-            final MetaAndTableJRDataSource source) throws JRException {
+    public JasperDesigner addReport(final ExportContextPDF exportContext, final JasperReporter reporter, final MetaAndTableJRDataSource source)
+            throws JRException {
 
         final JasperDesigner design = reporter.addReport(getJasperFile(), source);
-        addJRTableHeader(exportContextPDF, source, results);
-        addJRTableData(exportContextPDF, source, results);
+        addJRTableHeader(exportContext, source);
+        addJRTableData(exportContext, source);
         return design;
     }
 
     protected abstract String getJasperFile();
 
-    protected abstract void addJRTableHeader(ExportContextCSV exportContextPDF, MetaAndTableJRDataSource source, RESULTS results);
+    protected abstract void addJRTableHeader(ExportContextPDF exportContext, MetaAndTableJRDataSource source);
 
-    private void addJRTableData(final ExportContextCSV exportContextPDF, final MetaAndTableJRDataSource source, final RESULTS results) {
+    private void addJRTableData(final ExportContextPDF exportContext, final MetaAndTableJRDataSource source) {
 
         final Collection<ResultRow> rows = getRows();
 
         for (final ResultRow row : rows) {
 
-            final String[] formattedRow = formatPDFRow(exportContextPDF, results, row);
+            final String[] formattedRow = formatPDFRow(exportContext, row);
             source.addData(formattedRow);
         }
     }