diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java @ 9195:a4121ec450d6

'ca.'-issue ExportContextCSV+PDF separated uinfo.inundationduration url export
author gernotbelger
date Fri, 29 Jun 2018 14:52:54 +0200
parents 1614cb14308f
children b4402594213b
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Fri Jun 29 14:52:54 2018 +0200
@@ -14,7 +14,9 @@
 
 import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 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.SInfoResultType;
@@ -25,20 +27,18 @@
  *
  * @author Gernot Belger
  */
-final class FloodDurationCalculationResult extends AbstractCalculationExportableResult<FloodDurationCalculationResults> {
+final class FloodDurationCalculationResult extends AbstractCalculationExportableResult {
 
     private static final long serialVersionUID = 1L;
 
     private static final String JASPER_FILE = "/jasper/templates/sinfo.floodduration.jrxml";
 
-
     public FloodDurationCalculationResult(final String label, final Collection<ResultRow> rows) {
         super(label, rows);
     }
 
-
     @Override
-    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final FloodDurationCalculationResults results) {
+    protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
         // TODO Metadaten der Wasserspiegellage(n) falls gewählt
         // exportContextCSV.writeCSVWaterlevelMetadata(this.wstInfo);
         // exportContextCSV.writeBlankLine();
@@ -51,7 +51,7 @@
         return JASPER_FILE;
     }
 
-    protected String[] formatRow(final ExportContextCSV exportContextCSV, final FloodDurationCalculationResults results, final ResultRow row) {
+    protected String[] formatRow(final IExportContext exportContextCSV, final ResultRow row) {
 
         final Collection<String> lines = new ArrayList<>(10);
 
@@ -71,7 +71,7 @@
     }
 
     @Override
-    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final FloodDurationCalculationResults results, final RiverInfo river) {
+    public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
 
         final Collection<String> header = new ArrayList<>(20);
 
@@ -92,20 +92,19 @@
     }
 
     @Override
-    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final FloodDurationCalculationResults results, final ResultRow row) {
+    protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
 
-        return this.formatRow(exportContextCSV, results, row);
+        return this.formatRow(exportContextCSV, row);
     }
 
     @Override
-    protected String[] formatPDFRow(final ExportContextCSV exportContextPDF, final FloodDurationCalculationResults results, final ResultRow row) {
+    protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) {
 
-        return this.formatRow(exportContextPDF, results, row);
+        return this.formatRow(exportContextPDF, row);
     }
 
     @Override
-    protected void addJRTableHeader(final ExportContextCSV exportContextPDF, final MetaAndTableJRDataSource source,
-            final FloodDurationCalculationResults results) {
+    protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) {
 
         /* column headings */
         exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station);

http://dive4elements.wald.intevation.org