Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java @ 9622:36d201244529
jasperreports rename infrastructure ..type => ..group and ..part => ..type
author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
---|---|
date | Thu, 10 Oct 2019 17:28:43 +0200 |
parents | d889ffe2fb05 |
children | 677ff7ed9a60 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java Thu Oct 10 16:08:47 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java Thu Oct 10 17:28:43 2019 +0200 @@ -123,13 +123,13 @@ } public String getFloodHeightLabel(final CallContext context) { - return Resources.getMsg(context.getMeta(), FACET_ABSOLUTE_HEIGHT, FACET_ABSOLUTE_HEIGHT) - + " " + SInfoResultType.getInfrastructureLabel(context, this.m_group, this.m_type, this.m_riverside); + return Resources.getMsg(context.getMeta(), FACET_ABSOLUTE_HEIGHT, FACET_ABSOLUTE_HEIGHT) + " " + + SInfoResultType.getInfrastructureLabel(context, this.m_group, this.m_type, this.m_riverside); } public String getFloodDurationLabel(final CallContext context) { - return Resources.getMsg(context.getMeta(), FACET_FLOOD_DURATION_DESCRIPTION, FACET_FLOOD_DURATION_DESCRIPTION) - + " " + SInfoResultType.getInfrastructureLabel(context, this.m_group, this.m_type, this.m_riverside); + return Resources.getMsg(context.getMeta(), FACET_FLOOD_DURATION_DESCRIPTION, FACET_FLOOD_DURATION_DESCRIPTION) + " " + + SInfoResultType.getInfrastructureLabel(context, this.m_group, this.m_type, this.m_riverside); } } @@ -308,9 +308,8 @@ exportContextPDF.addJRMetadata(source, "inundationduration_header", SInfoResultType.floodDuration); exportContextPDF.addJRMetadata(source, "inundationduration_q_header", SInfoResultType.floodDischarge); exportContextPDF.addJRMetadata(source, "infrastructure_height_header", SInfoResultType.infrastructureHeight); - // FIXME Tironi: report-keys ..type => ..group und ..part => ..type umbenennen zwecks Einheitlichkeit - exportContextPDF.addJRMetadata(source, "infrastructure_type_header", SInfoResultType.infrastructuregroup); - exportContextPDF.addJRMetadata(source, "infrastructure_part_header", SInfoResultType.infrastructuretype); + exportContextPDF.addJRMetadata(source, "infrastructure_group_header", SInfoResultType.infrastructuregroup); + exportContextPDF.addJRMetadata(source, "infrastructure_type_header", SInfoResultType.infrastructuretype); for (int i = 1; i <= this.getWaterlevelCount(); i++) {