From ae2936fbee9671c508816da114cb64472317d2c1 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 15 Apr 2014 14:59:12 +0000
Subject: [PATCH] Fix for OPENDJ-1425 dsconfig output is incorrect when configuring LDAPS connection handler in interactive mode
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
index 523c174..53f1950 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
@@ -61,6 +61,8 @@
import org.forgerock.opendj.config.StringPropertyDefinition;
import org.forgerock.opendj.config.Tag;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
+import org.forgerock.opendj.config.client.ManagedObject;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -409,16 +411,23 @@
*
* @param app
* The application console.
- * @param d
- * The managed object definition.
+ * @param mo
+ * The managed object.
* @param c
* The collection of properties to be displayed.
*/
public static void displaySingleComponent(ConsoleApplication app,
- AbstractManagedObjectDefinition<?, ?> d,
+ ManagedObject<?> mo,
Collection<PropertyDefinition<?>> c) {
+ String ufn = mo.getManagedObjectPath().getName();
+ if (ufn == null)
+ {
+ ufn = mo.getManagedObjectDefinition().getUserFriendlyName().toString();
+ }
// Display the title.
- app.println(INFO_DSCFG_HELP_HEADING_COMPONENT.get(d.getUserFriendlyName()));
+ app.println(INFO_DSCFG_HELP_HEADING_COMPONENT.get(ufn));
+
+ final AbstractManagedObjectDefinition<?, ?> d = mo.getManagedObjectDefinition();
app.println();
app.println(d.getSynopsis());
@@ -435,7 +444,7 @@
app.println();
// Headings.
- TableBuilder builder = new TableBuilder();
+ final TableBuilder builder = new TableBuilder();
builder.appendHeading(INFO_DSCFG_HEADING_PROPERTY_NAME.get());
builder.appendHeading(INFO_DSCFG_HEADING_PROPERTY_OPTIONS.get());
@@ -445,7 +454,7 @@
builder.addSortKey(0);
// Output summary of each property.
- for (PropertyDefinition<?> pd : c) {
+ for (final PropertyDefinition<?> pd : c) {
// Display the property.
builder.startRow();
@@ -456,13 +465,12 @@
builder.appendCell(getPropertyOptionSummary(pd));
// Display the syntax.
- PropertyDefinitionUsageBuilder v = new PropertyDefinitionUsageBuilder(
+ final PropertyDefinitionUsageBuilder v = new PropertyDefinitionUsageBuilder(
false);
builder.appendCell(v.getUsage(pd));
}
- TablePrinter printer = new TextTablePrinter(app.getErrorStream());
- builder.print(printer);
+ builder.print(new TextTablePrinter(app.getErrorStream()));
}
--
Gitblit v1.10.0