From ace2aeac634939d514dbf91b6df06bf2c285bbbf Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Feb 2008 23:52:21 +0000
Subject: [PATCH] Fix for issue 2130 (i18n CLI usage placeholders)

---
 opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
index cbd2fe8..7f787f3 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2007 Sun Microsystems, Inc.
+ *      Copyright 2007-2008 Sun Microsystems, Inc.
  */
 package org.opends.server.admin.client.cli;
 import org.opends.messages.Message;
@@ -293,13 +293,14 @@
     subCommands.add(createAdminUserSubCmd);
 
     createAdminUserUserIdArg = new StringArgument("userID", null,
-        OPTION_LONG_USERID, false, true, OPTION_VALUE_USERID,
+        OPTION_LONG_USERID, false, true, INFO_USERID_PLACEHOLDER.get(),
         INFO_ADMIN_ARG_USERID_DESCRIPTION.get());
     createAdminUserSubCmd.addArgument(createAdminUserUserIdArg);
 
     createAdminUserSetArg = new StringArgument(OPTION_LONG_SET,
         OPTION_SHORT_SET, OPTION_LONG_SET, false, true, true,
-        OPTION_VALUE_SET, null, null, INFO_DSCFG_DESCRIPTION_PROP_VAL.get());
+        INFO_VALUE_SET_PLACEHOLDER.get(), null, null,
+        INFO_DSCFG_DESCRIPTION_PROP_VAL.get());
     createAdminUserSubCmd.addArgument(createAdminUserSetArg);
 
     // delete-admin-user subcommand.
@@ -309,7 +310,7 @@
     subCommands.add(deleteAdminUserSubCmd);
 
     deleteAdminUserUserIdArg = new StringArgument("userID", null,
-        OPTION_LONG_USERID, false, true, OPTION_VALUE_USERID,
+        OPTION_LONG_USERID, false, true, INFO_USERID_PLACEHOLDER.get(),
         INFO_ADMIN_ARG_USERID_DESCRIPTION.get());
     deleteAdminUserSubCmd.addArgument(deleteAdminUserUserIdArg);
 
@@ -326,7 +327,7 @@
     subCommands.add(getAdminUserPropertiesSubCmd);
 
     getAdminUserPropertiesUserIdArg = new StringArgument("userID", null,
-        OPTION_LONG_USERID, false, true, OPTION_VALUE_USERID,
+        OPTION_LONG_USERID, false, true, INFO_USERID_PLACEHOLDER.get(),
         INFO_ADMIN_ARG_USERID_DESCRIPTION.get());
     getAdminUserPropertiesUserIdArg.setMultiValued(true);
     getAdminUserPropertiesSubCmd.addArgument(getAdminUserPropertiesUserIdArg);
@@ -338,13 +339,14 @@
     subCommands.add(setAdminUserPropertiesSubCmd);
 
     setAdminUserPropertiesUserIdArg = new StringArgument("userID", null,
-        OPTION_LONG_USERID, false, true, OPTION_VALUE_USERID,
+        OPTION_LONG_USERID, false, true, INFO_USERID_PLACEHOLDER.get(),
         INFO_ADMIN_ARG_USERID_DESCRIPTION.get());
     setAdminUserPropertiesSubCmd.addArgument(setAdminUserPropertiesUserIdArg);
 
     setAdminUserPropertiesSetArg = new StringArgument(OPTION_LONG_SET,
         OPTION_SHORT_SET, OPTION_LONG_SET, false, true, true,
-        OPTION_VALUE_SET, null, null, INFO_DSCFG_DESCRIPTION_PROP_VAL.get());
+        INFO_VALUE_SET_PLACEHOLDER.get(), null, null,
+        INFO_DSCFG_DESCRIPTION_PROP_VAL.get());
     setAdminUserPropertiesSubCmd.addArgument(setAdminUserPropertiesSetArg);
 
     // list-admin-user-properties subcommand.
@@ -366,7 +368,7 @@
       AdministratorProperty prop = AdministratorProperty.UID;
       String attName = prop.getAttributeName();
       StringArgument arg = new StringArgument(attName, null,
-          attName, false, false, true, "", null, null, null);
+          attName, false, false, true, Message.raw(""), null, null, null);
       userAdminProperties.put(prop, arg);
     }
 
@@ -378,7 +380,7 @@
       AdministratorProperty prop = AdministratorProperty.PASSWORD;
       String attName = prop.getAttributeName();
       StringArgument arg = new StringArgument(attName, null,
-          attName, false, false, true, "", null, null, null);
+          attName, false, false, true, Message.raw(""), null, null, null);
       userAdminProperties.put(prop, arg);
     }
 
@@ -389,7 +391,7 @@
       AdministratorProperty prop = AdministratorProperty.DESCRIPTION;
       String attName = prop.getAttributeName();
       StringArgument arg = new StringArgument(attName, null,
-          attName, false, false, true, "", null, null, null);
+          attName, false, false, true, Message.raw(""), null, null, null);
       userAdminProperties.put(prop, arg);
     }
 
@@ -400,7 +402,7 @@
       AdministratorProperty prop = AdministratorProperty.ADMINISTRATOR_DN;
       String attName = prop.getAttributeName();
       StringArgument arg = new StringArgument(attName, null,
-          attName, false, false, true, "", null, null, null);
+          attName, false, false, true, Message.raw(""), null, null, null);
       userAdminProperties.put(prop, arg);
       readonlyadminUserProperties.add(prop);
     }
@@ -412,7 +414,7 @@
       AdministratorProperty prop = AdministratorProperty.PRIVILEGE;
       String attName = prop.getAttributeName();
       StringArgument arg = new StringArgument(attName, null,
-          attName, true, true, true, "", "root", null, null);
+          attName, true, true, true, Message.raw(""), "root", null, null);
       userAdminProperties.put(prop, arg);
     }
   }

--
Gitblit v1.10.0