X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFeaturesFile.java;h=a704f24d93fec206ccbb651e1640e53e0de3413a;hb=c24ec44edbedba55005373c43bf712c047b56faa;hp=745bce3ad9bc0726a0b2688918ed3e7dc8dd9836;hpb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;p=jalview.git diff --git a/src/jalview/io/FeaturesFile.java b/src/jalview/io/FeaturesFile.java index 745bce3..a704f24 100755 --- a/src/jalview/io/FeaturesFile.java +++ b/src/jalview/io/FeaturesFile.java @@ -20,8 +20,6 @@ */ package jalview.io; -import java.util.Locale; - import java.awt.Color; import java.io.IOException; import java.util.ArrayList; @@ -30,6 +28,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; @@ -313,7 +312,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI // should report somewhere useful for UI if necessary warningMessage = ((warningMessage == null) ? "" : warningMessage) + "Parsing error at\n" + line; - System.out.println("Error parsing feature file: " + ex + "\n" + line); + jalview.bin.Console.outPrintln("Error parsing feature file: " + ex + "\n" + line); ex.printStackTrace(System.err); resetMatcher(); return false; @@ -355,7 +354,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI String[] tokens = line.split(TAB_REGEX); if (tokens.length != 2) { - System.err.println(String.format("Invalid token count %d for %d", + jalview.bin.Console.errPrintln(String.format("Invalid token count %d for %d", tokens.length, line)); } else @@ -393,7 +392,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI */ if (gffColumns.length < 6) { - System.err.println("Ignoring feature line '" + line + jalview.bin.Console.errPrintln("Ignoring feature line '" + line + "' with too few columns (" + gffColumns.length + ")"); return false; } @@ -416,13 +415,13 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI seq = alignment.getSequenceAt(idx); } catch (NumberFormatException ex) { - System.err.println("Invalid sequence index: " + seqIndex); + jalview.bin.Console.errPrintln("Invalid sequence index: " + seqIndex); } } if (seq == null) { - System.out.println("Sequence not found: " + line); + jalview.bin.Console.outPrintln("Sequence not found: " + line); return false; } @@ -1010,7 +1009,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI @Override public String print(SequenceI[] sqs, boolean jvsuffix) { - System.out.println("Use printGffFormat() or printJalviewFormat()"); + jalview.bin.Console.outPrintln("Use printGffFormat() or printJalviewFormat()"); return null; } @@ -1334,7 +1333,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI */ if (gffColumns.length < 5) { - System.err.println("Ignoring GFF feature line with too few columns (" + jalview.bin.Console.errPrintln("Ignoring GFF feature line with too few columns (" + gffColumns.length + ")"); return null; } @@ -1365,7 +1364,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI } } catch (IOException e) { - System.err.println("GFF parsing failed with: " + e.getMessage()); + jalview.bin.Console.errPrintln("GFF parsing failed with: " + e.getMessage()); return null; } } @@ -1533,7 +1532,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI } else { - System.err.println("Ignoring unknown pragma: " + line); + jalview.bin.Console.errPrintln("Ignoring unknown pragma: " + line); } } }