From 522d1b6d2373d084ccaa1b7db82ea42d2430a188 Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 Apr 2016 12:16:18 +0100
Subject: [PATCH] JAL-1981 catch any exception when setting QuaQua look and
 feel

---
 src/jalview/bin/Jalview.java |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 8fe3bca..1eeda98 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -51,7 +51,6 @@ import java.util.Map;
 import java.util.Vector;
 
 import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 
 /**
  * Main class for Jalview Application <br>
@@ -68,6 +67,7 @@ public class Jalview
     // grab all the rights we can the JVM
     Policy.setPolicy(new Policy()
     {
+      @Override
       public PermissionCollection getPermissions(CodeSource codesource)
       {
         Permissions perms = new Permissions();
@@ -75,6 +75,7 @@ public class Jalview
         return (perms);
       }
 
+      @Override
       public void refresh()
       {
       }
@@ -178,7 +179,7 @@ public class Jalview
     } catch (Exception ex)
     {
     }
-    if (new Platform().isAMac())
+    if (Platform.isAMac())
     {
       System.setProperty("com.apple.mrj.application.apple.menu.about.name",
               "Jalview");
@@ -187,10 +188,10 @@ public class Jalview
       {
         UIManager.setLookAndFeel(ch.randelshofer.quaqua.QuaquaManager
                 .getLookAndFeel());
-      } catch (UnsupportedLookAndFeelException e)
+      } catch (Throwable e)
       {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
+        System.err.println("Failed to set QuaQua look and feel: "
+                + e.toString());
       }
     }
 
@@ -729,6 +730,7 @@ public class Jalview
                     + "\n\n(you can enable or disable usage tracking in the preferences)",
             new Runnable()
             {
+              @Override
               public void run()
               {
                 Cache.log
@@ -738,6 +740,7 @@ public class Jalview
               }
             }, new Runnable()
             {
+              @Override
               public void run()
               {
                 Cache.log.debug("Not enabling Google Tracking.");
@@ -1040,6 +1043,7 @@ public class Jalview
 
 class rnabuttonlistener implements ActionListener
 {
+  @Override
   public void actionPerformed(ActionEvent arg0)
   {
     System.out.println("Good idea ! ");
@@ -1049,6 +1053,7 @@ class rnabuttonlistener implements ActionListener
 
 class pbuttonlistener implements ActionListener
 {
+  @Override
   public void actionPerformed(ActionEvent arg0)
   {
 
@@ -1169,6 +1174,7 @@ class FeatureFetcher
     new Thread(new Runnable()
     {
 
+      @Override
       public void run()
       {
         synchronized (us)
-- 
1.7.10.2