diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-09-13 16:02:17 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-09-13 16:02:17 -0400 |
| commit | 5fcf890c71268e35b68462838ca892c2ec6b16a7 (patch) | |
| tree | c1930cc5ac7208e6cef94d1cda2540ef4b5c74cb /java/src | |
| parent | Fixed C++11 relational operators build failure with GCC 6 (diff) | |
| parent | Removed double About on OS X (diff) | |
| download | ice-5fcf890c71268e35b68462838ca892c2ec6b16a7.tar.bz2 ice-5fcf890c71268e35b68462838ca892c2ec6b16a7.tar.xz ice-5fcf890c71268e35b68462838ca892c2ec6b16a7.zip | |
Merge remote-tracking branch 'origin/3.6'
Fixed IceGridGUI app launching on macOS
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/build.gradle | 2 | ||||
| -rw-r--r-- | java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index 45a609ae86f..9096d659375 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -201,7 +201,7 @@ if(macosx) icon: "${projectDir}/src/main/resources/icons/icegrid.icns", shortversion: "${project.version}", applicationCategory: "public.app-category.utilities", - mainclassname: "IceGridGUI/MainProxy", + mainclassname: "com.zeroc.IceGridGUI/MainProxy", copyright: "Copyright © 2005-2016 ZeroC, Inc. All rights reserved.") { classpath(file: "${libDir}/${jarName}") { } diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java index 91fdd166b0b..8bbd0625ac1 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java @@ -507,8 +507,11 @@ public class Coordinator helpMenu.add(_helpContents); - helpMenu.addSeparator(); - helpMenu.add(_about); + if(!System.getProperty("os.name").startsWith("Mac OS")) + { + helpMenu.addSeparator(); + helpMenu.add(_about); + } } } @@ -3260,14 +3263,19 @@ public class Coordinator private void helpContents() { - int pos = com.zeroc.Ice.Util.stringVersion().indexOf('b'); + String version = com.zeroc.Ice.Util.stringVersion(); + + int pos = version.indexOf('a'); if(pos == -1) { - pos = com.zeroc.Ice.Util.stringVersion().lastIndexOf('.'); - assert(pos != -1); + pos = version.indexOf('b'); } - String version = com.zeroc.Ice.Util.stringVersion().substring(0, pos); + if(pos != -1) + { + // 3.7a3 or 3.7b1 becomes simply 3.7 + version = version.substring(0, pos); + } Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; if(desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) |