X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=f59c37f16cae5d38c3848d231c4e168a08e9f57c;hb=edd94b99dba923b1d6da64e4cea1608dc640fae7;hp=7970437b9603f71ce8bae5f1b5dbfb9c168e0344;hpb=2a8f05d270d7346dd6ec68da46ca08152dd84933;p=jalview.git

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 7970437..f59c37f 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -305,6 +305,15 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
 
     String usrPropsFile = aparser.getValue(ArgsParser.PROPS);
     Cache.loadProperties(usrPropsFile);
+
+    if (aparser.contains(ArgsParser.NODISPLAY)
+            || aparser.contains(ArgsParser.NOGUI)
+            || aparser.contains(ArgsParser.HEADLESS)
+            || "true".equals(System.getProperty("java.awt.headless")))
+    {
+      headless = true;
+    }
+
     if (isJS)
     {
       isJavaAppletTag = aparser.isApplet();
@@ -336,13 +345,7 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
         showUsage();
         System.exit(0);
       }
-      if (aparser.contains(ArgsParser.NODISPLAY)
-              || aparser.contains(ArgsParser.NOGUI)
-              || aparser.contains(ArgsParser.HEADLESS)
-              || "true".equals(System.getProperty("java.awt.headless")))
-      {
-        headless = true;
-      }
+
 
       // anything else!
 
@@ -398,7 +401,13 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
 
     try
     {
-      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+      if (!isJS && Platform.isWin())
+       {
+        UIManager.setLookAndFeel(
+                headless ? "javax.swing.plaf.metal.MetalLookAndFeel"
+                        : UIManager.getSystemLookAndFeelClassName());
+//      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+      }
     } catch (Exception ex)
     {
       System.err.println("Unexpected Look and Feel Exception");
@@ -849,11 +858,11 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
                     + "] executed successfully!");
             groovyscript = null;
           }
-          checkOutputFile(aparser, af, format);
-          while (aparser.getSize() > 0)
-          {
-            System.out.println("Unknown arg: " + aparser.nextValue());
-          }
+        }
+        checkOutputFile(aparser, af, format);
+        while (aparser.getSize() > 0)
+        {
+          System.out.println("Unknown arg: " + aparser.nextValue());
         }
       }
     }
@@ -1043,6 +1052,8 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
       // biojsmsa filename
       String outputFormat = aparser.nextValue();
       String file = aparser.nextValue();
+      System.out.println("format " + outputFormat);
+
       if (outputFormat.equalsIgnoreCase("png"))
       {
         af.createPNG(new File(file));
@@ -2052,8 +2063,8 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
 
   public void notifyWorker(AlignCalcWorkerI worker, String status)
   {
-    System.out.println("Jalview worker " + worker.getClass().getSimpleName()
-            + " " + status);
+    // System.out.println("Jalview worker " + worker.getClass().getSimpleName()
+    // + " " + status);
   }
 
 }