Changeset 7862 in josm for trunk

Timestamp:

2014-12-20T21:12:00+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10858 - fix problematic help topics

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (2 diffs)
• dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• help/HelpUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -120 +120 @@
      * The MapView this status belongs to.
      */
-    final MapView mv;
-    final Collector collector;
+    private final MapView mv;
+    private final Collector collector;
 
     public class BackgroundProgressMonitor implements ProgressMonitorDialog {
@@ -902 +902 @@
     @Override
     public String helpTopic() {
-        return ht("/Statusline");
+        return ht("/StatusBar");
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -85 +85 @@
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.PresetHandler;
@@ -234 +235 @@
                 Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
                         Shortcut.ALT_SHIFT), 150, true);
+
+        HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/TagsMembership"));
 
         setupTagsMenu();

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

@@ -152 +152 @@
     /**
      * Replies the context specific help topic configured for <code>context</code>.
+     * @param context The UI object used as context
      *
      * @return the help topic. null, if no context specific help topic is found
@@ -201 +202 @@
      * is not.
      *
-     * @param component the component  the component
+     * @param component the component
      * @param relativeHelpTopic the help topic. Set to the default help topic if null.
      */
     public static void setHelpContext(JComponent component, String relativeHelpTopic) {
-        if (relativeHelpTopic == null) {
-            relativeHelpTopic = "/";
-        }
         component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("F1"), "help");
         component.getActionMap().put("help", getHelpAction());
-        component.putClientProperty("help", relativeHelpTopic);
+        component.putClientProperty("help", relativeHelpTopic == null ? "/" : relativeHelpTopic);
     }