diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/BareBonesBrowserLaunch.java | 2 | ||||
| -rw-r--r-- | java/src/IceGridGUI/Coordinator.java | 46 |
2 files changed, 8 insertions, 40 deletions
diff --git a/java/src/IceGridGUI/BareBonesBrowserLaunch.java b/java/src/IceGridGUI/BareBonesBrowserLaunch.java index 6900313af0c..af6b0e0a5e3 100644 --- a/java/src/IceGridGUI/BareBonesBrowserLaunch.java +++ b/java/src/IceGridGUI/BareBonesBrowserLaunch.java @@ -34,7 +34,7 @@ public class BareBonesBrowserLaunch { Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url); else { //assume Unix or Linux String[] browsers = { - "firefox", "opera", "konqueror", "mozilla", "netscape" }; + "google-chrome", "firefox", "opera", "konqueror", "mozilla", "netscape" }; String browser = null; for (int count = 0; count < browsers.length && browser == null; count++) if (Runtime.getRuntime().exec( diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index 4f62ca5a81e..3bd3c65a37b 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -3153,47 +3153,15 @@ public class Coordinator private void helpContents() { - if(System.getProperty("os.name").startsWith("Windows")) + int pos = Ice.Util.stringVersion().indexOf('b'); + if(pos == -1) { - java.net.URL url = ClassLoader.getSystemResource("IceGridAdmin.chm"); - if(url != null) - { - // - // Get rid of the leading "/" - // - String path = url.getPath().substring(1); - try - { - path = java.net.URLDecoder.decode(path, "UTF-8"); - } - catch(java.io.UnsupportedEncodingException ex) - { - } - try - { - Runtime.getRuntime().exec("hh.exe " + path); - return; // success - } - catch(java.io.IOException ex) - { - _initData.logger.warning(ex.toString()); - } - } - } - - // - // Otherwise, browser based-help - // - java.net.URL url = ClassLoader.getSystemResource("IceGridAdmin/index.html"); - if(url != null) - { - BareBonesBrowserLaunch.openURL(url.toString()); - } - else - { - BareBonesBrowserLaunch.openURL("http://www.zeroc.com/doc/Ice-" - + Ice.Util.stringVersion() + "/IceGridAdmin/index.html"); + pos = Ice.Util.stringVersion().lastIndexOf('.'); + assert(pos != -1); } + + String version = Ice.Util.stringVersion().substring(0, pos); + BareBonesBrowserLaunch.openURL("http://doc.zeroc.com/display/Rel/Ice+" + version + "+IceGrid+Admin"); } private void about() |