X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fhtsjdk%2FVCFReader.java;h=04525f00003fba43e47f6bdfffe80da551ff4a7f;hb=4f77328104498504339216829abf5ea87e2791ec;hp=14c057f7e56a23b195889473fe11d38cd04465de;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git diff --git a/src/jalview/ext/htsjdk/VCFReader.java b/src/jalview/ext/htsjdk/VCFReader.java index 14c057f..04525f0 100644 --- a/src/jalview/ext/htsjdk/VCFReader.java +++ b/src/jalview/ext/htsjdk/VCFReader.java @@ -1,14 +1,14 @@ package jalview.ext.htsjdk; +import java.io.Closeable; +import java.io.File; +import java.io.IOException; + import htsjdk.samtools.util.CloseableIterator; import htsjdk.variant.variantcontext.VariantContext; import htsjdk.variant.vcf.VCFFileReader; import htsjdk.variant.vcf.VCFHeader; -import java.io.Closeable; -import java.io.File; -import java.io.IOException; - /** * A thin wrapper for htsjdk classes to read either plain, or compressed, or * compressed and indexed VCF files @@ -116,7 +116,7 @@ public class VCFReader implements Closeable, Iterable { final CloseableIterator it = reader.iterator(); - return new CloseableIterator() + return new CloseableIterator() { boolean atEnd = false; @@ -145,7 +145,7 @@ public class VCFReader implements Closeable, Iterable int vend = variant.getEnd(); // todo what is the undeprecated way to get // the chromosome for the variant? - if (chrom.equals(variant.getChr()) && (vstart <= end) + if (chrom.equals(variant.getContig()) && (vstart <= end) && (vend >= start)) { return variant;