Mercurial > dive4elements > river

changeset 141:7f909429ccc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added some more calculation types (to the DESCRIBE in the calculation select state). flys-artifacts/trunk@1524 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 21 Mar 2011 09:16:17 +0000
parents 43f03f6047b9
children b43671a551d1
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_en.properties
diffstat 5 files changed, 73 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Mar 21 08:17:15 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Mar 21 09:16:17 2011 +0000
@@ -1,3 +1,13 @@
+2011-03-21  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java:
+	  Added some further calculation types.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties: Added i18n strings for the
+	  calculation types
+
 2011-03-21  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java	Mon Mar 21 08:17:15 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java	Mon Mar 21 09:16:17 2011 +0000
@@ -5,11 +5,14 @@
 import org.w3c.dom.Element;
 
 import de.intevation.artifacts.CallContext;
+import de.intevation.artifacts.CallMeta;
 
 import de.intevation.artifacts.common.utils.XMLUtils;
 
 import de.intevation.artifactdatabase.ProtocolUtils;
 
+import de.intevation.flys.artifacts.resources.Resources;
+
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
@@ -19,15 +22,54 @@
     private static Logger logger = Logger.getLogger(CalculationSelect.class);
 
 
+    /** Constant value for the reference line calculation.*/
+    public static final String CALCULATION_REFERENCE_LINE =
+        "calc.reference.line";
+
+    /** Constant value for the differences calculation.*/
+    public static final String CALCULATION_DIFFERENCES =
+        "calc.differences";
+
+    /** Constant value for the flood map calculation.*/
+    public static final String CALCULATION_FLOOD_MAP =
+        "calc.flood.map";
+
+    /** Constant value for the profile calculation.*/
+    public static final String CALCULATION_PROFILE =
+        "calc.profile";
+
+    /** Constant value for the state discharge curve calculation.*/
+    public static final String CALCULATION_STATE_DISCHARGE_CURVE =
+        "calc.state.discharge.curve";
+
+    /** An array that holds all available calculation modes.*/
+    public static final String[] CALCULATIONS = {
+        CALCULATION_REFERENCE_LINE,
+        CALCULATION_DIFFERENCES,
+        CALCULATION_FLOOD_MAP,
+        CALCULATION_PROFILE,
+        CALCULATION_STATE_DISCHARGE_CURVE };
+
+
     protected Element[] createItems(
         XMLUtils.ElementCreator cr,
         String      name,
         CallContext context)
     {
-        Element one = createItem(cr, new String[] {"Abflusskurve", "1"});
-        Element two = createItem(cr, new String[] {"Wasserspiegellage", "2"});
+        CallMeta meta   = context.getMeta();
+        Element[] calcs = new Element[CALCULATIONS.length];
 
-        return new Element[] { one, two };
+        int i = 0;
+
+        for (String calc: CALCULATIONS) {
+            calcs[i++] = createItem(
+                cr, new String[] {
+                    Resources.getMsg(meta, calc, calc),
+                    calc
+                });
+        }
+
+        return calcs;
     }
 
 
--- a/flys-artifacts/src/main/resources/messages.properties	Mon Mar 21 08:17:15 2011 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Mon Mar 21 09:16:17 2011 +0000
@@ -3,5 +3,11 @@
 state.winfo.location_distance = Location or distance selection
 state.winfo.wq = Input for W/Q data
 
+calc.reference.line = Reference Line
+calc.differences = Differences
+calc.flood.map = Flood Map
+calc.profile = Profile
+calc.state.discharge.curve = State Discharge Curve
+
 river = River
 calculation_mode = Calculation Mode
--- a/flys-artifacts/src/main/resources/messages_de.properties	Mon Mar 21 08:17:15 2011 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Mon Mar 21 09:16:17 2011 +0000
@@ -3,5 +3,11 @@
 state.winfo.location_distance = Wahl des Berechnungsortes/strecke
 state.winfo.wq = Eingabe f\u00fcr W/Q Daten
 
+calc.reference.line = Bezugslinie
+calc.differences = Differenzen
+calc.flood.map = \u00dcberschwemmungskarte
+calc.profile = Steckbrief
+calc.state.discharge.curve = Abflusskurve
+
 river = Fluss
 calculation_mode = Berechnungsart
--- a/flys-artifacts/src/main/resources/messages_en.properties	Mon Mar 21 08:17:15 2011 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Mon Mar 21 09:16:17 2011 +0000
@@ -3,5 +3,11 @@
 state.winfo.location_distance = Location or distance selection
 state.winfo.wq = Input for W/Q data
 
+calc.reference.line = Reference Line
+calc.differences = Differences
+calc.flood.map = Flood Map
+calc.profile = Profile
+calc.state.discharge.curve = State Discharge Curve
+
 river = River
 calculation_mode = Calculation Mode
http://dive4elements.wald.intevation.org