JAL-1643 Modified JalviewFileChooser to have a more native laf on mac

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index bca5051..42202dd 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -49,6 +49,7 @@ import java.util.Map;
 import java.util.Vector;
 
 import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 
 /**
  * Main class for Jalview Application <br>
@@ -79,11 +80,6 @@ public class Jalview
   }
 
   /**
-   * Put protein=true for get a protein example
-   */
-  private static boolean protein = false;
-
-  /**
    * main class for Jalview application
    * 
    * @param args
@@ -96,12 +92,23 @@ public class Jalview
     System.out.println(System.getProperty("os.arch") + " "
             + System.getProperty("os.name") + " "
             + System.getProperty("os.version"));
-    if (new Platform().isAMac())
-    {
-      System.setProperty("com.apple.mrj.application.apple.menu.about.name",
-              "Jalview");
-      System.setProperty("apple.laf.useScreenMenuBar", "true");
-    }
+    // if (new Platform().isAMac())
+    // {
+    // // 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());
+    // System.out
+    // .println("--------------------------------------------> in here");
+    // } catch (UnsupportedLookAndFeelException e)
+    // {
+    // // TODO Auto-generated catch block
+    // e.printStackTrace();
+    // }
+    // }
 
     ArgsParser aparser = new ArgsParser(args);
     boolean headless = false;
@@ -177,6 +184,21 @@ public class Jalview
     } catch (Exception ex)
     {
     }
+    if (new Platform().isAMac())
+    {
+      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());
+      } catch (UnsupportedLookAndFeelException e)
+      {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+    }
 
     if (!headless)
     {
@@ -527,8 +549,7 @@ public class Jalview
     // ////////////////////
 
     if (!headless && file == null && vamsasImport == null
-            && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
-            && protein == true)
+            && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
     {
       file = jalview.bin.Cache.getDefault(
               "STARTUP_FILE",