--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java	Tue Jul 05 16:13:08 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java	Tue Jul 05 17:28:04 2011 +0000
@@ -37,6 +37,10 @@
 
     public static final int DEFAULT_STEP_WIDTH = 100;
 
+    public static final String FIELD_LOWER = "ld_from";
+    public static final String FIELD_UPPER = "ld_to";
+    public static final String FIELD_STEP  = "ld_step";
+
 
     protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
 
@@ -52,20 +56,27 @@
 
 
     public DistancePanel() {
+        this("right");
+    }
+
+
+    public DistancePanel(String labelOrientation) {
         distancesTable = new RangeTable();
         locationsTable = new LocationsTable();
         distancePanel  = new DoubleRangePanel(
-            MSG.unitFrom(), MSG.unitTo(), MSG.unitWidth(),
-            0d, 0d, 0d, 250, this);
+            getLabelFrom(), getLabelTo(), getLabelStep(),
+            0d, 0d, 0d, 250, this, labelOrientation);
     }
 
 
     @Override
     public Canvas create(DataList data) {
+        Data d = data.get(0);
+
         VLayout layout = new VLayout();
         layout.setMembersMargin(10);
 
-        Label label = new Label(MSG.distance_state());
+        Label label = new Label(d.getDescription());
 
         Canvas submit = getNextButton();
 
@@ -109,9 +120,9 @@
     protected String getOldSelectionString(DataList dataList) {
         List<Data> items = dataList.getAll();
 
-        Data dFrom = getData(items, "ld_from");
-        Data dTo   = getData(items, "ld_to");
-        Data dStep = getData(items, "ld_step");
+        Data dFrom = getData(items, getLowerField());
+        Data dTo   = getData(items, getUpperField());
+        Data dStep = getData(items, getStepField());
 
         DataItem[] from = dFrom.getItems();
         DataItem[] to   = dTo.getItems();
@@ -119,16 +130,46 @@
 
         StringBuilder sb = new StringBuilder();
         sb.append(from[0].getLabel());
-        sb.append(" " + MSG.unitFrom() + " ");
+        sb.append(" " + getLabelFrom() + " ");
         sb.append(to[0].getLabel());
-        sb.append(" " + MSG.unitTo() + " ");
+        sb.append(" " + getLabelTo() + " ");
         sb.append(step[0].getLabel());
-        sb.append(" " + MSG.unitWidth());
+        sb.append(" " + getLabelStep());
 
         return sb.toString();
     }
 
 
+    protected String getLabelFrom() {
+        return MSG.unitFrom();
+    }
+
+
+    protected String getLabelTo() {
+        return MSG.unitTo();
+    }
+
+
+    protected String getLabelStep() {
+        return MSG.unitWidth();
+    }
+
+
+    protected String getLowerField() {
+        return FIELD_LOWER;
+    }
+
+
+    protected String getUpperField() {
+        return FIELD_UPPER;
+    }
+
+
+    protected String getStepField() {
+        return FIELD_STEP;
+    }
+
+
     @Override
     public List<String> validate() {
         List<String> errors = new ArrayList<String>();
@@ -191,26 +232,32 @@
 
 
     protected Data getDataFrom() {
-        String value  = String.valueOf(distancePanel.getFrom());
-        DataItem item = new DefaultDataItem("ld_from", "ld_from", value);
+        String value = String.valueOf(distancePanel.getFrom());
+        String field = getLowerField();
+
+        DataItem item = new DefaultDataItem(field, field, value);
         return new DefaultData(
-            "ld_from", null, null, new DataItem[] { item });
+            field, null, null, new DataItem[] { item });
     }
 
 
     protected Data getDataTo() {
-        String value  = String.valueOf(distancePanel.getTo());
-        DataItem item = new DefaultDataItem("ld_to", "ld_to", value);
+        String value = String.valueOf(distancePanel.getTo());
+        String field = getUpperField();
+
+        DataItem item = new DefaultDataItem(field, field, value);
         return new DefaultData(
-            "ld_to", null, null, new DataItem[] { item });
+            field, null, null, new DataItem[] { item });
     }
 
 
     protected Data getDataStep() {
-        String value  = String.valueOf(distancePanel.getStep());
-        DataItem item = new DefaultDataItem("ld_step","ld_step", value);
+        String value = String.valueOf(distancePanel.getStep());
+        String field = getStepField();
+
+        DataItem item = new DefaultDataItem(field, field, value);
         return new DefaultData(
-            "ld_step", null, null, new DataItem[] { item });
+            field, null, null, new DataItem[] { item });
     }
 
 
@@ -221,8 +268,8 @@
 
 
     protected void initMinMaxValues(DataList data) {
-        Data f = getData(data.getAll(), "ld_from");
-        Data t = getData(data.getAll(), "ld_to");
+        Data f = getData(data.getAll(), getLowerField());
+        Data t = getData(data.getAll(), getUpperField());
 
         DataItem[] fItems = f.getItems();
         DataItem[] tItems = t.getItems();
@@ -246,9 +293,9 @@
 
 
     protected void initDefaultFrom(DataList data) {
-        Data f = getData(data.getAll(), "ld_from");
+        Data f = getData(data.getAll(), getLowerField());
 
-        double from = min;
+        double from = getDefaultFrom();
 
         try {
             from = getDefaultValue(f);
@@ -261,10 +308,15 @@
     }
 
 
+    protected double getDefaultFrom() {
+        return min;
+    }
+
+
     protected void initDefaultTo(DataList data) {
-        Data t = getData(data.getAll(), "ld_to");
+        Data t = getData(data.getAll(), getUpperField());
 
-        double to = max;
+        double to = getDefaultTo();
 
         try {
             to = getDefaultValue(t);
@@ -277,10 +329,15 @@
     }
 
 
+    protected double getDefaultTo() {
+        return max;
+    }
+
+
     protected void initDefaultStep(DataList data) {
-        Data s = getData(data.getAll(), "ld_step");
+        Data s = getData(data.getAll(), getStepField());
 
-        double step = (double) DEFAULT_STEP_WIDTH;
+        double step = getDefaultStep();
 
         try {
             step = getDefaultValue(s);
@@ -293,6 +350,11 @@
     }
 
 
+    protected double getDefaultStep() {
+        return (double) DEFAULT_STEP_WIDTH;
+    }
+
+
     protected double getDefaultValue(Data data)
     throws NumberFormatException
     {