From 61cfba9be6d79eb9cea135c86330dfcad9ed29d8 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 04 Apr 2007 07:46:18 +0000
Subject: [PATCH] Fix CLI consistency  issues: 1407 1408 1410 1411 1412 1413 1414 1416 1417 1418 1419 1420 1421

---
 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
index 2e8b468..b3fec69 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
@@ -59,6 +59,7 @@
 import static org.opends.server.messages.MessageHandler.*;
 import static org.opends.server.messages.ToolMessages.*;
 import static org.opends.server.util.StaticUtils.*;
+import static org.opends.server.tools.ToolConstants.*;
 
 
 
@@ -169,8 +170,9 @@
                                     MSGID_LDIFSEARCH_DESCRIPTION_LDIF_FILE);
       argParser.addArgument(ldifFile);
 
-      baseDNString = new StringArgument("basedn", 'b', "baseDN", false, true,
-                                        true, "{baseDN}", "", null,
+      baseDNString = new StringArgument("basedn", OPTION_SHORT_BASEDN,
+                                        OPTION_LONG_BASEDN, false, true,
+                                        true, OPTION_VALUE_BASEDN, "", null,
                                         MSGID_LDIFSEARCH_DESCRIPTION_BASEDN);
       argParser.addArgument(baseDNString);
 
@@ -186,8 +188,9 @@
       configFile.setHidden(true);
       argParser.addArgument(configFile);
 
-      configClass = new StringArgument("configclass", 'C', "configClass", false,
-                             false, true, "{configClass}",
+      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
+                             OPTION_LONG_CONFIG_CLASS, false,
+                             false, true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_LDIFSEARCH_DESCRIPTION_CONFIG_CLASS);
       configClass.setHidden(true);
@@ -225,7 +228,8 @@
       argParser.addArgument(timeLimit);
 
 
-      showUsage = new BooleanArgument("help", 'H', "help",
+      showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
+                                      OPTION_LONG_HELP,
                                       MSGID_LDIFSEARCH_DESCRIPTION_USAGE);
       argParser.addArgument(showUsage);
       argParser.setUsageArgument(showUsage);

--
Gitblit v1.10.0