Changeset 3481 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-08-29T15:30:31+02:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r3472 r3481 145 145 returnValue.hadEmpty = true; 146 146 } 147 returnValue.hadKeys = ! returnValue.values.isEmpty() | returnValue.hadEmpty; 147 if(s.hasKeys()) { 148 returnValue.hadKeys = true; 149 } 148 150 } 149 151 return returnValue; … … 347 349 // find out if our key is already used in the selection. 348 350 usage = determineTextUsage(sel, key); 351 String def = default_; 349 352 350 353 String[] value_array = values.split(","); … … 359 362 } 360 363 364 if(use_last_as_default && def == null && lastValue.containsKey(key)) 365 { 366 def = lastValue.get(key); 367 } 368 361 369 if (display_array.length != value_array.length) { 362 370 System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in display_values must be the same as in values", key, text)); … … 380 388 } 381 389 } 382 if (def ault_ != null && !lhm.containsKey(default_)) {383 lhm.put(def ault_, default_);390 if (def != null && !lhm.containsKey(def)) { 391 lhm.put(def, def); 384 392 } 385 393 if(!lhm.containsKey("")) { … … 400 408 } 401 409 // use default only in case it is a totally new entry 402 else if(def ault_!= null && !usage.hadKeys()) {403 combo.setSelectedItem(def ault_);410 else if(def != null && !usage.hadKeys()) { 411 combo.setSelectedItem(def); 404 412 originalValue=DIFFERENT; 405 413 } … … 452 460 if (delete_if_empty && value.length() == 0) { 453 461 value = null; 462 } 463 if (use_last_as_default) { 464 lastValue.put(key, value); 454 465 } 455 466 cmds.add(new ChangePropertyCommand(sel, key, value));
Note:
See TracChangeset
for help on using the changeset viewer.