Changeset 12517 in josm for trunk/src/org/openstreetmap/josm/gui/util
- Timestamp:
- 2017-07-26T23:18:38+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/util
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
r11386 r12517 35 35 36 36 private final List<KeyPressReleaseListener> keyListeners = new CopyOnWriteArrayList<>(); 37 @Deprecated 37 38 private final List<ModifierListener> modifierListeners = new CopyOnWriteArrayList<>(); 39 private final List<ModifierExListener> modifierExListeners = new CopyOnWriteArrayList<>(); 38 40 private int previousModifiers; 41 private int previousModifiersEx; 39 42 40 43 private boolean enabled = true; … … 51 54 * Adds an object that wants to receive key modifier changed events. 52 55 * @param l listener to add 53 */ 56 * @deprecated use {@link #addModifierExListener} instead 57 */ 58 @Deprecated 54 59 public void addModifierListener(ModifierListener l) { 55 60 modifierListeners.add(l); … … 57 62 58 63 /** 64 * Adds an object that wants to receive extended key modifier changed events. 65 * @param l listener to add 66 * @since 12516 67 */ 68 public void addModifierExListener(ModifierExListener l) { 69 modifierExListeners.add(l); 70 } 71 72 /** 59 73 * Removes the listener. 60 74 * @param l listener to remove … … 67 81 * Removes the key modifier listener. 68 82 * @param l listener to remove 69 */ 83 * @deprecated use {@link #removeModifierExListener} instead 84 */ 85 @Deprecated 70 86 public void removeModifierListener(ModifierListener l) { 71 87 modifierListeners.remove(l); 88 } 89 90 /** 91 * Removes the extended key modifier listener. 92 * @param l listener to remove 93 * @since 12516 94 */ 95 public void removeModifierExListener(ModifierExListener l) { 96 modifierExListeners.remove(l); 72 97 } 73 98 … … 105 130 if (!modifierListeners.isEmpty()) { 106 131 Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString()); 132 } 133 if (!modifierExListeners.isEmpty()) { 134 Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierExListeners.toString()); 107 135 } 108 136 try { … … 147 175 148 176 @Override 177 @SuppressWarnings("deprecation") 149 178 public void eventDispatched(AWTEvent e) { 150 179 if (!(e instanceof KeyEvent)) { … … 162 191 } 163 192 193 // check if ctrl, alt, shift extended modifiers are changed 194 int modifEx = ke.getModifiersEx(); 195 if (previousModifiersEx != modifEx) { 196 previousModifiersEx = modifEx; 197 for (ModifierExListener m: modifierExListeners) { 198 m.modifiersExChanged(modifEx); 199 } 200 } 201 164 202 processKeyEvent(ke); 165 203 } -
trunk/src/org/openstreetmap/josm/gui/util/ModifierListener.java
r12304 r12517 6 6 * @since 7217 7 7 * @since 10600 (functional interface) 8 * @deprecated use ModifierExListener instead 8 9 */ 10 @Deprecated 9 11 @FunctionalInterface 10 12 public interface ModifierListener {
Note:
See TracChangeset
for help on using the changeset viewer.