Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculationResult.java @ 9318:7b2b086e45f0
collision pdf details, ResultType refactoring, bezugswst result
| author | gernotbelger |
|---|---|
| date | Fri, 27 Jul 2018 10:11:23 +0200 |
| parents | 740d65e4aa14 |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculationResult.java Thu Jul 26 17:37:23 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculationResult.java Fri Jul 27 10:11:23 2018 +0200 @@ -59,7 +59,7 @@ if (descriptionHeader != null) header.add(descriptionHeader); - header.add(exportContext.formatCsvHeader(SInfoResultType.gaugeLabel)); + header.add(exportContext.formatCsvHeader(GeneralResultType.gaugeLabel)); header.add(exportContext.formatCsvHeader(GeneralResultType.location)); exportContext.writeCSVLine(header.toArray(new String[header.size()])); @@ -105,10 +105,10 @@ final TkhCalculationResults results = exportContext.getResults(); final String descriptionHeader = results.getDescriptionHeader(); - final String waterlevelNameHeader = descriptionHeader == null ? exportContext.msgPdf(SInfoResultType.waterlevelLabel) : descriptionHeader; + final String waterlevelNameHeader = descriptionHeader == null ? exportContext.msgPdf(GeneralResultType.waterlevelLabel) : descriptionHeader; exportContext.addJRMetadata(source, "waterlevel_name_header", waterlevelNameHeader); - exportContext.addJRMetadata(source, "gauge_header", SInfoResultType.gaugeLabel); + exportContext.addJRMetadata(source, "gauge_header", GeneralResultType.gaugeLabel); exportContext.addJRMetadata(source, "location_header", GeneralResultType.location); } @@ -128,9 +128,9 @@ final TkhCalculationResults results = exportContext.getResults(); final String descriptionHeader = results.getDescriptionHeader(); if (descriptionHeader != null || mode == ExportMode.pdf) - lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevelLabel)); + lines.add(exportContext.formatRowValue(row, GeneralResultType.waterlevelLabel)); - lines.add(exportContext.formatRowValue(row, SInfoResultType.gaugeLabel)); + lines.add(exportContext.formatRowValue(row, GeneralResultType.gaugeLabel)); lines.add(exportContext.formatRowValue(row, GeneralResultType.location)); return lines.toArray(new String[lines.size()]);