X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJPredFile.java;h=9f8ac4ee84f394c32bea10d4b8797ba8db372ba0;hb=6ca8a32d88328b8f2162512f41c657c87e131045;hp=a944f389dd5d18939cfeb27cf00658276312acc7;hpb=c945c9641de88cad01b09b3db19e45667dfe751e;p=jalview.git diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java index a944f38..9f8ac4e 100755 --- a/src/jalview/io/JPredFile.java +++ b/src/jalview/io/JPredFile.java @@ -25,6 +25,8 @@ */ package jalview.io; +import java.util.Locale; + import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Sequence; @@ -148,7 +150,7 @@ public class JPredFile extends AlignFile @Override public void parse() throws IOException { - // JBPNote log.System.out.println("all read in "); + // JBPNote log.jalview.bin.Console.outPrintln("all read in "); String line; QuerySeqPosition = -1; noSeqs = 0; @@ -209,7 +211,7 @@ public class JPredFile extends AlignFile { ascore = symbols.nextToken(); - Float score = new Float(ascore); + Float score = Float.valueOf(ascore); scores.addElement(score); } @@ -238,7 +240,7 @@ public class JPredFile extends AlignFile } else if (id.equals("jnetconf")) { - // log.debug System.out.println("here"); + // log.debug jalview.bin.Console.outPrintln("here"); id = "Prediction Confidence"; this.conf = new Vector(numSymbols); @@ -285,7 +287,7 @@ public class JPredFile extends AlignFile seq_entries.addElement(newseq.toString()); ids.addElement(id); - Symscores.put(id, new Integer(ids.size() - 1)); + Symscores.put(id, Integer.valueOf(ids.size() - 1)); } } } @@ -363,10 +365,9 @@ public class JPredFile extends AlignFile } /** - * DOCUMENT ME! * * @param args - * DOCUMENT ME! + * @j2sIgnore */ public static void main(String[] args) { @@ -376,14 +377,14 @@ public class JPredFile extends AlignFile for (int i = 0; i < jpred.seqs.size(); i++) { - System.out.println(((Sequence) jpred.seqs.elementAt(i)).getName() + jalview.bin.Console.outPrintln(((Sequence) jpred.seqs.elementAt(i)).getName() + "\n" + ((Sequence) jpred.seqs.elementAt(i)).getSequenceAsString() + "\n"); } } catch (java.io.IOException e) { - System.err.println("Exception " + e); + jalview.bin.Console.errPrintln("Exception " + e); // e.printStackTrace(); not java 1.1 compatible! } } @@ -410,7 +411,7 @@ public class JPredFile extends AlignFile // check that no stray annotations have been added at the end. { SequenceI sq = seqs.elementAt(j - 1); - if (sq.getName().toUpperCase().startsWith("JPRED")) + if (sq.getName().toUpperCase(Locale.ROOT).startsWith("JPRED")) { annotSeqs.addElement(sq); seqs.removeElementAt(--j); @@ -446,6 +447,6 @@ public class JPredFile extends AlignFile * out = BLCFile.print(s); * * AlignFrame af = new AlignFrame(null, s); af.resize(700, 500); af.show(); - * System.out.println(out); } catch (java.io.IOException e) { - * System.out.println("Exception " + e); } } } + * jalview.bin.Console.outPrintln(out); } catch (java.io.IOException e) { + * jalview.bin.Console.outPrintln("Exception " + e); } } } */