From ae61d0915bf8e4968674a1eb4bb3ec16c1371168 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 29 Aug 2007 23:12:07 +0000
Subject: [PATCH] Use consistently line breaks in the uninstall and status command-lines.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
index e2cced9..5276892 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
@@ -272,8 +272,9 @@
catch (ArgumentException ae)
{
Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
- err.println(wrap(message));
- err.println(argParser.getUsage());
+ printErrorMessage(message);
+ printLineBreak();
+ printErrorMessage(argParser.getUsage());
return ErrorReturnCode.ERROR_PARSING_ARGS.getReturnCode();
}
@@ -288,7 +289,7 @@
if (v != DsFrameworkCliReturnCode.SUCCESSFUL_NOP.getReturnCode())
{
- err.println(argParser.getUsage());
+ printErrorMessage(argParser.getUsage());
return v;
}
else
@@ -329,7 +330,6 @@
{
bindPwd = promptForPassword(
INFO_LDAPAUTH_PASSWORD_PROMPT.get(bindDn));
- printLineBreak();
prompted = true;
}
@@ -337,10 +337,12 @@
{
if (canUseSSL)
{
- useSSL = confirm(INFO_CLI_USESSL_PROMPT.get(), useSSL);
+ printLineBreak();
+ useSSL = confirm(INFO_CLI_USESSL_PROMPT.get(), useSSL);
}
if (!useSSL && canUseStartTLS)
{
+ printLineBreak();
useStartTLS =
confirm(INFO_CLI_USESTARTTLS_PROMPT.get(), useStartTLS);
}
@@ -421,6 +423,7 @@
useSSL = confirm(INFO_CLI_USESSL_PROMPT.get(), useSSL);
if (!useSSL)
{
+ printLineBreak();
useStartTLS =
confirm(INFO_CLI_USESTARTTLS_PROMPT.get(), useStartTLS);
}
@@ -478,6 +481,7 @@
}
catch (ConfigException ce)
{
+ printLineBreak();
printErrorMessage(ce.getMessageObject());
}
}
--
Gitblit v1.10.0