changeset 1618:95b821d63db3

Cosmetics. flys-client/trunk@3990 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 09 Feb 2012 10:55:28 +0000
parents f13a7c126f24
children f8c03d3af300
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java
diffstat 3 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Thu Feb 09 09:52:37 2012 +0000
+++ b/flys-client/ChangeLog	Thu Feb 09 10:55:28 2012 +0000
@@ -1,3 +1,12 @@
+2012-02-09	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java:
+	  Cosmetics, renamed local 'values' variables to avoid confusion with
+	  values field from superclass.
+
+	* src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java:
+	  Cosmetics.
+
 2012-02-09	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java	Thu Feb 09 09:52:37 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java	Thu Feb 09 10:55:28 2012 +0000
@@ -110,8 +110,8 @@
         findDataItemName(dataList);
 
         List<Data> items = dataList.getAll();
-        Data dLocation = getData(items, getDataItemName());
-        DataItem[] loc = dLocation.getItems();
+        Data dLocation   = getData(items, getDataItemName());
+        DataItem[] loc   = dLocation.getItems();
 
         HLayout layout = new HLayout();
         layout.setWidth("400px");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java	Thu Feb 09 09:52:37 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/MultipleLocationPanel.java	Thu Feb 09 10:55:28 2012 +0000
@@ -204,11 +204,11 @@
             return errors;
         }
 
-        double[] values = getLocationValues();
-        double[] good   = new double[values.length];
+        double[] lValues = getLocationValues();
+        double[] good   = new double[lValues.length];
         int      idx    = 0;
 
-        for (double value: values) {
+        for (double value: lValues) {
             if (value < min || value > max) {
                 String tmp = MSG.error_validate_range();
                 tmp = tmp.replace("$1", nf.format(value));
@@ -241,15 +241,15 @@
      */
     public Data[] getData() {
         saveLocationValues(locationPanel);
-        double[] values      = getLocationValues();
+        double[] lValues     = getLocationValues();
         Data[]   data        = new Data[2];
         boolean  first       = true;
         String   valueString = "";
 
-        for (int i = 0; i < values.length; i++) {
+        for (int i = 0; i < lValues.length; i++) {
             if (!first) valueString += " ";
             else first = false;
-            valueString += Double.valueOf(values[i]).toString();
+            valueString += Double.valueOf(lValues[i]).toString();
         }
 
         data[0] = createDataArray(getDataItemName(), valueString);

http://dive4elements.wald.intevation.org