# HG changeset patch # User gernotbelger # Date 1547222324 -3600 # Node ID e8d8f90308dcce5e338885c9061fca7099217016 # Parent ccbf8413ddbb5fc107a3a13b1f6ec8d414fbc369 Punkt 11.2 - Fließtiefe bundu und sinfo verschiedene Labels diff -r ccbf8413ddbb -r e8d8f90308dc artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstDepthProcessor.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstDepthProcessor.java Fri Jan 11 16:56:27 2019 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstDepthProcessor.java Fri Jan 11 16:58:44 2019 +0100 @@ -46,7 +46,7 @@ private static final String FACET_FIELD_DEPTH_DESCRIPTION = "bundu_facet_field_depth.description"; - private static final String AXIS_LABEL = "sinfo.chart.flow_depth.section.yaxis.label"; + private static final String AXIS_LABEL = "bundu.chart.flow_depth.section.yaxis.label"; private static final Set HANDLED_FACET_TYPES = new HashSet<>(); @@ -61,22 +61,21 @@ super(AXIS_LABEL, HANDLED_FACET_TYPES); } - public static Facet createFlowdepthFilteredFacet(final CallContext context, final String hash, final String id, final int facetIndex, - final int resultIndex, final String seriesName) { + public static Facet createFlowdepthFilteredFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex, + final String seriesName) { final String description = Resources.getMsg(context.getMeta(), FACET_FLOWDEPTH_FILTERED_DESCRIPTION, FACET_FLOWDEPTH_FILTERED_DESCRIPTION, seriesName); return new BezugswstResultFacet(facetIndex, resultIndex, FACET_FLOWDEPTH_FILTERED, description, AXIS_LABEL, id, hash); } - public static Facet createChanneldepthFacet(final CallContext context, final String hash, final String id, final int facetIndex, - final int resultIndex) { + public static Facet createChanneldepthFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex) { final String description = Resources.getMsg(context.getMeta(), FACET_CHANNELDEPTH_DESCRIPTION, FACET_CHANNELDEPTH_DESCRIPTION); return new BezugswstResultFacet(facetIndex, resultIndex, FACET_CHANNELDEPTH, description, AXIS_LABEL, id, hash); } - public static Facet createFieldDepthFacet(final CallContext context, final String hash, final String id, final int facetIndex, - final int resultIndex, final int fieldIndex) { + public static Facet createFieldDepthFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex, + final int fieldIndex) { final String description = Resources.getMsg(context.getMeta(), FACET_FIELD_DEPTH_DESCRIPTION, FACET_FIELD_DEPTH_DESCRIPTION, fieldIndex); final String facetName = String.format(FACET_FIELD_DEPTH_FORMAT, fieldIndex); diff -r ccbf8413ddbb -r e8d8f90308dc artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Fri Jan 11 16:56:27 2019 +0100 +++ b/artifacts/src/main/resources/messages.properties Fri Jan 11 16:58:44 2019 +0100 @@ -978,7 +978,7 @@ sinfo.chart.km.xaxis.label = {0}-km sinfo.chart.flow_depth.yaxis.label = Flow Depth [m] - +bundu.chart.flow_depth.section.yaxis.label = Flow Depth (Ref. W.) [m] sinfo.chart.flow_depth.section.yaxis.label=Flow Depth [m] sinfo.facet.flow_depth.filtered.description = h ({0}) sinfo.facet.flow_depth.raw.description = h ({0}) (raw) diff -r ccbf8413ddbb -r e8d8f90308dc artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Fri Jan 11 16:56:27 2019 +0100 +++ b/artifacts/src/main/resources/messages_de.properties Fri Jan 11 16:58:44 2019 +0100 @@ -978,7 +978,7 @@ sinfo.chart.km.xaxis.label = {0}-km sinfo.chart.flow_depth.yaxis.label = Flie\u00dftiefe [m] - +bundu.chart.flow_depth.section.yaxis.label = Flie\u00dftiefe (Bezugsw.) [m] sinfo.chart.flow_depth.section.yaxis.label = Flie\u00dftiefe [m] sinfo.facet.flow_depth.filtered.description = h ({0}) sinfo.facet.flow_depth.raw.description = h ({0}) (Rohdaten)