X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FMSFfile.java;h=0a0520ab3d9bff4d7180b71b4dac2901591c1197;hb=ae73ba1b149dce528d3cba7fd9a4d20b7e50baa6;hp=b05acff59b3daf445fae36cefa96ea7a649d751b;hpb=ff450fad8709ae81919af7a15ea382af7292794c;p=jalview.git diff --git a/src/jalview/io/MSFfile.java b/src/jalview/io/MSFfile.java index b05acff..0a0520a 100755 --- a/src/jalview/io/MSFfile.java +++ b/src/jalview/io/MSFfile.java @@ -20,6 +20,8 @@ */ package jalview.io; +import java.util.Locale; + import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; import jalview.util.Comparison; @@ -134,7 +136,7 @@ public class MSFfile extends AlignFile } } catch (IOException e) { - System.err.println("Exception parsing MSFFile " + e); + jalview.bin.Console.errPrintln("Exception parsing MSFFile " + e); e.printStackTrace(); } @@ -167,7 +169,7 @@ public class MSFfile extends AlignFile } else { - System.err.println("MSFFile Parser: Can't find sequence for " + jalview.bin.Console.errPrintln("MSFFile Parser: Can't find sequence for " + headers.get(i)); } } @@ -184,7 +186,7 @@ public class MSFfile extends AlignFile public int checkSum(String seq) { int check = 0; - String sequence = seq.toUpperCase(); + String sequence = seq.toUpperCase(Locale.ROOT); for (int i = 0; i < sequence.length(); i++) { @@ -198,7 +200,7 @@ public class MSFfile extends AlignFile } } catch (Exception e) { - System.err.println("Exception during MSF Checksum calculation"); + jalview.bin.Console.errPrintln("Exception during MSF Checksum calculation"); e.printStackTrace(); } } @@ -278,10 +280,10 @@ public class MSFfile extends AlignFile i++; } - Format maxLenpad = new Format("%" + (new String("" + max)).length() - + "d"); - Format maxChkpad = new Format("%" + (new String("1" + max)).length() - + "d"); + Format maxLenpad = new Format( + "%" + (new String("" + max)).length() + "d"); + Format maxChkpad = new Format( + "%" + (new String("1" + max)).length() + "d"); i = 0; int bigChecksum = 0; @@ -370,8 +372,7 @@ public class MSFfile extends AlignFile int end = start + 10; int length = s[j].getLength(); - if ((end < length) - && (start < length)) + if ((end < length) && (start < length)) { out.append(s[j].getSequence(start, end));