--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentExporter.java	Thu Apr 12 19:13:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentExporter.java	Thu Apr 12 19:14:19 2018 +0200
@@ -12,8 +12,9 @@
 import java.util.Collection;
 
 import org.apache.log4j.Logger;
+import org.dive4elements.river.artifacts.common.GeneralResultType;
+import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoExporter;
-import org.dive4elements.river.artifacts.sinfo.common.SInfoResultRow;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.util.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
@@ -52,17 +53,17 @@
             final FlowDepthDevelopmentCalculationResult result) {
 
         writeCSVSoundingMetadata(writer, result.getCurrentSounding(), CSV_META_HEADER_SOUNDING_CURRENT);
+        writer.writeNext(new String[] { "" }); // break line
         writeCSVWaterlevelMetadata(writer, result.getCurrentWst(), CSV_META_HEADER_WATERLEVEL_CURRENT);
+        writer.writeNext(new String[] { "" }); // break line
         writeCSVSoundingMetadata(writer, result.getHistoricalSounding(), CSV_META_HEADER_SOUNDING_HISTORICAL);
+        writer.writeNext(new String[] { "" }); // break line
         writeCSVWaterlevelMetadata(writer, result.getHistoricalWst(), CSV_META_HEADER_WATERLEVEL_HISTORICAL);
     }
 
     @Override
     protected void writeCSVGlobalMetadata(final CSVWriter writer, final FlowDepthDevelopmentCalculationResults results) {
-
         super.writeCSVGlobalMetadataDefaults(writer, results);
-
-        writer.writeNext(new String[] { "" });
     }
 
     /**
@@ -80,7 +81,7 @@
 
         final Collection<String> header = new ArrayList<>(11);
 
-        header.add(msg(SInfoResultType.station.getCsvHeader()));
+        header.add(msg(GeneralResultType.station.getCsvHeader()));
         header.add(msgUnit(SInfoResultType.flowdepthDevelopment.getCsvHeader(), SInfoResultType.flowdepthDevelopment.getUnit()));
         header.add(msgUnit(SInfoResultType.flowdepthDevelopmentPerYear.getCsvHeader(), SInfoResultType.flowdepthDevelopmentPerYear.getUnit()));
         header.add(msgUnitLabel(SInfoResultType.waterlevelDifference.getCsvHeader(), SInfoResultType.waterlevelDifference.getUnit(),
@@ -96,12 +97,6 @@
         writer.writeNext(header.toArray(new String[header.size()]));
     }
 
-    @Override
-    protected String[] formatCSVRow(final FlowDepthDevelopmentCalculationResults results, final FlowDepthDevelopmentCalculationResult result,
-            final SInfoResultRow row) {
-        return formatRow(result, row);
-    }
-
     /**
      * Format a row of a flow depth result into an array of string, both used by csv and pdf
      *
@@ -109,12 +104,12 @@
      *
      * @param useTkh
      */
-    private String[] formatRow(final FlowDepthDevelopmentCalculationResult result, final SInfoResultRow row) {
+    @Override
+    protected String[] formatRow(final FlowDepthDevelopmentCalculationResults results, final ResultRow row, final ExportMode mode) {
 
         final Collection<String> lines = new ArrayList<>(10);
 
-        lines.add(row.exportValue(this.context, SInfoResultType.station));
-
+        lines.add(row.exportValue(this.context, GeneralResultType.station));
         lines.add(row.exportValue(this.context, SInfoResultType.flowdepthDevelopment));
         lines.add(row.exportValue(this.context, SInfoResultType.flowdepthDevelopmentPerYear));
         lines.add(row.exportValue(this.context, SInfoResultType.waterlevelDifference));
@@ -135,14 +130,14 @@
     protected final void addJRMetaData(final MetaAndTableJRDataSource source, final FlowDepthDevelopmentCalculationResults results) {
 
         /* general metadata */
-        super.addJRMetaDataDefaults(source, results);
+        super.addJRMetaData(source, results);
 
         final FlowDepthDevelopmentCalculationResult result = results.getResult();
         source.addMetaData("flowdepthdevelopment", result.getLabel());
-        source.addMetaData("flowdepthdevelopment_header_label",SInfoResultType.flowdepthDevelopment.getCsvHeader(this.context.getMeta()));//(this.context.getMeta()));
+        source.addMetaData("flowdepthdevelopment_header_label", SInfoResultType.flowdepthDevelopment.getCsvHeader(this.context.getMeta()));// (this.context.getMeta()));
 
         /* column headings */
-        source.addMetaData("station_header", SInfoResultType.station.getPdfHeader(this.context.getMeta()));
+        source.addMetaData("station_header", GeneralResultType.station.getPdfHeader(this.context.getMeta()));
         source.addMetaData("flowdepthdevelopment_header", SInfoResultType.flowdepthDevelopment.getPdfHeader(this.context.getMeta()));
         source.addMetaData("flowdepthdevelopmentperyear_header", SInfoResultType.flowdepthDevelopmentPerYear.getPdfHeader(this.context.getMeta()));
 
@@ -161,8 +156,4 @@
         source.addMetaData("location_header", SInfoResultType.location.getPdfHeader(this.context.getMeta()));
     }
 
-    @Override
-    protected String[] formatPDFRow(final FlowDepthDevelopmentCalculationResults results, final SInfoResultRow row) {
-        return formatRow(null, row);
-    }
 }
\ No newline at end of file