From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 4 Apr 2006 09:37:38 +0000 (+0000)
Subject: Jalview2XML does not use static load
X-Git-Tag: Release_2_08~75
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2096047f177913a0ea9295a1e61782fce2f8d893;hp=50be9a6af05e540b996aa6de433fd0edfe9155d5;p=jalview.git

Jalview2XML does not use static load
---

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index a734054..e244d67 100755
--- 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.
         //////////////////////
           if (
-              !headless &&
-              jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
+              !headless
+          && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
+                    )
           {
 
             file = jalview.bin.Cache.getDefault("STARTUP_FILE",
                                                 "http://www.jalview.org/examples/exampleFile.jar");
+
             protocol = "File";
 
             if (file.indexOf("http:") > -1)
@@ -234,7 +236,7 @@ public class Jalview
 
             if (file.endsWith(".jar"))
             {
-              Jalview2XML.LoadJalviewAlign(file);
+              new Jalview2XML().LoadJalviewAlign(file);
             }
             else
             {
diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 38959a7..a3ef237 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -74,7 +74,7 @@ public class FileLoader
 
     if (format.equalsIgnoreCase("Jalview"))
     {
-      af = Jalview2XML.LoadJalviewAlign(file);
+      af = new Jalview2XML().LoadJalviewAlign(file);
     }
     else
     {