--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WQAdaptedInputPanel.java	Sat May 25 16:18:28 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WQAdaptedInputPanel.java	Sat May 25 16:58:27 2013 +0200
@@ -51,7 +51,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -220,7 +219,6 @@
                         return;
                     }
 
-                    int    idx = e.getColNum();
                     Record r   = e.getRecord();
                     double val = r.getAttributeAsDouble("value");
 
@@ -385,13 +383,10 @@
         List<String> errors = new ArrayList<String>();
         NumberFormat nf     = NumberFormat.getDecimalFormat();
 
-        Iterator<String> iter = wqranges.keySet().iterator();
+        for (Map.Entry<String, DoubleArrayPanel> entry: wqranges.entrySet()) {
 
-        while (iter.hasNext()) {
-            List<String> tmpErrors = new ArrayList<String>();
-
-            String           key = iter.next();
-            DoubleArrayPanel dap = wqranges.get(key);
+            String           key = entry.getKey();
+            DoubleArrayPanel dap = entry.getValue();
 
             if (!dap.validateForm()) {
                 errors.add(MSG.error_invalid_double_value());
@@ -409,6 +404,7 @@
 
             int idx = 0;
 
+            List<String> tmpErrors = new ArrayList<String>();
             for (double value: values) {
                 if (value < mm[0] || value > mm[1]) {
                     String tmp = MSG.error_validate_range();
@@ -697,10 +693,9 @@
     protected Data getWQValues() {
         String wqvalue = null;
 
-        Iterator<String> iter = wqranges.keySet().iterator();
-        while (iter.hasNext()) {
-            String           key = iter.next();
-            DoubleArrayPanel dap = wqranges.get(key);
+        for (Map.Entry<String, DoubleArrayPanel> entry: wqranges.entrySet()) {
+            String           key = entry.getKey();
+            DoubleArrayPanel dap = entry.getValue();
             String label = dap.getItemTitle();
 
             double[] values = dap.getInputValues();