Skip to content

Commit d0623e7

Browse files
committed
Use the same name method style as Commons Lang
1 parent 52cb4de commit d0623e7

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public void appendHeader(final int level, final CharSequence text) throws IOExce
208208
final int idx = Math.min(level, fillChars.length) - 1;
209209
final TextStyle style = styleBuilder.get();
210210
final Queue<String> queue = makeColumnQueue(text, style);
211-
queue.add(Util.createPadding(style.getLeftPad()) + Util.repeat(Math.min(text.length(), style.getMaxWidth()), fillChars[idx]));
211+
queue.add(Util.repeatSpace(style.getLeftPad()) + Util.repeat(Math.min(text.length(), style.getMaxWidth()), fillChars[idx]));
212212
queue.add(BLANK_LINE);
213213
printQueue(queue);
214214
}
@@ -261,7 +261,7 @@ public void appendTitle(final CharSequence title) throws IOException {
261261
if (!Util.isEmpty(title)) {
262262
final TextStyle style = styleBuilder.get();
263263
final Queue<String> queue = makeColumnQueue(title, style);
264-
queue.add(Util.createPadding(style.getLeftPad()) + Util.repeat(Math.min(title.length(), style.getMaxWidth()), '#'));
264+
queue.add(Util.repeatSpace(style.getLeftPad()) + Util.repeat(Math.min(title.length(), style.getMaxWidth()), '#'));
265265
queue.add(BLANK_LINE);
266266
printQueue(queue);
267267
}
@@ -307,8 +307,8 @@ public TextStyle.Builder getStyleBuilder() {
307307
* @return A queue of the string wrapped.
308308
*/
309309
protected Queue<String> makeColumnQueue(final CharSequence columnData, final TextStyle style) {
310-
final String lpad = Util.createPadding(style.getLeftPad());
311-
final String indent = Util.createPadding(style.getIndent());
310+
final String lpad = Util.repeatSpace(style.getLeftPad());
311+
final String indent = Util.repeatSpace(style.getIndent());
312312
final Queue<String> result = new LinkedList<>();
313313
int wrapPos = 0;
314314
int nextPos;
@@ -431,7 +431,7 @@ public void setMaxWidth(final int maxWidth) {
431431
*/
432432
protected void writeColumnQueues(final List<Queue<String>> columnQueues, final List<TextStyle> styles) throws IOException {
433433
boolean moreData = true;
434-
final String lPad = Util.createPadding(styleBuilder.get().getLeftPad());
434+
final String lPad = Util.repeatSpace(styleBuilder.get().getLeftPad());
435435
while (moreData) {
436436
output.append(lPad);
437437
moreData = false;
@@ -440,7 +440,7 @@ protected void writeColumnQueues(final List<Queue<String>> columnQueues, final L
440440
final Queue<String> columnQueue = columnQueues.get(i);
441441
final String line = columnQueue.poll();
442442
if (Util.isEmpty(line)) {
443-
output.append(Util.createPadding(style.getMaxWidth() + style.getLeftPad()));
443+
output.append(Util.repeatSpace(style.getMaxWidth() + style.getLeftPad()));
444444
} else {
445445
output.append(line);
446446
}

src/main/java/org/apache/commons/cli/help/TextStyle.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,25 +331,25 @@ public CharSequence pad(final boolean addIndent, final CharSequence text) {
331331
padLen = maxWidth - text.length();
332332
}
333333
final int left = padLen / 2;
334-
indentPad = Util.createPadding(left);
335-
rest = Util.createPadding(padLen - left);
334+
indentPad = Util.repeatSpace(left);
335+
rest = Util.repeatSpace(padLen - left);
336336
sb.append(indentPad).append(text).append(rest);
337337
break;
338338
case LEFT:
339339
case RIGHT:
340340
default: // default should never happen. It is here to keep code coverage happy.
341341
if (maxWidth == UNSET_MAX_WIDTH) {
342-
indentPad = addIndent ? Util.createPadding(indent) : "";
342+
indentPad = addIndent ? Util.repeatSpace(indent) : "";
343343
rest = "";
344344
} else {
345345
int restLen = maxWidth - text.length();
346346
if (addIndent && restLen > indent) {
347-
indentPad = Util.createPadding(indent);
347+
indentPad = Util.repeatSpace(indent);
348348
restLen -= indent;
349349
} else {
350350
indentPad = "";
351351
}
352-
rest = Util.createPadding(restLen);
352+
rest = Util.repeatSpace(restLen);
353353
}
354354

355355
if (alignment == Alignment.LEFT) {

src/main/java/org/apache/commons/cli/help/Util.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2424
*/
2525
final class Util {
2626

27-
/**
28-
* Creates a String of padding of length {@code len}.
29-
*
30-
* @param len The length of the String of padding to create.
31-
*
32-
* @return The String of padding
33-
* @since 1.10.0
34-
*/
35-
static String createPadding(final int len) {
36-
return repeat(len, ' ');
37-
}
38-
3927
/**
4028
* Returns the {@code defaultValue} if {@code str} is empty.
4129
*
@@ -110,6 +98,18 @@ static String repeat(final int len, final char fillChar) {
11098
return new String(padding);
11199
}
112100

101+
/**
102+
* Creates a String of padding of length {@code len}.
103+
*
104+
* @param len The length of the String of padding to create.
105+
*
106+
* @return The String of padding
107+
* @since 1.10.0
108+
*/
109+
static String repeatSpace(final int len) {
110+
return repeat(len, ' ');
111+
}
112+
113113
/**
114114
* Removes the trailing whitespace from the specified String.
115115
*

0 commit comments

Comments
 (0)