Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java @ 8790:d793caaf5b5e
Remove indirections internally.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Thu, 10 Dec 2015 14:38:32 +0100 |
parents | 316a9eeb0836 |
children | 2aaf87bc3ea7 |
comparison
equal
deleted
inserted
replaced
8789:d199860fb087 | 8790:d793caaf5b5e |
---|---|
61 public class DistancePanel extends AbstractUIProvider implements BlurHandler, FilterHandler | 61 public class DistancePanel extends AbstractUIProvider implements BlurHandler, FilterHandler |
62 { | 62 { |
63 | 63 |
64 private static final long serialVersionUID = -883142387908664588L; | 64 private static final long serialVersionUID = -883142387908664588L; |
65 | 65 |
66 public static final int DEFAULT_STEP_WIDTH = 100; | 66 private static final int DEFAULT_STEP_WIDTH = 100; |
67 | 67 |
68 public static final String FIELD_LOWER = "ld_from"; | 68 private static final String FIELD_LOWER = "ld_from"; |
69 public static final String FIELD_UPPER = "ld_to"; | 69 private static final String FIELD_UPPER = "ld_to"; |
70 public static final String FIELD_STEP = "ld_step"; | 70 private static final String FIELD_STEP = "ld_step"; |
71 | 71 |
72 | 72 |
73 protected FLYSConstants MSG = GWT.create(FLYSConstants.class); | 73 protected FLYSConstants MSG = GWT.create(FLYSConstants.class); |
74 | 74 |
75 protected RangeTable distancesTable; | 75 protected RangeTable distancesTable; |
147 | 147 |
148 | 148 |
149 protected String getOldSelectionString(DataList dataList) { | 149 protected String getOldSelectionString(DataList dataList) { |
150 List<Data> items = dataList.getAll(); | 150 List<Data> items = dataList.getAll(); |
151 | 151 |
152 Data dFrom = getData(items, getLowerField()); | 152 Data dFrom = getData(items, FIELD_LOWER); |
153 Data dTo = getData(items, getUpperField()); | 153 Data dTo = getData(items, FIELD_UPPER); |
154 Data dStep = getData(items, getStepField()); | 154 Data dStep = getData(items, FIELD_STEP); |
155 | 155 |
156 DataItem[] from = dFrom.getItems(); | 156 DataItem[] from = dFrom.getItems(); |
157 DataItem[] to = dTo.getItems(); | 157 DataItem[] to = dTo.getItems(); |
158 DataItem[] step = dStep.getItems(); | 158 DataItem[] step = dStep.getItems(); |
159 | 159 |
299 } | 299 } |
300 | 300 |
301 | 301 |
302 protected Data getDataFrom() { | 302 protected Data getDataFrom() { |
303 String value = String.valueOf(distancePanel.getFrom()); | 303 String value = String.valueOf(distancePanel.getFrom()); |
304 String field = getLowerField(); | 304 String field = FIELD_LOWER; |
305 | 305 |
306 DataItem item = new DefaultDataItem(field, field, value); | 306 DataItem item = new DefaultDataItem(field, field, value); |
307 return new DefaultData( | 307 return new DefaultData( |
308 field, null, null, new DataItem[] { item }); | 308 field, null, null, new DataItem[] { item }); |
309 } | 309 } |
310 | 310 |
311 | 311 |
312 protected Data getDataTo() { | 312 protected Data getDataTo() { |
313 String value = String.valueOf(distancePanel.getTo()); | 313 String value = String.valueOf(distancePanel.getTo()); |
314 String field = getUpperField(); | 314 String field = FIELD_UPPER; |
315 | 315 |
316 DataItem item = new DefaultDataItem(field, field, value); | 316 DataItem item = new DefaultDataItem(field, field, value); |
317 return new DefaultData( | 317 return new DefaultData( |
318 field, null, null, new DataItem[] { item }); | 318 field, null, null, new DataItem[] { item }); |
319 } | 319 } |
320 | 320 |
321 | 321 |
322 protected Data getDataStep() { | 322 protected Data getDataStep() { |
323 String value = String.valueOf(distancePanel.getStep()); | 323 String value = String.valueOf(distancePanel.getStep()); |
324 String field = getStepField(); | 324 String field = FIELD_STEP; |
325 | 325 |
326 DataItem item = new DefaultDataItem(field, field, value); | 326 DataItem item = new DefaultDataItem(field, field, value); |
327 return new DefaultData( | 327 return new DefaultData( |
328 field, null, null, new DataItem[] { item }); | 328 field, null, null, new DataItem[] { item }); |
329 } | 329 } |
334 distancePanel.validateForm(); | 334 distancePanel.validateForm(); |
335 } | 335 } |
336 | 336 |
337 | 337 |
338 protected void initMinMaxValues(DataList data) { | 338 protected void initMinMaxValues(DataList data) { |
339 Data f = getData(data.getAll(), getLowerField()); | 339 Data f = getData(data.getAll(), FIELD_LOWER); |
340 Data t = getData(data.getAll(), getUpperField()); | 340 Data t = getData(data.getAll(), FIELD_UPPER); |
341 | 341 |
342 DataItem[] fItems = f.getItems(); | 342 DataItem[] fItems = f.getItems(); |
343 DataItem[] tItems = t.getItems(); | 343 DataItem[] tItems = t.getItems(); |
344 | 344 |
345 try { | 345 try { |
359 initDefaultStep(data); | 359 initDefaultStep(data); |
360 } | 360 } |
361 | 361 |
362 | 362 |
363 protected void initDefaultFrom(DataList data) { | 363 protected void initDefaultFrom(DataList data) { |
364 Data f = getData(data.getAll(), getLowerField()); | 364 Data f = getData(data.getAll(), FIELD_LOWER); |
365 | 365 |
366 double from = getDefaultFrom(); | 366 double from = getDefaultFrom(); |
367 | 367 |
368 try { | 368 try { |
369 from = getDefaultValue(f); | 369 from = getDefaultValue(f); |
380 return min; | 380 return min; |
381 } | 381 } |
382 | 382 |
383 | 383 |
384 protected void initDefaultTo(DataList data) { | 384 protected void initDefaultTo(DataList data) { |
385 Data t = getData(data.getAll(), getUpperField()); | 385 Data t = getData(data.getAll(), FIELD_UPPER); |
386 | 386 |
387 double to = getDefaultTo(); | 387 double to = getDefaultTo(); |
388 | 388 |
389 try { | 389 try { |
390 to = getDefaultValue(t); | 390 to = getDefaultValue(t); |
401 return max; | 401 return max; |
402 } | 402 } |
403 | 403 |
404 | 404 |
405 protected void initDefaultStep(DataList data) { | 405 protected void initDefaultStep(DataList data) { |
406 Data s = getData(data.getAll(), getStepField()); | 406 Data s = getData(data.getAll(), FIELD_STEP); |
407 | 407 |
408 double step = getDefaultStep(); | 408 double step = DEFAULT_STEP_WIDTH; |
409 | 409 |
410 try { | 410 try { |
411 step = getDefaultValue(s); | 411 step = getDefaultValue(s); |
412 } | 412 } |
413 catch (NumberFormatException nfe) { | 413 catch (NumberFormatException nfe) { |