Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java @ 9195:a4121ec450d6
'ca.'-issue
ExportContextCSV+PDF separated
uinfo.inundationduration url export
author | gernotbelger |
---|---|
date | Fri, 29 Jun 2018 14:52:54 +0200 |
parents | 3ace6db2f87b |
children | 4f411c6ee3ae |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java Thu Jun 28 15:57:40 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java Fri Jun 29 14:52:54 2018 +0200 @@ -14,6 +14,7 @@ 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.MetaAndTableJRDataSource; import org.dive4elements.river.artifacts.common.ResultRow; @@ -25,7 +26,7 @@ * * @author Gernot Belger */ -final public class CollisionCalcOverviewResult extends AbstractCalculationExportableResult<CollisionCalculationResults> { +final public class CollisionCalcOverviewResult extends AbstractCalculationExportableResult { private static final long serialVersionUID = 1L; @@ -36,12 +37,12 @@ } @Override - protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results) { + protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) { // do nothing so far } @Override - public void writeCSVHeader(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final RiverInfo river) { + public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { final int colSize = 3; exportContextCSV.writeTitleForTabs("sinfo.export.csv.title.collison.overview", 3); // Voraussetzung für Tabs ist, dass der Titel vor den Headern // geschrieben wird. @@ -57,21 +58,23 @@ } @Override - protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) { - return formatRow(exportContextCSV, results, row); + protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) { + return formatRow(exportContextCSV, row); } @Override - protected String[] formatPDFRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) { + protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) { + final Collection<String> lines = new ArrayList<>(3); - lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station)); - lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.years)); - lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.collisionCount)); + lines.add(exportContextPDF.formatRowValue(row, GeneralResultType.station)); + lines.add(exportContextPDF.formatRowValue(row, SInfoResultType.years)); + lines.add(exportContextPDF.formatRowValue(row, SInfoResultType.collisionCount)); + return lines.toArray(new String[lines.size()]); } - private String[] formatRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) { + private String[] formatRow(final ExportContextCSV exportContextCSV, final ResultRow row) { final Collection<String> lines = new ArrayList<>(3); @@ -88,11 +91,11 @@ } @Override - protected void addJRTableHeader(final ExportContextCSV exportContextCSV, final MetaAndTableJRDataSource source, final CollisionCalculationResults results) { + protected void addJRTableHeader(final ExportContextPDF exportContext, final MetaAndTableJRDataSource source) { /* column headings */ - exportContextCSV.addJRMetadata(source, "station_header", GeneralResultType.station); - exportContextCSV.addJRMetadata(source, "collision_years_header", SInfoResultType.years); - exportContextCSV.addJRMetadata(source, "collision_count_header", SInfoResultType.collisionCount); + exportContext.addJRMetadata(source, "station_header", GeneralResultType.station); + exportContext.addJRMetadata(source, "collision_years_header", SInfoResultType.years); + exportContext.addJRMetadata(source, "collision_count_header", SInfoResultType.collisionCount); } } \ No newline at end of file