Changeset 5951 in josm for trunk/src

Timestamp:

2013-05-10T04:24:25+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8697 - Disable restart action with JVMs that do not provide sun.java.command system property (ex: JDK 6u24)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestartAction.java (modified) (3 diffs)
• gui/HelpAwareOptionPane.java (modified) (2 diffs)

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

@@ -37 +37 @@
         putValue("toolbar", "action/restart");
         Main.toolbar.register(this);
+        setEnabled(isRestartSupported());
     }
 
@@ -48 +49 @@
     
     /**
+     * Determines if restartting the application should be possible on this platform.
+     * @return {@code true} if the mandatory system property {@code sun.java.command} is defined, {@code false} otherwise.
+     * @since 5951
+     */
+    public static boolean isRestartSupported() {
+        return System.getProperty("sun.java.command") != null;
+    }
+    
+    /**
      * Restarts the current Java application
      * @throws IOException
      */
     public static void restartJOSM() throws IOException {
-        if (!Main.exitJosm(false)) return;
+        if (isRestartSupported() && !Main.exitJosm(false)) return;
         try {
             // java binary
@@ -108 +118 @@
                 ImageProvider.get("restart"),
                 tr("Restart the application."),
-                ht("/Action/Restart")
+                ht("/Action/Restart"),
+                isRestartSupported()
         );
     }

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

@@ -33 +33 @@
 
     public static class ButtonSpec {
-        public String text;
-        public Icon icon;
-        public String tooltipText;
-        public String helpTopic;
-
+        public final String text;
+        public final Icon icon;
+        public final String tooltipText;
+        public final String helpTopic;
+        public final boolean enabled;
+       
         /**
-         *
-         * @param text  the button text
-         * @param icon  the icon to display. Can be null
-         * @param tooltipText  the tooltip text. Can be null.
+         * Constructs a new {@code ButtonSpec}.
+         * @param text the button text
+         * @param icon the icon to display. Can be null
+         * @param tooltipText the tooltip text. Can be null.
          * @param helpTopic the help topic. Can be null.
          */
         public ButtonSpec(String text, Icon icon, String tooltipText, String helpTopic) {
+            this(text, icon, tooltipText, helpTopic, true);
+        }
+
+        /**
+         * Constructs a new {@code ButtonSpec}.
+         * @param text the button text
+         * @param icon the icon to display. Can be null
+         * @param tooltipText the tooltip text. Can be null.
+         * @param helpTopic the help topic. Can be null.
+         * @param enabled the enabled status
+         * @since 5951
+         */
+        public ButtonSpec(String text, Icon icon, String tooltipText, String helpTopic, boolean enabled) {
             this.text = text;
             this.icon = icon;
             this.tooltipText = tooltipText;
             this.helpTopic = helpTopic;
+            this.enabled = enabled;
         }
     }
@@ -95 +110 @@
                 }
                 b.setFocusable(true);
+                b.setEnabled(spec.enabled);
                 buttons.add(b);
             }