Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationNoScenarioResult.java @ 9316:72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
author | mschaefer |
---|---|
date | Thu, 26 Jul 2018 17:28:32 +0200 |
parents | da0bdbcd6f09 |
children | c36befc9011c |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationNoScenarioResult.java Thu Jul 26 17:23:49 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationNoScenarioResult.java Thu Jul 26 17:28:32 2018 +0200 @@ -20,7 +20,6 @@ import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource; import org.dive4elements.river.artifacts.common.ResultRow; import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; -import org.dive4elements.river.artifacts.sinfo.util.WstInfo; import org.dive4elements.river.artifacts.uinfo.commons.UInfoResultType; /** @@ -31,7 +30,7 @@ private static final long serialVersionUID = 1L; private static final String JASPER_FILE = "/jasper/templates/uinfo.salixline.jrxml"; - public SalixLineCalculationNoScenarioResult(final String label, final WstInfo wst, final Collection<ResultRow> rows) { + public SalixLineCalculationNoScenarioResult(final String label, final Collection<ResultRow> rows) { super(label, rows); } @@ -78,7 +77,7 @@ } - private String[] formatRow(final IExportContext context, final ResultRow row) { + protected String[] formatRow(final IExportContext context, final ResultRow row) { final Collection<String> lines = getNoScenarioFormat(row, context); @@ -92,13 +91,13 @@ } protected final Collection<String> getNoScenarioFormat(final ResultRow row, final IExportContext context) { + final Collection<String> lines = new ArrayList<>(); lines.add(context.formatRowValue(row, GeneralResultType.station)); lines.add(context.formatRowValue(row, UInfoResultType.salixline)); lines.add(context.formatRowValue(row, UInfoResultType.salix_delta_mw)); return lines; - } protected final void writeRegionalCommonCSVMeta(final ExportContextCSV exportContextCSV) {