You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/10/14 20:42:33 UTC
(commons-cli) branch master updated: Use the same name method style as Commons Lang
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new d0623e72 Use the same name method style as Commons Lang
d0623e72 is described below
commit d0623e728f055bbef710efb0573db37eea163eb9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Oct 14 16:42:29 2024 -0400
Use the same name method style as Commons Lang
---
.../commons/cli/help/TextHelpAppendable.java | 12 +++++------
.../org/apache/commons/cli/help/TextStyle.java | 10 ++++-----
.../java/org/apache/commons/cli/help/Util.java | 24 +++++++++++-----------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java b/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java
index 00892745..922ac61e 100644
--- a/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java
+++ b/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java
@@ -208,7 +208,7 @@ public class TextHelpAppendable extends FilterHelpAppendable {
final int idx = Math.min(level, fillChars.length) - 1;
final TextStyle style = styleBuilder.get();
final Queue<String> queue = makeColumnQueue(text, style);
- queue.add(Util.createPadding(style.getLeftPad()) + Util.repeat(Math.min(text.length(), style.getMaxWidth()), fillChars[idx]));
+ queue.add(Util.repeatSpace(style.getLeftPad()) + Util.repeat(Math.min(text.length(), style.getMaxWidth()), fillChars[idx]));
queue.add(BLANK_LINE);
printQueue(queue);
}
@@ -261,7 +261,7 @@ public class TextHelpAppendable extends FilterHelpAppendable {
if (!Util.isEmpty(title)) {
final TextStyle style = styleBuilder.get();
final Queue<String> queue = makeColumnQueue(title, style);
- queue.add(Util.createPadding(style.getLeftPad()) + Util.repeat(Math.min(title.length(), style.getMaxWidth()), '#'));
+ queue.add(Util.repeatSpace(style.getLeftPad()) + Util.repeat(Math.min(title.length(), style.getMaxWidth()), '#'));
queue.add(BLANK_LINE);
printQueue(queue);
}
@@ -307,8 +307,8 @@ public class TextHelpAppendable extends FilterHelpAppendable {
* @return A queue of the string wrapped.
*/
protected Queue<String> makeColumnQueue(final CharSequence columnData, final TextStyle style) {
- final String lpad = Util.createPadding(style.getLeftPad());
- final String indent = Util.createPadding(style.getIndent());
+ final String lpad = Util.repeatSpace(style.getLeftPad());
+ final String indent = Util.repeatSpace(style.getIndent());
final Queue<String> result = new LinkedList<>();
int wrapPos = 0;
int nextPos;
@@ -431,7 +431,7 @@ public class TextHelpAppendable extends FilterHelpAppendable {
*/
protected void writeColumnQueues(final List<Queue<String>> columnQueues, final List<TextStyle> styles) throws IOException {
boolean moreData = true;
- final String lPad = Util.createPadding(styleBuilder.get().getLeftPad());
+ final String lPad = Util.repeatSpace(styleBuilder.get().getLeftPad());
while (moreData) {
output.append(lPad);
moreData = false;
@@ -440,7 +440,7 @@ public class TextHelpAppendable extends FilterHelpAppendable {
final Queue<String> columnQueue = columnQueues.get(i);
final String line = columnQueue.poll();
if (Util.isEmpty(line)) {
- output.append(Util.createPadding(style.getMaxWidth() + style.getLeftPad()));
+ output.append(Util.repeatSpace(style.getMaxWidth() + style.getLeftPad()));
} else {
output.append(line);
}
diff --git a/src/main/java/org/apache/commons/cli/help/TextStyle.java b/src/main/java/org/apache/commons/cli/help/TextStyle.java
index e5ef70ee..28a51aa1 100644
--- a/src/main/java/org/apache/commons/cli/help/TextStyle.java
+++ b/src/main/java/org/apache/commons/cli/help/TextStyle.java
@@ -331,25 +331,25 @@ public final class TextStyle {
padLen = maxWidth - text.length();
}
final int left = padLen / 2;
- indentPad = Util.createPadding(left);
- rest = Util.createPadding(padLen - left);
+ indentPad = Util.repeatSpace(left);
+ rest = Util.repeatSpace(padLen - left);
sb.append(indentPad).append(text).append(rest);
break;
case LEFT:
case RIGHT:
default: // default should never happen. It is here to keep code coverage happy.
if (maxWidth == UNSET_MAX_WIDTH) {
- indentPad = addIndent ? Util.createPadding(indent) : "";
+ indentPad = addIndent ? Util.repeatSpace(indent) : "";
rest = "";
} else {
int restLen = maxWidth - text.length();
if (addIndent && restLen > indent) {
- indentPad = Util.createPadding(indent);
+ indentPad = Util.repeatSpace(indent);
restLen -= indent;
} else {
indentPad = "";
}
- rest = Util.createPadding(restLen);
+ rest = Util.repeatSpace(restLen);
}
if (alignment == Alignment.LEFT) {
diff --git a/src/main/java/org/apache/commons/cli/help/Util.java b/src/main/java/org/apache/commons/cli/help/Util.java
index e5933554..17dcb9e6 100644
--- a/src/main/java/org/apache/commons/cli/help/Util.java
+++ b/src/main/java/org/apache/commons/cli/help/Util.java
@@ -24,18 +24,6 @@ import java.util.Arrays;
*/
final class Util {
- /**
- * Creates a String of padding of length {@code len}.
- *
- * @param len The length of the String of padding to create.
- *
- * @return The String of padding
- * @since 1.10.0
- */
- static String createPadding(final int len) {
- return repeat(len, ' ');
- }
-
/**
* Returns the {@code defaultValue} if {@code str} is empty.
*
@@ -110,6 +98,18 @@ final class Util {
return new String(padding);
}
+ /**
+ * Creates a String of padding of length {@code len}.
+ *
+ * @param len The length of the String of padding to create.
+ *
+ * @return The String of padding
+ * @since 1.10.0
+ */
+ static String repeatSpace(final int len) {
+ return repeat(len, ' ');
+ }
+
/**
* Removes the trailing whitespace from the specified String.
*