--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java	Fri Jun 29 14:52:54 2018 +0200
@@ -14,7 +14,9 @@
 
 import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 import org.dive4elements.river.artifacts.common.ExportContextCSV;
+import org.dive4elements.river.artifacts.common.ExportContextPDF;
 import org.dive4elements.river.artifacts.common.GeneralResultType;
+import org.dive4elements.river.artifacts.common.IExportContext;
 import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
@@ -25,7 +27,7 @@
  *
  * @author Gernot Belger
  */
-final class CollisionCalcDetailResult extends AbstractCalculationExportableResult<CollisionCalculationResults> {
+final class CollisionCalcDetailResult extends AbstractCalculationExportableResult {
 
     private static final long serialVersionUID = 1L;
     private static final String JASPER_FILE = "/jasper/templates/sinfo.collision.detail.jrxml";
@@ -35,13 +37,13 @@
     }
 
     @Override
-    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results) {
+    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
 
         // do nothing so far
     }
 
     @Override
-    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final RiverInfo river) {
+    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
 
         final int colSize = 6;
         exportContextCSV.writeTitleForTabs("sinfo.export.csv.title.collision.detail", 6); // Voraussetzung für Tabs ist, dass der Titel vor den Headern
@@ -61,30 +63,30 @@
     }
 
     @Override
-    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) {
-        return formatRow(exportContextCSV, results, row);
+    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
+        return formatRow(exportContextCSV, row);
     }
 
     @Override
-    protected String[] formatPDFRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) {
+    protected String[] formatPDFRow(final ExportContextPDF exportContextCSV, final ResultRow row) {
         /*
          * final Collection<String> lines = new ArrayList<>(6);
          * lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
          * return lines.toArray(new String[lines.size()]);
          */
-        return formatRow(exportContextCSV, results, row);
+        return formatRow(exportContextCSV, row);
     }
 
-    private String[] formatRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) {
+    private String[] formatRow(final IExportContext exportContext, final ResultRow row) {
 
         final Collection<String> lines = new ArrayList<>(6);
 
-        lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
-        lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.date));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.collisionGaugeW));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.gaugeLabel));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.discharge));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.dischargeZone));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.station));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.date));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.collisionGaugeW));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.gaugeLabel));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.discharge));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.dischargeZone));
 
         return lines.toArray(new String[lines.size()]);
     }
@@ -95,7 +97,7 @@
     }
 
     @Override
-    protected void addJRTableHeader(final ExportContextCSV exportContextCSV, final MetaAndTableJRDataSource source, final CollisionCalculationResults results) {
+    protected void addJRTableHeader(final ExportContextPDF exportContextCSV, final MetaAndTableJRDataSource source) {
 
         /* column headings */
         exportContextCSV.addJRMetadata(source, "station_header", GeneralResultType.station);