Changeset 3765 in josm for trunk/src/org

Timestamp:

2011-01-02T01:54:29+01:00 (14 years ago)

Author:

stoecker

Message:

fix help

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• ConflictDialog.java (modified) (3 diffs)
• ConflictResolutionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -259 +259 @@
     @Override
     public String helpTopic() {
-        return ht("/Dialogs/ConflictListDialog");
+        return ht("/Dialog/ConflictList");
     }
 
@@ -328 +328 @@
             putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
-            putValue("help", ht("/Dialogs/ConflictListDialog#ResolveAction"));
+            putValue("help", ht("/Dialog/ConflictList#ResolveAction"));
         }
 
@@ -348 +348 @@
             putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
-            putValue("help", ht("/Dialogs/ConflictListDialog#SelectAction"));
+            putValue("help", ht("/Dialog/ConflictList#SelectAction"));
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -170 +170 @@
 
         resolver.addPropertyChangeListener(this);
-        HelpUtil.setHelpContext(this.getRootPane(), "Dialog/ConflictDialog");
+        HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
 
         registerListeners();
@@ -212 +212 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            HelpBrowser.setUrlForHelpTopic("/Dialog/ConflictDialog");
+            HelpBrowser.setUrlForHelpTopic(ht("/Dialog/Conflict"));
         }
     }