--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java	Fri Jun 29 14:52:54 2018 +0200
@@ -13,7 +13,9 @@
 import java.util.Collection;
 
 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.AbstractTkhCalculationResult;
@@ -28,7 +30,7 @@
  * @author Gernot Belger
  */
 
-final class FlowDepthCalculationResult extends AbstractTkhCalculationResult<FlowDepthCalculationResults> {
+final class FlowDepthCalculationResult extends AbstractTkhCalculationResult {
 
     private static final long serialVersionUID = 1L;
 
@@ -53,7 +55,7 @@
     }
 
     @Override
-    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final FlowDepthCalculationResults results, final RiverInfo river) {
+    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
         // getLog().info("FlowDepthExporter.writeCSVHeader");
 
         final Collection<String> header = new ArrayList<>(11);
@@ -79,7 +81,7 @@
     }
 
     @Override
-    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final FlowDepthCalculationResults results) {
+    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
 
         exportContextCSV.writeCSVSoundingMetadata(this.sounding);
 
@@ -97,18 +99,18 @@
     }
 
     @Override
-    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final FlowDepthCalculationResults results, final ResultRow row) {
-        return formatRow(ExportMode.csv, exportContextCSV, results, row);
+    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
+        return formatRow(ExportMode.csv, exportContextCSV, row);
     }
 
     @Override
-    protected String[] formatPDFRow(final ExportContextCSV exportContextPDF, final FlowDepthCalculationResults results, final ResultRow row) {
+    protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) {
 
-        return formatRow(ExportMode.pdf, exportContextPDF, results, row);
+        return formatRow(ExportMode.pdf, exportContextPDF, row);
     }
 
     @Override
-    protected void addJRTableHeader(final ExportContextCSV exportContextPDF, final MetaAndTableJRDataSource source, final FlowDepthCalculationResults results) {
+    protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) {
 
         /* column headings */
         exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station);
@@ -124,25 +126,26 @@
         exportContextPDF.addJRMetadata(source, "location_header", SInfoResultType.location);
     }
 
-    private String[] formatRow(final ExportMode mode, final ExportContextCSV exportContextCSV, final FlowDepthCalculationResults results, final ResultRow row) {
+    private String[] formatRow(final ExportMode mode, final IExportContext exportContext, final ResultRow row) {
 
         final Collection<String> lines = new ArrayList<>(11);
 
-        lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.flowdepth));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.station));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepth));
+        final FlowDepthCalculationResults results = exportContext.getResults();
 
         if (mode == ExportMode.pdf || results.isUseTkh()) {
-            lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.flowdepthtkh));
-            lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.tkh));
+            lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthtkh));
+            lines.add(exportContext.formatRowValue(row, SInfoResultType.tkh));
         }
 
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.waterlevel));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.discharge));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.waterlevelLabel));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.gaugeLabel));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.meanBedHeight));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.soundingLabel));
-        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.location));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevel));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.discharge));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevelLabel));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.gaugeLabel));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.meanBedHeight));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.soundingLabel));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.location));
 
         return lines.toArray(new String[lines.size()]);
     }