Mercurial > dive4elements > river

comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WQAdaptedInputPanel.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 2132c4b70cf9
children 9b7f1288e6c4
comparison
equal deleted inserted replaced
6099:96b5066ab55e 6100:de92e0cdebdc
49 import org.dive4elements.river.client.shared.model.WQInfoObject; 49 import org.dive4elements.river.client.shared.model.WQInfoObject;
50 import org.dive4elements.river.client.shared.model.WQInfoRecord; 50 import org.dive4elements.river.client.shared.model.WQInfoRecord;
51 51
52 import java.util.ArrayList; 52 import java.util.ArrayList;
53 import java.util.HashMap; 53 import java.util.HashMap;
54 import java.util.Iterator;
55 import java.util.LinkedHashMap; 54 import java.util.LinkedHashMap;
56 import java.util.List; 55 import java.util.List;
57 import java.util.Map; 56 import java.util.Map;
58 57
59 58
218 public void onCellClick(CellClickEvent e) { 217 public void onCellClick(CellClickEvent e) {
219 if (isWMode() || table.isLocked()) { 218 if (isWMode() || table.isLocked()) {
220 return; 219 return;
221 } 220 }
222 221
223 int idx = e.getColNum();
224 Record r = e.getRecord(); 222 Record r = e.getRecord();
225 double val = r.getAttributeAsDouble("value"); 223 double val = r.getAttributeAsDouble("value");
226 224
227 doubleArrayPanels.get(fi).setValues(new double[]{val}); 225 doubleArrayPanels.get(fi).setValues(new double[]{val});
228 // If a named value for first gauge is chosen, try to find and set 226 // If a named value for first gauge is chosen, try to find and set
383 381
384 protected List<String> validateRange(Map<String, double[]> ranges) { 382 protected List<String> validateRange(Map<String, double[]> ranges) {
385 List<String> errors = new ArrayList<String>(); 383 List<String> errors = new ArrayList<String>();
386 NumberFormat nf = NumberFormat.getDecimalFormat(); 384 NumberFormat nf = NumberFormat.getDecimalFormat();
387 385
388 Iterator<String> iter = wqranges.keySet().iterator(); 386 for (Map.Entry<String, DoubleArrayPanel> entry: wqranges.entrySet()) {
389 387
390 while (iter.hasNext()) { 388 String key = entry.getKey();
391 List<String> tmpErrors = new ArrayList<String>(); 389 DoubleArrayPanel dap = entry.getValue();
392
393 String key = iter.next();
394 DoubleArrayPanel dap = wqranges.get(key);
395 390
396 if (!dap.validateForm()) { 391 if (!dap.validateForm()) {
397 errors.add(MSG.error_invalid_double_value()); 392 errors.add(MSG.error_invalid_double_value());
398 return errors; 393 return errors;
399 } 394 }
407 double[] values = dap.getInputValues(); 402 double[] values = dap.getInputValues();
408 double[] good = new double[values.length]; 403 double[] good = new double[values.length];
409 404
410 int idx = 0; 405 int idx = 0;
411 406
407 List<String> tmpErrors = new ArrayList<String>();
412 for (double value: values) { 408 for (double value: values) {
413 if (value < mm[0] || value > mm[1]) { 409 if (value < mm[0] || value > mm[1]) {
414 String tmp = MSG.error_validate_range(); 410 String tmp = MSG.error_validate_range();
415 tmp = tmp.replace("$1", nf.format(value)); 411 tmp = tmp.replace("$1", nf.format(value));
416 tmp = tmp.replace("$2", nf.format(mm[0])); 412 tmp = tmp.replace("$2", nf.format(mm[0]));
695 691
696 692
697 protected Data getWQValues() { 693 protected Data getWQValues() {
698 String wqvalue = null; 694 String wqvalue = null;
699 695
700 Iterator<String> iter = wqranges.keySet().iterator(); 696 for (Map.Entry<String, DoubleArrayPanel> entry: wqranges.entrySet()) {
701 while (iter.hasNext()) { 697 String key = entry.getKey();
702 String key = iter.next(); 698 DoubleArrayPanel dap = entry.getValue();
703 DoubleArrayPanel dap = wqranges.get(key);
704 String label = dap.getItemTitle(); 699 String label = dap.getItemTitle();
705 700
706 double[] values = dap.getInputValues(); 701 double[] values = dap.getInputValues();
707 if (wqvalue == null) { 702 if (wqvalue == null) {
708 wqvalue = createValueString(key + ";" + label, values); 703 wqvalue = createValueString(key + ";" + label, values);
http://dive4elements.wald.intevation.org