Mercurial > dive4elements > river
changeset 3413:4c4d88c0af6a
FixA: Renamed FixationVolmerCompute to FixRealizingCompute.
flys-artifacts/trunk@5066 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 19 Jul 2012 14:27:20 +0000 |
| parents | da000d9513f7 |
| children | 1bb6fb621167 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/fixanalysis.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationVolmerCompute.java |
| diffstat | 4 files changed, 49 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Jul 19 14:19:35 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Jul 19 14:27:20 2012 +0000 @@ -1,3 +1,13 @@ +2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationVolmerCompute.java: + Deleted. + + * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: + Re-added here. + + * doc/conf/artifacts/fixanalysis.xml: Adjusted. BTW: Vollmer is spelled with two 'l's. + 2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java:
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml Thu Jul 19 14:19:35 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml Thu Jul 19 14:27:20 2012 +0000 @@ -70,8 +70,8 @@ <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition"> <from state="state.fix.eventselect"/> - <to state="state.fix.volmer.function"/> - <condition data="calculation.mode" value="calculation.volmer" + <to state="state.fix.vollmer.function"/> + <condition data="calculation.mode" value="calculation.vollmer" operator="equal"/> </transition> @@ -187,41 +187,41 @@ </outputmodes> </state> - <state id="state.fix.volmer.function" - description="state.fix.volmer.function" + <state id="state.fix.vollmer.function" + description="state.fix.vollmer.function" state="de.intevation.flys.artifacts.states.fixation.FunctionSelect"> <data name="function" type="String"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> - <from state="state.fix.volmer.function"/> - <to state="state.fix.volmer.preprocessing"/> + <from state="state.fix.vollmer.function"/> + <to state="state.fix.vollmer.preprocessing"/> </transition> - <state id="state.fix.volmer.preprocessing" - description="state.fix.volmer.preprocessing" + <state id="state.fix.vollmer.preprocessing" + description="state.fix.vollmer.preprocessing" state="de.intevation.flys.artifacts.states.fixation.PreprocessingSelect"> <data name="preprocessing" type="Boolean"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> - <from state="state.fix.volmer.preprocessing"/> - <to state="state.fix.volmer.qs"/> + <from state="state.fix.vollmer.preprocessing"/> + <to state="state.fix.vollmer.qs"/> </transition> - <state id="state.fix.volmer.qs" description="state.fix.volmer.qs" + <state id="state.fix.vollmer.qs" description="state.fix.vollmer.qs" state="de.intevation.flys.artifacts.states.fixation.QSelect"> <data name="qs" type="Double[]"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> - <from state="state.fix.volmer.qs"/> - <to state="state.fix.volmer.compute"/> + <from state="state.fix.vollmer.qs"/> + <to state="state.fix.vollmer.compute"/> </transition> - <state id="state.fix.volmer.compute" - description="state.fix.volmer.compute" - state="de.intevation.flys.artifacts.states.fixation.FixationVolmerCompute"> + <state id="state.fix.vollmer.compute" + description="state.fix.vollmer.compute" + state="de.intevation.flys.artifacts.states.fixation.FixRealizingCompute"> <outputmodes> <outputmode> <facets>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java Thu Jul 19 14:27:20 2012 +0000 @@ -0,0 +1,23 @@ +package de.intevation.flys.artifacts.states.fixation; + +import org.apache.log4j.Logger; + +import de.intevation.flys.artifacts.states.DefaultState; + + +/** + * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> + */ +public class FixRealizingCompute extends DefaultState { + + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(FixRealizingCompute.class); + + + /** + * The default constructor that initializes an empty State object. + */ + public FixRealizingCompute() { + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationVolmerCompute.java Thu Jul 19 14:19:35 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -package de.intevation.flys.artifacts.states.fixation; - -import org.apache.log4j.Logger; - -import de.intevation.flys.artifacts.states.DefaultState; - - -/** - * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> - */ -public class FixationVolmerCompute extends DefaultState { - - /** The logger used in this class. */ - private static Logger logger = Logger.getLogger(FixationVolmerCompute.class); - - - /** - * The default constructor that initializes an empty State object. - */ - public FixationVolmerCompute() { - } - -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :