Mercurial > dive4elements > river

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java @ 595:9155110ec0a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#104 The WQ panel now display the selected wq mode. flys-client/trunk@2195 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 22 Jun 2011 07:39:12 +0000
parents 78907f0fb939
children 3f094045d512
comparison
equal deleted inserted replaced
594:646cf09dabf2 595:9155110ec0a6
253 253
254 public Canvas createOld(DataList dataList) { 254 public Canvas createOld(DataList dataList) {
255 List<Data> items = dataList.getAll(); 255 List<Data> items = dataList.getAll();
256 256
257 Data dMode = getData(items, "wq_mode"); 257 Data dMode = getData(items, "wq_mode");
258 Data dFree = getData(items, "wq_free");
258 Data dSelection = getData(items, "wq_selection"); 259 Data dSelection = getData(items, "wq_selection");
259 Data dSingle = getData(items, "wq_single"); 260 Data dSingle = getData(items, "wq_single");
260 Data dFrom = getData(items, "wq_from"); 261 Data dFrom = getData(items, "wq_from");
261 Data dTo = getData(items, "wq_to"); 262 Data dTo = getData(items, "wq_to");
262 Data dStep = getData(items, "wq_step"); 263 Data dStep = getData(items, "wq_step");
263 264
264 DataItem[] mode = dMode.getItems(); 265 DataItem[] mode = dMode.getItems();
265 String strMode = mode[0].getStringValue(); 266 String strMode = mode[0].getStringValue();
266 boolean wMode = strMode.equals(FIELD_WQ_W); 267 boolean wMode = strMode.equals(FIELD_WQ_W);
267 268
269 DataItem[] free = dFree.getItems();
270 String strFree = free[0].getStringValue();
271 boolean isFree = Boolean.valueOf(strFree);
272
268 HLayout layout = new HLayout(); 273 HLayout layout = new HLayout();
269 layout.setWidth("400px"); 274 layout.setWidth("400px");
270 275
271 Label label = new Label(dataList.getLabel()); 276 Label label = new Label(dataList.getLabel());
272 label.setWidth("200px"); 277 label.setWidth("200px");
293 text = wMode 298 text = wMode
294 ? createWString(from[0], to[0], step[0]) 299 ? createWString(from[0], to[0], step[0])
295 : createQString(from[0], to[0], step[0]); 300 : createQString(from[0], to[0], step[0]);
296 } 301 }
297 302
298 Label selected = new Label(text); 303 VLayout selectedLayout = new VLayout();
299 selected.setWidth("130px"); 304 String wqMode = null;
305
306 if (wMode) {
307 wqMode = MESSAGE.wqW();
308 }
309 else {
310 wqMode = isFree ? MESSAGE.wqQ() : MESSAGE.wqQGauge();
311 }
312
313 Label mLabel = new Label(wqMode);
314 Label vLabel = new Label(text);
315 mLabel.setWidth(175);
316 mLabel.setHeight(20);
317 vLabel.setWidth(175);
318 vLabel.setHeight(20);
319
320 selectedLayout.addMember(mLabel);
321 selectedLayout.addMember(vLabel);
322 selectedLayout.setHeight(40);
300 323
301 Canvas back = getBackButton(dataList.getState()); 324 Canvas back = getBackButton(dataList.getState());
302 325
303 layout.addMember(label); 326 layout.addMember(label);
304 layout.addMember(selected); 327 layout.addMember(selectedLayout);
305 layout.addMember(back); 328 layout.addMember(back);
306 329
307 return layout; 330 return layout;
308 } 331 }
309 332
354 377
355 Data m = getData(allData, "wq_mode"); 378 Data m = getData(allData, "wq_mode");
356 DataItem modeItem = m != null ? m.getDefault() : null; 379 DataItem modeItem = m != null ? m.getDefault() : null;
357 String theMode = modeItem != null 380 String theMode = modeItem != null
358 ? modeItem.getStringValue() 381 ? modeItem.getStringValue()
382 : "";
383
384 Data f = getData(allData, "wq_free");
385 DataItem freeItem = f != null ? f.getDefault() : null;
386 String theFree = freeItem != null
387 ? freeItem.getStringValue()
359 : null; 388 : null;
360 389
361 Data s = getData(allData, "wq_selection"); 390 Data s = getData(allData, "wq_selection");
362 DataItem sI = s != null ? s.getDefault() : null; 391 DataItem sI = s != null ? s.getDefault() : null;
363 String theSelection = sI != null ? sI.getStringValue() : null; 392 String theSelection = sI != null ? sI.getStringValue() : null;
364 393
365 if (theMode == null || theMode.length() == 0) { 394 if (theMode == null || theMode.length() == 0) {
366 return; 395 return;
367 } 396 }
368 397
398 boolean isW = theMode.equals(FIELD_WQ_W);
399 boolean isFree = Boolean.valueOf(theFree);
400
369 initUserSingleValues(list, theMode); 401 initUserSingleValues(list, theMode);
370 initUserRangeValues(list, theMode); 402 initUserRangeValues(list, theMode);
371 403
372 modes.setValue(FIELD_WQ, theMode); 404 if (isW) {
405 modes.setValue(FIELD_WQ, theMode);
406 }
407 else {
408 modes.setValue(FIELD_WQ, isFree ? FIELD_WQ_Q : FIELD_WQ_Q_GAUGE);
409 }
373 410
374 if (theSelection != null || theSelection.length() > 0) { 411 if (theSelection != null || theSelection.length() > 0) {
375 modes.setValue(FIELD_MODE, theSelection); 412 modes.setValue(FIELD_MODE, theSelection);
376 updatePanels(theMode, theSelection); 413 updatePanels(theMode, theSelection);
377 } 414 }
http://dive4elements.wald.intevation.org