JAL-1988 Make sensible choices if only the opening file has been opened, and alter...

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 071d700..cb078b8 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -880,8 +880,6 @@ public class Jalview
      * @j2sIgnore
      */
     {
-      boolean defaultStartupFile = Cache.getDefault("STARTUP_FILE",
-              null) == null;
       file = Cache.getDefault("STARTUP_FILE",
               Cache.getDefault("www.jalview.org", "https://www.jalview.org")
                       + "/examples/exampleFile_2_7.jvp");
@@ -895,7 +893,6 @@ public class Jalview
         file.replace("2_7.jar", "2_7.jvp");
         // and remove the stale setting
         Cache.removeProperty("STARTUP_FILE");
-        defaultStartupFile = true;
       }
 
       protocol = AppletFormatAdapter.checkProtocol(file);
@@ -917,11 +914,10 @@ public class Jalview
 
       startUpAlframe = fileLoader.LoadFileWaitTillLoaded(file, protocol,
               format);
-      if (defaultStartupFile)
-      {
-        Console.debug("Resetting up-to-date flag for startup file");
-        startUpAlframe.getViewport().setSavedUpToDate(true);
-      }
+      // don't ask to save when quitting if only the startup file has been
+      // opened
+      Console.debug("Resetting up-to-date flag for startup file");
+      startUpAlframe.getViewport().setSavedUpToDate(true);
       // extract groovy arguments before anything else.
     }
 
@@ -1126,7 +1122,8 @@ public class Jalview
     {
       try
       {
-        UIManager.setLookAndFeel("com.formdev.flatlaf.FlatMacLightLaf");
+        UIManager.setLookAndFeel(
+                "com.formdev.flatlaf.themes.FlatMacLightLaf");
         set = true;
         Console.debug("Using FlatMacLightLaf");
       } catch (ClassNotFoundException | InstantiationException
@@ -1155,7 +1152,7 @@ public class Jalview
       Console.debug("Using FlatMacLightLaf");
       set = true;
     }
-    else if (SystemInfo.isWindows)
+    if (!set)
     {
       try
       {