--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java	Sat May 25 16:18:28 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java	Sat May 25 16:58:27 2013 +0200
@@ -23,7 +23,6 @@
 import org.dive4elements.river.client.shared.model.DefaultDataItem;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -145,15 +144,14 @@
 
     @Override
     public Data[] getData() {
-        Map values    = form.getValues();
-        Iterator keys = values.keySet().iterator();
+        Map<?, ?> values = form.getValues();
 
         Data[] list = new Data[values.size()];
         int       i = 0;
 
-        while (keys.hasNext()) {
-            String fieldname = (String) keys.next();
-            String selection = (String) values.get(fieldname);
+        for (Map.Entry<?, ?>entry: values.entrySet()) {
+            String fieldname = (String)entry.getKey();
+            String selection = (String)entry.getValue();
 
             DataItem item    = new DefaultDataItem(fieldname, null, selection);