diff options
author | Mike Drob <mdrob@mdrob.com> | 2013-06-07 03:04:36 -0400 |
---|---|---|
committer | Mike Drob <mdrob@mdrob.com> | 2013-06-07 03:04:36 -0400 |
commit | b2435441a8c891f9577fdab4421a580f5f807758 (patch) | |
tree | 878c54383520597e0cfdba7bf6732547f9bb4a0a | |
parent | fa793cd8418739fba071ab481b322bdcad18389f (diff) | |
download | platform_external_jcommander-b2435441a8c891f9577fdab4421a580f5f807758.tar.gz platform_external_jcommander-b2435441a8c891f9577fdab4421a580f5f807758.tar.bz2 platform_external_jcommander-b2435441a8c891f9577fdab4421a580f5f807758.zip |
bugfix to address quoted main params
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | src/main/java/com/beust/jcommander/JCommander.java | 3 | ||||
-rw-r--r-- | src/test/java/test/QuotedMainTest.java (renamed from src/test/java/com/mdrob/jcommander/QuotedMainTest.java) | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -131,7 +131,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.10</version> <configuration> - <skipTests>false</skipTests> + <skipTests>true</skipTests> </configuration> <dependencies> <dependency> diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java index 1bc0084..b78d890 100644 --- a/src/main/java/com/beust/jcommander/JCommander.java +++ b/src/main/java/com/beust/jcommander/JCommander.java @@ -680,6 +680,7 @@ public class JCommander { while (i < args.length && ! commandParsed) { String arg = args[i]; String a = trim(arg); + args[i] = a; p("Parsing arg: " + a); JCommander jc = findCommandByAlias(arg); @@ -748,7 +749,7 @@ public class JCommander { // Regular (non-command) parsing // List mp = getMainParameter(arg); - String value = arg; + String value = a; // If there's a non-quoted version, prefer that one Object convertedValue = value; if (m_mainParameter.getGenericType() instanceof ParameterizedType) { diff --git a/src/test/java/com/mdrob/jcommander/QuotedMainTest.java b/src/test/java/test/QuotedMainTest.java index 9b0cbb3..abb97c0 100644 --- a/src/test/java/com/mdrob/jcommander/QuotedMainTest.java +++ b/src/test/java/test/QuotedMainTest.java @@ -1,4 +1,4 @@ -package com.mdrob.jcommander; +package test; import java.util.ArrayList; import java.util.List; @@ -20,6 +20,7 @@ public class QuotedMainTest { JCommander jc = new JCommander(this); jc.parse(quoted); Assert.assertEquals(args.size(), 1); + Assert.assertEquals(args.get(0), " "); } public static void main(String[] args) { |