From ef98b739b780e41d9b40c5c392ebec62455a022c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 11 Dec 2013 15:03:48 +0000
Subject: [PATCH] Code cleanups

---
 opends/src/server/org/opends/server/util/args/Argument.java |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/opends/src/server/org/opends/server/util/args/Argument.java b/opends/src/server/org/opends/server/util/args/Argument.java
index 9e6b254..518f7d8 100644
--- a/opends/src/server/org/opends/server/util/args/Argument.java
+++ b/opends/src/server/org/opends/server/util/args/Argument.java
@@ -72,7 +72,7 @@
   /** The unique ID of the description for this argument. */
   private Message description;
 
-  /** The set of values for this argument. */
+  /** The set of provided values for this argument. */
   private LinkedList<String> values;
 
   /** The default value for the argument if none other is provided. */
@@ -89,7 +89,8 @@
 
   /**
    * The value placeholder for this argument, which will be used in usage
-   * information.
+   * information. It describes the format that must be used to specify the
+   * values for this argument.
    */
   private Message valuePlaceholder;
 
@@ -692,19 +693,11 @@
         sb.append("--").append(longIdentifier);
       }
     }
-    if (isRequired)
-    {
-      sb.append(", required");
-    }
-    if (isMultiValued)
-    {
-      sb.append(", multiValued");
-    }
-    if (needsValue)
-    {
-      sb.append(", needsValue");
-    }
+    sb.append(", ").append(isRequired ? "required" : "optional");
+    sb.append(", ").append(isMultiValued ? "multiValued" : "singleValued");
     sb.append(", defaultValue=\"").append(defaultValue)
+      .append("\", valueFormat=\"").append(valuePlaceholder)
+      .append("\", providedValues=\"").append(values)
       .append("\", description=\"").append(description)
       .append("\"]");
     return sb.toString();

--
Gitblit v1.10.0