Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationNoScenarioResult.java @ 9319:c36befc9011c
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
author | gernotbelger |
---|---|
date | Fri, 27 Jul 2018 10:18:18 +0200 |
parents | 72b3270e1568 |
children | b3d3c958a594 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationNoScenarioResult.java Thu Jul 26 17:37:23 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationNoScenarioResult.java Fri Jul 27 10:18:18 2018 +0200 @@ -38,7 +38,6 @@ public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { final Collection<String> header = writeNoScenarioHeader(exportContextCSV); exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); - } protected final Collection<String> writeNoScenarioHeader(final ExportContextCSV exportContextCSV) { @@ -51,20 +50,17 @@ @Override protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) { - return formatRow(exportContextCSV, row); } @Override protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) { - return formatRow(exportContextPDF, row); } @Override protected String getJasperFile() { - - return this.JASPER_FILE; + return JASPER_FILE; } @Override @@ -74,7 +70,6 @@ exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station); exportContextPDF.addJRMetadata(source, "salix_line", UInfoResultType.salixline); exportContextPDF.addJRMetadata(source, "salix_delta_mw", UInfoResultType.salix_delta_mw); - } protected String[] formatRow(final IExportContext context, final ResultRow row) { @@ -102,8 +97,6 @@ protected final void writeRegionalCommonCSVMeta(final ExportContextCSV exportContextCSV) { final String main = "uinfo.export.csv.meta.header.salix"; - // "# Szenariotyp: " - exportContextCSV.writeCSVMetaEntry(main + ".szenariotyp"); // "# Teilabschnitt: " exportContextCSV.writeCSVMetaEntry(main + ".teilabschnitt"); // "# Mittelwasserspiegellagenänderung: " @@ -115,21 +108,4 @@ // do nothing. subclass may override } - - // private void writeHistoricalViewCSVMetadata(final ExportContextCSV exportContextCSV) { - // final String main = "uinfo.export.csv.meta.header.salix.historical"; - // // "##Historische Betrachtung" - // exportContextCSV.writeCSVMetaEntry(main); - // - // final String mainSub = "uinfo.export.csv.meta.header.salix"; - // // "# Szenariotyp: " - // exportContextCSV.writeCSVMetaEntry(mainSub + ".szenariotyp"); - // // "# Teilabschnitt: " - // exportContextCSV.writeCSVMetaEntry(mainSub + ".teilabschnitt"); - // - // // "# Art des Zeitraums: " - // exportContextCSV.writeCSVMetaEntry(main + ".zeitart"); - // // "# Historischer Zeitpunkt: " - // exportContextCSV.writeCSVMetaEntry(main + ".zeitpunkt"); - // } } \ No newline at end of file