Merge branch 'master' of github.com:cbeust/jcommander

CHANGELOG

@@ -2,6 +2,7 @@ Current
 
 Added: IValueValidator to validate parameter values (typed) as oppoed to IParameterValidator which validates strings
 Added: echoInput, used when password=true to echo the characters (Jason Wheeler)
+Fixed: wasn't handling parameters that start with " but don't end with one correctly
 Fixed: if using a different option prefix, unknown option are mistakenly reported as "no main parameter defined" (kurmasz)
 Fixed: 113: getCommandDescription() returns the description of the main parameter instead of that of the command
 Fixed: bug with several multiple arity parameters (VariableArityTest)

src/main/java/com/beust/jcommander/JCommander.java

@@ -492,11 +492,8 @@ private static List<String> readFile(String fileName) {
    */
   private static String trim(String string) {
     String result = string.trim();
-    if (result.startsWith("\"")) {
-      if (result.endsWith("\"")) {
-          return result.substring(1, result.length() - 1);
-      }
-      return result.substring(1);
+    if (result.startsWith("\"") && result.endsWith("\"")) {
+      result = result.substring(1, result.length() - 1);
     }
     return result;
   }

src/test/java/com/beust/jcommander/JCommanderTest.java

@@ -762,15 +762,14 @@ class SlashSeparator {
   public void equalSeparator() {
     @Parameters(separators = "=", commandDescription = "My command")
     class MyClass {
-       @Parameter(names = { "-p", "--param" }, required = true,
-           description = "param desc...")
+
+       @Parameter(names = { "-p", "--param" }, required = true, description = "param desc...")
        private String param;
     }
-
     MyClass c = new MyClass();
-    String expected = "some=value";
+    String expected = "\"hello\"world";
     new JCommander(c).parse("--param=" + expected);
-    Assert.assertEquals(c.param, expected);
+    Assert.assertEquals(expected, c.param);
   }
 
   @Test(enabled = false)