Changeset 8380 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2015-05-17T06:02:07+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r8378 r8380 82 82 } 83 83 84 public boolean getAssignedDefault() {84 public boolean isAssignedDefault() { 85 85 return assignedDefault; 86 86 } 87 87 88 public boolean getAssignedUser() {88 public boolean isAssignedUser() { 89 89 return assignedUser; 90 90 } 91 91 92 public boolean getAutomatic() {92 public boolean isAutomatic() { 93 93 return automatic; 94 94 } … … 98 98 } 99 99 100 private boolean getReset() {100 private boolean isReset() { 101 101 return reset; 102 102 } … … 167 167 // get a string that can be put into the preferences 168 168 private boolean save() { 169 if ( getAutomatic() ||getReset() || !getAssignedUser()) {169 if (isAutomatic() || isReset() || !isAssignedUser()) { 170 170 return Main.pref.putCollection("shortcut.entry."+shortText, null); 171 171 } else { … … 316 316 317 317 for(Shortcut sc : newshortcuts) { 318 if (sc. getAssignedUser()318 if (sc.isAssignedUser() 319 319 && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) { 320 320 shortcuts.put(sc.getShortText(), sc); … … 323 323 // Shortcuts at their default values 324 324 for(Shortcut sc : newshortcuts) { 325 if (!sc. getAssignedUser() && sc.getAssignedDefault()325 if (!sc.isAssignedUser() && sc.isAssignedDefault() 326 326 && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) { 327 327 shortcuts.put(sc.getShortText(), sc); … … 330 330 // Shortcuts that were automatically moved 331 331 for(Shortcut sc : newshortcuts) { 332 if (!sc. getAssignedUser() && !sc.getAssignedDefault()332 if (!sc.isAssignedUser() && !sc.isAssignedDefault() 333 333 && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) { 334 334 shortcuts.put(sc.getShortText(), sc);
Note:
See TracChangeset
for help on using the changeset viewer.