X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FAnnotationFile.java;h=7e4ee16768623e1c8fc24783193f6e3635ad5fc4;hb=HEAD;hp=09859c9aff81aaae02736c58a449cbd7ba4166ef;hpb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;p=jalview.git diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java index 09859c9..7e4ee16 100755 --- a/src/jalview/io/AnnotationFile.java +++ b/src/jalview/io/AnnotationFile.java @@ -317,7 +317,8 @@ public class AnnotationFile } else { - // System.err.println("Skipping NaN - not valid value."); + // jalview.bin.Console.errPrintln("Skipping NaN - not valid + // value."); text.append(comma + 0f);// row.annotations[j].value); } comma = ","; @@ -679,11 +680,12 @@ public class AnnotationFile } catch (Exception ex) { ex.printStackTrace(); - System.out.println("Problem reading annotation file: " + ex); + jalview.bin.Console + .outPrintln("Problem reading annotation file: " + ex); if (nlinesread > 0) { - System.out.println("Last read line " + nlinesread + ": '" + lastread - + "' (first 80 chars) ..."); + jalview.bin.Console.outPrintln("Last read line " + nlinesread + + ": '" + lastread + "' (first 80 chars) ..."); } return false; } @@ -821,7 +823,7 @@ public class AnnotationFile if (refSeqIndex < 1) { refSeqIndex = 1; - System.out.println( + jalview.bin.Console.outPrintln( "WARNING: SEQUENCE_REF index must be > 0 in AnnotationFile"); } } catch (Exception ex) @@ -923,7 +925,7 @@ public class AnnotationFile { if (hidden == null) { - System.err.println( + jalview.bin.Console.errPrintln( "Cannot process HIDE_INSERTIONS without an alignment view: Ignoring line: " + line); } @@ -1075,7 +1077,7 @@ public class AnnotationFile { // TODO: specify and implement duplication of alignment annotation // for multiple group references. - System.err.println( + jalview.bin.Console.errPrintln( "Ignoring 1:many group reference mappings for group name '" + groupRef + "'"); } @@ -1368,7 +1370,7 @@ public class AnnotationFile } else { - System.err.println( + jalview.bin.Console.errPrintln( "Couldn't combine annotations. None are added to alignment yet!"); } } @@ -1385,8 +1387,8 @@ public class AnnotationFile value = Float.valueOf(nextToken); } catch (NumberFormatException e) { - System.err.println("line " + nlinesread + ": Threshold '" + nextToken - + "' invalid, setting to zero"); + jalview.bin.Console.errPrintln("line " + nlinesread + ": Threshold '" + + nextToken + "' invalid, setting to zero"); } String label = st.hasMoreTokens() ? st.nextToken() : null; Color colour = null; @@ -1435,7 +1437,7 @@ public class AnnotationFile } } catch (Exception e) { - System.err.println( + jalview.bin.Console.errPrintln( "Couldn't parse Group Start or End Field as '*' or a valid column or sequence index: '" + rng + "' - assuming alignment width for group."); // assume group is full width