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 52cb4de Rename to match String style of naming 52cb4de is described below commit 52cb4debef1ef27b4261688b5bb800c87cd81b6c Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Mon Oct 14 16:39:35 2024 -0400 Rename to match String style of naming --- src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java | 2 +- src/main/java/org/apache/commons/cli/help/Util.java | 6 +++--- src/test/java/org/apache/commons/cli/help/UtilTest.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 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 b7d4a92..0089274 100644 --- a/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java +++ b/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java @@ -318,7 +318,7 @@ public class TextHelpAppendable extends FilterHelpAppendable { nextPos = findWrapPos(columnData, workingWidth, wrapPos); final CharSequence working = columnData.subSequence(wrapPos, nextPos); result.add(lpad + style.pad(wrapPos > 0, working)); - wrapPos = Util.findNonWhitespacePos(columnData, nextPos); + wrapPos = Util.indexOfNonWhitespace(columnData, nextPos); wrapPos = wrapPos == -1 ? nextPos : wrapPos; } return result; 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 66e2794..e593355 100644 --- a/src/main/java/org/apache/commons/cli/help/Util.java +++ b/src/main/java/org/apache/commons/cli/help/Util.java @@ -49,13 +49,13 @@ final class Util { } /** - * Finds the position of the first non whitespace character. + * Finds the index of the first non whitespace character. * * @param text the text to search in. * @param startPos the starting position to search from. * @return the index of the first non whitespace character or -1 if non found. */ - static int findNonWhitespacePos(final CharSequence text, final int startPos) { + static int indexOfNonWhitespace(final CharSequence text, final int startPos) { if (isEmpty(text)) { return -1; } @@ -93,7 +93,7 @@ final class Util { * @return The String of without the leading padding */ static String ltrim(final String s) { - final int pos = findNonWhitespacePos(s, 0); + final int pos = indexOfNonWhitespace(s, 0); return pos == -1 ? "" : s.substring(pos); } diff --git a/src/test/java/org/apache/commons/cli/help/UtilTest.java b/src/test/java/org/apache/commons/cli/help/UtilTest.java index f736c3b..5e61967 100644 --- a/src/test/java/org/apache/commons/cli/help/UtilTest.java +++ b/src/test/java/org/apache/commons/cli/help/UtilTest.java @@ -60,17 +60,17 @@ public class UtilTest { @Test public void testFindNonWhitespacePos() { - assertEquals(-1, Util.findNonWhitespacePos(null, 0)); - assertEquals(-1, Util.findNonWhitespacePos("", 0)); + assertEquals(-1, Util.indexOfNonWhitespace(null, 0)); + assertEquals(-1, Util.indexOfNonWhitespace("", 0)); } @ParameterizedTest @MethodSource("charArgs") public void testFindNonWhitespacePos(final Character c, final boolean isWhitespace) { String text = format("%cWorld", c); - assertEquals(isWhitespace ? 1 : 0, Util.findNonWhitespacePos(text, 0)); + assertEquals(isWhitespace ? 1 : 0, Util.indexOfNonWhitespace(text, 0)); text = format("%c%c%c", c, c, c); - assertEquals(isWhitespace ? -1 : 0, Util.findNonWhitespacePos(text, 0)); + assertEquals(isWhitespace ? -1 : 0, Util.indexOfNonWhitespace(text, 0)); } @Test