Merge branch 'develop' into features/mchmmer

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index bc93c37..f911675 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -279,6 +279,8 @@ public class Jalview
       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
     } catch (Exception ex)
     {
+      System.err.println("Unexpected Look and Feel Exception");
+      ex.printStackTrace();
     }
     if (Platform.isAMac())
     {
@@ -294,6 +296,20 @@ public class Jalview
         System.err.println(
                 "Failed to set QuaQua look and feel: " + e.toString());
       }
+      if (!ch.randelshofer.quaqua.QuaquaManager.getLookAndFeel()
+              .equals(UIManager.getLookAndFeel()))
+      {
+        try
+        {
+          System.err.println(
+                  "Quaqua LaF not available. Using VAqua(4).");
+          UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
+        } catch (Throwable e)
+        {
+          System.err.println(
+                  "Failed to reset look and feel: " + e.toString());
+        }
+      }
     }
 
     /*