Changeset 34221 in osm for applications

Timestamp:

2018-05-27T03:45:50+02:00 (6 years ago)

Author:

donvip

Message:

fix #josm16094 - abort "open custom url" action when dialog is canceled

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl

Files:

• ChooseURLAction.java (modified) (2 diffs)
• OpenPageAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java

@@ -38 +38 @@
     }
 
-    public static void showConfigDialog(final boolean fast) {
+    public static int showConfigDialog(final boolean fast) {
         JPanel all = new JPanel(new GridBagLayout());
 
@@ -78 +78 @@
         all.add(check1, GBC.eop().fill(GBC.HORIZONTAL).insets(5, 5, 0, 0));
 
-
-        dialog.setContent(all, false);
-        dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
-        dialog.setDefaultButton(1);
-        dialog.showDialog();
+        int ret = dialog.setContent(all, false)
+              .setButtonIcons(new String[] {"ok", "cancel"})
+              .setDefaultButton(1)
+              .showDialog()
+              .getValue();
 
         int idx = list1.getSelectedIndex();
-        if (dialog.getValue() == 1 && idx >= 0) {
+        if (ret == 1 && idx >= 0) {
             URLList.select(vals[idx]);
             Main.pref.putBoolean("utilsplugin2.askurl", check1.isSelected());
         }
+        return ret;
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java

@@ -50 +50 @@
         }
 
-        if (Main.pref.getBoolean("utilsplugin2.askurl", false) == true)
-            ChooseURLAction.showConfigDialog(true);
+        if (Main.pref.getBoolean("utilsplugin2.askurl", false) && 1 != ChooseURLAction.showConfigDialog(true)) {
+            return;
+        }
 
         MapView mv = MainApplication.getMap().mapView;