Mercurial > dive4elements > river
changeset 2306:cc6b8af44728
Prepare new data input for reference curves 'Ziel' locations.
flys-artifacts/trunk@3976 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 08 Feb 2012 16:12:15 +0000 |
| parents | ff558d0332e2 |
| children | 51f530476e36 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java |
| diffstat | 4 files changed, 31 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Feb 08 15:51:25 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Feb 08 16:12:15 2012 +0000 @@ -1,3 +1,16 @@ +2012-02-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Prepare Reference curves to eat multiple locations as 'Ziel'. + + * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: + Cosmetics. + + * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: + New. State to provoke multi_location_panel. + + * doc/conf/artifacts/winfo.xml: Made end state of ref curves a (new) + EnterMultipleLocationState. + 2012-02-08 Ingo Weinzierl <ingo@intevation.de> flys/issue483 (Historische Abflusstafeln ohne Ergebnis)
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml Wed Feb 08 15:51:25 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Wed Feb 08 16:12:15 2012 +0000 @@ -182,7 +182,7 @@ <to state="state.winfo.reference.curve.input.end"/> </transition> - <state id="state.winfo.reference.curve.input.end" description="state.winfo.reference.curve.input (end)" state="de.intevation.flys.artifacts.states.EnterLocationState"> + <state id="state.winfo.reference.curve.input.end" description="state.winfo.reference.curve.input (end)" state="de.intevation.flys.artifacts.states.EnterMultipleLocationsState"> <data name="reference.endpoint" type="Double[]"/> </state>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java Wed Feb 08 15:51:25 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java Wed Feb 08 16:12:15 2012 +0000 @@ -4,23 +4,20 @@ import de.intevation.flys.utils.FLYSUtils; -import org.apache.log4j.Logger; /** - * Get me a double startpoint. + * Get me a double (km). */ public class EnterLocationState extends InputDoubleState { - private static final Logger logger = - Logger.getLogger(EnterLocationState.class); - - + /** Provoke this kind of provider in the UI. */ @Override protected String getUIProvider() { return "location_panel"; } + /** Allow from min km of river. */ @Override protected Object getLower(FLYSArtifact flys) { double[] lowerUpper = FLYSUtils.getRiverMinMax(flys); @@ -31,6 +28,7 @@ } + /** Allow to max km of river. */ @Override protected Object getUpper(FLYSArtifact flys) { double[] lowerUpper = FLYSUtils.getRiverMinMax(flys);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java Wed Feb 08 16:12:15 2012 +0000 @@ -0,0 +1,13 @@ +package de.intevation.flys.artifacts.states; + +/** + * Get me doubles (km). + */ +public class EnterMultipleLocationsState extends EnterLocationState { + + @Override + protected String getUIProvider() { + return "multi_location_panel"; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :