Changeset 1004 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2008-09-22T03:53:47+02:00 (16 years ago)

Author:

framm

Message:

• display a confirmation request if user tries to delete data outside downloaded area (can be don't-show-again'd). Note this feature is not a hard measure but needs to be actively requested by the component making the deletion, so it is possible that plugins deleting data do not honour this. Also, this currently only affects deleting, not otherwise modifying stuff outside of the box.

File:

• trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java

@@ -17 +17 @@
 
         public static boolean show(String prefKey, String msg) {
-                return show(prefKey, new JLabel(msg), true);
+                return show(prefKey, new JLabel(msg), true, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
         }
 
         public static boolean show(String prefKey, String msg, Boolean state) {
-                return show(prefKey, new JLabel(msg), state);
+                return show(prefKey, new JLabel(msg), state, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
         }
 
         public static boolean show(String prefKey, Container msg) {
-                return show(prefKey, msg, true);
+                return show(prefKey, msg, true, JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_OPTION);
         }
 
-        public static boolean show(String prefKey, Container msg, Boolean state) {
+        public static boolean show(String prefKey, Container msg, Boolean state, int options, int true_option) {
                 if (!Main.pref.getBoolean("message."+prefKey)) {
                         JCheckBox dontshowagain = new JCheckBox(tr("Do not show again"));
@@ -35 +35 @@
                         all.add(msg, GBC.eop());
                         all.add(dontshowagain, GBC.eol());
-                        int answer = JOptionPane.showConfirmDialog(Main.parent, all, tr("Information"), JOptionPane.OK_CANCEL_OPTION);
-                        if (answer != JOptionPane.OK_OPTION)
+                        int answer = JOptionPane.showConfirmDialog(Main.parent, all, tr("Information"), options);
+                        if (answer != true_option)
                                 return false;
                         Main.pref.put("message."+prefKey, dontshowagain.isSelected());