--- a/flys-client/ChangeLog	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/ChangeLog	Tue Apr 05 08:13:48 2011 +0000
@@ -1,3 +1,33 @@
+2011-04-05  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.java:
+	  New. A constants interface with the ability to lookup an i18n string
+	  with a given key.
+
+	* src/main/java/de/intevation/flys/client/client/ui/CollectionGrid.java,
+	  src/main/java/de/intevation/flys/client/client/ui/ProjectList.java,
+	  src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/DoubleRangePanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/MainMenu.java,
+	  src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java,
+	  src/main/java/de/intevation/flys/client/client/ui/ParameterList.java,
+	  src/main/java/de/intevation/flys/client/client/ui/CollectionView.java,
+	  src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java,
+	  src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/DoubleArrayPanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java,
+	  src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java,
+	  src/main/java/de/intevation/flys/client/client/ui/FLYSFooter.java:
+	  Replaced the FLYSMessages interface with the FLYSConstants interface.
+
+	* src/main/java/de/intevation/flys/client/client/FLYSMessages_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSMessages_de.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSMessages.java:
+	  Removed.
+
 2011-04-05  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/MainMenu.java:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Tue Apr 05 08:13:48 2011 +0000
@@ -0,0 +1,111 @@
+package de.intevation.flys.client.client;
+
+import com.google.gwt.i18n.client.ConstantsWithLookup;
+
+
+/**
+ * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
+ */
+public interface FLYSConstants extends ConstantsWithLookup {
+
+    String title();
+
+    String fullname();
+
+    String user();
+
+    String guest();
+
+    String projects();
+
+    String manage_projects();
+
+    String logout();
+
+    String switch_language();
+
+    String info();
+
+    String no_projects();
+
+    String load_projects();
+
+    String date_format();
+
+    String datetime_format();
+
+    String new_project();
+
+    String new_calculation();
+
+    String module_selection();
+
+    String river_selection();
+
+    String winfo();
+
+    String minfo();
+
+    String map();
+
+    String chart();
+
+    String fix();
+
+    String next();
+
+    String location_distance_state();
+
+    String location();
+
+    String distance();
+
+    String unitFrom();
+
+    String unitTo();
+
+    String unitWidth();
+
+    String unitLocation();
+
+    String wrongFormat();
+
+    String wqTitle();
+
+    String wqW();
+
+    String wqQ();
+
+    String wqSingle();
+
+    String wqRange();
+
+    String unitWSingle();
+
+    String unitWFrom();
+
+    String unitWTo();
+
+    String unitWStep();
+
+    String unitQSingle();
+
+    String unitQFrom();
+
+    String unitQTo();
+
+    String unitQStep();
+
+    String footerHome();
+
+    String footerContact();
+
+    String footerImpressum();
+
+    String buttonNext();
+
+    String imageBack();
+
+    String discharge_curve();
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Tue Apr 05 08:13:48 2011 +0000
@@ -0,0 +1,53 @@
+title = FLYS-3.0
+fullname = Flusshydrologische Software
+user = User:
+guest = guest
+logout = Logout
+projects = Calculations
+manage_projects = Manage Projects
+switch_language = German
+info = Info
+no_projects = No existing calculations found.
+load_projects = Load calculations...
+date_format = yyyy-MM-dd
+datetime_format = yyyy-MM-dd HH:mm
+new_project = New Project
+new_calculation = New Calculation
+module_selection = Module
+river_selection = Rivers
+winfo = WINFO
+minfo = MINFO
+map = New Map
+chart = New Chart
+fix = TODO FIX ANALYSE TODO
+next = Next
+location_distance_state = Choose calculation location/distance
+location = Location
+distance = Distance
+unitFrom = km
+unitTo = km a
+unitWidth = m
+unitLocation = km
+wrongFormat = Wrong format
+
+wqTitle = Input for W/Q Data
+wqW = W at Gauge [cm]
+wqQ = Q [m³/s]
+wqSingle = Single values
+wqRange = Range
+unitWSingle = cm
+unitWFrom = cm -
+unitWTo = cm a
+unitWStep = cm
+unitQSingle = m³/s
+unitQFrom = m³/s -
+unitQTo = m³/s a
+unitQStep = m³/s
+footerHome = Home
+footerContact = Kontakt
+footerImpressum = Impressum
+
+buttonNext = Next
+imageBack = images/back_en.png
+
+discharge_curve = Discharge Curve

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Tue Apr 05 08:13:48 2011 +0000
@@ -0,0 +1,53 @@
+title = FLYS-3.0
+fullname = Flusshydrologische Software
+user = Benutzer:
+guest = Gast
+logout = Abmelden
+projects = Projekte
+manage_projects = Projekte verwalten
+switch_language = Englisch
+info = Info
+no_projects = Keine alten Berechnungen gefunden.
+load_projects = Lade Berechnungen...
+date_format = dd.MM.yyyy
+datetime_format = dd.MM.yyyy HH:mm
+new_project = Neues Projekt
+new_calculation = Neue Berechnung
+module_selection = Modul
+river_selection = Gewässer
+winfo = WINFO
+minfo = MINFO
+map = Neue Karte
+chart = Neues Diagramm
+fix = Fixierungsanalyse
+next = Weiter
+location_distance_state = Berechnungsort/strecke wählen
+location = Ort
+distance = Strecke
+unitFrom = km -
+unitTo = km a
+unitWidth = m
+unitLocation = km
+wrongFormat = Falsches Format
+
+wqTitle = Eingabe für W/Q Daten
+wqW = W am Pegel [cm]
+wqQ = Q [m³/s]
+wqSingle = Einzelwerte
+wqRange = Wertebereich
+unitWSingle = cm
+unitWFrom = cm -
+unitWTo = cm a
+unitWStep = cm
+unitQSingle = m³/s
+unitQFrom = m³/s -
+unitQTo = m³/s a
+unitQStep = m³/s
+footerHome = Home
+footerContact = Kontakt
+footerImpressum = Impressum
+
+buttonNext = Übernehmen
+imageBack = images/back_de.png
+
+discharge_curve = Abflusskurve

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Tue Apr 05 08:13:48 2011 +0000
@@ -0,0 +1,53 @@
+title = FLYS-3.0
+fullname = Flusshydrologische Software
+user = User:
+guest = guest
+logout = Logout
+projects = Calculations
+manage_projects = Manage Projects
+switch_language = German
+info = Info
+no_projects = No existing calculations found.
+load_projects = Load calculations...
+date_format = yyyy-MM-dd
+datetime_format = yyyy-MM-dd HH:mm
+new_project = New Project
+new_calculation = New Calculation
+module_selection = Module
+river_selection = Rivers
+winfo = WINFO
+minfo = MINFO
+map = New Map
+chart = New Chart
+fix = TODO FIX ANALYSE TODO
+next = Next
+location_distance_state = Choose calculation location/distance
+location = Location
+distance = Distance
+unitFrom = km
+unitTo = km a
+unitWidth = m
+unitLocation = km
+wrongFormat = Wrong format
+
+wqTitle = Input for W/Q Data
+wqW = W at Gauge [cm]
+wqQ = Q [m³/s]
+wqSingle = Single values
+wqRange = Range
+unitWSingle = cm
+unitWFrom = cm -
+unitWTo = cm a
+unitWStep = cm
+unitQSingle = m³/s
+unitQFrom = m³/s -
+unitQTo = m³/s a
+unitQStep = m³/s
+footerHome = Home
+footerContact = Kontakt
+footerImpressum = Impressum
+
+buttonNext = Next
+imageBack = images/back_en.png
+
+discharge_curve = Discharge Curve

--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSMessages.java	Tue Apr 05 06:25:17 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-package de.intevation.flys.client.client;
-
-import com.google.gwt.i18n.client.ConstantsWithLookup;
-
-
-/**
- * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
- */
-public interface FLYSMessages extends ConstantsWithLookup {
-
-    String title();
-
-    String fullname();
-
-    String user();
-
-    String guest();
-
-    String projects();
-
-    String manage_projects();
-
-    String logout();
-
-    String switch_language();
-
-    String info();
-
-    String no_projects();
-
-    String load_projects();
-
-    String date_format();
-
-    String datetime_format();
-
-    String new_project();
-
-    String new_calculation();
-
-    String module_selection();
-
-    String river_selection();
-
-    String winfo();
-
-    String minfo();
-
-    String map();
-
-    String chart();
-
-    String fix();
-
-    String next();
-
-    String location_distance_state();
-
-    String location();
-
-    String distance();
-
-    String unitFrom();
-
-    String unitTo();
-
-    String unitWidth();
-
-    String unitLocation();
-
-    String wrongFormat();
-
-    String wqTitle();
-
-    String wqW();
-
-    String wqQ();
-
-    String wqSingle();
-
-    String wqRange();
-
-    String unitWSingle();
-
-    String unitWFrom();
-
-    String unitWTo();
-
-    String unitWStep();
-
-    String unitQSingle();
-
-    String unitQFrom();
-
-    String unitQTo();
-
-    String unitQStep();
-
-    String footerHome();
-
-    String footerContact();
-
-    String footerImpressum();
-
-    String buttonNext();
-
-    String imageBack();
-
-    String discharge_curve();
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSMessages_de.properties	Tue Apr 05 06:25:17 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-title = FLYS-3.0
-fullname = Flusshydrologische Software
-user = Benutzer:
-guest = Gast
-logout = Abmelden
-projects = Projekte
-manage_projects = Projekte verwalten
-switch_language = Englisch
-info = Info
-no_projects = Keine alten Berechnungen gefunden.
-load_projects = Lade Berechnungen...
-date_format = dd.MM.yyyy
-datetime_format = dd.MM.yyyy HH:mm
-new_project = Neues Projekt
-new_calculation = Neue Berechnung
-module_selection = Modul
-river_selection = Gewässer
-winfo = WINFO
-minfo = MINFO
-map = Neue Karte
-chart = Neues Diagramm
-fix = Fixierungsanalyse
-next = Weiter
-location_distance_state = Berechnungsort/strecke wählen
-location = Ort
-distance = Strecke
-unitFrom = km -
-unitTo = km a
-unitWidth = m
-unitLocation = km
-wrongFormat = Falsches Format
-
-wqTitle = Eingabe für W/Q Daten
-wqW = W am Pegel [cm]
-wqQ = Q [m³/s]
-wqSingle = Einzelwerte
-wqRange = Wertebereich
-unitWSingle = cm
-unitWFrom = cm -
-unitWTo = cm a
-unitWStep = cm
-unitQSingle = m³/s
-unitQFrom = m³/s -
-unitQTo = m³/s a
-unitQStep = m³/s
-footerHome = Home
-footerContact = Kontakt
-footerImpressum = Impressum
-
-buttonNext = Übernehmen
-imageBack = images/back_de.png
-
-discharge_curve = Abflusskurve

--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSMessages_en.properties	Tue Apr 05 06:25:17 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-title = FLYS-3.0
-fullname = Flusshydrologische Software
-user = User:
-guest = guest
-logout = Logout
-projects = Calculations
-manage_projects = Manage Projects
-switch_language = German
-info = Info
-no_projects = No existing calculations found.
-load_projects = Load calculations...
-date_format = yyyy-MM-dd
-datetime_format = yyyy-MM-dd HH:mm
-new_project = New Project
-new_calculation = New Calculation
-module_selection = Module
-river_selection = Rivers
-winfo = WINFO
-minfo = MINFO
-map = New Map
-chart = New Chart
-fix = TODO FIX ANALYSE TODO
-next = Next
-location_distance_state = Choose calculation location/distance
-location = Location
-distance = Distance
-unitFrom = km
-unitTo = km a
-unitWidth = m
-unitLocation = km
-wrongFormat = Wrong format
-
-wqTitle = Input for W/Q Data
-wqW = W at Gauge [cm]
-wqQ = Q [m³/s]
-wqSingle = Single values
-wqRange = Range
-unitWSingle = cm
-unitWFrom = cm -
-unitWTo = cm a
-unitWStep = cm
-unitQSingle = m³/s
-unitQFrom = m³/s -
-unitQTo = m³/s a
-unitQStep = m³/s
-footerHome = Home
-footerContact = Kontakt
-footerImpressum = Impressum
-
-buttonNext = Next
-imageBack = images/back_en.png
-
-discharge_curve = Discharge Curve

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java	Tue Apr 05 08:13:48 2011 +0000
@@ -11,7 +11,7 @@
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.Button;
 
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.event.HasStepBackHandlers;
 import de.intevation.flys.client.client.event.HasStepForwardHandlers;
 import de.intevation.flys.client.client.event.StepBackEvent;
@@ -32,7 +32,7 @@
              HasStepBackHandlers
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MSG = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
 
 
     /** The StepForwardHandlers.*/

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionGrid.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionGrid.java	Tue Apr 05 08:13:48 2011 +0000
@@ -13,7 +13,7 @@
 
 import de.intevation.flys.client.shared.model.CollectionRecord;
 
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 /**
@@ -22,7 +22,7 @@
 public class CollectionGrid extends ListGrid {
 
     /** The message class that provides i18n strings.*/
-    FLYSMessages messages = GWT.create(FLYSMessages.class);
+    FLYSConstants messages = GWT.create(FLYSConstants.class);
 
     /**
      * The default constructor that creates a new ListGrid item.

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Tue Apr 05 08:13:48 2011 +0000
@@ -22,7 +22,7 @@
 
 import de.intevation.flys.client.client.Config;
 import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.event.HasCollectionChangeHandlers;
 import de.intevation.flys.client.client.event.CollectionChangeEvent;
 import de.intevation.flys.client.client.event.CollectionChangeHandler;
@@ -57,7 +57,7 @@
         GWT.create(DescribeCollectionService.class);
 
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages messages = GWT.create(FLYSMessages.class);
+    protected FLYSConstants messages = GWT.create(FLYSConstants.class);
 
     /** The FLYS instance used to call services.*/
     protected FLYS flys;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleArrayPanel.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleArrayPanel.java	Tue Apr 05 08:13:48 2011 +0000
@@ -12,13 +12,13 @@
 import com.smartgwt.client.widgets.form.fields.TextItem;
 import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
 
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 public class DoubleArrayPanel
 extends      DynamicForm
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MESSAGES = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
 
     /** The constant input field name.*/

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleRangePanel.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleRangePanel.java	Tue Apr 05 08:13:48 2011 +0000
@@ -12,7 +12,7 @@
 import com.smartgwt.client.widgets.form.fields.StaticTextItem;
 import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
 
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 
@@ -25,7 +25,7 @@
 extends      DynamicForm
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MESSAGES = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
 
     /** The constant name of the input field to enter the start of a distance.*/

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSFooter.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSFooter.java	Tue Apr 05 08:13:48 2011 +0000
@@ -7,7 +7,7 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 
 import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 /**
@@ -16,7 +16,7 @@
 public class FLYSFooter extends HLayout {
 
     /** The interface that provides i18n messages. */
-    private FLYSMessages messages = GWT.create(FLYSMessages.class);
+    private FLYSConstants messages = GWT.create(FLYSConstants.class);
 
     /** An instance to FLYS.*/
     protected FLYS flys;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java	Tue Apr 05 08:13:48 2011 +0000
@@ -10,7 +10,7 @@
 import com.smartgwt.client.widgets.layout.VLayout;
 
 import de.intevation.flys.client.client.FLYSImages;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 /**
@@ -22,7 +22,7 @@
     private FLYSImages IMAGES = GWT.create(FLYSImages.class);
 
     /** The interface that provides the message resources. */
-    private FLYSMessages MESSAGES = GWT.create(FLYSMessages.class);
+    private FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
     /** The height used for this header.*/
     public static final int HEIGHT = 75;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java	Tue Apr 05 08:13:48 2011 +0000
@@ -22,7 +22,7 @@
 import de.intevation.flys.client.shared.model.DataList;
 import de.intevation.flys.client.shared.model.DefaultData;
 import de.intevation.flys.client.shared.model.DefaultDataItem;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 /**
@@ -35,7 +35,7 @@
 implements   ChangeHandler, BlurHandler
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MESSAGES = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
 
     /** The constant name of the input field to enter locations.*/

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/MainMenu.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/MainMenu.java	Tue Apr 05 08:13:48 2011 +0000
@@ -11,7 +11,7 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 
 import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.shared.model.User;
 
 
@@ -21,7 +21,7 @@
 public class MainMenu extends HLayout {
 
     /** The interface that provides i18n messages. */
-    private FLYSMessages messages = GWT.create(FLYSMessages.class);
+    private FLYSConstants messages = GWT.create(FLYSConstants.class);
 
     /** An instance to FLYS.*/
     protected FLYS flys;
@@ -185,7 +185,7 @@
 
     /**
      * Update the text field that shows the current user. If no user is
-     * currently logged in, the text will display {@link FLYSMessages.guest()}.
+     * currently logged in, the text will display {@link FLYSConstants.guest()}.
      */
     public void updateCurrentUser() {
         String name = currentUser != null

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java	Tue Apr 05 08:13:48 2011 +0000
@@ -18,7 +18,7 @@
 import de.intevation.flys.client.shared.model.DefaultData;
 import de.intevation.flys.client.shared.model.DefaultDataItem;
 
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 /**
  * The ModuleSelection combines the river selection and the module selection in
@@ -31,7 +31,7 @@
 public class ModuleSelection extends MapSelection {
 
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MESSAGES = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class);
 
 
     /** Constant field name for the plugin selection.*/

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Tue Apr 05 08:13:48 2011 +0000
@@ -22,7 +22,7 @@
 import de.intevation.flys.client.shared.model.River;
 import de.intevation.flys.client.client.Config;
 import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.event.HasParameterChangeHandler;
 import de.intevation.flys.client.client.event.HasStepBackHandlers;
 import de.intevation.flys.client.client.event.HasStepForwardHandlers;
@@ -46,7 +46,7 @@
              HasParameterChangeHandler
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MSG = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
 
     /** The ArtifactService used to communicate with the Artifact server. */
     protected ArtifactServiceAsync artifactService =

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java	Tue Apr 05 08:13:48 2011 +0000
@@ -16,7 +16,7 @@
 import de.intevation.flys.client.shared.model.User;
 
 import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.event.CollectionChangeEvent;
 import de.intevation.flys.client.client.event.CollectionChangeHandler;
 import de.intevation.flys.client.client.services.UserCollectionsService;
@@ -33,7 +33,7 @@
 implements   CollectionChangeHandler
 {
     /** The interface that provides i18n messages. */
-    private FLYSMessages messages = GWT.create(FLYSMessages.class);
+    private FLYSConstants messages = GWT.create(FLYSConstants.class);
 
     /** The UserService used to retrieve information about the current user. */
     protected UserCollectionsServiceAsync userCollectionsService =

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java	Tue Apr 05 08:13:48 2011 +0000
@@ -20,7 +20,7 @@
 import de.intevation.flys.client.shared.model.DefaultData;
 import de.intevation.flys.client.shared.model.DefaultDataItem;
 
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 /**
@@ -32,7 +32,7 @@
 extends      AbstractUIProvider
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages messages = GWT.create(FLYSMessages.class);
+    protected FLYSConstants messages = GWT.create(FLYSConstants.class);
 
     /** The combobox.*/
     protected DynamicForm form;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Tue Apr 05 06:25:17 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Tue Apr 05 08:13:48 2011 +0000
@@ -22,7 +22,7 @@
 import de.intevation.flys.client.shared.model.DataList;
 import de.intevation.flys.client.shared.model.DefaultData;
 import de.intevation.flys.client.shared.model.DefaultDataItem;
-import de.intevation.flys.client.client.FLYSMessages;
+import de.intevation.flys.client.client.FLYSConstants;
 
 
 /**
@@ -35,7 +35,7 @@
 implements   ChangeHandler, BlurHandler
 {
     /** The message class that provides i18n strings.*/
-    protected FLYSMessages MSG = GWT.create(FLYSMessages.class);
+    protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
 
 
     /** The constant field name for choosing w or q mode.*/