diff --git a/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java b/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java index 2758c3ea0..e5974d16f 100644 --- a/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java +++ b/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java @@ -2,6 +2,8 @@ package org.broadinstitute.sting.utils.sam; import net.sf.samtools.SAMFileReader; import net.sf.samtools.SAMRecord; +import net.sf.samtools.SAMRecordIterator; +import net.sf.samtools.SAMFileHeader; import net.sf.samtools.util.CloseableIterator; import java.io.InputStream; @@ -51,7 +53,7 @@ public class ArtificialSAMFileReader extends SAMFileReader { * @{inheritDoc} */ @Override - public CloseableIterator query(final String sequence, final int start, final int end, final boolean contained) { + public SAMRecordIterator query(final String sequence, final int start, final int end, final boolean contained) { GenomeLoc region = GenomeLocParser.createGenomeLoc(sequence, start, end); List coveredSubset = new ArrayList(); @@ -62,17 +64,25 @@ public class ArtificialSAMFileReader extends SAMFileReader { } final Iterator iterator = coveredSubset.iterator(); - return new CloseableIterator() { + return new SAMRecordIterator() { public boolean hasNext() { return iterator.hasNext(); } public SAMRecord next() { return iterator.next(); } public void close() {} - public void remove() { iterator.remove(); } + public void remove() { iterator.remove(); } + public SAMRecordIterator assertSorted(SAMFileHeader.SortOrder sortOrder) { return this; } }; } @Override - public CloseableIterator iterator() { - return StingSAMIteratorAdapter.adapt( new Reads( Collections.emptyList() ), reads.iterator() ); + public SAMRecordIterator iterator() { + return new SAMRecordIterator() { + private final Iterator iterator = reads.iterator(); + public boolean hasNext() { return iterator.hasNext(); } + public SAMRecord next() { return iterator.next(); } + public void close() {} + public void remove() { iterator.remove(); } + public SAMRecordIterator assertSorted(SAMFileHeader.SortOrder sortOrder) { return this; } + }; } /** diff --git a/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java b/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java index ad8b43641..25300542f 100755 --- a/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java +++ b/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java @@ -121,7 +121,7 @@ public class UnifiedGenotyperIntegrationTest extends WalkerTest { @Test public void testOtherFormat() { HashMap e = new HashMap(); - e.put( "GLF", "ddb1074b6f4a0fd1e15e4381476f1055" ); + e.put( "GLF", "b3d463eb0b7e59604296747e1eb7103c" ); e.put( "GELI_BINARY", "764a0fed1b3cf089230fd91f3be9c2df" ); for ( Map.Entry entry : e.entrySet() ) { diff --git a/settings/repository/edu.mit.broad/picard-private-parts-1432.jar b/settings/repository/edu.mit.broad/picard-private-parts-1432.jar deleted file mode 100644 index c89efd5eb..000000000 Binary files a/settings/repository/edu.mit.broad/picard-private-parts-1432.jar and /dev/null differ diff --git a/settings/repository/edu.mit.broad/picard-private-parts-1443.jar b/settings/repository/edu.mit.broad/picard-private-parts-1443.jar new file mode 100644 index 000000000..3cc780ccf Binary files /dev/null and b/settings/repository/edu.mit.broad/picard-private-parts-1443.jar differ diff --git a/settings/repository/edu.mit.broad/picard-private-parts-1432.xml b/settings/repository/edu.mit.broad/picard-private-parts-1443.xml similarity index 58% rename from settings/repository/edu.mit.broad/picard-private-parts-1432.xml rename to settings/repository/edu.mit.broad/picard-private-parts-1443.xml index b7d87ec0a..8e00e959f 100644 --- a/settings/repository/edu.mit.broad/picard-private-parts-1432.xml +++ b/settings/repository/edu.mit.broad/picard-private-parts-1443.xml @@ -1,3 +1,3 @@ - + diff --git a/settings/repository/net.sf/picard-1.22.448.xml b/settings/repository/net.sf/picard-1.22.448.xml deleted file mode 100644 index e9b5359d2..000000000 --- a/settings/repository/net.sf/picard-1.22.448.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/settings/repository/net.sf/picard-1.22.448.jar b/settings/repository/net.sf/picard-1.24.465.jar similarity index 71% rename from settings/repository/net.sf/picard-1.22.448.jar rename to settings/repository/net.sf/picard-1.24.465.jar index b4e68d37a..175dbff67 100644 Binary files a/settings/repository/net.sf/picard-1.22.448.jar and b/settings/repository/net.sf/picard-1.24.465.jar differ diff --git a/settings/repository/net.sf/picard-1.24.465.xml b/settings/repository/net.sf/picard-1.24.465.xml new file mode 100644 index 000000000..cef023431 --- /dev/null +++ b/settings/repository/net.sf/picard-1.24.465.xml @@ -0,0 +1,3 @@ + + + diff --git a/settings/repository/net.sf/sam-1.22.448.xml b/settings/repository/net.sf/sam-1.22.448.xml deleted file mode 100644 index 186f70023..000000000 --- a/settings/repository/net.sf/sam-1.22.448.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/settings/repository/net.sf/sam-1.22.448.jar b/settings/repository/net.sf/sam-1.24.465.jar similarity index 83% rename from settings/repository/net.sf/sam-1.22.448.jar rename to settings/repository/net.sf/sam-1.24.465.jar index 82fa9729c..15495a7b9 100644 Binary files a/settings/repository/net.sf/sam-1.22.448.jar and b/settings/repository/net.sf/sam-1.24.465.jar differ diff --git a/settings/repository/net.sf/sam-1.24.465.xml b/settings/repository/net.sf/sam-1.24.465.xml new file mode 100644 index 000000000..6d5538a0b --- /dev/null +++ b/settings/repository/net.sf/sam-1.24.465.xml @@ -0,0 +1,3 @@ + + +