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

Timestamp:

2009-10-11T22:50:48+02:00 (15 years ago)

Author:

Gubaer

Message:

Using java instead of javaw for launching external help browser on non-windows OS

Location:

trunk/src/org/openstreetmap/josm/gui/help

Files:

• HelpBrowser.java (modified) (2 diffs)
• HelpBrowserProxy.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -37 +36 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.WikiReader;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 public class HelpBrowser extends JFrame {

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java

@@ -3 +3 @@
 
 import java.io.File;
+import static org.openstreetmap.josm.tools.I18n.tr;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -45 +50 @@
             javaBin = "javaw.exe";
         } else {
-            javaBin = "javaw";
+            javaBin = "java";
         }
         cmdLine.add(new File(new File(System.getProperty("java.home"), "bin"), javaBin).toString());
@@ -61 +66 @@
             e.printStackTrace();
         }
-        pw = new PrintWriter(
-                new OutputStreamWriter(
-                        helpBrowserProcess.getOutputStream()
-                )
-        );
+        if (helpBrowserProcess != null) {
+            pw = new PrintWriter(
+                    new OutputStreamWriter(
+                            helpBrowserProcess.getOutputStream()
+                    )
+            );
+        }
     }
 
@@ -79 +86 @@
         }
         if (helpBrowserProcess == null) {
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("Failed to launch the external help browser"),
+                    tr("Error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
             System.err.println("Failed to launch browser");
             return;