diff options
| author | Jose <jose@zeroc.com> | 2015-06-12 13:26:48 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-06-12 13:26:48 +0200 |
| commit | f66f17f22992ad799f7b651af9f48176f3096bf8 (patch) | |
| tree | c011f656648ca9413f391de56292e9ec5c8bf80a /java/src | |
| parent | renaming Release Notes page (diff) | |
| download | ice-f66f17f22992ad799f7b651af9f48176f3096bf8.tar.bz2 ice-f66f17f22992ad799f7b651af9f48176f3096bf8.tar.xz ice-f66f17f22992ad799f7b651af9f48176f3096bf8.zip | |
Fixed ICE-6590: IceGridAdmin.app doesn't work on OS X
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java | 2 | ||||
| -rw-r--r-- | java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java index ee5ef16687c..f6e11f4a0c0 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java @@ -23,7 +23,7 @@ public class Fallback extends javax.swing.JApplet java.util.List<String> command = new java.util.ArrayList<String>(); command.add("java"); command.add("-cp"); - command.add(jar.getPath()); + command.add(jar.toURI().getPath()); command.add("IceGridGUI.Main"); String[] args = MainProxy.args(); diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java index 3c571ffaeb1..237b2b5411e 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java @@ -23,7 +23,7 @@ public class MainProxy String version = System.getProperty("java.version"); Class<?> cls = IceInternal.Util.findClass("com.javafx.main.Main", null); - if(cls != null) + if(cls != null && version.indexOf("1.7") == 0) { try { |