diff --git a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java index c5fa04b20..084cf2c7a 100644 --- a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java +++ b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java @@ -8,6 +8,8 @@ import net.sf.samtools.SAMFileReader.ValidationStringency; import net.sf.samtools.SAMSequenceRecord; import net.sf.samtools.util.RuntimeIOException; import org.apache.log4j.Logger; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedData; import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedDatum; import org.broadinstitute.sting.gatk.refdata.rodDbSNP; @@ -96,6 +98,8 @@ public class GenomeAnalysisTK extends CommandLineProgram { */ private static Logger logger = Logger.getLogger(GenomeAnalysisTK.class); + public static ArrayList ROD_BINDINGS = null; + /** * setup our arguments, both required and optional @@ -128,7 +132,13 @@ public class GenomeAnalysisTK extends CommandLineProgram { m_parser.addOptionalArg("mother", "MOM", "Mother's genotype (SAM pileup)", "MOTHER_GENOTYPE_FILE"); m_parser.addOptionalArg("father", "DAD", "Father's genotype (SAM pileup)", "FATHER_GENOTYPE_FILE"); m_parser.addOptionalArg("daughter", "KID", "Daughter's genotype (SAM pileup)", "DAUGHTER_GENOTYPE_FILE"); - + + // --rodBind + Option rodBinder = OptionBuilder.withArgName("rodBind") + .hasArgs() + .withDescription( "Bind rod with and to " ) + .create("B"); + m_parser.addOptionalArg(rodBinder, "ROD_BINDINGS"); } /** @@ -172,6 +182,11 @@ public class GenomeAnalysisTK extends CommandLineProgram { final boolean TEST_ROD = false; List > rods = new ArrayList >(); + if ( ROD_BINDINGS != null ) { + System.out.printf("ROD BINDINGS are %s%n", Utils.join(":", ROD_BINDINGS)); + } + + if ( TEST_ROD ) { ReferenceOrderedData gff = new ReferenceOrderedData("test", new File("trunk/data/gFFTest.gff"), rodGFF.class ); gff.testMe(); diff --git a/java/src/org/broadinstitute/sting/utils/cmdLine/ArgumentParser.java b/java/src/org/broadinstitute/sting/utils/cmdLine/ArgumentParser.java index 8b144c49b..c88b7d235 100644 --- a/java/src/org/broadinstitute/sting/utils/cmdLine/ArgumentParser.java +++ b/java/src/org/broadinstitute/sting/utils/cmdLine/ArgumentParser.java @@ -99,6 +99,11 @@ public class ArgumentParser { } + public void addOptionalArg(Option opt, String fieldname) { + // add it to the option + AddToOptionStorage(opt, fieldname); + } + /** * Used locally to add to the options storage we have, for latter processing *