JAL-2778 try http://violetlib.org/vaqua/ instead of Quaqua to see if border problem...

diff --git a/.classpath b/.classpath
index d704f10..97a9c53 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -47,8 +47,8 @@
        <classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
        <classpathentry kind="lib" path="lib/VARNAv3-93.jar"/>
        <classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
-       <classpathentry kind="lib" path="lib/quaqua-filechooser-only-8.0.jar"/>
        <classpathentry kind="lib" path="lib/htsjdk-1.133.jar"/>
+       <classpathentry kind="lib" path="lib/VAqua4.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
        <classpathentry kind="lib" path="lib/xml-apis.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

diff --git a/lib/VAqua4.jar b/lib/VAqua4.jar
new file mode 100644 (file)
index 0000000..c1e7cfc
Binary files /dev/null and b/lib/VAqua4.jar differ

diff --git a/lib/libquaqua-8.0.jnilib.jar b/lib/libquaqua-8.0.jnilib.jar
deleted file mode 100644 (file)
index 79383b0..0000000
Binary files a/lib/libquaqua-8.0.jnilib.jar and /dev/null differ

diff --git a/lib/libquaqua64-8.0.jnilib.jar b/lib/libquaqua64-8.0.jnilib.jar
deleted file mode 100644 (file)
index efb46a4..0000000
Binary files a/lib/libquaqua64-8.0.jnilib.jar and /dev/null differ

diff --git a/lib/quaqua-filechooser-only-8.0.jar b/lib/quaqua-filechooser-only-8.0.jar
deleted file mode 100644 (file)
index 182e0da..0000000
Binary files a/lib/quaqua-filechooser-only-8.0.jar and /dev/null differ

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 9ec0033..a896f8a 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -20,9 +20,6 @@
  */
 package jalview.bin;
 
-import groovy.lang.Binding;
-import groovy.util.GroovyScriptEngine;
-
 import jalview.ext.so.SequenceOntology;
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
@@ -66,6 +63,9 @@ import java.util.Vector;
 
 import javax.swing.UIManager;
 
+import groovy.lang.Binding;
+import groovy.util.GroovyScriptEngine;
+
 /**
  * Main class for Jalview Application <br>
  * <br>
@@ -281,14 +281,15 @@ public class Jalview
       System.setProperty("com.apple.mrj.application.apple.menu.about.name",
               "Jalview");
       System.setProperty("apple.laf.useScreenMenuBar", "true");
+
       try
       {
-        UIManager.setLookAndFeel(
-                ch.randelshofer.quaqua.QuaquaManager.getLookAndFeel());
+        UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
       } catch (Throwable e)
       {
         System.err.println(
-                "Failed to set QuaQua look and feel: " + e.toString());
+                "Failed to set VioletLib's Aqua look and feel: "
+                        + e.toString());
       }
     }