Changeset 7862 in josm


Ignore:
Timestamp:
2014-12-20T21:12:00+01:00 (5 years ago)
Author:
Don-vip
Message:

fix #10858 - fix problematic help topics

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r7714 r7862  
    120120     * The MapView this status belongs to.
    121121     */
    122     final MapView mv;
    123     final Collector collector;
     122    private final MapView mv;
     123    private final Collector collector;
    124124
    125125    public class BackgroundProgressMonitor implements ProgressMonitorDialog {
     
    902902    @Override
    903903    public String helpTopic() {
    904         return ht("/Statusline");
     904        return ht("/StatusBar");
    905905    }
    906906
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r7668 r7862  
    8585import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
    8686import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
     87import org.openstreetmap.josm.gui.help.HelpUtil;
    8788import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    8889import org.openstreetmap.josm.gui.tagging.PresetHandler;
     
    234235                Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
    235236                        Shortcut.ALT_SHIFT), 150, true);
     237
     238        HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/TagsMembership"));
    236239
    237240        setupTagsMenu();
  • trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java

    r7509 r7862  
    152152    /**
    153153     * Replies the context specific help topic configured for <code>context</code>.
     154     * @param context The UI object used as context
    154155     *
    155156     * @return the help topic. null, if no context specific help topic is found
     
    201202     * is not.
    202203     *
    203      * @param component the component  the component
     204     * @param component the component
    204205     * @param relativeHelpTopic the help topic. Set to the default help topic if null.
    205206     */
    206207    public static void setHelpContext(JComponent component, String relativeHelpTopic) {
    207         if (relativeHelpTopic == null) {
    208             relativeHelpTopic = "/";
    209         }
    210208        component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("F1"), "help");
    211209        component.getActionMap().put("help", getHelpAction());
    212         component.putClientProperty("help", relativeHelpTopic);
     210        component.putClientProperty("help", relativeHelpTopic == null ? "/" : relativeHelpTopic);
    213211    }
    214212
Note: See TracChangeset for help on using the changeset viewer.