diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java index e87f99fd2..8fa7c61c7 100755 --- a/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java +++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java @@ -350,7 +350,7 @@ public abstract class TraversalEngine { samReader = initializeSAMFile(allReadsFiles.get(0)); else samReader = null; - return WrapReadsIterator(getReadsIterator(samReader), true); + return wrapReadsIterator(getReadsIterator(samReader), true); } protected Iterator getReadsIterator(final SAMFileReader samReader) { @@ -381,9 +381,9 @@ public abstract class TraversalEngine { } @Deprecated - protected StingSAMIterator WrapReadsIterator( final Iterator rawIterator, final boolean enableVerification ) { + protected StingSAMIterator wrapReadsIterator( final Iterator rawIterator, final boolean enableVerification ) { StingSAMIterator wrappedIterator = StingSAMIteratorAdapter.adapt(rawIterator); - wrappedIterator = ApplyDecoratingIterators(enableVerification, wrappedIterator); + wrappedIterator = applyDecoratingIterators(enableVerification, wrappedIterator); if (THREADED_IO) { @@ -394,7 +394,7 @@ public abstract class TraversalEngine { return wrappedIterator; } - protected StingSAMIterator ApplyDecoratingIterators(boolean enableVerification, StingSAMIterator wrappedIterator) { + protected StingSAMIterator applyDecoratingIterators(boolean enableVerification, StingSAMIterator wrappedIterator) { // NOTE: this (and other filtering) should be done before on-the-fly sorting // as there is no reason to sort something that we will end of throwing away if (DOWNSAMPLE_BY_FRACTION) diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLoci.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLoci.java index 1c819c899..c3b3a834b 100644 --- a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLoci.java +++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLoci.java @@ -81,7 +81,7 @@ public class TraverseByLoci extends TraversalEngine { (int)interval.getStart(), (int)interval.getStop()+1 ); - Iterator wrappedIter = WrapReadsIterator( readIter, false ); + Iterator wrappedIter = wrapReadsIterator( readIter, false ); sum = carryWalkerOverInterval(walker, wrappedIter, sum, interval); readIter.close(); } @@ -89,7 +89,7 @@ public class TraverseByLoci extends TraversalEngine { else { // We aren't locus oriented logger.debug("Doing non-interval-based traversal"); - samReadIter = WrapReadsIterator(getReadsIterator(samReader), true); + samReadIter = wrapReadsIterator(getReadsIterator(samReader), true); sum = carryWalkerOverInterval(walker, samReadIter, sum, null); } diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLocusWindows.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLocusWindows.java index ca1430c22..5b91f48b3 100755 --- a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLocusWindows.java +++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseByLocusWindows.java @@ -9,7 +9,6 @@ import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker; import org.broadinstitute.sting.gatk.iterators.ReferenceIterator; import org.broadinstitute.sting.utils.GenomeLoc; import org.broadinstitute.sting.utils.Utils; -import org.broadinstitute.sting.utils.Pair; import java.util.*; import java.io.File; @@ -90,7 +89,7 @@ public class TraverseByLocusWindows extends TraversalEngine { CloseableIterator readIter = samReader.queryOverlapping( interval.getContig(), (int)interval.getStart(), (int)interval.getStop()); - Iterator wrappedIter = WrapReadsIterator(readIter, false); + Iterator wrappedIter = wrapReadsIterator(readIter, false); LocusContext locus = getLocusContext(wrappedIter, interval); readIter.close(); @@ -150,7 +149,7 @@ public class TraverseByLocusWindows extends TraversalEngine { // otherwise, we're past the interval so first deal with the collected reads and then this one else { if ( intervalReads.size() > 0 ) { - Iterator wrappedIter = WrapReadsIterator(intervalReads.iterator(), false); + Iterator wrappedIter = wrapReadsIterator(intervalReads.iterator(), false); LocusContext locus = getLocusContext(wrappedIter, currentInterval); if ( nextLociToCarry.size() == 0 ) { @@ -186,7 +185,7 @@ public class TraverseByLocusWindows extends TraversalEngine { } // some cleanup if ( intervalReads.size() > 0 ) { - Iterator wrappedIter = WrapReadsIterator(intervalReads.iterator(), false); + Iterator wrappedIter = wrapReadsIterator(intervalReads.iterator(), false); LocusContext locus = getLocusContext(wrappedIter, currentInterval); if ( nextLociToCarry.size() == 0 ) { nextLociToCarry.add(locus); diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReads.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReads.java index 2e1f771ad..d822597f4 100755 --- a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReads.java +++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReads.java @@ -89,7 +89,7 @@ public class TraverseReads extends TraversalEngine { ReadWalker readWalker = (ReadWalker) walker; // we allow a bunch of wrapping iterators for down sampling, threadingIO, etc. - StingSAMIterator it = ApplyDecoratingIterators(true, dataProvider.getReadIterator()); + StingSAMIterator it = applyDecoratingIterators(true, dataProvider.getReadIterator()); // while we still have more reads for (SAMRecord read : it) {