Jalview2XML does not use static load

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index a734054..e244d67 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -219,12 +219,14 @@ public class Jalview
         // We'll only open the default file if the desktop is visible.\r
         //////////////////////\r
           if (\r
-              !headless &&\r
-              jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))\r
+              !headless\r
+          && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)\r
+                    )\r
           {\r
 \r
             file = jalview.bin.Cache.getDefault("STARTUP_FILE",\r
                                                 "http://www.jalview.org/examples/exampleFile.jar");\r
+\r
             protocol = "File";\r
 \r
             if (file.indexOf("http:") > -1)\r
@@ -234,7 +236,7 @@ public class Jalview
 \r
             if (file.endsWith(".jar"))\r
             {\r
-              Jalview2XML.LoadJalviewAlign(file);\r
+              new Jalview2XML().LoadJalviewAlign(file);\r
             }\r
             else\r
             {\r

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 38959a7..a3ef237 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -74,7 +74,7 @@ public class FileLoader
 \r
     if (format.equalsIgnoreCase("Jalview"))\r
     {\r
-      af = Jalview2XML.LoadJalviewAlign(file);\r
+      af = new Jalview2XML().LoadJalviewAlign(file);\r
     }\r
     else\r
     {\r