--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java	Thu Apr 12 19:13:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.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.BedHeightInfo;
 import org.dive4elements.river.artifacts.sinfo.util.MetaAndTableJRDataSource;
@@ -31,14 +32,10 @@
 // REMARK: must be public because its registered in generators.xml
 public class FlowDepthExporter extends AbstractSInfoExporter<FlowDepthCalculationResult, FlowDepthCalculationResults> {
 
-    private static enum ExportMode {
-        pdf, csv
-    }
-
     /** The log used in this exporter. */
     private static Logger log = Logger.getLogger(FlowDepthExporter.class);
 
-    private static final String JASPER_FILE = "/jasper/sinfo.flowdepth.jasper";
+    private static final String JASPER_FILE = "/jasper/templates/sinfo.flowdepth.jrxml"; // TODO use jrxml-path all over the project
 
     @Override
     protected Logger getLog() {
@@ -48,10 +45,7 @@
     @Override
     protected void writeCSVGlobalMetadata(final CSVWriter writer, final FlowDepthCalculationResults results) {
         log.info("FlowDepthExporter.writeCSVMeta");
-
         super.writeCSVGlobalMetadataDefaults(writer, results);
-
-        writer.writeNext(new String[] { "" });
     }
 
     @Override
@@ -60,8 +54,11 @@
         final BedHeightInfo sounding = result.getSounding();
         super.writeCSVSoundingMetadata(writer, sounding);
 
+        writer.writeNext(new String[] { "" }); // break line
+
         final WstInfo wst = result.getWst();
         super.writeCSVWaterlevelMetadata(writer, wst);
+
     }
 
     /**
@@ -77,7 +74,7 @@
 
         final Collection<String> header = new ArrayList<>(11);
 
-        header.add(msg(SInfoResultType.station.getCsvHeader()));
+        header.add(msg(GeneralResultType.station.getCsvHeader()));
         header.add(msgUnit(SInfoResultType.flowdepth.getCsvHeader(), SInfoResultType.flowdepth.getUnit()));
 
         if (results.isUseTkh()) {
@@ -96,11 +93,6 @@
         writer.writeNext(header.toArray(new String[header.size()]));
     }
 
-    @Override
-    protected String[] formatCSVRow(final FlowDepthCalculationResults results, final FlowDepthCalculationResult result, final SInfoResultRow row) {
-        return formatRow(row, ExportMode.csv);
-    }
-
     /**
      * Format a row of a flow depth result into an array of string, both used by csv and pdf
      *
@@ -108,11 +100,12 @@
      *
      * @param useTkh
      */
-    private String[] formatRow(final SInfoResultRow row, final ExportMode mode) {
+    @Override
+    protected String[] formatRow(final FlowDepthCalculationResults results, final ResultRow row, final ExportMode mode) {
 
         final Collection<String> lines = new ArrayList<>(11);
 
-        lines.add(row.exportValue(this.context, SInfoResultType.station));
+        lines.add(row.exportValue(this.context, GeneralResultType.station));
         lines.add(row.exportValue(this.context, SInfoResultType.flowdepth));
 
         if (mode == ExportMode.pdf || getData().isUseTkh()) {
@@ -140,10 +133,10 @@
     protected final void addJRMetaData(final MetaAndTableJRDataSource source, final FlowDepthCalculationResults results) {
 
         /* general metadata */
-        super.addJRMetaDataDefaults(source, results);
+        super.addJRMetaData(source, results);
 
         /* column headings */
-        source.addMetaData("station_header", SInfoResultType.station.getPdfHeader(this.context.getMeta()));
+        source.addMetaData("station_header", GeneralResultType.station.getPdfHeader(this.context.getMeta()));
         source.addMetaData("flowdepth_header", SInfoResultType.flowdepth.getPdfHeader(this.context.getMeta()));
         source.addMetaData("flowdepth_tkh_header", SInfoResultType.flowdepthtkh.getPdfHeader(this.context.getMeta()));
         source.addMetaData("tkh_header", SInfoResultType.tkh.getPdfHeader(this.context.getMeta()));
@@ -156,8 +149,4 @@
         source.addMetaData("location_header", SInfoResultType.location.getPdfHeader(this.context.getMeta()));
     }
 
-    @Override
-    protected String[] formatPDFRow(final FlowDepthCalculationResults results, final SInfoResultRow row) {
-        return formatRow(row, ExportMode.pdf);
-    }
 }
\ No newline at end of file