# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1347544022 0
# Node ID e54f8dc222cf0f9275ee5fc2bb9fdfb80507f634
# Parent  75bc96dd9d82e6a83e1aca83c1fa96ebc4afcff9
Renamed input parameters of MINFO flow velocity calculation.

flys-artifacts/trunk@5457 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Sep 13 13:47:02 2012 +0000
@@ -1,3 +1,14 @@
+2012-09-13  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/artifacts/minfo.xml,
+	  src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java,
+	  src/main/java/de/intevation/flys/artifacts/states/DischargeState.java,
+	  src/main/resources/messages.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties: Renamed MINFO parameter
+	  'main.channel' -> 'main_channel' and 'total.channel' -> 'total_channel'.
+
 2012-09-13  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java,
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/doc/conf/artifacts/minfo.xml
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml	Thu Sep 13 13:47:02 2012 +0000
@@ -91,8 +91,8 @@
         </transition>
 
         <state id="state.minfo.dischargestate" description="state.minfo.dischargestate" state="de.intevation.flys.artifacts.states.DischargeState" helpText="help.minfo.dischargestate">
-            <data name="total.channel" type="intoptions"/>
-            <data name="main.channel"  type="intoptions"/>
+            <data name="total_channel" type="intoptions"/>
+            <data name="main_channel"  type="intoptions"/>
         </state>
 
         <state id="state.minfo.soundings" description="state.minfo.soundingsstate" state="de.intevation.flys.artifacts.states.SoundingsSelect" helpText="help.minfo.soundingsstate">
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java	Thu Sep 13 13:47:02 2012 +0000
@@ -19,7 +19,7 @@
 
     public int[] getMainChannels() {
         if (mainChannels == null) {
-            mainChannels = getIntArray("main.channel");
+            mainChannels = getIntArray("main_channel");
         }
 
         return mainChannels;
@@ -28,7 +28,7 @@
 
     public int[] getTotalChannels() {
         if (totalChannels == null) {
-            totalChannels = getIntArray("total.channel");
+            totalChannels = getIntArray("total_channel");
         }
 
         return totalChannels;
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeState.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeState.java	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeState.java	Thu Sep 13 13:47:02 2012 +0000
@@ -18,8 +18,8 @@
 
 public class DischargeState extends MultiIntArrayState {
 
-    public static final String MAIN_CHANNEL  = "main.channel";
-    public static final String TOTAL_CHANNEL = "total.channel";
+    public static final String MAIN_CHANNEL  = "main_channel";
+    public static final String TOTAL_CHANNEL = "total_channel";
 
 
     private static final Logger logger = Logger.getLogger(DischargeState.class);
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/src/main/resources/messages.properties
--- a/flys-artifacts/src/main/resources/messages.properties	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Thu Sep 13 13:47:02 2012 +0000
@@ -118,8 +118,8 @@
 river = River
 calculation_mode = Calculation Mode
 ld_locations = Location(s)
-main.channel = Main channel
-total.channel = Total channel
+main_channel = Main channel
+total_channel = Total channel
 
 chart.longitudinal.section.title = W-Longitudinal Section
 chart.longitudinal.section.subtitle = Range: {0}-km {1,number,#.###} - {2,number,#.###}
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Thu Sep 13 13:47:02 2012 +0000
@@ -118,8 +118,8 @@
 river = Fluss
 calculation_mode = Berechnungsart
 ld_locations = Ort(e)
-main.channel = Hauptgerinne
-total.channel = Gesamtgerinne
+main_channel = Hauptgerinne
+total_channel = Gesamtgerinne
 
 chart.cross_section.title = Querprofildiagramm f\u00fcr Gew\u00e4sser {0}
 chart.cross_section.subtitle = {0}-km: {1,number,#.###}
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/src/main/resources/messages_de_DE.properties
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Sep 13 13:47:02 2012 +0000
@@ -118,8 +118,8 @@
 river = Fluss
 calculation_mode = Berechnungsart
 ld_locations = Ort(e)
-main.channel = Hauptgerinne
-total.channel = Gesamtgerinne
+main_channel = Hauptgerinne
+total_channel = Gesamtgerinne
 
 chart.cross_section.title = Querprofildiagramm f\u00fcr Gew\u00e4sser {0}
 chart.cross_section.subtitle = {0}-km: {1,number,#.###}
diff -r 75bc96dd9d82 -r e54f8dc222cf flys-artifacts/src/main/resources/messages_en.properties
--- a/flys-artifacts/src/main/resources/messages_en.properties	Thu Sep 13 13:43:00 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Thu Sep 13 13:47:02 2012 +0000
@@ -118,8 +118,8 @@
 river = River
 calculation_mode = Calculation Mode
 ld_locations = Location(s)
-main.channel = Main channel
-total.channel = Total channel
+main_channel = Main channel
+total_channel = Total channel
 
 chart.cross_section.title = Cross Section for river {0}
 chart.cross_section.subtitle = {0}-km: {1,number,#.###}