Turned off the use of Quaqua in Mac OS (it is no longer being develop…

…ed and has issues in Java 10).
beast-dev · Aug 9, 2018 · 83f724d · 83f724d
1 parent e38b662
commit 83f724d
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 51 deletions.
diff --git a/build.xml b/build.xml
@@ -320,7 +320,7 @@
     <property name="version" value="1.9"/>
      -->
     <property name="version" value="1.10.1"/>
-    <property name="jvm_version" value="1.6+"/>
+    <property name="jvm_version" value="1.7+"/>
 
     <property name="version_number" value="1.10.1"/>
     <property name="copyright" value="Copyright 2002-2018"/>

diff --git a/release/Mac/lib/libquaqua64.dylib b/release/Mac/lib/libquaqua64.dylib
diff --git a/release/Mac/lib/libquaqua64.jnilib b/release/Mac/lib/libquaqua64.jnilib
diff --git a/release/Mac/lib/quaqua.jar b/release/Mac/lib/quaqua.jar
diff --git a/src/dr/app/beauti/BeautiApp.java b/src/dr/app/beauti/BeautiApp.java
@@ -170,58 +170,64 @@ static public void main(String[] args) {
             System.setProperty("swing.aatext", "true");
 
             System.setProperty("apple.awt.graphics.UseQuartz", "true");
-            System.setProperty("apple.awt.antialiasing","true");
-            System.setProperty("apple.awt.rendering","VALUE_RENDER_QUALITY");
-
-            System.setProperty("apple.laf.useScreenMenuBar","true");
-            System.setProperty("apple.awt.draggableWindowBackground","true");
-            System.setProperty("apple.awt.showGrowBox","true");
-
-            try {
-                // set the Quaqua Look and Feel in the UIManager
-                javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
-                    public void run() {
-                        try {
-                            System.setProperty(
-                                    "Quaqua.design","Sierra"
-                            );
+            System.setProperty("apple.awt.antialiasing", "true");
+            System.setProperty("apple.awt.rendering", "VALUE_RENDER_QUALITY");
 
-                            try {
-                                // We need to do this using dynamic class loading to avoid other platforms
-                                // having to link to this class. If the Quaqua library is not on the classpath
-                                // it simply won't be used.
-                                Class<?> qm = Class.forName("ch.randelshofer.quaqua.QuaquaManager");
-//
-//                                Method method = qm.getMethod("setIncludedUIs", Set.class);
-//                                Set<String> includes = new HashSet<String>();
-//                                includes.add("ColorChooser");
-//                                includes.add("FileChooser");
-//                                includes.add("Button");
-//                                includes.add("SplitPane");
-//                                includes.add("Table");
-//                                includes.add("Panel");
-//                                method.invoke(null, includes);
-
-                                Method method = qm.getMethod("setExcludedUIs", Set.class);
-                                Set<String> excludes = new HashSet<String>();
-                                excludes.add("RootPane");
-//                                excludes.add("Table");
-                                excludes.add("TextField");
-                                method.invoke(null, excludes);
-
-                            }
-                            catch (Throwable e) {
-                            }
+            System.setProperty("apple.laf.useScreenMenuBar", "true");
+            System.setProperty("apple.awt.draggableWindowBackground", "true");
+            System.setProperty("apple.awt.showGrowBox", "true");
 
-                            //set the Quaqua Look and Feel in the UIManager
-                            UIManager.setLookAndFeel("ch.randelshofer.quaqua.QuaquaLookAndFeel");
-                            lafLoaded = true;
-                        } catch (Exception e) {
-                        }
-                    }
-                });
-            } catch (Exception e) {
-            }
+//            int javaVersion = Integer.parseInt(System.getProperty("java.version").split("\\.")[0]);
+//
+//            System.out.println("Java version: " + javaVersion);
+//
+//
+//            if (javaVersion < 10) {
+//                try {
+//                    // set the Quaqua Look and Feel in the UIManager
+//                    javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
+//                        public void run() {
+//                            try {
+//                                System.setProperty(
+//                                        "Quaqua.design", "Sierra"
+//                                );
+//
+//                                try {
+//                                    // We need to do this using dynamic class loading to avoid other platforms
+//                                    // having to link to this class. If the Quaqua library is not on the classpath
+//                                    // it simply won't be used.
+//                                    Class<?> qm = Class.forName("ch.randelshofer.quaqua.QuaquaManager");
+//
+////                                Method method = qm.getMethod("setIncludedUIs", Set.class);
+////                                Set<String> includes = new HashSet<String>();
+//////                                includes.add("ColorChooser");
+//////                                includes.add("FileChooser");
+////                                includes.add("Button");
+////                                includes.add("SplitPane");
+////                                includes.add("Table");
+////                                includes.add("Panel");
+////                                method.invoke(null, includes);
+//
+//                                    Method method = qm.getMethod("setExcludedUIs", Set.class);
+//                                    Set<String> excludes = new HashSet<String>();
+//                                    excludes.add("RootPane");
+////                                excludes.add("Table");
+//                                    excludes.add("TextField");
+//                                    method.invoke(null, excludes);
+//
+//                                } catch (Throwable e) {
+//                                }
+//
+//                                //set the Quaqua Look and Feel in the UIManager
+//                                UIManager.setLookAndFeel("ch.randelshofer.quaqua.QuaquaLookAndFeel");
+//                                lafLoaded = true;
+//                            } catch (Exception e) {
+//                            }
+//                        }
+//                    });
+//                } catch (Exception e) {
+//                }
+//            }
 
             UIManager.put("SystemFont", new Font("Lucida Grande", Font.PLAIN, 13));
             UIManager.put("SmallSystemFont", new Font("Lucida Grande", Font.PLAIN, 11));