Fixed (ICE-5544) - IceGrid admin and Ubuntu launcher

1 files changed, 25 insertions, 29 deletions

diff --git a/java/src/IceGridGUI/MainProxy.java b/java/src/IceGridGUI/MainProxy.java
index e7c24fb2eb6..dd681dcb9ba 100644
--- a/java/src/IceGridGUI/MainProxy.java
+++ b/java/src/IceGridGUI/MainProxy.java
@@ -22,37 +22,33 @@ public class MainProxy
         
         String version =  System.getProperty("java.version");
         
-        Class<?> cls = null;
-        if(version.startsWith("1.7"))
+        Class<?> cls = IceInternal.Util.findClass("com.javafx.main.Main", null);
+        if(cls != null)
         {
-            cls = IceInternal.Util.findClass("com.javafx.main.Main", null);
-            if(cls != null)
+            try
+            {
+                java.lang.reflect.Method main = cls.getMethod("main", new Class[]{String[].class});
+                main.invoke(null, new Object[]{args});
+                return;
+            }
+            catch(NoSuchMethodException ex)
+            {
+                ex.printStackTrace();
+                JOptionPane.showMessageDialog(null, 
+                                            "Unable to find method `main(String[] args)' in class `com.javafx.main.Main'",
+                                            "IceGrid Admin Error", 
+                                            JOptionPane.ERROR_MESSAGE);
+            }
+            catch(IllegalAccessException ex)
+            {
+                ex.printStackTrace();
+                JOptionPane.showMessageDialog(null, 
+                                            "IllegalAccessException invoking method `main(String[] args)' in class `com.javafx.main.Main'",
+                                            "IceGrid Admin Error", 
+                                            JOptionPane.ERROR_MESSAGE);
+            }
+            catch(java.lang.reflect.InvocationTargetException ex)
             {
-                try
-                {
-                    java.lang.reflect.Method main = cls.getMethod("main", new Class[]{String[].class});
-                    main.invoke(null, new Object[]{args});
-                    return;
-                }
-                catch(NoSuchMethodException ex)
-                {
-                    ex.printStackTrace();
-                    JOptionPane.showMessageDialog(null, 
-                                                "Unable to find method `main(String[] args)' in class `com.javafx.main.Main'",
-                                                "IceGrid Admin Error", 
-                                                JOptionPane.ERROR_MESSAGE);
-                }
-                catch(IllegalAccessException ex)
-                {
-                    ex.printStackTrace();
-                    JOptionPane.showMessageDialog(null, 
-                                                "IllegalAccessException invoking method `main(String[] args)' in class `com.javafx.main.Main'",
-                                                "IceGrid Admin Error", 
-                                                JOptionPane.ERROR_MESSAGE);
-                }
-                catch(java.lang.reflect.InvocationTargetException ex)
-                {
-                }
             }
         }
         cls = IceInternal.Util.findClass("IceGridGUI.Main", null);