JAL-3253-applet JAL-3424 headless fix for Windows

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 060d6ad..2efa0fb 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -20,6 +20,7 @@
  */
 package jalview.bin;
 
+import jalview.api.AlignCalcWorkerI;
 import jalview.api.AlignFrameI;
 import jalview.api.AlignViewportI;
 import jalview.api.JalviewApp;
@@ -397,7 +398,13 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
 
     try
     {
-      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+      if (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");
@@ -640,14 +647,6 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
         // TODO ?
       }
 
-      if (aparser.contains(ArgsParser.SHOWOVERVIEW))
-      {
-        jalview.bin.Cache.setPropertyNoSave(Preferences.SHOW_OVERVIEW,
-                "true");
-
-        System.out.println("CMD [showoverview] executed successfully!");
-      }
-
       if (aparser.contains(ArgsParser.NOMENUBAR))
       {
         noMenuBar = true;
@@ -757,6 +756,13 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
           System.out.println(
                   "CMD [-annotations " + data + "] executed successfully!");
         }
+
+        if (aparser.contains(ArgsParser.SHOWOVERVIEW))
+        {
+          af.overviewMenuItem_actionPerformed(null);
+          System.out.println("CMD [showoverview] executed successfully!");
+        }
+
         // set or clear the sortbytree flag.
         if (aparser.contains(ArgsParser.SORTBYTREE))
         {
@@ -2044,6 +2050,17 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi
 
   }
 
+  @Override
+  public void showOverview()
+  {
+    currentAlignFrame.overviewMenuItem_actionPerformed(null);
+  }
+
+  public void notifyWorker(AlignCalcWorkerI worker, String status)
+  {
+    // System.out.println("Jalview worker " + worker.getClass().getSimpleName()
+    // + " " + status);
+  }
 
 }