# HG changeset patch # User Ingo Weinzierl # Date 1337180995 0 # Node ID cd6bcca17de6308052876fb8a03cfea103885218 # Parent 282db12a5bdfea295f630ff15f728c6bb82ead3a Added states and improved transition model for MINFO middle bed height calculation. flys-artifacts/trunk@4431 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 282db12a5bdf -r cd6bcca17de6 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Wed May 16 14:56:28 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed May 16 15:09:55 2012 +0000 @@ -1,3 +1,20 @@ +2012-05-16 Ingo Weinzierl + + * doc/conf/artifacts/minfo.xml: Added states and transitions for MINFO + middle bed height calculation. + + * src/main/java/de/intevation/flys/artifacts/states/MultiStringArrayState.java: + New. Nearly a copy of MultiIntArrayState but uses String values. + + * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: + New subclass of MultiStringArrayState. It will be used for bed heights + selection. We need to do handle the values as string, because singles + and epochs are mixed, so the DB ID is not enough as parameter value. + + * src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: + New. This state will trigger the calculation for middle bed height in + MINFO module. + 2012-05-16 Ingo Weinzierl * src/main/java/de/intevation/flys/artifacts/states/MultiIntArrayState.java: diff -r 282db12a5bdf -r cd6bcca17de6 flys-artifacts/doc/conf/artifacts/minfo.xml --- a/flys-artifacts/doc/conf/artifacts/minfo.xml Wed May 16 14:56:28 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Wed May 16 15:09:55 2012 +0000 @@ -21,14 +21,27 @@ + + + + + + - + + + + + + + + @@ -36,11 +49,20 @@ + + + + + + + + + @@ -61,6 +83,24 @@ + + + + + + + + + + + + + + + + diff -r 282db12a5bdf -r cd6bcca17de6 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java Wed May 16 15:09:55 2012 +0000 @@ -0,0 +1,34 @@ +package de.intevation.flys.artifacts.states; + +import java.util.List; + +import org.apache.log4j.Logger; + +import de.intevation.artifacts.CallContext; + +import de.intevation.artifactdatabase.state.Facet; + +import de.intevation.flys.artifacts.FLYSArtifact; + + +public class MiddleBedHeight extends DefaultState { + + private static final Logger logger = Logger.getLogger(MiddleBedHeight.class); + + + @Override + public Object computeAdvance( + FLYSArtifact artifact, + String hash, + CallContext context, + List facets, + Object old + ) { + logger.debug("MiddleBedHeight.computeAdvance"); + + logger.warn("TODO: Implement MiddleBedHeight.computeAdvance"); + + return null; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 282db12a5bdf -r cd6bcca17de6 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MultiStringArrayState.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MultiStringArrayState.java Wed May 16 15:09:55 2012 +0000 @@ -0,0 +1,94 @@ +package de.intevation.flys.artifacts.states; + +import org.w3c.dom.Element; + +import org.apache.log4j.Logger; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.CallContext; + +import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator; +import de.intevation.artifacts.common.model.KVP; + +import de.intevation.flys.artifacts.FLYSArtifact; +import de.intevation.flys.artifacts.resources.Resources; + + +/** + * + * @author Ingo Weinzierl + */ +public abstract class MultiStringArrayState extends DefaultState { + + private static final Logger logger = + Logger.getLogger(MultiStringArrayState.class); + + + @Override + protected void appendItems( + Artifact artifact, + ElementCreator creator, + String name, + CallContext context, + Element select + ) { + try { + creator.addAttr(select, "type", "options", true); + + for (KVP kvp: getOptions(artifact, name)) { + Element item = creator.create("item"); + creator.addAttr(item, "label", kvp.getValue().toString(), true); + creator.addAttr(item, "value", kvp.getKey().toString(), true); + + select.appendChild(item); + } + } + catch (IllegalArgumentException iae) { + logger.warn("Illegal argument", iae); + } + } + + + @Override + protected Element createStaticData( + FLYSArtifact flys, + ElementCreator creator, + CallContext cc, + String name, + String value, + String type + ) { + Element data = creator.create("data"); + creator.addAttr(data, "name", name, true); + creator.addAttr(data, "type", type, true); + creator.addAttr(data, "label", + Resources.getMsg(cc.getMeta(), name, name), true); + + String[] values = value.split(";"); + + for (String val: values) { + Element item = creator.create("item"); + creator.addAttr(item, "value", val, true); + creator.addAttr(item, "label", getLabelFor(cc, name, val), true); + + data.appendChild(item); + } + + return data; + } + + + protected abstract KVP[] getOptions( + Artifact artifact, + String parameterName + ) + throws IllegalArgumentException; + + + protected abstract String getLabelFor( + CallContext cc, + String parameterName, + String value + ) + throws IllegalArgumentException; +} diff -r 282db12a5bdf -r cd6bcca17de6 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java Wed May 16 15:09:55 2012 +0000 @@ -0,0 +1,89 @@ +package de.intevation.flys.artifacts.states; + +import org.apache.log4j.Logger; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.CallContext; + +import de.intevation.artifacts.common.model.KVP; + + +public class SoundingsSelect extends MultiStringArrayState { + + public static final String SOUNDINGS = "soundings"; + + + private static final Logger logger = Logger.getLogger(SoundingsSelect.class); + + + @Override + public String getUIProvider() { + return "parameter-matrix"; + } + + + @Override + protected KVP[] getOptions( + Artifact artifact, + String parameterName + ) + throws IllegalArgumentException + { + logger.debug("Get options for parameter: '" + parameterName + "'"); + + if (!testParameterName(parameterName)) { + throw new IllegalArgumentException( + "Invalid parameter for state: '" + parameterName + "'"); + } + + KVP[] kvp = new KVP[10]; + + for (int i = 0; i < 10; i++) { + String id = String.valueOf(i); + String value = "#" + id; + + kvp[i] = new KVP(id, value); + } + + return kvp; + } + + + @Override + protected String getLabelFor( + CallContext cc, + String parameterName, + String value + ) throws IllegalArgumentException + { + if (!testParameterName(parameterName)) { + throw new IllegalArgumentException( + "Invalid parameter for state: '" + parameterName + "'"); + } + + return "#" + value; + } + + + /** + * This method might be used to test, if a parameter name is handled by this + * state. + * + * @param parameterName The name of a parameter. + * + * @return true, if parameterName is one of MAIN_CHANNEL or + * TOTAL_CHANNEL. Otherwise false. + */ + protected boolean testParameterName(String parameterName) { + if (parameterName == null || parameterName.length() == 0) { + return false; + } + else if (parameterName.equals(SOUNDINGS)) { + return true; + } + else { + return false; + } + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :