Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java @ 6100:de92e0cdebdc
GWT client: Removed some Iterator cruft.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Sat, 25 May 2013 16:58:27 +0200 |
| parents | ea9eef426962 |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 6099:96b5066ab55e | 6100:de92e0cdebdc |
|---|---|
| 21 import org.dive4elements.river.client.shared.model.DataList; | 21 import org.dive4elements.river.client.shared.model.DataList; |
| 22 import org.dive4elements.river.client.shared.model.DefaultData; | 22 import org.dive4elements.river.client.shared.model.DefaultData; |
| 23 import org.dive4elements.river.client.shared.model.DefaultDataItem; | 23 import org.dive4elements.river.client.shared.model.DefaultDataItem; |
| 24 | 24 |
| 25 import java.util.HashMap; | 25 import java.util.HashMap; |
| 26 import java.util.Iterator; | |
| 27 import java.util.LinkedHashMap; | 26 import java.util.LinkedHashMap; |
| 28 import java.util.Map; | 27 import java.util.Map; |
| 29 | 28 |
| 30 public class FixFunctionSelect extends FixationPanel { | 29 public class FixFunctionSelect extends FixationPanel { |
| 31 private static final Map<String, String> funcDesc = new HashMap<String, String>(); | 30 private static final Map<String, String> funcDesc = new HashMap<String, String>(); |
| 143 } | 142 } |
| 144 | 143 |
| 145 | 144 |
| 146 @Override | 145 @Override |
| 147 public Data[] getData() { | 146 public Data[] getData() { |
| 148 Map values = form.getValues(); | 147 Map<?, ?> values = form.getValues(); |
| 149 Iterator keys = values.keySet().iterator(); | |
| 150 | 148 |
| 151 Data[] list = new Data[values.size()]; | 149 Data[] list = new Data[values.size()]; |
| 152 int i = 0; | 150 int i = 0; |
| 153 | 151 |
| 154 while (keys.hasNext()) { | 152 for (Map.Entry<?, ?>entry: values.entrySet()) { |
| 155 String fieldname = (String) keys.next(); | 153 String fieldname = (String)entry.getKey(); |
| 156 String selection = (String) values.get(fieldname); | 154 String selection = (String)entry.getValue(); |
| 157 | 155 |
| 158 DataItem item = new DefaultDataItem(fieldname, null, selection); | 156 DataItem item = new DefaultDataItem(fieldname, null, selection); |
| 159 | 157 |
| 160 list[i++] = new DefaultData( | 158 list[i++] = new DefaultData( |
| 161 fieldname, null, null, new DataItem[] { item }); | 159 fieldname, null, null, new DataItem[] { item }); |