Remove commented-out code

8 files changed, 1 insertions, 25 deletions

diff --git a/src/main/java/com/beust/jcommander/ParameterDescription.java b/src/main/java/com/beust/jcommander/ParameterDescription.java
index a812f49..06f145a 100644
--- a/src/main/java/com/beust/jcommander/ParameterDescription.java
+++ b/src/main/java/com/beust/jcommander/ParameterDescription.java
@@ -104,10 +104,6 @@ public class ParameterDescription {
     if (! "".equals(descriptionKey)) {
       if (m_bundle != null) {
         m_description = m_bundle.getString(descriptionKey);
-      } else {
-//        JCommander.getConsole().println("Warning: field " + object.getClass() + "." + field.getName()
-//            + " has a descriptionKey but no bundle was defined with @ResourceBundle, using " +
-//            "default description:'" + m_description + "'");
       }
     }
 
@@ -259,10 +255,8 @@ public class ParameterDescription {
       }
       if (convertedValue instanceof Collection) {
         l.addAll((Collection) convertedValue);
-      } else { // if (isMainParameter || m_parameterAnnotation.arity() > 1) {
+      } else {
         l.add(convertedValue);
-//        } else {
-//          l.
       }
     } else {
       m_wrappedParameter.addValue(m_parameterized, m_object, convertedValue);
diff --git a/src/test/java/com/beust/jcommander/FinderTest.java b/src/test/java/com/beust/jcommander/FinderTest.java
index 4602c9f..d4adda9 100644
--- a/src/test/java/com/beust/jcommander/FinderTest.java
+++ b/src/test/java/com/beust/jcommander/FinderTest.java
@@ -27,7 +27,6 @@ public class FinderTest {
     JCommander jc = new JCommander(a);
     jc.addCommand(conf);
     jc.setCaseSensitiveOptions(false);
-//    jc.setCaseSensitiveCommands(false);
     jc.parse("--CONFIGURE");
     String command = jc.getParsedCommand();
     Assert.assertEquals(command, "--configure");
diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index b88453a..bece62f 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -236,7 +236,6 @@ public class JCommanderTest {
     ArgsI18N1 i18n = new ArgsI18N1();
     String[] argv = { "-host", "localhost" };
     JCommander jc = new JCommander(i18n, bundle, argv);
-//    jc.usage();
 
     ParameterDescription pd = jc.getParameters().get(0);
     Assert.assertEquals(pd.getDescription(), expectedString);
@@ -984,7 +983,6 @@ public class JCommanderTest {
     Arg arg = new Arg();
     JCommander jc = new JCommander(arg);
     jc.parse("-help");
-//    System.out.println("helpTest:" + arg.help);
   }
 
   @Test(enabled = false, description = "Should only be enable once multiple parameters are allowed")
diff --git a/src/test/java/com/beust/jcommander/MethodSetterTest.java b/src/test/java/com/beust/jcommander/MethodSetterTest.java
index cb3c0c0..49bb42c 100644
--- a/src/test/java/com/beust/jcommander/MethodSetterTest.java
+++ b/src/test/java/com/beust/jcommander/MethodSetterTest.java
@@ -26,9 +26,6 @@ public class MethodSetterTest {
       public void setRest(List<String> rest) {
         this.rest = rest;
       }
-//      public List<String> getRest() {
-//        return this.rest;
-//      }
       public List<String> rest;
     }
     ArgsArityStringSetter args = new ArgsArityStringSetter();
diff --git a/src/test/java/com/beust/jcommander/ValidatePropertiesWhenParsingTest.java b/src/test/java/com/beust/jcommander/ValidatePropertiesWhenParsingTest.java
index 1994b97..e237d73 100644
--- a/src/test/java/com/beust/jcommander/ValidatePropertiesWhenParsingTest.java
+++ b/src/test/java/com/beust/jcommander/ValidatePropertiesWhenParsingTest.java
@@ -10,7 +10,6 @@ public class ValidatePropertiesWhenParsingTest {
     JCommander cmd = new JCommander();
 
     cmd.addCommand("a", new A());
-//    cmd.addCommand("b", new B());
 
     cmd.parse("a", "-path", "myPathToHappiness");
   }
diff --git a/src/test/java/com/beust/jcommander/VariableArityTest.java b/src/test/java/com/beust/jcommander/VariableArityTest.java
index 1b4c326..c2d86b8 100644
--- a/src/test/java/com/beust/jcommander/VariableArityTest.java
+++ b/src/test/java/com/beust/jcommander/VariableArityTest.java
@@ -52,7 +52,6 @@ public class VariableArityTest {
 
     com.parse(split);
 
-//    config.print();
     Assert.assertNotEquals(config.seed, 0);
     Assert.assertEquals(config.modelMatrixFile, Arrays.asList("foo"));
     Assert.assertEquals(config.featureFile, Arrays.asList("foo"));
diff --git a/src/test/java/com/beust/jcommander/command/CommandTest.java b/src/test/java/com/beust/jcommander/command/CommandTest.java
index 54f8a28..5cb7c34 100644
--- a/src/test/java/com/beust/jcommander/command/CommandTest.java
+++ b/src/test/java/com/beust/jcommander/command/CommandTest.java
@@ -76,11 +76,6 @@ public class CommandTest {
     jc.addCommand("commit", commit);
     jc.parse("-v", "commit", "--amend", "--author=cbeust", "A.java", "B.java");
 
-//    jc.setProgramName("TestCommander");
-//    jc.usage();
-//    jc.usage("add");
-//    jc.usage("commit");
-
     Assert.assertTrue(cm.verbose);
     Assert.assertEquals(jc.getParsedCommand(), "commit");
     Assert.assertTrue(commit.amend);
diff --git a/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java b/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java
index 98327bd..73e3c9e 100644
--- a/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java
+++ b/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java
@@ -51,10 +51,5 @@ public class DynamicParameterTest {
   public static void main(String[] args) {
     DynamicParameterTest dpt = new DynamicParameterTest();
     dpt.simpleWithSpaces();
-//    dpt.nonMapShouldThrow();
-//    dpt.wrongSeparatorShouldThrow();
-//    dpt.differentAssignment();
-//    dpt.arity0();
-//    dpt.usage();
   }
 }