From 4df4b439048aa629e87945af2e4dfac9747e0861 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 05 May 2014 15:56:21 +0000
Subject: [PATCH] OPENDJ-1303 "opendj-cli" - Removed && replaced StaticUtils.wrapText by com.forgerock.opendj.cli.Utils.wrapText;
---
opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java | 206 ---------------------------------------------------
1 files changed, 0 insertions(+), 206 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
index 396885d..687d098 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
@@ -3745,212 +3745,6 @@
}
}
-
-
- /**
- * Inserts line breaks into the provided buffer to wrap text at no more than
- * the specified column width. Wrapping will only be done at space boundaries
- * and if there are no spaces within the specified width, then wrapping will
- * be performed at the first space after the specified column.
- *
- * @param message The message to be wrapped.
- * @param width The maximum number of characters to allow on a line if there
- * is a suitable breaking point.
- *
- * @return The wrapped text.
- */
- public static String wrapText(LocalizableMessage message, int width)
- {
- return wrapText(message.toString(), width, 0);
- }
-
-
-
- /**
- * Inserts line breaks into the provided buffer to wrap text at no more than
- * the specified column width. Wrapping will only be done at space boundaries
- * and if there are no spaces within the specified width, then wrapping will
- * be performed at the first space after the specified column.
- *
- * @param text The text to be wrapped.
- * @param width The maximum number of characters to allow on a line if there
- * is a suitable breaking point.
- *
- * @return The wrapped text.
- */
- public static String wrapText(String text, int width) {
- return wrapText(text, width, 0);
- }
-
-
-
- /**
- * Inserts line breaks into the provided buffer to wrap text at no
- * more than the specified column width. Wrapping will only be done
- * at space boundaries and if there are no spaces within the
- * specified width, then wrapping will be performed at the first
- * space after the specified column. In addition each line will be
- * indented by the specified amount.
- *
- * @param message
- * The message to be wrapped.
- * @param width
- * The maximum number of characters to allow on a line if
- * there is a suitable breaking point (including any
- * indentation).
- * @param indent
- * The number of columns to indent each line.
- * @return The wrapped text.
- */
- public static String wrapText(LocalizableMessage message, int width, int indent)
- {
- return wrapText(message.toString(), width, indent);
- }
-
-
-
- /**
- * Inserts line breaks into the provided buffer to wrap text at no
- * more than the specified column width. Wrapping will only be done
- * at space boundaries and if there are no spaces within the
- * specified width, then wrapping will be performed at the first
- * space after the specified column. In addition each line will be
- * indented by the specified amount.
- *
- * @param text
- * The text to be wrapped.
- * @param width
- * The maximum number of characters to allow on a line if
- * there is a suitable breaking point (including any
- * indentation).
- * @param indent
- * The number of columns to indent each line.
- * @return The wrapped text.
- */
- public static String wrapText(String text, int width, int indent)
- {
- Reject.ifFalse(indent >= 0 && indent < width);
-
- // Calculate the real width and indentation padding.
- width -= indent;
- StringBuilder pb = new StringBuilder();
- for (int i = 0; i < indent; i++) {
- pb.append(' ');
- }
- String padding = pb.toString();
-
- StringBuilder buffer = new StringBuilder();
- if (text != null) {
- StringTokenizer lineTokenizer = new StringTokenizer(text, "\r\n", true);
- while (lineTokenizer.hasMoreTokens())
- {
- String line = lineTokenizer.nextToken();
- if (line.equals("\r") || line.equals("\n"))
- {
- // It's an end-of-line character, so append it as-is.
- buffer.append(line);
- }
- else if (line.length() < width)
- {
- // The line fits in the specified width, so append it as-is.
- buffer.append(padding);
- buffer.append(line);
- }
- else
- {
- // The line doesn't fit in the specified width, so it needs to be
- // wrapped. Do so at space boundaries.
- StringBuilder lineBuffer = new StringBuilder();
- StringBuilder delimBuffer = new StringBuilder();
- StringTokenizer wordTokenizer = new StringTokenizer(line, " ", true);
- while (wordTokenizer.hasMoreTokens())
- {
- String word = wordTokenizer.nextToken();
- if (word.equals(" "))
- {
- // It's a space, so add it to the delim buffer only if the line
- // buffer is not empty.
- if (lineBuffer.length() > 0)
- {
- delimBuffer.append(word);
- }
- }
- else if (word.length() > width)
- {
- // This is a long word that can't be wrapped, so we'll just have
- // to make do.
- if (lineBuffer.length() > 0)
- {
- buffer.append(padding);
- buffer.append(lineBuffer);
- buffer.append(EOL);
- lineBuffer = new StringBuilder();
- }
- buffer.append(padding);
- buffer.append(word);
-
- if (wordTokenizer.hasMoreTokens())
- {
- // The next token must be a space, so remove it. If there are
- // still more tokens after that, then append an EOL.
- wordTokenizer.nextToken();
- if (wordTokenizer.hasMoreTokens())
- {
- buffer.append(EOL);
- }
- }
-
- if (delimBuffer.length() > 0)
- {
- delimBuffer = new StringBuilder();
- }
- }
- else
- {
- // It's not a space, so see if we can fit it on the curent line.
- int newLineLength = lineBuffer.length() + delimBuffer.length() +
- word.length();
- if (newLineLength < width)
- {
- // It does fit on the line, so add it.
- lineBuffer.append(delimBuffer).append(word);
-
- if (delimBuffer.length() > 0)
- {
- delimBuffer = new StringBuilder();
- }
- }
- else
- {
- // It doesn't fit on the line, so end the current line and start
- // a new one.
- buffer.append(padding);
- buffer.append(lineBuffer);
- buffer.append(EOL);
-
- lineBuffer = new StringBuilder();
- lineBuffer.append(word);
-
- if (delimBuffer.length() > 0)
- {
- delimBuffer = new StringBuilder();
- }
- }
- }
- }
-
- // If there's anything left in the line buffer, then add it to the
- // final buffer.
- buffer.append(padding);
- buffer.append(lineBuffer);
- }
- }
- }
- return buffer.toString();
- }
-
-
-
/**
* Filters the provided value to ensure that it is appropriate for use as an
* exit code. Exit code values are generally only allowed to be between 0 and
--
Gitblit v1.10.0