Changeset 4897 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2012-02-02T19:44:03+01:00 (12 years ago)

Author:

stoecker

Message:

cleanup shortcut handling a lot, fix some more deprecations

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -76 +76 @@
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor;
+import org.openstreetmap.josm.gui.util.RedirectInputMap;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -378 +379 @@
     protected static final JPanel contentPanePrivate = new JPanel(new BorderLayout());
 
-    /**
-     * @deprecated If you just need to register shortcut for action, use registerActionShortcut instead of accessing InputMap directly
-     */
-    @Deprecated
-    public static final JPanel contentPane = contentPanePrivate;
+    public static void redirectToMainContentPane(JComponent source) {
+        RedirectInputMap.redirect(source, contentPanePrivate);
+    }
 
     public static void registerActionShortcut(Action action, Shortcut shortcut) {
@@ -843 +842 @@
     /**
      * The projection method used.
-     * @deprecated use {@link #getProjection()} and {@link #setProjection(Projection)} instead.
-     * For the time being still publicly available, but avoid/migrate write access to it. Use
-     * {@link #setProjection(Projection)} in order to trigger a projection change event.
-     */
-    @Deprecated
-    public static Projection proj;
+     * use {@link #getProjection()} and {@link #setProjection(Projection)} for access.
+     * Use {@link #setProjection(Projection)} in order to trigger a projection change event.
+     */
+    private static Projection proj;
 
     /**