X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLiteURLRetrieve.java;fp=src%2Fjalview%2Fbin%2FJalviewLiteURLRetrieve.java;h=4705f20ea757cefdb45f29e3e90528bea323e39d;hb=e83ce5d8ef826fc0b509a51f154abdf734501077;hp=f2ffda58222a7190b64c846418a508667871d5f3;hpb=786475501a15799d7c4058dbf74e4bf896d03736;p=jalview.git diff --git a/src/jalview/bin/JalviewLiteURLRetrieve.java b/src/jalview/bin/JalviewLiteURLRetrieve.java index f2ffda5..4705f20 100644 --- a/src/jalview/bin/JalviewLiteURLRetrieve.java +++ b/src/jalview/bin/JalviewLiteURLRetrieve.java @@ -64,8 +64,9 @@ public class JalviewLiteURLRetrieve extends Applet DataSourceType protocol = null; try { - System.out.println("Loading thread started with:\n>>file\n" + file - + ">>endfile"); + jalview.bin.Console + .outPrintln("Loading thread started with:\n>>file\n" + file + + ">>endfile"); // This might throw a security exception in certain browsers // Netscape Communicator for instance. try @@ -77,7 +78,7 @@ public class JalviewLiteURLRetrieve extends Applet rtn = true; is.close(); } - System.err.println("Resource '" + file + "' was " + jalview.bin.Console.errPrintln("Resource '" + file + "' was " + (rtn ? "" : "not") + " located by classloader."); if (rtn) { @@ -86,7 +87,7 @@ public class JalviewLiteURLRetrieve extends Applet } catch (Exception ex) { - System.out.println( + jalview.bin.Console.outPrintln( "Exception checking resources: " + file + " " + ex); } if (file.indexOf("://") > -1) @@ -99,7 +100,7 @@ public class JalviewLiteURLRetrieve extends Applet protocol = DataSourceType.FILE; } - System.out.println("Trying to get contents of resource:"); + jalview.bin.Console.outPrintln("Trying to get contents of resource:"); FileParse fp = new FileParse(file, protocol); if (fp.isValid()) { @@ -112,7 +113,7 @@ public class JalviewLiteURLRetrieve extends Applet } else { - System.out.println("Resource at " + file + jalview.bin.Console.outPrintln("Resource at " + file + " cannot be read with protocol==" + protocol); return; } @@ -121,11 +122,12 @@ public class JalviewLiteURLRetrieve extends Applet if (format == null) { format = new IdentifyFile().identify(file, protocol); - System.out.println("Format is " + format); + jalview.bin.Console.outPrintln("Format is " + format); } else { - System.out.println("User specified Format is " + format); + jalview.bin.Console + .outPrintln("User specified Format is " + format); } AlignmentI al = null; try @@ -133,17 +135,17 @@ public class JalviewLiteURLRetrieve extends Applet al = new AppletFormatAdapter().readFile(file, protocol, format); } catch (java.io.IOException ex) { - System.err.println("Failed to open the file."); + jalview.bin.Console.errPrintln("Failed to open the file."); ex.printStackTrace(); } if (al != null) { - System.out.println(new AppletFormatAdapter() + jalview.bin.Console.outPrintln(new AppletFormatAdapter() .formatSequences(FileFormat.Fasta, al, false)); } } catch (Exception e) { - System.err.println("bailing out : Unexpected exception:"); + jalview.bin.Console.errPrintln("bailing out : Unexpected exception:"); e.printStackTrace(); } }