Changeset 8713 in josm

Timestamp:

2015-09-01T22:04:50+02:00 (10 years ago)

Author:

simon04

Message:

see #11428 - Overpass Download: make help work

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OverpassDownloadAction.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java

@@ -86 +86 @@
 
         private OverpassDownloadDialog(Component parent) {
-            super(parent);
+            super(parent, ht("/Action/OverpassDownload"));
             cbDownloadOsmData.setEnabled(false);
             cbDownloadOsmData.setSelected(false);

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -209 +209 @@
         // -- help button
         SideButton btnHelp;
-        pnl.add(btnHelp = new SideButton(new ContextSensitiveHelpAction(ht("/Action/Download"))));
+        pnl.add(btnHelp = new SideButton(new ContextSensitiveHelpAction(getRootPane().getClientProperty("help").toString())));
         InputMapUtils.enableEnter(btnHelp);
 
@@ -220 +220 @@
      */
     public DownloadDialog(Component parent) {
+        this(parent, ht("/Action/Download"));
+    }
+
+    /**
+     * Constructs a new {@code DownloadDialog}.
+     * @param parent the parent component
+     * @param helpTopic the help topic to assign
+     */
+    public DownloadDialog(Component parent, String helpTopic) {
         super(JOptionPane.getFrameForComponent(parent), tr("Download"), ModalityType.DOCUMENT_MODAL);
+        HelpUtil.setHelpContext(getRootPane(), helpTopic);
         getContentPane().setLayout(new BorderLayout());
         getContentPane().add(buildMainPanel(), BorderLayout.CENTER);
@@ -241 +251 @@
             }
         });
-        HelpUtil.setHelpContext(getRootPane(), ht("/Action/Download"));
         addWindowListener(new WindowEventHandler());
         restoreSettings();