Changeset 1857 in josm for trunk/src/org/openstreetmap/josm/actions/UploadAction.java

Timestamp:

2009-07-26T22:52:23+02:00 (15 years ago)

Author:

Gubaer

Message:

replaced JOptionDialog.show... by OptionPaneUtil.show....
improved relation editor

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (2 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -174 +175 @@
         ConflictCollection conflicts = Main.map.mapView.getEditLayer().getConflicts();
         if (conflicts !=null && !conflicts.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first."));
+            OptionPaneUtil.showMessageDialog(
+                    Main.parent,
+                    tr("There are unresolved conflicts. You have to resolve these first."),
+                    tr("Warning"),
+                    JOptionPane.WARNING_MESSAGE
+            );
             Main.map.conflictDialog.action.button.setSelected(true);
             Main.map.conflictDialog.action.actionPerformed(null);