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

Timestamp:

2006-04-25T00:11:38+02:00 (20 years ago)

Author:

imi

Message:

• added Applet version of JOSM (unfinished)
• fixed display bug if --no-fullscreen and --geometry was specified

File:

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

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

@@ -43 +43 @@
                 //TODO: Remove this in later versions (temporary only)
                 if (osmDataServer.endsWith("/0.2") || osmDataServer.endsWith("/0.2/")) {
-                        int answer = JOptionPane.showConfirmDialog(Main.main, 
+                        int answer = JOptionPane.showConfirmDialog(Main.parent, 
                                         "You seem to have an outdated server entry in your preferences.\n" +
                                         "\n" +
@@ -56 +56 @@
                 }
 
-                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);
+                if (!Main.map.conflictDialog.conflicts.isEmpty()) {
+                        JOptionPane.showMessageDialog(Main.parent, "There are unresolved conflicts. You have to resolve these first.");
+                        Main.map.conflictDialog.action.button.setSelected(true);
+                        Main.map.conflictDialog.action.actionPerformed(null);
                         return;
                 }
@@ -90 +90 @@
                         }
                         @Override protected void finish() {
-                                Main.main.getMapFrame().mapView.editLayer().cleanData(server.processed, !add.isEmpty());
+                                Main.main.editLayer().cleanData(server.processed, !add.isEmpty());
                         }
                         @Override protected void cancel() {
@@ -108 +108 @@
         private boolean displayUploadScreen(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update, Collection<OsmPrimitive> delete) {
                 if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.main, "No changes to upload.");
+                        JOptionPane.showMessageDialog(Main.parent, "No changes to upload.");
                         return false;
                 }
@@ -140 +140 @@
                 }
 
-                return JOptionPane.showConfirmDialog(Main.main, p, "Upload this changes?", 
+                return JOptionPane.showConfirmDialog(Main.parent, p, "Upload this changes?", 
                                 JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
         }