Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

Location:

trunk/src/org/openstreetmap/josm/gui/util

Files:

• AdvancedKeyPressDetector.java (modified) (5 diffs)
• GuiHelper.java (modified) (3 diffs)
• ModifierListener.java (deleted)

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -36 +36 @@
 
     private final List<KeyPressReleaseListener> keyListeners = new CopyOnWriteArrayList<>();
-    /** @deprecated replaced by {@link #modifierExListeners} */
-    @Deprecated
-    private final List<ModifierListener> modifierListeners = new CopyOnWriteArrayList<>();
     private final ListenerList<ModifierExListener> modifierExListeners = ListenerList.create();
-    /** @deprecated replaced by {@link #previousModifiersEx} */
-    @Deprecated
-    private int previousModifiers;
     private int previousModifiersEx;
 
@@ -53 +47 @@
     public void addKeyListener(KeyPressReleaseListener l) {
         keyListeners.add(l);
-    }
-
-    /**
-     * Adds an object that wants to receive key modifier changed events.
-     * @param l listener to add
-     * @deprecated use {@link #addModifierExListener} instead
-     */
-    @Deprecated
-    public void addModifierListener(ModifierListener l) {
-        modifierListeners.add(l);
     }
 
@@ -80 +64 @@
     public void removeKeyListener(KeyPressReleaseListener l) {
         keyListeners.remove(l);
-    }
-
-    /**
-     * Removes the key modifier listener.
-     * @param l listener to remove
-     * @deprecated use {@link #removeModifierExListener} instead
-     */
-    @Deprecated
-    public void removeModifierListener(ModifierListener l) {
-        modifierListeners.remove(l);
     }
 
@@ -131 +105 @@
         if (!keyListeners.isEmpty()) {
             Logging.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());
-        }
-        if (!modifierListeners.isEmpty()) {
-            Logging.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
         }
         if (modifierExListeners.hasListeners()) {
@@ -183 +154 @@
         KeyEvent ke = (KeyEvent) e;
 
-        // check if ctrl, alt, shift modifiers are changed
-        int modif = ke.getModifiers();
-        if (previousModifiers != modif) {
-            previousModifiers = modif;
-            for (ModifierListener m: modifierListeners) {
-                m.modifiersChanged(modif);
-            }
-        }
-
         // check if ctrl, alt, shift extended modifiers are changed
         int modifEx = ke.getModifiersEx();

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -21 +21 @@
 import java.awt.Window;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -66 +65 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.PlatformHook;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
@@ -462 +460 @@
 
     /**
-     * Returns extended modifier key used as the appropriate accelerator key for menu shortcuts.
-     * It is advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but:
-     * <ul>
-     * <li>it returns KeyEvent.CTRL_MASK instead of KeyEvent.CTRL_DOWN_MASK. We used the extended
-     *    modifier for years, and Oracle recommends to use it instead, so it's best to keep it</li>
-     * <li>the method throws a HeadlessException ! So we would need to handle it for unit tests anyway</li>
-     * </ul>
-     * @return extended modifier key used as the appropriate accelerator key for menu shortcuts
-     * @since 7539
-     * @deprecated to be removed end of 2017. Use {@link PlatformHook#getMenuShortcutKeyMaskEx()} instead
-     */
-    @Deprecated
-    public static int getMenuShortcutKeyMaskEx() {
-        return Main.isPlatformOsx() ? KeyEvent.META_DOWN_MASK : KeyEvent.CTRL_DOWN_MASK;
-    }
-
-    /**
      * Sets a global font for all UI, replacing default font of current look and feel.
      * @param name Font name. It is up to the caller to make sure the font exists