Changeset 11093 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-10-07T21:55:54+02:00 (8 years ago)

Author:

simon04

Message:

fix #13320 - Use restart text and icon in unsaved changes dialog

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DeleteLayerAction.java (modified) (2 diffs)
• ExitAction.java (modified) (1 diff)
• RestartAction.java (modified) (3 diffs)

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -34 +35 @@
             return;
         }
-        if (!Main.saveUnsavedModifications(Collections.singletonList(activeLayer), false)) {
+        if (!SaveLayersDialog.saveUnsavedModifications(Collections.singletonList(activeLayer), SaveLayersDialog.Reason.DELETE)) {
             return;
         }

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

@@ -28 +28 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.exitJosm(true, 0);
+        Main.exitJosm(true, 0, null);
     }
 }

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

@@ -17 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -59 +60 @@
         String scriptRestart = System.getProperty("josm.restart");
         if ("true".equals(scriptRestart)) {
-            Main.exitJosm(true, 9);
+            Main.exitJosm(true, 9, SaveLayersDialog.Reason.RESTART);
         }
 
@@ -83 +84 @@
      */
     public static void restartJOSM() throws IOException {
-        if (isRestartSupported() && !Main.exitJosm(false, 0)) return;
+        if (isRestartSupported() && !Main.exitJosm(false, 0, SaveLayersDialog.Reason.RESTART)) return;
         final List<String> cmd;
         // special handling for OSX .app package