From b3d81984aa47d34ca6cb374507b42bcc34003842 Mon Sep 17 00:00:00 2001 From: asivache Date: Fri, 8 Oct 2010 14:10:11 +0000 Subject: [PATCH] renaming MergingIterator to RODMergingIterator as it is more appropriate for this specialized implementation git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4462 348d0f76-0448-11de-a6fe-93d51630548a --- .../sting/gatk/datasources/providers/RodLocusView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/src/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java b/java/src/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java index 06df3ccd0..186a7d335 100644 --- a/java/src/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java +++ b/java/src/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java @@ -31,7 +31,7 @@ import org.broadinstitute.sting.gatk.contexts.AlignmentContext; import org.broadinstitute.sting.gatk.refdata.utils.LocationAwareSeekableRODIterator; import org.broadinstitute.sting.gatk.refdata.utils.RODRecordList; import org.broadinstitute.sting.utils.GenomeLoc; -import org.broadinstitute.sting.utils.collections.MergingIterator; +import org.broadinstitute.sting.utils.collections.RODMergingIterator; import org.broadinstitute.sting.utils.GenomeLocParser; import org.broadinstitute.sting.utils.pileup.ReadBackedPileupImpl; @@ -44,7 +44,7 @@ public class RodLocusView extends LocusView implements ReferenceOrderedView { /** * The data sources along with their current states. */ - private MergingIterator rodQueue = null; + private RODMergingIterator rodQueue = null; RefMetaDataTracker tracker = null; GenomeLoc lastLoc = null; @@ -94,7 +94,7 @@ public class RodLocusView extends LocusView implements ReferenceOrderedView { } } - rodQueue = new MergingIterator(iterators); + rodQueue = new RODMergingIterator(iterators); //throw new StingException("RodLocusView currently disabled"); }