From 3d7c5f9f00dd845b1cc8f14d52b48252b10bc375 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 07 Apr 2008 08:33:44 +0000
Subject: [PATCH] Fix for 3125 (Missing LF in summary of setup --cli)
---
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index c8975f6..e759aa6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -76,8 +76,6 @@
import org.opends.server.util.cli.Menu;
import org.opends.server.util.cli.MenuBuilder;
import org.opends.server.util.cli.MenuResult;
-import org.opends.server.util.table.TableBuilder;
-import org.opends.server.util.table.TextTablePrinter;
/**
* This class provides a very simple mechanism for installing the OpenDS
* Directory Service. It performs the following tasks:
@@ -2342,21 +2340,46 @@
Message.raw(uData.getDirectoryManagerDn()),
Message.raw(InstallReviewPanel.getDataDisplayString(uData)),
};
- TableBuilder table = new TableBuilder();
+ int maxWidth = 0;
+ StringBuilder sb = new StringBuilder();
+ for (Message l : labels)
+ {
+ maxWidth = Math.max(maxWidth, l.length());
+ }
+
for (int i=0; i<labels.length; i++)
{
if (values[i] != null)
{
- table.startRow();
- table.appendCell(labels[i]);
- table.appendCell(values[i]);
+ Message l = labels[i];
+ sb.append(l.toString());
+
+ sb.append(" ");
+ String[] lines = values[i].toString().split(Constants.LINE_SEPARATOR);
+ for (int j=0; j<lines.length; j++)
+ {
+ if (j != 0)
+ {
+ sb.append(Constants.LINE_SEPARATOR);
+ for (int k=0; k <= maxWidth; k++)
+ {
+ sb.append(" ");
+ }
+ }
+ else
+ {
+ for (int k=0; k<maxWidth - l.length(); k++)
+ {
+ sb.append(" ");
+ }
+ }
+ sb.append(lines[j].toString());
+ }
+ sb.append(Constants.LINE_SEPARATOR);
}
}
- TextTablePrinter printer = new TextTablePrinter(getOutputStream());
- printer.setDisplayHeadings(false);
- printer.setColumnSeparator("");
- table.print(printer);
+ println(Message.raw(sb));
println();
if (uData.getStartServer())
{
--
Gitblit v1.10.0