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