Mercurial > dive4elements > river

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java @ 2432:61c8e517671e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed state data fields for W/Q input. flys-client/trunk@4075 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 17 Feb 2012 11:04:18 +0000
parents f405eb46762e
children 5659b5e8c9a8
comparison
equal deleted inserted replaced
2431:90c339e26a0a 2432:61c8e517671e
273 273
274 274
275 public Canvas createOld(DataList dataList) { 275 public Canvas createOld(DataList dataList) {
276 List<Data> items = dataList.getAll(); 276 List<Data> items = dataList.getAll();
277 277
278 Data dMode = getData(items, "wq_mode"); 278 Data dMode = getData(items, "wq_isq");
279 Data dFree = getData(items, "wq_free"); 279 Data dFree = getData(items, "wq_isfree");
280 Data dSelection = getData(items, "wq_selection"); 280 Data dSelection = getData(items, "wq_isrange");
281 Data dSingle = getData(items, "wq_single"); 281 Data dSingle = getData(items, "wq_single");
282 Data dFrom = getData(items, "wq_from"); 282 Data dFrom = getData(items, "wq_from");
283 Data dTo = getData(items, "wq_to"); 283 Data dTo = getData(items, "wq_to");
284 Data dStep = getData(items, "wq_step"); 284 Data dStep = getData(items, "wq_step");
285 285
402 * @param list The DataList that contains the user data. 402 * @param list The DataList that contains the user data.
403 */ 403 */
404 protected void initUserDefaults(DataList list) { 404 protected void initUserDefaults(DataList list) {
405 List<Data> allData = list.getAll(); 405 List<Data> allData = list.getAll();
406 406
407 Data m = getData(allData, "wq_mode"); 407 Data m = getData(allData, "wq_isq");
408 DataItem modeItem = m != null ? m.getDefault() : null; 408 DataItem modeItem = m != null ? m.getDefault() : null;
409 boolean isQ = modeItem != null 409 boolean isQ = modeItem != null
410 ? Boolean.valueOf(modeItem.getStringValue()) 410 ? Boolean.valueOf(modeItem.getStringValue())
411 : false; 411 : false;
412 412
413 Data f = getData(allData, "wq_free"); 413 Data f = getData(allData, "wq_isfree");
414 DataItem freeItem = f != null ? f.getDefault() : null; 414 DataItem freeItem = f != null ? f.getDefault() : null;
415 boolean isFree = freeItem != null 415 boolean isFree = freeItem != null
416 ? Boolean.valueOf(freeItem.getStringValue()) 416 ? Boolean.valueOf(freeItem.getStringValue())
417 : false; 417 : false;
418 418
419 Data s = getData(allData, "wq_selection"); 419 Data s = getData(allData, "wq_isrange");
420 DataItem sI = s != null ? s.getDefault() : null; 420 DataItem sI = s != null ? s.getDefault() : null;
421 boolean isRange = sI != null 421 boolean isRange = sI != null
422 ? Boolean.valueOf(sI.getStringValue()) 422 ? Boolean.valueOf(sI.getStringValue())
423 : false; 423 : false;
424 424
937 String value = null; 937 String value = null;
938 if (wqMode.equals(FIELD_WQ_Q_FREE) || wqMode.equals(FIELD_WQ_Q)) { 938 if (wqMode.equals(FIELD_WQ_Q_FREE) || wqMode.equals(FIELD_WQ_Q)) {
939 GWT.log("getData: FIELD_WQ_Q || FIELD_WQ_Q_FREE"); 939 GWT.log("getData: FIELD_WQ_Q || FIELD_WQ_Q_FREE");
940 value = "true"; 940 value = "true";
941 } 941 }
942 /* else if (wqMode.equals(FIELD_WQ_W_FREE)) {
943 GWT.log("getData: FIELD_WQ_W_FREE");
944 value = FIELD_WQ_W_FREE;
945 }*/
946 else { 942 else {
947 GWT.log("getData: FIELD_WQ_W"); 943 GWT.log("getData: FIELD_WQ_W");
948 value = "false"; 944 value = "false";
949 } 945 }
950 946
951 DataItem item = new DefaultDataItem("wq_mode", "wq_mode", value); 947 DataItem item = new DefaultDataItem("wq_isq", "wq_isq", value);
952 return new DefaultData( 948 return new DefaultData(
953 "wq_mode", null, null, new DataItem[] { item }); 949 "wq_isq", null, null, new DataItem[] { item });
954 } 950 }
955 951
956 952
957 /** 953 /**
958 * Returns the Q mode. The Q mode can be "true" or "false". True means, the 954 * Returns the Q mode. The Q mode can be "true" or "false". True means, the
961 * 957 *
962 * @return the Data object for the 'wq_free' attribute. 958 * @return the Data object for the 'wq_free' attribute.
963 */ 959 */
964 protected Data getFree() { 960 protected Data getFree() {
965 String value = ""; 961 String value = "";
966 GWT.log("--------mode: " + isWMode());
967 if(!isWMode()) { 962 if(!isWMode()) {
968 value = isQFree() ? "true" : "false"; 963 value = isQFree() ? "true" : "false";
969 } 964 }
970 else { 965 else {
971 value = isWFree() ? "true" : "false"; 966 value = isWFree() ? "true" : "false";
972 } 967 }
973 GWT.log("--------free? " + value); 968 DataItem item = new DefaultDataItem("wq_isfree", "wq_isfree", value);
974 DataItem item = new DefaultDataItem("wq_free", "wq_free", value);
975 return new DefaultData( 969 return new DefaultData(
976 "wq_free", null, null, new DataItem[] { item }); 970 "wq_isfree", null, null, new DataItem[] { item });
977 } 971 }
978 972
979 973
980 /** 974 /**
981 * Returns the Data object for the 'mode' attribute. 975 * Returns the Data object for the 'mode' attribute.
987 981
988 String isRange = "true"; 982 String isRange = "true";
989 if (wqSelection.equals(FIELD_MODE_SINGLE)) { 983 if (wqSelection.equals(FIELD_MODE_SINGLE)) {
990 isRange = "false"; 984 isRange = "false";
991 } 985 }
992
993 GWT.log("selection mode: " + isRange);
994 DataItem item = new DefaultDataItem( 986 DataItem item = new DefaultDataItem(
995 "wq_selection", "wq_selection", isRange); 987 "wq_isrange", "wq_isrange", isRange);
996 988
997 return new DefaultData( 989 return new DefaultData(
998 "wq_selection", null, null, new DataItem[] { item }); 990 "wq_isrange", null, null, new DataItem[] { item });
999 } 991 }
1000 992
1001 993
1002 /** 994 /**
1003 * Returns the data object for the 'single' attribute. 995 * Returns the data object for the 'single' attribute.
1216 return wqMode.equals(FIELD_WQ_Q_FREE); 1208 return wqMode.equals(FIELD_WQ_Q_FREE);
1217 } 1209 }
1218 1210
1219 protected boolean isWFree() { 1211 protected boolean isWFree() {
1220 String wqMode = modes.getValueAsString(FIELD_WQ); 1212 String wqMode = modes.getValueAsString(FIELD_WQ);
1221 GWT.log("#########wqmode: " + wqMode + " " + FIELD_WQ_W_FREE);
1222 return wqMode.equals(FIELD_WQ_W_FREE); 1213 return wqMode.equals(FIELD_WQ_W_FREE);
1223 } 1214 }
1224 1215
1225 1216
1226 /** 1217 /**
1237 boolean isFree = false; 1228 boolean isFree = false;
1238 boolean isRange = false; 1229 boolean isRange = false;
1239 1230
1240 if (item.getFieldName().equals(FIELD_MODE)) { 1231 if (item.getFieldName().equals(FIELD_MODE)) {
1241 String wq = form.getValueAsString(FIELD_WQ); 1232 String wq = form.getValueAsString(FIELD_WQ);
1242 GWT.log("mode change: " + wq);
1243 isQ = wq.contains("Q"); 1233 isQ = wq.contains("Q");
1244 isFree = wq.contains("FREE"); 1234 isFree = wq.contains("FREE");
1245 isRange = ((String) event.getValue()).equals(FIELD_MODE_RANGE); 1235 isRange = ((String) event.getValue()).equals(FIELD_MODE_RANGE);
1246 } 1236 }
1247 else { 1237 else {
1248 String wq = ((String) event.getValue()); 1238 String wq = ((String) event.getValue());
1249 GWT.log("else: " + wq);
1250 isQ = wq.contains("Q"); 1239 isQ = wq.contains("Q");
1251 isFree = wq.contains("FREE"); 1240 isFree = wq.contains("FREE");
1252 isRange = 1241 isRange =
1253 form.getValueAsString(FIELD_MODE).equals(FIELD_MODE_RANGE); 1242 form.getValueAsString(FIELD_MODE).equals(FIELD_MODE_RANGE);
1254 } 1243 }
1255 1244
1256 if (!isQ) { 1245 if (isQ && isFree) {
1257 qdTable.hideIconFields(); 1246 qdTable.hideIconFields();
1258 } 1247 }
1259 else { 1248 else {
1260 qdTable.showIconFields(); 1249 qdTable.showIconFields();
1261 } 1250 }
http://dive4elements.wald.intevation.org