Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

Timestamp:

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

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -19 +17 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -65 +65 @@
 
     /**
-     * Constructor for mapmodes without a menu
-     * @param name the action's text
-     * @param iconName icon filename in {@code mapmode} directory
-     * @param tooltip  a longer description of the action that will be displayed in the tooltip.
-     * @param shortcut a ready-created shortcut object or null if you don't want a shortcut.
-     * @param mapFrame unused but kept for plugin compatibility. Can be {@code null}
-     * @param cursor cursor displayed when map mode is active
-     * @deprecated use {@link #MapMode(String, String, String, Shortcut, Cursor)} instead
-     */
-    @Deprecated
-    public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) {
-        this(name, iconName, tooltip, shortcut, cursor);
-    }
-
-    /**
-     * Constructor for mapmodes with a menu (no shortcut will be registered)
-     * @param name the action's text
-     * @param iconName icon filename in {@code mapmode} directory
-     * @param tooltip  a longer description of the action that will be displayed in the tooltip.
-     * @param mapFrame unused but kept for plugin compatibility. Can be {@code null}
-     * @param cursor cursor displayed when map mode is active
-     * @deprecated use {@link #MapMode(String, String, String, Cursor)} instead
-     */
-    @Deprecated
-    public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) {
-        this(name, iconName, tooltip, cursor);
-    }
-
-    /**
      * Makes this map mode active.
      */
@@ -179 +150 @@
 
     /**
-     * Update internal ctrl, alt, shift mask from given modifiers mask.
-     * @param modifiers event modifiers mask
-     * @deprecated use {@link #updateKeyModifiersEx} instead
-     */
-    @Deprecated
-    protected void updateKeyModifiers(int modifiers) {
-        ctrl = (modifiers & ActionEvent.CTRL_MASK) != 0;
-        alt = (modifiers & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
-        shift = (modifiers & ActionEvent.SHIFT_MASK) != 0;
-    }
-
-    /**
      * Update internal ctrl, alt, shift mask from given extended modifiers mask.
      * @param modifiers event extended modifiers mask