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

Timestamp:

2006-04-21T20:05:14+02:00 (18 years ago)

Author:

imi

Message:

• fixed that toggle dialog buttons are sync with the dialogs
• added search for timestamp (e.g. timestamp:06-3-25)

File:

• src/org/openstreetmap/josm/actions/UploadAction.java (modified) (1 diff)

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

@@ -53 +53 @@
                         int cutPos = osmDataServer.endsWith("/0.2") ? 4 : 5;
                         Main.pref.put("osm-server.url", osmDataServer.substring(0, osmDataServer.length()-cutPos));
+                }
+                
+                if (!Main.main.getMapFrame().conflictDialog.conflicts.isEmpty()) {
+                        JOptionPane.showMessageDialog(Main.main, "There are unresolved conflicts. You have to resolve these first.");
+                        Main.main.getMapFrame().conflictDialog.action.button.setSelected(true);
+                        Main.main.getMapFrame().conflictDialog.action.actionPerformed(null);
+                        return;
                 }