diff --git a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java index c042e40fa..fb8b91d8f 100755 --- a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java +++ b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java @@ -871,7 +871,7 @@ public class GenomeAnalysisEngine { SAMSequenceDictionary sequenceDictionary, GenomeLocParser genomeLocParser, ValidationExclusion.TYPE validationExclusionType) { - RMDTrackBuilder builder = new RMDTrackBuilder(referenceMetaDataFiles,sequenceDictionary,genomeLocParser,validationExclusionType); + RMDTrackBuilder builder = new RMDTrackBuilder(sequenceDictionary,genomeLocParser,validationExclusionType); // try and make the tracks given their requests // create of live instances of the tracks List tracks = new ArrayList(); diff --git a/java/src/org/broadinstitute/sting/gatk/refdata/tracks/builders/RMDTrackBuilder.java b/java/src/org/broadinstitute/sting/gatk/refdata/tracks/builders/RMDTrackBuilder.java index e49cd9a9b..23063ee16 100644 --- a/java/src/org/broadinstitute/sting/gatk/refdata/tracks/builders/RMDTrackBuilder.java +++ b/java/src/org/broadinstitute/sting/gatk/refdata/tracks/builders/RMDTrackBuilder.java @@ -73,9 +73,6 @@ public class RMDTrackBuilder extends PluginManager { // a constant we use for marking sequence dictionary entries in the Tribble index property list public static final String SequenceDictionaryPropertyPredicate = "DICT:"; - // the input strings we use to create RODs from - private final Collection inputs; - private Map classes = null; // private sequence dictionary we use to set our tracks with @@ -91,24 +88,6 @@ public class RMDTrackBuilder extends PluginManager { */ private ValidationExclusion.TYPE validationExclusionType; - /** - * Create a new RMDTrackBuilder, predefined to use a given set of reference metadata. - * @param referenceMetaDataDescriptors file descriptors to build out during trackbuilder construction. - * @param dict Sequence dictionary to use. - * @param genomeLocParser Location parser to use. - * @param validationExclusionType Types of validations to exclude, for sequence dictionary verification. - */ - public RMDTrackBuilder(Collection referenceMetaDataDescriptors, - SAMSequenceDictionary dict, - GenomeLocParser genomeLocParser, - ValidationExclusion.TYPE validationExclusionType) { - super(FeatureCodec.class, "Codecs", "Codec"); - this.inputs = referenceMetaDataDescriptors; - this.dict = dict; - this.genomeLocParser = genomeLocParser; - this.validationExclusionType = validationExclusionType; - } - /** * Construct an RMDTrackerBuilder, allowing the user to define tracks to build after-the-fact. This is generally * used when walkers want to directly manage the ROD system for whatever reason. Before using this constructor, @@ -120,16 +99,19 @@ public class RMDTrackBuilder extends PluginManager { public RMDTrackBuilder(SAMSequenceDictionary dict, GenomeLocParser genomeLocParser, ValidationExclusion.TYPE validationExclusionType) { - this(Collections.emptyList(),dict,genomeLocParser,validationExclusionType); - } + super(FeatureCodec.class, "Codecs", "Codec"); + this.dict = dict; + this.genomeLocParser = genomeLocParser; + this.validationExclusionType = validationExclusionType; - /** @return a list of all available track types we currently have access to create */ - public Map getAvailableTrackNamesAndTypes() { classes = new HashMap(); for (String name: this.getPluginsByName().keySet()) { classes.put(name.toUpperCase(), getPluginsByName().get(name)); - } - return classes; + } } + + /** @return a list of all available track types we currently have access to create */ + public Map getAvailableTrackNamesAndTypes() { + return Collections.unmodifiableMap(classes); } /** @return a list of all available track record types we currently have access to create */ diff --git a/java/test/org/broadinstitute/sting/gatk/datasources/simpleDataSources/ReferenceOrderedDataPoolUnitTest.java b/java/test/org/broadinstitute/sting/gatk/datasources/simpleDataSources/ReferenceOrderedDataPoolUnitTest.java index 392df2c8a..d85c1d634 100755 --- a/java/test/org/broadinstitute/sting/gatk/datasources/simpleDataSources/ReferenceOrderedDataPoolUnitTest.java +++ b/java/test/org/broadinstitute/sting/gatk/datasources/simpleDataSources/ReferenceOrderedDataPoolUnitTest.java @@ -76,7 +76,7 @@ public class ReferenceOrderedDataPoolUnitTest extends BaseTest { if (indexFileName.exists()) indexFileName.delete(); triplet = new RMDTriplet("tableTest","Table",fileName,RMDStorageType.FILE); - builder = new RMDTrackBuilder(Collections.singletonList(triplet),seq.getSequenceDictionary(),genomeLocParser,null); + builder = new RMDTrackBuilder(seq.getSequenceDictionary(),genomeLocParser,null); } @Test