From b2aecb495242d055dca4109ff9f6889507af7f72 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Mon, 23 Apr 2007 07:06:28 +0000
Subject: [PATCH] Fix for Issue 1427 (CLIs should handled both -? and -H for help)
---
opends/src/statuspanel/org/opends/statuspanel/StatusCli.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java b/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
index 0ee9279..8f3e675 100644
--- a/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
+++ b/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
@@ -30,6 +30,7 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.PrintStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -132,7 +133,8 @@
for (int i=0; i<args.length; i++)
{
if (args[i].equalsIgnoreCase("-H") ||
- args[i].equalsIgnoreCase("--help"))
+ args[i].equalsIgnoreCase("--help") ||
+ args[i].equalsIgnoreCase("-?"))
{
printUsage = true;
}
@@ -224,14 +226,14 @@
if (printUsage)
{
- printUsage();
+ printUsage(System.out);
}
else if (errors.size() > 0)
{
System.err.println(Utils.getStringFromCollection(errors,
LINE_SEPARATOR+LINE_SEPARATOR));
- System.out.println();
- printUsage();
+ System.err.println();
+ printUsage(System.err);
returnValue = USER_DATA_ERROR;
}
else
@@ -334,7 +336,7 @@
return ResourceProvider.getInstance();
}
- private void printUsage()
+ private void printUsage(PrintStream stream)
{
String arg;
if (Utils.isWindows())
@@ -350,7 +352,7 @@
*/
String msg = getMsg("status-cli-usage", true);
msg = msg.replace("{0}", arg);
- System.err.println(msg);
+ stream.println(msg);
}
private ServerStatusDescriptor createServerStatusDescriptor(String dn,
--
Gitblit v1.10.0