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

Timestamp:

2009-09-03T01:00:52+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #2905: patch by xeen: Add option to disable the new "Move elements" dialog)

File:

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

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

@@ -487 +487 @@
 
             while(true) {
-                int result = new ExtendedDialog(Main.parent,
+                ExtendedDialog dialog = new ExtendedDialog(
+                        Main.parent,
                         tr("Upload these changes?"),
-                        p,
-                        new String[] {tr("Upload Changes"), tr("Cancel")},
-                        new String[] {"upload.png", "cancel.png"}).getValue();
+                        new String[] {tr("Upload Changes"), tr("Cancel")}
+                );
+                dialog.setButtonIcons(new String[] {"upload.png", "cancel.png"});
+                dialog.setContent(p);
+                dialog.showDialog();
+                int result = dialog.getValue();
+
 
                 // cancel pressed