--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/ExportContextPDF.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/ExportContextPDF.java	Fri Jun 29 14:52:54 2018 +0200
@@ -18,96 +18,66 @@
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.FLYS;
 import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
-import org.dive4elements.river.utils.Formatter;
 
 /**
  * @author Domenico Nardi Tironi
  *
  */
-public final class ExportContextPDF {
-
-    private NumberFormat kmFormat;
+public final class ExportContextPDF extends AbstractExportContext {
 
-    /** The CallContext object. */
-    private final CallContext context;
-
-    public ExportContextPDF(final CallContext context) {
-        this.context = context;
-
+    public ExportContextPDF(final CallContext context, final AbstractCalculationResults<?> results) {
+        super(context, results);
     }
 
-    private String msg(final String key) {
-        return Resources.getMsg(this.context.getMeta(), key, key);
-    }
-
-    private String msg(final String key, final Object... args) {
-        return Resources.getMsg(this.context.getMeta(), key, key, args);
+    // TODO: rename
+    public String msgPdf(final SInfoResultType type) {
+        return type.getPdfHeader(getContext().getMeta());
     }
 
     public void addJRMetadata(final MetaAndTableJRDataSource source, final String key, final IResultType type) {
-        source.addMetaData(key, type.getPdfHeader(this.context.getMeta()));
+        source.addMetaData(key, type.getPdfHeader(getContext().getMeta()));
+    }
+
+    public void addJRMetadata(final MetaAndTableJRDataSource source, final String key, final String msg) {
+        source.addMetaData(key, msg);
     }
 
     // *** CUSTOM STUFF that is used multiple times ***///
-    public void addJRMetaDataDefaults(final MetaAndTableJRDataSource source, final AbstractCalculationResults results) {
+    public void addJRMetaDataDefaults(final MetaAndTableJRDataSource source) {
 
         source.addMetaData("header", msg(I18NStrings.CSV_META_HEADER_RESULT_LABEL));
-        source.addMetaData("calcMode", results.getCalcModeLabel());
+        source.addMetaData("calcMode", getResults().getCalcModeLabel());
 
         source.addMetaData("version_label", msg(I18NStrings.CSV_META_VERSION_LABEL));
         source.addMetaData("version", FLYS.VERSION);
 
         source.addMetaData("user_label", msg(I18NStrings.CSV_META_USER_LABEL));
-        source.addMetaData("user", results.getUser());
+        source.addMetaData("user", getResults().getUser());
 
-        final Locale locale = Resources.getLocale(this.context.getMeta());
+        final Locale locale = Resources.getLocale(getContext().getMeta());
         final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
         source.addMetaData("date_label", msg(I18NStrings.CSV_META_CREATION_LABEL));
         source.addMetaData("date", df.format(new Date()));
     }
 
-    public void addJRMetaDataUSINFO(final MetaAndTableJRDataSource source, final AbstractCalculationResults results) {
+    public void addJRMetaDataUSINFO(final MetaAndTableJRDataSource source) {
 
         /* general metadata */
-        addJRMetaDataDefaults(source, results);
+        addJRMetaDataDefaults(source);
 
-        final RiverInfo river = results.getRiver();
+        final RiverInfo river = getResults().getRiver();
         final String wstUnitName = river.getWstUnit();
 
         source.addMetaData("river_label", msg(I18NStrings.CSV_META_RIVER_LABEL));
         source.addMetaData("river", river.getName());
         source.addMetaData("river_unit", wstUnitName);
 
-        final DoubleRange calcRange = results.getCalcRange();
+        final DoubleRange calcRange = getResults().getCalcRange();
         final NumberFormat kmFormatter = getKmFormatter();
         final String rangeValue = String.format("%s - %s", kmFormatter.format(calcRange.getMinimumDouble()), kmFormatter.format(calcRange.getMaximumDouble()));
         source.addMetaData("range_label", msg(I18NStrings.CSV_META_RANGE_LABEL));
         source.addMetaData("range", rangeValue);
-
-        /* column headings */
-        // source.addMetaData("station_header", GeneralResultType.station.getPdfHeader(this.context.getMeta()));
-
-        // moved to *result
-        /* column headings */
-        // 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()));
-        // source.addMetaData("waterlevel_header", SInfoResultType.waterlevel.getPdfHeader(this.context.getMeta()));
-        // source.addMetaData("discharge_header", SInfoResultType.discharge.getPdfHeader(this.context.getMeta()));
-        // source.addMetaData("waterlevel_name_header", SInfoResultType.waterlevelLabel.getPdfHeader(this.context.getMeta()));
-        // source.addMetaData("gauge_header", SInfoResultType.gaugeLabel.getPdfHeader(this.context.getMeta()));
-        // source.addMetaData("bedheight_header", SInfoResultType.meanBedHeight.getPdfHeader(this.context.getMeta()));
-        // source.addMetaData("sounding_name_header", SInfoResultType.soundingLabel.getPdfHeader(this.context.getMeta()));
-        // source.addMetaData("location_header", SInfoResultType.location.getPdfHeader(this.context.getMeta()));
-    }
-
-    // copy from AbstractExporter TODO merge with ExportContextCSV
-    protected NumberFormat getKmFormatter() {
-
-        if (this.kmFormat == null) {
-            this.kmFormat = Formatter.getWaterlevelKM(this.context);
-        }
-        return this.kmFormat;
     }
 }
\ No newline at end of file