Changeset 12643 in josm for trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java

Timestamp:

2017-08-25T10:18:53+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.main.menu. Replacement: gui.MainApplication.getMenu()

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.HelpAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
@@ -187 +188 @@
 
     /**
-     * Replies the global help action, if available. Otherwise, creates an instance
-     * of {@link HelpAction}.
+     * Replies the global help action, if available. Otherwise, creates an instance of {@link HelpAction}.
      *
      * @return instance of help action
      */
     private static Action getHelpAction() {
-        if (Main.main != null && Main.main.menu != null) {
-            return Main.main.menu.help;
+        if (MainApplication.getMenu() != null) {
+            return MainApplication.getMenu().help;
         }
         return HelpAction.createWithoutShortcut();
@@ -202 +202 @@
      * Makes a component aware of context sensitive help.
      *
-     * A relative help topic doesn't start with /Help and doesn't include a locale
-     * code. Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor
-     * is not.
+     * A relative help topic doesn't start with /Help and doesn't include a locale code.
+     * Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor is not.
      *
      * @param component the component