From 4f8d8309607ecc2141d8af52a6f93147503a2b5e Mon Sep 17 00:00:00 2001 From: Mark DePristo Date: Sat, 30 Jul 2011 15:34:20 -0400 Subject: [PATCH] Updated to reflect new parse() function --- .../queue/util/ScalaCompoundArgumentTypeDescriptor.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala b/public/scala/src/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala index 40a296022..58341a0a5 100644 --- a/public/scala/src/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala +++ b/public/scala/src/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala @@ -4,6 +4,7 @@ import collection.JavaConversions._ import org.broadinstitute.sting.queue.QException import java.lang.Class import org.broadinstitute.sting.commandline.{ArgumentMatches, ArgumentSource, ArgumentTypeDescriptor, ParsingEngine} +import java.lang.reflect.Type /** * An ArgumentTypeDescriptor that can parse the scala collections. @@ -42,6 +43,10 @@ class ScalaCompoundArgumentTypeDescriptor extends ArgumentTypeDescriptor { * @param argumentMatches The argument match strings that were found for this argument source. * @return The parsed object. */ + def parse(parsingEngine: ParsingEngine, source: ArgumentSource, typeType: Type, argumentMatches: ArgumentMatches) = { + parse(parsingEngine,source, makeRawTypeIfNecessary(typeType), argumentMatches) + } + def parse(parsingEngine: ParsingEngine, source: ArgumentSource, classType: Class[_], argumentMatches: ArgumentMatches) = { val componentType = ReflectionUtils.getCollectionType(source.field) val componentArgumentParser = parsingEngine.selectBestTypeDescriptor(componentType)