X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fhtsjdk%2FVCFReader.java;fp=src%2Fjalview%2Fext%2Fhtsjdk%2FVCFReader.java;h=176b21dec490ab5d3239d09f00f46131a96fb2a4;hb=5e20c0116864d77705d951e35c41a13197791156;hp=16ff41b19a2ab2cc1c5115f75b787ba5b4a4fd3c;hpb=1bad3c3f74b2e204e0d7ba93a745f5ec775c8a3e;p=jalview.git diff --git a/src/jalview/ext/htsjdk/VCFReader.java b/src/jalview/ext/htsjdk/VCFReader.java index 16ff41b..176b21d 100644 --- a/src/jalview/ext/htsjdk/VCFReader.java +++ b/src/jalview/ext/htsjdk/VCFReader.java @@ -20,8 +20,6 @@ */ package jalview.ext.htsjdk; -import jalview.bin.Cache; - import java.io.Closeable; import java.io.File; import java.io.IOException; @@ -30,6 +28,7 @@ import htsjdk.samtools.util.CloseableIterator; import htsjdk.variant.variantcontext.VariantContext; import htsjdk.variant.vcf.VCFFileReader; import htsjdk.variant.vcf.VCFHeader; +import jalview.bin.Console; /** * A thin wrapper for htsjdk classes to read either plain, or compressed, or @@ -48,10 +47,12 @@ public class VCFReader implements Closeable, Iterable private VCFFileReader reader; /** - * Constructor given a raw or compressed VCF file or a (csi or tabix) index file + * Constructor given a raw or compressed VCF file or a (csi or tabix) index + * file *

- * If the file path ends in ".tbi" or ".csi", or appending one of these - * extensions gives a valid file path, open as indexed, else as unindexed. + * If the file path ends in ".tbi" or ".csi", or appending one of + * these extensions gives a valid file path, open as indexed, else as + * unindexed. * * @param f * @throws IOException @@ -85,7 +86,7 @@ public class VCFReader implements Closeable, Iterable } else { - Cache.log.error("File not found: " + filePath); + Console.error("File not found: " + filePath); } } @@ -154,7 +155,7 @@ public class VCFReader implements Closeable, Iterable final String chrom, final int start, final int end) { final CloseableIterator it = reader.iterator(); - + return new CloseableIterator() { boolean atEnd = false;