diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java @ 8938:9c02733a1b3c

Work on Sinfo-tkh - exports; using same logic for wst-description as winfo
author gernotbelger
date Tue, 06 Mar 2018 17:09:39 +0100
parents 791714b92b5c
children 5d5d482da3e9
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java	Tue Mar 06 17:08:51 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java	Tue Mar 06 17:09:39 2018 +0100
@@ -71,7 +71,7 @@
     }
 
     @Override
-    protected void writeCSVResultHeader(final CSVWriter writer, final FlowDepthCalculationResult result) {
+    protected void writeCSVResultMetadata(final CSVWriter writer, final FlowDepthCalculationResults results, final FlowDepthCalculationResult result) {
 
         /* first some specific metadata */
         final BedHeightInfo sounding = result.getSounding();
@@ -104,7 +104,7 @@
     }
 
     @Override
-    protected final void writeCSVMeta(final CSVWriter writer, final FlowDepthCalculationResults results) {
+    protected void writeCSVGlobalMetadata(final CSVWriter writer, final FlowDepthCalculationResults results) {
         log.info("FlowDepthExporter.writeCSVMeta");
 
         final String calcModeLabel = results.getCalcModeLabel();
@@ -144,8 +144,9 @@
      * @param river
      * @param useTkh
      */
+
     @Override
-    protected final void writeCSVHeader(final CSVWriter writer, final RiverInfo river) {
+    protected void writeCSVHeader(final CSVWriter writer, final FlowDepthCalculationResults results, final RiverInfo river) {
         log.info("FlowDepthExporter.writeCSVHeader");
 
         final Collection<String> header = new ArrayList<>(11);
@@ -169,7 +170,7 @@
     }
 
     @Override
-    protected final String[] formatCSVRow(final FlowDepthRow row) {
+    protected String[] formatCSVRow(final FlowDepthCalculationResults results, final FlowDepthRow row) {
         return formatFlowDepthRow(row);
     }
 
@@ -277,7 +278,7 @@
     }
 
     @Override
-    protected final String[] formatPDFRow(final FlowDepthRow row) {
+    protected String[] formatPDFRow(final FlowDepthCalculationResults results, final FlowDepthRow row) {
         return formatFlowDepthRow(row);
     }
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org