From 5746e04ca99fcb8efa8a3dea642ee1c90d207e4e Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 30 Aug 2007 13:46:48 +0000
Subject: [PATCH] Use the new TextTablePrinter#setIndentWidth(int) method for menu indentation.
---
opends/src/server/org/opends/server/util/cli/MenuBuilder.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/cli/MenuBuilder.java b/opends/src/server/org/opends/server/util/cli/MenuBuilder.java
index a69d9a0..5944529 100644
--- a/opends/src/server/org/opends/server/util/cli/MenuBuilder.java
+++ b/opends/src/server/org/opends/server/util/cli/MenuBuilder.java
@@ -268,9 +268,9 @@
new TextTablePrinter(app.getErrorStream());
cprinter.setDisplayHeadings(false);
int sz = String.valueOf(nbuilder.getTableHeight()).length() + 1;
- cprinter.setColumnWidth(0, 2);
- cprinter.setColumnWidth(1, sz);
- cprinter.setColumnWidth(2, 0);
+ cprinter.setIndentWidth(4);
+ cprinter.setColumnWidth(0, sz);
+ cprinter.setColumnWidth(1, 0);
cbuilder.print(cprinter);
app.println();
}
@@ -703,7 +703,6 @@
// Create optional column headers.
if (!columnHeadings.isEmpty()) {
nbuilder.appendHeading();
- nbuilder.appendHeading();
for (Message heading : columnHeadings) {
if (heading != null) {
nbuilder.appendHeading(heading);
@@ -740,7 +739,6 @@
for (int i = 0, j = rows; i < rows; i++, j++) {
nbuilder.startRow();
- nbuilder.appendCell();
nbuilder.appendCell(INFO_MENU_NUMERIC_OPTION.get(i + 1));
for (Message field : numericFields.get(i)) {
@@ -776,7 +774,6 @@
Message option = INFO_MENU_CHAR_OPTION.get(c);
cbuilder.startRow();
- cbuilder.appendCell();
cbuilder.appendCell(option);
cbuilder.appendCell(charSynopsis.get(i));
@@ -792,21 +789,21 @@
printer.setDisplayHeadings(true);
}
- printer.setColumnWidth(0, 2);
+ printer.setIndentWidth(4);
if (columnWidths.isEmpty()) {
- printer.setColumnWidth(2, 0);
+ printer.setColumnWidth(1, 0);
if (useMultipleColumns) {
- printer.setColumnWidth(4, 0);
+ printer.setColumnWidth(3, 0);
}
} else {
for (int i = 0; i < columnWidths.size(); i++) {
Integer j = columnWidths.get(i);
if (j != null) {
// Skip the option key column.
- printer.setColumnWidth(i + 2, j);
+ printer.setColumnWidth(i + 1, j);
if (useMultipleColumns) {
- printer.setColumnWidth(i + 3 + columnWidths.size(), j);
+ printer.setColumnWidth(i + 2 + columnWidths.size(), j);
}
}
}
--
Gitblit v1.10.0