X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FGroupUrlLink.java;fp=src%2Fjalview%2Futil%2FGroupUrlLink.java;h=af0b3083e0c039d77bcfccefa61988fb9ec30fb5;hb=e83ce5d8ef826fc0b509a51f154abdf734501077;hp=67309a0cf4c8477359b6cd1f1b263234c5db9c75;hpb=786475501a15799d7c4058dbf74e4bf896d03736;p=jalview.git diff --git a/src/jalview/util/GroupUrlLink.java b/src/jalview/util/GroupUrlLink.java index 67309a0..af0b308 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,33 @@ 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] - + "out of " + idstring[0].length + " sequences."); - System.out.println("Sequences that did not match:"); + jalview.bin.Console + .outPrintln("Created a url from " + ((int[]) url[0])[0] + + "out of " + idstring[0].length + " sequences."); + 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: " - + idstring[1][sq]); + 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: " - + idstring[1][sq]); + 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 +850,17 @@ 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()); - - System.out.println( + 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()); + + jalview.bin.Console.outPrintln( " Without onlyIfMatches:"); Object[] urls; try @@ -867,9 +870,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,13 +881,13 @@ 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] + " : " - + ul.getInvalidMessage()); + jalview.bin.Console.errPrintln("Invalid URLLink : " + links[i] + + " : " + ul.getInvalidMessage()); } } }