--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java	Fri Feb 03 11:15:09 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java	Fri Feb 03 13:57:27 2012 +0000
@@ -52,9 +52,6 @@
     /** The table data. */
     protected DistanceInfoObject[] tableData;
 
-    /** Name of the data item that keeps locations. */
-    protected String DATA_ITEM_NAME = "ld_locations";
-
     /** The input helper (usually right side, table to click on, values are
      * then entered in the texfield. */
     protected LocationPicker picker;
@@ -78,6 +75,8 @@
      */
     @Override
     public Canvas create(DataList data) {
+        findDataItemName(data);
+
         VLayout layout = new VLayout();
         layout.setMembersMargin(10);
 
@@ -109,7 +108,6 @@
     protected void initDefaults(DataList list) {
         Data data = list.get(0);
 
-        /*
         // Compatibility with MinMax- DataItems:
         RangeData rangeData = null;
 
@@ -126,9 +124,6 @@
             max = Double.parseDouble(rangeData.getDefaultUpper().toString());
             // catch ..?
         }
-        */
-
-        if (false) {}
         else {
             DataItem[] items = data.getItems();
             DataItem   iMin  = getDataItem(items, "min");
@@ -145,22 +140,24 @@
             }
         }
 
-        DataItem def   = data.getDefault();
-        String   value = def.getStringValue();
+        DataItem def = data.getDefault();
+        if (def != null) {
+            String value = def.getStringValue();
 
-        try {
-            double d = Double.parseDouble(value);
-            setLocationValues(new double[] { d } );
-        }
-        catch (NumberFormatException nfe) {
-            // could not parse, dont know what to do else
+            try {
+                double d = Double.parseDouble(value);
+                setLocationValues(new double[] { d } );
+            }
+            catch (NumberFormatException nfe) {
+                // could not parse, dont know what to do else
+            }
         }
     }
 
 
     protected Canvas createWidget(DataList data) {
         VLayout layout = new VLayout();
-        inputLayout      = new HLayout();
+        inputLayout    = new HLayout();
 
         // The initial view will display the location input mode.
         locationPanel = new DoubleArrayPanel(
@@ -187,27 +184,6 @@
 
 
     /**
-     * This method grabs the Data with name <i>name</i> from the list and
-     * returns it.
-     *
-     * @param items A list of Data.
-     * @param name The name of the Data that we are searching for.
-     *
-     * @return the Data with the name <i>name</i>.
-     */
-    @Override
-    protected Data getData(List<Data> data, String name) {
-        for (Data d: data) {
-            if (name.equals(d.getLabel())) {
-                return d;
-            }
-        }
-
-        return null;
-    }
-
-
-    /**
      * This method returns the selected data.
      *
      * @return the selected/inserted data.
@@ -218,7 +194,7 @@
         Data[] data = new Data[values.length+1];
 
         for (int i = 0; i < values.length; i++) {
-            data[i] = createDataArray(DATA_ITEM_NAME,
+            data[i] = createDataArray(getDataItemName(),
                 Double.valueOf(values[i]).toString());
         }
         data[values.length] = createDataArray("ld_mode", "locations");