Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

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

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

@@ -50 +50 @@
         if (!open) {
             File file = fc.getSelectedFile();
-            if (file == null || (file.exists() && 1 !=
-                new ExtendedDialog(Main.parent,
+            if (file != null && file.exists()) {
+                ExtendedDialog dialog = new ExtendedDialog(
+                        Main.parent,
                         tr("Overwrite"),
-                        tr("File exists. Overwrite?"),
-                        new String[] {tr("Overwrite"), tr("Cancel")},
-                        new String[] {"save_as.png", "cancel.png"}).getValue()))
-                return null;
+                        new String[] {tr("Overwrite"), tr("Cancel")}
+                );
+                dialog.setContent(tr("File exists. Overwrite?"));
+                dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
+                if (dialog.getValue() != 1)
+                    return null;
+            }
         }