summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2014-10-29 18:02:44 -0400
committerJoe George <joe@zeroc.com>2014-10-29 18:05:38 -0400
commit256207c5537d53a6db568fc3efa4b3dba606fa6e (patch)
tree567b007d5074ae50f69742ad2b21c40722db56ad /java/src
parentFixed (ICE-5761) - Remove jgoodies jars from TP installers (diff)
downloadice-256207c5537d53a6db568fc3efa4b3dba606fa6e.tar.bz2
ice-256207c5537d53a6db568fc3efa4b3dba606fa6e.tar.xz
ice-256207c5537d53a6db568fc3efa4b3dba606fa6e.zip
ICE-5799 - Replace BareBonesBrowserLaunch with Desktop.browse
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Freeze/Freeze.iml2
-rw-r--r--java/src/Glacier2/Glacier2.iml2
-rw-r--r--java/src/Ice/Ice.iml2
-rw-r--r--java/src/IceGrid/IceGrid.iml2
-rw-r--r--java/src/IceGridGUI/IceGridGUI.iml2
-rw-r--r--java/src/IceGridGUI/src/main/java/IceGridGUI/BareBonesBrowserLaunch.java53
-rw-r--r--java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java20
-rw-r--r--java/src/ant/ant.iml2
8 files changed, 25 insertions, 60 deletions
diff --git a/java/src/Freeze/Freeze.iml b/java/src/Freeze/Freeze.iml
index 3d70bf38cdc..c93cb2bf99c 100644
--- a/java/src/Freeze/Freeze.iml
+++ b/java/src/Freeze/Freeze.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
diff --git a/java/src/Glacier2/Glacier2.iml b/java/src/Glacier2/Glacier2.iml
index e3335a7fadf..f8034e9f0b6 100644
--- a/java/src/Glacier2/Glacier2.iml
+++ b/java/src/Glacier2/Glacier2.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
diff --git a/java/src/Ice/Ice.iml b/java/src/Ice/Ice.iml
index 3324833a537..577b1eae9a4 100644
--- a/java/src/Ice/Ice.iml
+++ b/java/src/Ice/Ice.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
diff --git a/java/src/IceGrid/IceGrid.iml b/java/src/IceGrid/IceGrid.iml
index 9f296914f7a..87fb5038f16 100644
--- a/java/src/IceGrid/IceGrid.iml
+++ b/java/src/IceGrid/IceGrid.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
diff --git a/java/src/IceGridGUI/IceGridGUI.iml b/java/src/IceGridGUI/IceGridGUI.iml
index a63ce28d68f..7c4755df98b 100644
--- a/java/src/IceGridGUI/IceGridGUI.iml
+++ b/java/src/IceGridGUI/IceGridGUI.iml
@@ -5,8 +5,8 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/BareBonesBrowserLaunch.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/BareBonesBrowserLaunch.java
deleted file mode 100644
index af6b0e0a5e3..00000000000
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/BareBonesBrowserLaunch.java
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// From http://www.centerkey.com/java/browser
-//
-
-////////////////////////////////////////////////////////
-// Bare Bones Browser Launch //
-// Version 1.1 //
-// July 8, 2005 //
-// Supports: Mac OS X, GNU/Linux, Unix, Windows XP //
-// Example Usage: //
-// String url = "http://www.centerkey.com/"; //
-// BareBonesBrowserLaunch.openURL(url); //
-// Public Domain Software -- Free to Use as You Like //
-////////////////////////////////////////////////////////
-
-package IceGridGUI;
-
-import java.lang.reflect.Method;
-import javax.swing.JOptionPane;
-
-public class BareBonesBrowserLaunch {
-
- private static final String errMsg = "Error attempting to launch web browser";
-
- public static void openURL(String url) {
- String osName = System.getProperty("os.name");
- try {
- if (osName.startsWith("Mac OS")) {
- Class<?> macUtils = Class.forName("com.apple.mrj.MRJFileUtils");
- Method openURL = macUtils.getDeclaredMethod("openURL", String.class);
- openURL.invoke(null, url);
- }
- else if (osName.startsWith("Windows"))
- Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
- else { //assume Unix or Linux
- String[] browsers = {
- "google-chrome", "firefox", "opera", "konqueror", "mozilla", "netscape" };
- String browser = null;
- for (int count = 0; count < browsers.length && browser == null; count++)
- if (Runtime.getRuntime().exec(
- new String[] {"which", browsers[count]}).waitFor() == 0)
- browser = browsers[count];
- if (browser == null)
- throw new Exception("Could not find web browser.");
- else
- Runtime.getRuntime().exec(new String[] {browser, url});
- }
- }
- catch (Exception e) {
- JOptionPane.showMessageDialog(null, errMsg + ":\n" + e.getLocalizedMessage());
- }
- }
-}
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java
index 73d5fdb8310..5e04d66c0fc 100644
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java
@@ -10,6 +10,7 @@
package IceGridGUI;
import java.lang.reflect.Constructor;
+import java.net.URI;
import java.util.prefs.Preferences;
import java.util.prefs.BackingStoreException;
import java.util.Enumeration;
@@ -3347,7 +3348,24 @@ public class Coordinator
}
String version = Ice.Util.stringVersion().substring(0, pos);
- BareBonesBrowserLaunch.openURL("http://doc.zeroc.com/display/Rel/Ice+" + version + "+IceGrid+Admin");
+
+ Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
+ if(desktop != null && desktop.isSupported(Desktop.Action.BROWSE))
+ {
+ try
+ {
+ desktop.browse(new URI("http://doc.zeroc.com/display/Rel/Ice+" + version + "+IceGrid+Admin"));
+ }
+ catch(Exception e)
+ {
+ JOptionPane.showMessageDialog(null,
+ "Error attempting to launch web browser" + ":\n" + e.getLocalizedMessage());
+ }
+ }
+ else
+ {
+ JOptionPane.showMessageDialog(null,"Launching a browser is not supported on your platform.");
+ }
}
private void about()
diff --git a/java/src/ant/ant.iml b/java/src/ant/ant.iml
index 2a29fbd915d..377cc1519bd 100644
--- a/java/src/ant/ant.iml
+++ b/java/src/ant/ant.iml
@@ -6,8 +6,8 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 22:41:16 +0000