Changeset 2301 in josm for trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

Timestamp:

2009-10-24T07:30:45+02:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3765: Unable to resolve conflict
Improved warning message for conflicting relation versions and added help page

File:

• trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) (2 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
-import org.openstreetmap.josm.gui.help.HelpBuilder;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -218 +218 @@
         if (showHelpButton) {
             buttonsPanel.add(new JButton(new HelpAction()), GBC.std().insets(2,2,2,2));
-            HelpBuilder.setHelpContext(getRootPane(),helpTopic);
+            HelpUtil.setHelpContext(getRootPane(),helpTopic);
         }