Mercurial > dive4elements > river

comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/QSegmentedInputPanel.java @ 6100:de92e0cdebdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4875ca46fdcd
comparison
equal deleted inserted replaced
6099:96b5066ab55e 6100:de92e0cdebdc
42 import org.dive4elements.river.client.shared.model.WQInfoObject; 42 import org.dive4elements.river.client.shared.model.WQInfoObject;
43 import org.dive4elements.river.client.shared.model.WQInfoRecord; 43 import org.dive4elements.river.client.shared.model.WQInfoRecord;
44 44
45 import java.util.ArrayList; 45 import java.util.ArrayList;
46 import java.util.HashMap; 46 import java.util.HashMap;
47 import java.util.Iterator;
48 import java.util.List; 47 import java.util.List;
49 import java.util.Map; 48 import java.util.Map;
50 49
51 50
52 /** 51 /**
240 @Override 239 @Override
241 public List<String> validate() { 240 public List<String> validate() {
242 List<String> errors = new ArrayList<String>(); 241 List<String> errors = new ArrayList<String>();
243 NumberFormat nf = NumberFormat.getDecimalFormat(); 242 NumberFormat nf = NumberFormat.getDecimalFormat();
244 243
245 Iterator<String> iter = wqranges.keySet().iterator(); 244 for (Map.Entry<String, DoubleArrayPanel> entry: wqranges.entrySet()) {
246 245
247 while (iter.hasNext()) { 246 String key = entry.getKey();
248 List<String> tmpErrors = new ArrayList<String>(); 247 DoubleArrayPanel dap = entry.getValue();
249
250 String key = iter.next();
251 DoubleArrayPanel dap = wqranges.get(key);
252 248
253 if (!dap.validateForm()) { 249 if (!dap.validateForm()) {
254 errors.add(MSG.error_invalid_double_value()); 250 errors.add(MSG.error_invalid_double_value());
255 return errors; 251 return errors;
256 } 252 }
259 if (mm == null) { 255 if (mm == null) {
260 SC.warn(MSG.error_read_minmax_values()); 256 SC.warn(MSG.error_read_minmax_values());
261 continue; 257 continue;
262 } 258 }
263 259
260 List<String> tmpErrors = new ArrayList<String>();
264 double[] values = dap.getInputValues(); 261 double[] values = dap.getInputValues();
265 // might geht npe here if one field not filled 262 // might geht npe here if one field not filled
266 double[] good = new double[values.length]; 263 double[] good = new double[values.length];
267 264
268 int idx = 0; 265 int idx = 0;
360 357
361 358
362 protected Data getWQValues() { 359 protected Data getWQValues() {
363 String wqvalue = null; 360 String wqvalue = null;
364 361
365 Iterator<String> iter = wqranges.keySet().iterator(); 362 for (Map.Entry<String, DoubleArrayPanel> entry: wqranges.entrySet()) {
366 while (iter.hasNext()) { 363 String key = entry.getKey();
367 String key = iter.next(); 364 DoubleArrayPanel dap = entry.getValue();
368 DoubleArrayPanel dap = wqranges.get(key);
369 365
370 double[] values = dap.getInputValues(); 366 double[] values = dap.getInputValues();
371 if (wqvalue == null) { 367 if (wqvalue == null) {
372 wqvalue = createValueString(key + "; ", values); 368 wqvalue = createValueString(key + "; ", values);
373 } 369 }
http://dive4elements.wald.intevation.org