--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculationResult.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculationResult.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;
@@ -27,7 +29,7 @@
  *
  * @author Gernot Belger
  */
-final class FlowDepthDevelopmentCalculationResult extends AbstractCalculationExportableResult<FlowDepthDevelopmentCalculationResults> {
+final class FlowDepthDevelopmentCalculationResult extends AbstractCalculationExportableResult {
 
     private static final long serialVersionUID = 1L;
 
@@ -109,7 +111,7 @@
     }
 
     @Override
-    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final FlowDepthDevelopmentCalculationResults results) {
+    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
 
         exportContextCSV.writeCSVSoundingMetadata(getCurrentSounding(), CSV_META_HEADER_SOUNDING_CURRENT);
         exportContextCSV.writeBlankLine();
@@ -127,24 +129,24 @@
         return JASPER_FILE;
     }
 
-    protected String[] formatRow(final ExportContextCSV exportContextCSV, final FlowDepthDevelopmentCalculationResults results, final ResultRow row) {
+    protected String[] formatRow(final IExportContext exportContext, final ResultRow row) {
 
         final Collection<String> lines = new ArrayList<>(10);
 
-        lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.flowdepthDevelopment));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.flowdepthDevelopmentPerYear));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.waterlevelDifference));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.bedHeightDifference));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.flowdepthCurrent));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.flowdepthHistorical));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.location));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.station));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthDevelopment));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthDevelopmentPerYear));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevelDifference));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.bedHeightDifference));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthCurrent));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthHistorical));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.location));
 
         return lines.toArray(new String[lines.size()]);
     }
 
     @Override
-    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final FlowDepthDevelopmentCalculationResults results, final RiverInfo river) {
+    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
 
         final Collection<String> header = new ArrayList<>(11);
 
@@ -162,20 +164,19 @@
     }
 
     @Override
-    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final FlowDepthDevelopmentCalculationResults results, final ResultRow row) {
+    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
 
-        return this.formatRow(exportContextCSV, results, row);
+        return this.formatRow(exportContextCSV, row);
     }
 
     @Override
-    protected String[] formatPDFRow(final ExportContextCSV exportContextPDF, final FlowDepthDevelopmentCalculationResults results, final ResultRow row) {
+    protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) {
 
-        return this.formatRow(exportContextPDF, results, row);
+        return this.formatRow(exportContextPDF, row);
     }
 
     @Override
-    protected void addJRTableHeader(final ExportContextCSV exportContextPDF, final MetaAndTableJRDataSource source,
-            final FlowDepthDevelopmentCalculationResults results) {
+    protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) {
         /* column headings */
         exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station);
         exportContextPDF.addJRMetadata(source, "flowdepthdevelopment_header", SInfoResultType.flowdepthDevelopment);