Mercurial > dive4elements > river
changeset 9474:76e8f13d6027
"Darstellungsbereich" statt "Berechnungsstrecke" jetzt auch für Uinfo.Vegetationszonen (vorher nur Uinfo.Ü'DauernAue)
author | gernotbelger |
---|---|
date | Fri, 07 Sep 2018 11:50:15 +0200 |
parents | 45908b79c079 |
children | 81753e3b1ed3 |
files | artifacts/doc/conf/artifacts/uinfo.xml artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceOnlyInundationDurSelect.java artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceOnlyInundationDurVegSelect.java artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties |
diffstat | 5 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/uinfo.xml Thu Sep 06 18:02:02 2018 +0200 +++ b/artifacts/doc/conf/artifacts/uinfo.xml Fri Sep 07 11:50:15 2018 +0200 @@ -15,7 +15,7 @@ <data name="calculation_mode" type="String"/> </state> - <state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.vegetationzone.distance_only"> + <state id="state.uinfo.veg.distance_only" description="state.uinfo.veg.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurVegSelect" helpText="help.state.uinfo.vegetationzone.distance_only"> <data name="ld_from" type="Double"/> <data name="ld_to" type="Double"/> </state> @@ -24,7 +24,7 @@ <data name="ld_from" type="Double"/> <data name="ld_to" type="Double"/> </state> - <state id="state.uinfo.inundationduration.distance_only" description="state.uinfo.inundationduration.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurSelect" helpText="help.state.uinfo.inundation_duration.location"> + <state id="state.uinfo.inundationduration.distance_only" description="state.uinfo.inundationduration.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurVegSelect" helpText="help.state.uinfo.inundation_duration.location"> <data name="ld_from" type="Double"/> <data name="ld_to" type="Double"/> </state> @@ -315,12 +315,12 @@ <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> <from state="state.uinfo.calculation_mode"/> - <to state="state.uinfo.distance_only"/> + <to state="state.uinfo.veg.distance_only"/> <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal"/> </transition> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> - <from state="state.uinfo.distance_only"/> + <from state="state.uinfo.veg.distance_only"/> <to state="state.uinfo.vegetation_zones.table"/> <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal"/> </transition>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceOnlyInundationDurSelect.java Thu Sep 06 18:02:02 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ - -package org.dive4elements.river.artifacts.states; - -import org.dive4elements.artifacts.CallContext; -import org.dive4elements.river.artifacts.resources.Resources; - -public class DistanceOnlyInundationDurSelect extends DistanceOnlySelect { - @Override - protected String getTitle(final CallContext context) { - // REMARK: that is how it should be: return Resources.getMsg(context.getMeta(), getID()); - return Resources.getMsg(context.getMeta(), "state.title.distance_only_inundationduration_state"); - } - -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DistanceOnlyInundationDurVegSelect.java Fri Sep 07 11:50:15 2018 +0200 @@ -0,0 +1,22 @@ +/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde + * Software engineering by Intevation GmbH + * + * This file is Free Software under the GNU AGPL (>=v3) + * and comes with ABSOLUTELY NO WARRANTY! Check out the + * documentation coming with Dive4Elements River for details. + */ + +package org.dive4elements.river.artifacts.states; + +import org.dive4elements.artifacts.CallContext; +import org.dive4elements.river.artifacts.resources.Resources; + +public class DistanceOnlyInundationDurVegSelect extends DistanceOnlySelect { + @Override + protected String getTitle(final CallContext context) { + // REMARK: that is how it should be: return Resources.getMsg(context.getMeta(), getID()); + return Resources.getMsg(context.getMeta(), "state.title.distance_only_inundationduration_veg_state"); + } + +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/artifacts/src/main/resources/messages.properties Thu Sep 06 18:02:02 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Fri Sep 07 11:50:15 2018 +0200 @@ -1124,7 +1124,7 @@ help.state.uinfo.vegetationzone.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetationzone.distance_only state.uinfo.salix.distance_only = Calculation Range Choice -state.uinfo.distance_only = Choose Calculation Range [km] +state.uinfo.veg.distance_only = Display Area Choice state.uinfo.inundationduration.distance_only = Display Area Choice help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.distance_only help.state.uinfo.inundation.year_totalepoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.year_totalepoch @@ -1337,4 +1337,4 @@ state.title.distance_part_state = Select Sub-range state.title.salix.historical.distance_part_state = Select Sub-range state.title.uinfo.bezugswst.miss_vol.distance_part_state = Choose sub-range for the missing depths to be calculated [km] -state.title.distance_only_inundationduration_state = Choose Display Area [km] \ No newline at end of file +state.title.distance_only_inundationduration_veg_state = Choose Display Area [km] \ No newline at end of file
--- a/artifacts/src/main/resources/messages_de.properties Thu Sep 06 18:02:02 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Fri Sep 07 11:50:15 2018 +0200 @@ -1124,7 +1124,7 @@ help.state.uinfo.vegetationzone.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetationzone.distance_only state.uinfo.salix.distance_only = Wahl der Berechnungsstrecke -state.uinfo.distance_only = Wahl der Berechnungsstrecke +state.uinfo.veg.distance_only = Wahl des Darstellungsbereichs state.uinfo.inundationduration.distance_only = Wahl des Darstellungsbereichs help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only help.state.uinfo.inundation.year_totalepoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.year_totalepoch @@ -1337,4 +1337,4 @@ state.title.distance_part_state = Festlegen eines Teilabschnitts state.title.salix.historical.distance_part_state = Festlegen eines Teilabschnitts state.title.uinfo.bezugswst.miss_vol.distance_part_state = Strecke der zu ermittelnden Fehltiefen w\u00e4hlen [km] -state.title.distance_only_inundationduration_state = Darstellungsbereich w\u00e4hlen [km] \ No newline at end of file +state.title.distance_only_inundationduration_veg_state = Darstellungsbereich w\u00e4hlen [km] \ No newline at end of file