From 809d10707f58d0841af81f69850859ea5564f773 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 26 Jul 2007 12:56:58 +0000
Subject: [PATCH] Minor beautifying of the dsconfig interactive mode.
---
opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java | 6 +++---
opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java | 1 +
opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 2 ++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java b/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
index abe488a..d8ba680 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
@@ -155,6 +155,7 @@
String ninput = input.toLowerCase().trim();
if (ninput.length() == 0) {
// Empty input.
+ app.println();
app.printMessage(errMsg);
} else if (no.startsWith(ninput)) {
return false;
@@ -162,6 +163,7 @@
return true;
} else {
// Try again...
+ app.println();
app.printMessage(errMsg);
}
@@ -208,7 +210,7 @@
* The verbose message.
*/
public final void printVerboseMessage(String msg) {
- if (isVerbose()) {
+ if (isVerbose() || isInteractive()) {
err.println(wrapText(msg, MAX_LINE_WIDTH));
}
}
@@ -375,7 +377,6 @@
printMessage(prompt);
println();
builder.print(printer);
- println();
return null;
} else {
@@ -389,7 +390,6 @@
app.println();
String errMsg = getMessage(MSGID_DSCFG_ERROR_GENERAL_CHOICE, size);
app.printMessage(errMsg);
- app.println();
return null;
}
}
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index 3c3034c..da46c18 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -664,6 +664,7 @@
} catch (IllegalManagedObjectNameException e) {
ArgumentException ae = ArgumentExceptionFactory
.adaptIllegalManagedObjectNameException(e, d);
+ app.println();
app.printMessage(ae.getMessage());
return null;
}
@@ -701,6 +702,7 @@
// A child with the specified name must already exist.
int msgID = MSGID_DSCFG_ERROR_CREATE_NAME_ALREADY_EXISTS;
String msg = getMessage(msgID, relation.getUserFriendlyName(), input);
+ app.println();
app.printMessage(msg);
return null;
}
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
index ac32ec1..2cfbb26 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
@@ -947,6 +947,7 @@
}
default: {
// Display a menu.
+ Arrays.sort(children, String.CASE_INSENSITIVE_ORDER);
List<String> choices = Arrays.asList(children);
int msgID = MSGID_DSCFG_FINDER_PROMPT_MANY;
String msg = getMessage(msgID, d.getUserFriendlyName());
--
Gitblit v1.10.0