--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java	Tue Apr 17 13:19:56 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java	Tue Apr 17 13:20:25 2018 +0200
@@ -8,19 +8,22 @@
 
 package org.dive4elements.river.artifacts.sinfo.tkhstate;
 
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.log4j.Logger;
 import org.dive4elements.river.artifacts.common.GeneralResultType;
+import org.dive4elements.river.artifacts.common.JasperReporter;
+import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoExporter;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
-import org.dive4elements.river.artifacts.sinfo.util.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
 import org.dive4elements.river.artifacts.sinfo.util.WstInfo;
 
 import au.com.bytecode.opencsv.CSVWriter;
+import net.sf.jasperreports.engine.JRException;
 
 /**
  * Generates different output formats (csv, pdf) of data that resulted from a tkh computation.
@@ -35,7 +38,7 @@
 
     private static final String CSV_META_CALCULATION_FORMULA = "sinfo.export.tkh.calculation.formula";
 
-    private static final String JASPER_FILE = "/jasper/sinfo.tkh.jasper";
+    private static final String JASPER_FILE = "/jasper/templates/sinfo.tkh.jrxml";
 
     @Override
     protected Logger getLog() {
@@ -87,7 +90,7 @@
 
         final WstInfo wst = result.getWst();
         super.writeCSVWaterlevelMetadata(writer, wst);
-
+        writer.writeNext(new String[] { "" }); // break line
         // FIXME:
         // "# W/Pegel [cm]: " (nur bei Eingabe des Wasserstands am Pegel)
         // "# Q (m³/s): " (nur bei Eingabe des Durchflusses)
@@ -123,11 +126,6 @@
     }
 
     @Override
-    protected final String getJasperFile() {
-        return JASPER_FILE;
-    }
-
-    @Override
     protected final void addJRMetaData(final MetaAndTableJRDataSource source, final TkhCalculationResults results) {
 
         /* general metadata */
@@ -155,4 +153,18 @@
         source.addMetaData("location_header", SInfoResultType.location.getPdfHeader(this.context.getMeta()));
     }
 
+    @Override
+    protected void writePDF(final OutputStream out) {
+        try {
+            final MetaAndTableJRDataSource source = createJRData(this.data);
+
+            final JasperReporter reporter = new JasperReporter();
+            reporter.addReport(JASPER_FILE, source);
+            reporter.exportPDF(out);
+        }
+        catch (final JRException je) {
+            getLog().warn("Error generating PDF Report!", je);
+        }
+    }
+
 }
\ No newline at end of file