Changeset 745 in josm for trunk

Timestamp:

2008-08-04T16:51:56+02:00 (16 years ago)

Author:

stoecker

Message:

added security check for layer deletion. Fixes #262

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/LayerListDialog.java (modified) (2 diffs)
• tools/DontShowAgainInfo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -22 +22 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -69 +70 @@
                         int sel = instance.getSelectedIndex();
                         Layer l = layer != null ? layer : (Layer)instance.getSelectedValue();
-                        if (l instanceof OsmDataLayer && !DontShowAgainInfo.show("delete_layer", tr("Do you really want to delete the whole layer?")))
-                                return;
+                        if (l instanceof OsmDataLayer)
+                        {
+                                if (((OsmDataLayer)l).isModified())
+                                {
+                                        if(JOptionPane.showConfirmDialog(instance, tr("There are unsaved changes. Delete the layer anwyay?"),
+                                        tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION)
+                                                return;
+                                }
+                                else if(!DontShowAgainInfo.show("delete_layer", tr("Do you really want to delete the whole layer?"), false))
+                                        return;
+                        }
                         Main.main.removeLayer(l);
                         if (sel >= instance.getModel().getSize())

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

@@ -17 +17 @@
 
         public static boolean show(String prefKey, String msg) {
-                return show(prefKey, new JLabel(msg));
+                return show(prefKey, new JLabel(msg), true);
+        }
+
+        public static boolean show(String prefKey, String msg, Boolean state) {
+                return show(prefKey, new JLabel(msg), state);
         }
 
         public static boolean show(String prefKey, Container msg) {
+                return show(prefKey, msg, true);
+        }
+
+        public static boolean show(String prefKey, Container msg, Boolean state) {
                 if (!Main.pref.getBoolean("message."+prefKey)) {
                         JCheckBox dontshowagain = new JCheckBox(tr("Do not show again"));
-                        dontshowagain.setSelected(Main.pref.getBoolean("message."+prefKey, true));
+                        dontshowagain.setSelected(Main.pref.getBoolean("message."+prefKey, state));
                         JPanel all = new JPanel(new GridBagLayout());
                         all.add(msg, GBC.eop());