- * You do not need this when accessing the layer manager. The layer manager will be empty if no map view is shown.
- *
- * @return true if JOSM currently displays a map view
- * @deprecated use {@link org.openstreetmap.josm.gui.MainApplication#isDisplayingMapView()}
- */
- @Deprecated
- public static boolean isDisplayingMapView() {
- return MainApplication.isDisplayingMapView();
- }
-
- /**
* Global parent component for all dialogs and message boxes
*/
public static Component parent;
@@ -103,59 +77,11 @@
public static volatile Main main;
/**
- * The worker thread slave. This is for executing all long and intensive
- * calculations. The executed runnables are guaranteed to be executed separately and sequential.
- * @deprecated use {@link MainApplication#worker} instead
- */
- @Deprecated
- public static ExecutorService worker;
-
- /**
* Global application preferences
*/
public static final Preferences pref = new Preferences();
/**
- * The MapFrame.
- *
- * There should be no need to access this to access any map data. Use {@link MainApplication#getLayerManager} instead. - * - * @deprecated Use {@link MainApplication#getMap()} instead - * @see MainPanel - */ - @Deprecated - public static MapFrame map; - - /** - * The toolbar preference control to register new actions. - * @deprecated Use {@link MainApplication#getToolbar} instead - */ - @Deprecated - public static volatile ToolbarPreferences toolbar; - - /** - * The commands undo/redo handler. - * @deprecated Use {@link MainApplication#undoRedo} instead - */ - @Deprecated - public final UndoRedoHandler undoRedo = MainApplication.undoRedo; - - /** - * The main menu bar at top of screen. - * @deprecated Use {@link MainApplication#getMenu} instead - */ - @Deprecated - public MainMenu menu; - - /** - * The main panel. - * @deprecated Use {@link MainApplication#getMainPanel} instead - * @since 12125 - */ - @Deprecated - public MainPanel panel; - - /** * The file watcher service. */ public static final FileWatcher fileWatcher = new FileWatcher(); @@ -610,17 +536,6 @@ } /** - * Returns the main layer manager that is used by the map view. - * @return The layer manager. The value returned will never change. - * @since 10279 - * @deprecated use {@link MainApplication#getLayerManager} instead - */ - @Deprecated - public static MainLayerManager getLayerManager() { - return MainApplication.getLayerManager(); - } - - /** * Replies the current selected primitives, from a end-user point of view. * It is not always technically the same collection of primitives than {@link DataSet#getSelected()}. * @return The current selected primitives, from a end-user point of view. Can be {@code null}. @@ -630,70 +545,6 @@ return Collections.emptyList(); } - /** - * Registers a {@code JosmAction} and its shortcut. - * @param action action defining its own shortcut - * @deprecated use {@link MainApplication#registerActionShortcut(JosmAction)} instead - */ - @Deprecated - public static void registerActionShortcut(JosmAction action) { - MainApplication.registerActionShortcut(action); - } - - /** - * Registers an action and its shortcut. - * @param action action to register - * @param shortcut shortcut to associate to {@code action} - * @deprecated use {@link MainApplication#registerActionShortcut(Action, Shortcut)} instead - */ - @Deprecated - public static void registerActionShortcut(Action action, Shortcut shortcut) { - MainApplication.registerActionShortcut(action, shortcut); - } - - /** - * Unregisters a shortcut. - * @param shortcut shortcut to unregister - * @deprecated use {@link MainApplication#unregisterShortcut(Shortcut)} instead - */ - @Deprecated - public static void unregisterShortcut(Shortcut shortcut) { - MainApplication.unregisterShortcut(shortcut); - } - - /** - * Unregisters a {@code JosmAction} and its shortcut. - * @param action action to unregister - * @deprecated use {@link MainApplication#unregisterActionShortcut(JosmAction)} instead - */ - @Deprecated - public static void unregisterActionShortcut(JosmAction action) { - MainApplication.unregisterActionShortcut(action); - } - - /** - * Unregisters an action and its shortcut. - * @param action action to unregister - * @param shortcut shortcut to unregister - * @deprecated use {@link MainApplication#unregisterActionShortcut(Action, Shortcut)} instead - */ - @Deprecated - public static void unregisterActionShortcut(Action action, Shortcut shortcut) { - MainApplication.unregisterActionShortcut(action, shortcut); - } - - /** - * Replies the registered action for the given shortcut - * @param shortcut The shortcut to look for - * @return the registered action for the given shortcut - * @deprecated use {@link MainApplication#getRegisteredActionShortcut(Shortcut)} instead - * @since 5696 - */ - @Deprecated - public static Action getRegisteredActionShortcut(Shortcut shortcut) { - return MainApplication.getRegisteredActionShortcut(shortcut); - } - /////////////////////////////////////////////////////////////////////////// // Implementation part /////////////////////////////////////////////////////////////////////////// @@ -904,47 +755,6 @@ } /** - * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes. - *
- * It will fire an initial mapFrameInitialized event when the MapFrame is present. - * Otherwise will only fire when the MapFrame is created or destroyed. - * @param listener The MapFrameListener - * @return {@code true} if the listeners collection changed as a result of the call - * @see #addMapFrameListener - * @deprecated use {@link MainApplication#addAndFireMapFrameListener} instead - * @since 11904 - */ - @Deprecated - public static boolean addAndFireMapFrameListener(MapFrameListener listener) { - return MainApplication.addAndFireMapFrameListener(listener); - } - - /** - * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes - * @param listener The MapFrameListener - * @return {@code true} if the listeners collection changed as a result of the call - * @see #addAndFireMapFrameListener - * @deprecated use {@link MainApplication#addMapFrameListener} instead - * @since 5957 - */ - @Deprecated - public static boolean addMapFrameListener(MapFrameListener listener) { - return MainApplication.addMapFrameListener(listener); - } - - /** - * Unregisters the given {@code MapFrameListener} from MapFrame changes - * @param listener The MapFrameListener - * @return {@code true} if the listeners collection changed as a result of the call - * @deprecated use {@link MainApplication#removeMapFrameListener} instead - * @since 5957 - */ - @Deprecated - public static boolean removeMapFrameListener(MapFrameListener listener) { - return MainApplication.removeMapFrameListener(listener); - } - - /** * Adds a new network error that occur to give a hint about broken Internet connection. * Do not use this method for errors known for sure thrown because of a bad proxy configuration. *