X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=5bc98b16775c51218b059f1024a0280ce2d19a7a;hb=9693242bcb97efe77f9bad5be68c4984358a0de5;hp=2f763473568a31dfefac772a5ce6b237b1381321;hpb=38ae1e61b0cd4fdbf6c9be24cb5f53382a4e6d51;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 2f76347..5bc98b1 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -137,6 +137,7 @@ public class Jalview if(file!=null) { + System.out.println("Opening file: " + file); if (!file.startsWith("http://")) { @@ -155,15 +156,23 @@ public class Jalview protocol = "URL"; } + + if (file.endsWith(".jar")) format = "Jalview"; else format = new jalview.io.IdentifyFile().Identify(file, protocol); - System.out.println("Opening: " + format + " file " + file); + AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format); + if(af==null) + { + System.out.println("error"); + return; + } + data = aparser.getValue("colour"); if(data!=null) {