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

Timestamp:

2009-10-24T07:30:45+02:00 (15 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/io/UploadDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
-import org.openstreetmap.josm.gui.help.HelpBuilder;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
@@ -194 +194 @@
 
         pnl.add(new SideButton(new ContextSensitiveHelpAction("/Help/Dialogs/UploadDialog")));
-        HelpBuilder.setHelpContext(getRootPane(),"/Help/Dialogs/UploadDialog");
+        HelpUtil.setHelpContext(getRootPane(),"/Help/Dialogs/UploadDialog");
         return pnl;
     }