Changeset 5857 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-04-14T18:23:10+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8561 - Integrate restart plugin into core. Asks for restart when needed.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestartAction.java (added)
• actions/ZoomToAction.java (modified) (1 diff)
• gui/MainMenu.java (modified) (3 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (3 diffs)
• plugins/PluginHandler.java (modified) (1 diff)

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -68 +68 @@
 import org.openstreetmap.josm.actions.PurgeAction;
 import org.openstreetmap.josm.actions.RedoAction;
+import org.openstreetmap.josm.actions.RestartAction;
 import org.openstreetmap.josm.actions.ReverseWayAction;
 import org.openstreetmap.josm.actions.SaveAction;
@@ -138 +139 @@
     public final JosmAction upload = new UploadAction();
     public final JosmAction uploadSelection = new UploadSelectionAction();
+    public final JosmAction restart = new RestartAction();
     public final JosmAction exit = new ExitAction();
 
@@ -454 +456 @@
         add(fileMenu, closeChangesetAction, true);
         fileMenu.addSeparator();
+        add(fileMenu, restart);
         add(fileMenu, exit);
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -29 +29 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.RestartAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference;
 import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
@@ -285 +288 @@
                 if (requiresRestart) {
                     sb.append(tr("You have to restart JOSM for some settings to take effect."));
+                    sb.append("<br/><br/>");
+                    sb.append(tr("Would you like to restart now?"));
                 }
                 sb.append("</html>");
@@ -290 +295 @@
                 // display the message, if necessary
                 //
-                if ((task != null && !task.isCanceled()) || requiresRestart) {
+                if (requiresRestart) {
+                    final ButtonSpec [] options = RestartAction.getButtonSpecs();
+                    if (0 == HelpAwareOptionPane.showOptionDialog(
+                            Main.parent,
+                            sb.toString(),
+                            tr("Restart"),
+                            JOptionPane.INFORMATION_MESSAGE,
+                            null, /* no special icon */
+                            options,
+                            options[0],
+                            null /* no special help */
+                            )) {
+                        Main.main.menu.restart.actionPerformed(null);
+                    }
+                } else if (task != null && !task.isCanceled()) {
                     JOptionPane.showMessageDialog(
                             Main.parent,

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -113 +113 @@
             new DeprecatedPlugin("epsg31287", tr("replaced by new {0} plugin", "proj4j")),
             new DeprecatedPlugin("licensechange", tr("no longer required")),
+            new DeprecatedPlugin("restart", IN_CORE)
         });
     }