X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=a73405424d5743516bd7ae0325cadfdb209a439e;hb=4944c2f33bb34b4f262fd2f3ae40dcdc2a825557;hp=1a67c05f9e52e917ad2541025b06286d0fbf8f7d;hpb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 1a67c05..a734054 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -79,6 +79,7 @@ public class Jalview System.exit(0); } + Cache.loadProperties(aparser.getValue("props")); // must do this before anything else! if (aparser.contains("nodisplay")) { @@ -103,8 +104,6 @@ public class Jalview System.exit(0); } - Cache.loadProperties(aparser.getValue("props")); - Desktop desktop = null; if( !headless ) { @@ -164,7 +163,7 @@ public class Jalview if (file.endsWith(".jar")) format = "Jalview"; else - format = jalview.io.IdentifyFile.Identify(file, protocol); + format = new jalview.io.IdentifyFile().Identify(file, protocol); System.out.println("Opening: " + format + " file " + file); @@ -239,7 +238,7 @@ public class Jalview } else { - format = jalview.io.IdentifyFile.Identify(file, protocol); + format = new jalview.io.IdentifyFile().Identify(file, protocol); desktop.LoadFile(file, protocol, format); } }