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-vfs.git
The following commit(s) were added to refs/heads/master by this push: new 5ea3b33 Better internal name. 5ea3b33 is described below commit 5ea3b331cafa0b6465c8e054c651731b2dc0d30a Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Nov 30 16:07:35 2021 -0500 Better internal name. --- .../src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java | 2 +- .../src/main/java/org/apache/commons/vfs2/util/URIBitSets.java | 8 ++++---- .../src/main/java/org/apache/commons/vfs2/util/URIUtils.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java index dd1cd4c..3dcce5e 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java @@ -75,7 +75,7 @@ final class FluentBitSet { return this; } - FluentBitSet setRangeInclusive(final int startIncl, final int endIncl) { + FluentBitSet setInclusive(final int startIncl, final int endIncl) { bitSet.set(startIncl, endIncl + 1); return this; } diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java index ea02c1c..b92147a 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java @@ -50,7 +50,7 @@ final class URIBitSets { * </blockquote> * </p> */ - static final FluentBitSet DIGIT = bitSet().setRangeInclusive('0', '9'); + static final FluentBitSet DIGIT = bitSet().setInclusive('0', '9'); /** * BitSet for alpha. @@ -64,7 +64,7 @@ final class URIBitSets { * </blockquote> * </p> */ - static final FluentBitSet ALPHA = bitSet().setRangeInclusive('a', 'z').setRangeInclusive('A', 'Z'); + static final FluentBitSet ALPHA = bitSet().setInclusive('a', 'z').setInclusive('A', 'Z'); /** * BitSet for alphanum (join of alpha & digit). @@ -92,7 +92,7 @@ final class URIBitSets { * </blockquote> * </p> */ - static final FluentBitSet HEX = bitSet().or(DIGIT).setRangeInclusive('a', 'f').setRangeInclusive('A', 'F'); + static final FluentBitSet HEX = bitSet().or(DIGIT).setInclusive('a', 'f').setInclusive('A', 'F'); /** * BitSet for escaped. @@ -715,7 +715,7 @@ final class URIBitSets { */ private static final int CHARACTER_DEL = 0x7F; private static final int CHARCTER_US = 0x1F; - static final FluentBitSet CONTROL = bitSet().setRangeInclusive(0, CHARCTER_US).set(CHARACTER_DEL); + static final FluentBitSet CONTROL = bitSet().setInclusive(0, CHARCTER_US).set(CHARACTER_DEL); private static final int NBITS = 256; diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java index 39fc1c1..bc0768d 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java @@ -109,10 +109,10 @@ public class URIUtils { // @formatter:off private static final FluentBitSet WWW_FORM_URL_SAFE = URIBitSets.bitSet() // alpha characters - .setRangeInclusive('a', 'z') - .setRangeInclusive('A', 'Z') + .setInclusive('a', 'z') + .setInclusive('A', 'Z') // numeric characters - .setRangeInclusive('0', '9') + .setInclusive('0', '9') // special chars .set('-', '_', '.', '*') // blank to be replaced with +