diff flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java @ 4131:360e22afb98b

Cosmetics, warnings and minor TODOs.
author Christian Lins <christian.lins@intevation.de>
date Mon, 15 Oct 2012 00:04:35 +0200
parents 51ed89b754ae
children
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java	Sun Oct 14 14:44:28 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java	Mon Oct 15 00:04:35 2012 +0200
@@ -1,34 +1,34 @@
 package de.intevation.flys.client.client.ui;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
 
+import com.smartgwt.client.data.Record;
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
-import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
+import com.smartgwt.client.widgets.form.fields.FormItem;
 import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
-import com.smartgwt.client.widgets.form.fields.FormItem;
-
+import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
+import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
-
-import com.smartgwt.client.data.Record;
-
 import de.intevation.flys.client.shared.model.Data;
 import de.intevation.flys.client.shared.model.DataItem;
 import de.intevation.flys.client.shared.model.DataList;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * This UIProvider serves as base for UI Providers to enter a single location (km).
  */
 public abstract class LocationPanel
 extends               AbstractUIProvider
 {
+    private static final long serialVersionUID = -5306604428440015046L;
+
     /** A container that will contain the location or the distance panel. */
     protected HLayout inputLayout;
 
@@ -106,6 +106,7 @@
      * This method creates a Canvas element showing the old Data objects in the
      * DataList <i>data</i>.
      */
+    @Override
     public Canvas createOld(DataList dataList) {
         findDataItemName(dataList);
 
@@ -142,40 +143,18 @@
     protected void initDefaults(DataList list) {
         Data data = list.get(0);
 
-        /*
-        // Compatibility with MinMax- DataItems:
-        RangeData rangeData = null;
-
-        for (int i = 0, n = list.size(); i < n; i++) {
-            Data tmp = list.get(i);
+        DataItem[] items = data.getItems();
+        DataItem iMin = getDataItem(items, "min");
+        DataItem iMax = getDataItem(items, "max");
 
-            if (tmp instanceof RangeData) {
-                rangeData = (RangeData) tmp;
-            }
-        }
-
-        if (rangeData != null) {
-            min = Double.parseDouble(rangeData.getDefaultLower().toString());
-            max = Double.parseDouble(rangeData.getDefaultUpper().toString());
-            // catch ..?
+        try {
+            min = Double.parseDouble(iMin.getStringValue());
+            max = Double.parseDouble(iMax.getStringValue());
         }
-        */
-
-        if (false) {}
-        else {
-            DataItem[] items = data.getItems();
-            DataItem   iMin  = getDataItem(items, "min");
-            DataItem   iMax  = getDataItem(items, "max");
-
-            try {
-                min = Double.parseDouble(iMin.getStringValue());
-                max = Double.parseDouble(iMax.getStringValue());
-            }
-            catch (NumberFormatException nfe) {
-                SC.warn(MSG.error_read_minmax_values());
-                min = -Double.MAX_VALUE;
-                max = Double.MAX_VALUE;
-            }
+        catch (NumberFormatException nfe) {
+            SC.warn(MSG.error_read_minmax_values());
+            min = -Double.MAX_VALUE;
+            max = Double.MAX_VALUE;
         }
 
         DataItem def   = data.getDefault();
@@ -186,7 +165,8 @@
             setLocationValues(new double[] { d } );
         }
         catch (NumberFormatException nfe) {
-            // could not parse, dont know what to do else
+            // could not parse, don't know what else to do
+            GWT.log("LocationPanel", nfe);
         }
     }
 
@@ -220,7 +200,8 @@
         locationPanel = new DoubleArrayPanel(
             MSG.unitLocation(),
             getLocationValues(),
-            new BlurHandler(){public void onBlur(BlurEvent be) {}});
+            new BlurHandler(){@Override
+            public void onBlur(BlurEvent be) {}});
 
         // TODO Remove picker references, refactor such that subclasses can
         // easily use their picker if they want.
@@ -284,29 +265,6 @@
     }
 
 
-
-    /**
-     * This method returns the selected data.
-     *
-     * @return the selected/inserted data.
-    // TODO we are abstract because of this. Refactor to use DATA_NAME and
-    // similar fields for ld_mode .
-    public Data[] getData() {
-        saveLocationValues(locationPanel);
-        double[] values = getLocationValues();
-        Data[] data = new Data[values.length+1];
-
-        for (int i = 0; i < values.length; i++) {
-            data[i] = createDataArray(DATA_ITEM_NAME,
-                Double.valueOf(values[i]).toString());
-        }
-        data[values.length] = createDataArray("ld_mode", "locations");
-
-        return data;
-    }
-     */
-
-
     /**
      * Validates and stores all values entered in the location mode.
      *
@@ -362,7 +320,7 @@
                 Double.parseDouble(record.getAttribute("from"));
         }
         catch(NumberFormatException nfe) {
-            // Is there anything else to do here?
+            GWT.log("onRecordClick", nfe);
         }
         setLocationValues(selected);
     }

http://dive4elements.wald.intevation.org