X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Futil%2FGroupUrlLink.java;fp=src%2Fjalview%2Futil%2FGroupUrlLink.java;h=bd375bb497861b0a30eda01460b76f34efd5b4d5;hp=67309a0cf4c8477359b6cd1f1b263234c5db9c75;hb=f680b9a507cc1643c9eead990e15026c1eca4e6e;hpb=265e81c0b3599a09c312f17188e3a892e9d96c4e diff --git a/src/jalview/util/GroupUrlLink.java b/src/jalview/util/GroupUrlLink.java index 67309a0..bd375bb 100644 --- a/src/jalview/util/GroupUrlLink.java +++ b/src/jalview/util/GroupUrlLink.java @@ -585,7 +585,7 @@ public class GroupUrlLink // debug /* * for (int s = 0; s <= rg.numSubs(); s++) { - * System.err.println("Sub " + s + " : " + rg.matchedFrom(s) + + * jalview.bin.Console.errPrintln("Sub " + s + " : " + rg.matchedFrom(s) + * " : " + rg.matchedTo(s) + " : '" + rg.stringMatched(s) + "'"); * } */ @@ -787,32 +787,32 @@ public class GroupUrlLink if (url == null) { - System.out.println("Created NO urls."); + jalview.bin.Console.outPrintln("Created NO urls."); } else { - System.out.println("Created a url from " + ((int[]) url[0])[0] + jalview.bin.Console.outPrintln("Created a url from " + ((int[]) url[0])[0] + "out of " + idstring[0].length + " sequences."); - System.out.println("Sequences that did not match:"); + jalview.bin.Console.outPrintln("Sequences that did not match:"); for (int sq = 0; sq < idstring[0].length; sq++) { if (!((boolean[]) url[1])[sq]) { - System.out.println("Seq " + sq + ": " + idstring[0][sq] + "\t: " + jalview.bin.Console.outPrintln("Seq " + sq + ": " + idstring[0][sq] + "\t: " + idstring[1][sq]); } } - System.out.println("Sequences that DID match:"); + jalview.bin.Console.outPrintln("Sequences that DID match:"); for (int sq = 0; sq < idstring[0].length; sq++) { if (((boolean[]) url[1])[sq]) { - System.out.println("Seq " + sq + ": " + idstring[0][sq] + "\t: " + jalview.bin.Console.outPrintln("Seq " + sq + ": " + idstring[0][sq] + "\t: " + idstring[1][sq]); } } - System.out.println("The generated URL:"); - System.out.println(((String[]) url[3])[0]); + jalview.bin.Console.outPrintln("The generated URL:"); + jalview.bin.Console.outPrintln(((String[]) url[3])[0]); } } @@ -849,15 +849,15 @@ public class GroupUrlLink GroupUrlLink ul = new GroupUrlLink(links[i]); if (ul.isValid()) { - System.out.println("\n\n\n"); - System.out.println( + jalview.bin.Console.outPrintln("\n\n\n"); + jalview.bin.Console.outPrintln( "Link " + i + " " + links[i] + " : " + ul.toString()); - System.out.println(" pref : " + ul.getUrl_prefix()); - System.out.println(" IdReplace : " + ul.getIDRegexReplace()); - System.out.println(" SeqReplace : " + ul.getSeqRegexReplace()); - System.out.println(" Suffixes : " + ul.getUrl_suffix()); + jalview.bin.Console.outPrintln(" pref : " + ul.getUrl_prefix()); + jalview.bin.Console.outPrintln(" IdReplace : " + ul.getIDRegexReplace()); + jalview.bin.Console.outPrintln(" SeqReplace : " + ul.getSeqRegexReplace()); + jalview.bin.Console.outPrintln(" Suffixes : " + ul.getUrl_suffix()); - System.out.println( + jalview.bin.Console.outPrintln( " Without onlyIfMatches:"); Object[] urls; try @@ -867,9 +867,9 @@ public class GroupUrlLink testUrls(ul, seqsandids, urls); } catch (UrlStringTooLongException ex) { - System.out.println("too long exception " + ex); + jalview.bin.Console.outPrintln("too long exception " + ex); } - System.out.println( + jalview.bin.Console.outPrintln( " With onlyIfMatches set:"); try { @@ -878,12 +878,12 @@ public class GroupUrlLink testUrls(ul, seqsandids, urls); } catch (UrlStringTooLongException ex) { - System.out.println("too long exception " + ex); + jalview.bin.Console.outPrintln("too long exception " + ex); } } else { - System.err.println("Invalid URLLink : " + links[i] + " : " + jalview.bin.Console.errPrintln("Invalid URLLink : " + links[i] + " : " + ul.getInvalidMessage()); } }