# HG changeset patch # User Raimund Renkert # Date 1350978782 -7200 # Node ID a30647abf009c51a74f1873f54d81854ece2d024 # Parent 0674d89210f5fdf18dabf232890358e2f2d5bf37 Added config and states for sediment load calculation in MINFO module. The config describes the transitions and states for parameter input in sediment load calculation. diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/doc/conf/artifacts/minfo.xml --- a/flys-artifacts/doc/conf/artifacts/minfo.xml Tue Oct 23 07:39:09 2012 +0200 +++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Tue Oct 23 09:53:02 2012 +0200 @@ -45,6 +45,7 @@ + @@ -313,6 +314,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadCalculate.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadCalculate.java Tue Oct 23 09:53:02 2012 +0200 @@ -0,0 +1,12 @@ +package de.intevation.flys.artifacts.states.minfo; + +import de.intevation.flys.artifacts.model.FacetTypes; +import de.intevation.flys.artifacts.states.DefaultState; + + +public class SedimentLoadCalculate +extends DefaultState +implements FacetTypes +{ + +} diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadDistanceSelect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadDistanceSelect.java Tue Oct 23 09:53:02 2012 +0200 @@ -0,0 +1,13 @@ +package de.intevation.flys.artifacts.states.minfo; + +import de.intevation.flys.artifacts.states.DistanceOnlySelect; + + +public class SedimentLoadDistanceSelect +extends DistanceOnlySelect +{ + @Override + protected String getUIProvider() { + return "minfo.sedimentload_distance_select"; + } +} diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadEpochSelect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadEpochSelect.java Tue Oct 23 09:53:02 2012 +0200 @@ -0,0 +1,25 @@ +package de.intevation.flys.artifacts.states.minfo; + +import org.apache.log4j.Logger; + +import de.intevation.flys.artifacts.states.DefaultState; + + +public class SedimentLoadEpochSelect +extends DefaultState +{ + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(SedimentLoadEpochSelect.class); + + + /** + * The default constructor that initializes an empty State object. + */ + public SedimentLoadEpochSelect() { + } + + @Override + protected String getUIProvider() { + return "minfo.sedimentload_epoch_select"; + } +} diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadOffEpochSelect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadOffEpochSelect.java Tue Oct 23 09:53:02 2012 +0200 @@ -0,0 +1,25 @@ +package de.intevation.flys.artifacts.states.minfo; + +import org.apache.log4j.Logger; + +import de.intevation.flys.artifacts.states.DefaultState; + + +public class SedimentLoadOffEpochSelect +extends DefaultState +{ + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(SedimentLoadOffEpochSelect.class); + + + /** + * The default constructor that initializes an empty State object. + */ + public SedimentLoadOffEpochSelect() { + } + + @Override + protected String getUIProvider() { + return "minfo.sedimentload_offepoch_select"; + } +} diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadUnit.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadUnit.java Tue Oct 23 09:53:02 2012 +0200 @@ -0,0 +1,60 @@ +package de.intevation.flys.artifacts.states.minfo; + +import org.apache.log4j.Logger; +import org.w3c.dom.Element; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; +import de.intevation.artifacts.common.utils.XMLUtils; +import de.intevation.flys.artifacts.FLYSArtifact; +import de.intevation.flys.artifacts.resources.Resources; +import de.intevation.flys.artifacts.states.DefaultState; + + +public class SedimentLoadUnit +extends DefaultState +{ + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(SedimentLoadUnit.class); + + + /** + * The default constructor that initializes an empty State object. + */ + public SedimentLoadUnit() { + } + + @Override + protected String getUIProvider() { + return "minfo.sedimentload_unit_select"; + } + + @Override + protected Element[] createItems( + XMLUtils.ElementCreator ec, + Artifact artifact, + String name, + CallContext context) + { + CallMeta meta = context.getMeta(); + Element[] elements = new Element[2]; + elements[0] = createItem( + ec, + new String[] { + Resources.getMsg(meta, + "state.minfo.t_per_a", + "state.minfo.t_per_a"), + "t_per_a"}); + + elements[1] = createItem( + ec, + new String[] { + Resources.getMsg(meta, + "state.minfo.m3_per_a", + "state.minfo.m3_per_a"), + "m3_per_a"}); + + return elements; + } +} diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadYearSelect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/SedimentLoadYearSelect.java Tue Oct 23 09:53:02 2012 +0200 @@ -0,0 +1,26 @@ +package de.intevation.flys.artifacts.states.minfo; + +import org.apache.log4j.Logger; + +import de.intevation.flys.artifacts.states.DefaultState; + + +public class SedimentLoadYearSelect +extends DefaultState +{ + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(SedimentLoadYearSelect.class); + + + /** + * The default constructor that initializes an empty State object. + */ + public SedimentLoadYearSelect() { + } + + @Override + protected String getUIProvider() { + return "minfo.sedimentload_year_select"; + } + +} diff -r 0674d89210f5 -r a30647abf009 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/YearEpochSelect.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/YearEpochSelect.java Tue Oct 23 07:39:09 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/YearEpochSelect.java Tue Oct 23 09:53:02 2012 +0200 @@ -6,6 +6,7 @@ import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; import de.intevation.artifacts.common.utils.XMLUtils; +import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.resources.Resources; import de.intevation.flys.artifacts.states.DefaultState; @@ -33,7 +34,22 @@ CallContext context) { CallMeta meta = context.getMeta(); - Element[] elements = new Element[2]; + Element[] elements; + if (((FLYSArtifact)artifact).getCurrentStateId() + .equals("state.minfo.sediment.load.year_epoch") + ) { + elements = new Element[3]; + elements[2] = createItem( + ec, + new String[] { + Resources.getMsg(meta, + "state.minfo.off_epoch", + "state.minfo.off_epoch"), + "off_epoch"}); + } + else { + elements = new Element[2]; + } elements[0] = createItem( ec, new String[] { @@ -50,7 +66,7 @@ "state.minfo.epoch"), "epoch"}); - return elements; + return elements; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :