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-text.git
The following commit(s) were added to refs/heads/master by this push:
new 7aed14a Renme param.
7aed14a is described below
commit 7aed14a68e47c0d3d56b4dc3953efd0e6587783f
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Jan 5 13:31:42 2021 -0500
Renme param.
---
.../org/apache/commons/text/StringEscapeUtils.java | 6 +++---
.../commons/text/translate/AggregateTranslator.java | 4 ++--
.../commons/text/translate/CodePointTranslator.java | 8 ++++----
.../apache/commons/text/translate/CsvTranslators.java | 18 +++++++++---------
.../commons/text/translate/LookupTranslator.java | 4 ++--
.../commons/text/translate/NumericEntityEscaper.java | 8 ++++----
.../commons/text/translate/NumericEntityUnescaper.java | 8 ++++----
.../apache/commons/text/translate/OctalUnescaper.java | 4 ++--
.../commons/text/translate/SinglePassTranslator.java | 8 ++++----
.../apache/commons/text/translate/UnicodeEscaper.java | 14 +++++++-------
.../commons/text/translate/UnicodeUnescaper.java | 4 ++--
.../translate/UnicodeUnpairedSurrogateRemover.java | 2 +-
.../text/translate/SinglePassTranslatorTest.java | 2 +-
13 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/StringEscapeUtils.java
b/src/main/java/org/apache/commons/text/StringEscapeUtils.java
index 9720ddd..7daaace 100644
--- a/src/main/java/org/apache/commons/text/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/text/StringEscapeUtils.java
@@ -378,7 +378,7 @@ public class StringEscapeUtils {
private static final char BACKSLASH = '\\';
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
if (index != 0) {
throw new IllegalStateException("XsiUnescaper should never
reach the [1] index");
@@ -392,12 +392,12 @@ public class StringEscapeUtils {
final int pos = s.indexOf(BACKSLASH, searchOffset);
if (pos == -1) {
if (segmentStart < s.length()) {
- out.write(s.substring(segmentStart));
+ writer.write(s.substring(segmentStart));
}
break;
}
if (pos > segmentStart) {
- out.write(s.substring(segmentStart, pos));
+ writer.write(s.substring(segmentStart, pos));
}
segmentStart = pos + 1;
searchOffset = pos + 2;
diff --git
a/src/main/java/org/apache/commons/text/translate/AggregateTranslator.java
b/src/main/java/org/apache/commons/text/translate/AggregateTranslator.java
index ba25734..c0982f6 100644
--- a/src/main/java/org/apache/commons/text/translate/AggregateTranslator.java
+++ b/src/main/java/org/apache/commons/text/translate/AggregateTranslator.java
@@ -55,9 +55,9 @@ public class AggregateTranslator extends
CharSequenceTranslator {
* {@inheritDoc}
*/
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
for (final CharSequenceTranslator translator : translators) {
- final int consumed = translator.translate(input, index, out);
+ final int consumed = translator.translate(input, index, writer);
if (consumed != 0) {
return consumed;
}
diff --git
a/src/main/java/org/apache/commons/text/translate/CodePointTranslator.java
b/src/main/java/org/apache/commons/text/translate/CodePointTranslator.java
index 71828be..d225aac 100644
--- a/src/main/java/org/apache/commons/text/translate/CodePointTranslator.java
+++ b/src/main/java/org/apache/commons/text/translate/CodePointTranslator.java
@@ -32,9 +32,9 @@ public abstract class CodePointTranslator extends
CharSequenceTranslator {
* {@inheritDoc}
*/
@Override
- public final int translate(final CharSequence input, final int index,
final Writer out) throws IOException {
+ public final int translate(final CharSequence input, final int index,
final Writer writer) throws IOException {
final int codepoint = Character.codePointAt(input, index);
- final boolean consumed = translate(codepoint, out);
+ final boolean consumed = translate(codepoint, writer);
return consumed ? 1 : 0;
}
@@ -42,10 +42,10 @@ public abstract class CodePointTranslator extends
CharSequenceTranslator {
* Translate the specified codepoint into another.
*
* @param codepoint int character input to translate
- * @param out Writer to optionally push the translated output to
+ * @param writer Writer to optionally push the translated output to
* @return boolean as to whether translation occurred or not
* @throws IOException if and only if the Writer produces an IOException
*/
- public abstract boolean translate(int codepoint, Writer out) throws
IOException;
+ public abstract boolean translate(int codepoint, Writer writer) throws
IOException;
}
diff --git
a/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
b/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
index df95486..d192b4d 100644
--- a/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
+++ b/src/main/java/org/apache/commons/text/translate/CsvTranslators.java
@@ -54,15 +54,15 @@ public final class CsvTranslators {
public static class CsvEscaper extends SinglePassTranslator {
@Override
- void translateWhole(final CharSequence input, final Writer out) throws
IOException {
+ void translateWhole(final CharSequence input, final Writer writer)
throws IOException {
final String inputSting = input.toString();
if (StringUtils.containsNone(inputSting, CSV_SEARCH_CHARS)) {
- out.write(inputSting);
+ writer.write(inputSting);
} else {
// input needs quoting
- out.write(CSV_QUOTE);
- out.write(StringUtils.replace(inputSting, CSV_QUOTE_STR,
CSV_ESCAPED_QUOTE_STR));
- out.write(CSV_QUOTE);
+ writer.write(CSV_QUOTE);
+ writer.write(StringUtils.replace(inputSting, CSV_QUOTE_STR,
CSV_ESCAPED_QUOTE_STR));
+ writer.write(CSV_QUOTE);
}
}
}
@@ -73,10 +73,10 @@ public final class CsvTranslators {
public static class CsvUnescaper extends SinglePassTranslator {
@Override
- void translateWhole(final CharSequence input, final Writer out) throws
IOException {
+ void translateWhole(final CharSequence input, final Writer writer)
throws IOException {
// is input not quoted?
if (input.charAt(0) != CSV_QUOTE || input.charAt(input.length() -
1) != CSV_QUOTE) {
- out.write(input.toString());
+ writer.write(input.toString());
return;
}
@@ -85,9 +85,9 @@ public final class CsvTranslators {
if (StringUtils.containsAny(quoteless, CSV_SEARCH_CHARS)) {
// deal with escaped quotes; ie) ""
- out.write(StringUtils.replace(quoteless,
CSV_ESCAPED_QUOTE_STR, CSV_QUOTE_STR));
+ writer.write(StringUtils.replace(quoteless,
CSV_ESCAPED_QUOTE_STR, CSV_QUOTE_STR));
} else {
- out.write(quoteless);
+ writer.write(quoteless);
}
}
}
diff --git
a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java
b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java
index b072b05..a143cf8 100644
--- a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java
+++ b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java
@@ -78,7 +78,7 @@ public class LookupTranslator extends CharSequenceTranslator {
* {@inheritDoc}
*/
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
// check if translation exists for the input at position index
if (prefixSet.get(input.charAt(index))) {
int max = longest;
@@ -91,7 +91,7 @@ public class LookupTranslator extends CharSequenceTranslator {
final String result = lookupMap.get(subSeq.toString());
if (result != null) {
- out.write(result);
+ writer.write(result);
return i;
}
}
diff --git
a/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
b/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
index 58ea4da..a2b31b5 100644
--- a/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
+++ b/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
@@ -100,13 +100,13 @@ public class NumericEntityEscaper extends
CodePointTranslator {
* {@inheritDoc}
*/
@Override
- public boolean translate(final int codepoint, final Writer out) throws
IOException {
+ public boolean translate(final int codepoint, final Writer writer) throws
IOException {
if (this.between != this.range.contains(codepoint)) {
return false;
}
- out.write("&#");
- out.write(Integer.toString(codepoint, 10));
- out.write(';');
+ writer.write("&#");
+ writer.write(Integer.toString(codepoint, 10));
+ writer.write(';');
return true;
}
}
diff --git
a/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
b/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
index b1abde5..25f4d74 100644
---
a/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
+++
b/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
@@ -94,7 +94,7 @@ public class NumericEntityUnescaper extends
CharSequenceTranslator {
* {@inheritDoc}
*/
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
final int seqEnd = input.length();
// Uses -2 to ensure there is something after the &#
if (input.charAt(index) == '&' && index < seqEnd - 2 &&
input.charAt(index + 1) == '#') {
@@ -144,10 +144,10 @@ public class NumericEntityUnescaper extends
CharSequenceTranslator {
if (entityValue > 0xFFFF) {
final char[] chrs = Character.toChars(entityValue);
- out.write(chrs[0]);
- out.write(chrs[1]);
+ writer.write(chrs[0]);
+ writer.write(chrs[1]);
} else {
- out.write(entityValue);
+ writer.write(entityValue);
}
return 2 + end - start + (isHex ? 1 : 0) + (semiNext ? 1 : 0);
diff --git
a/src/main/java/org/apache/commons/text/translate/OctalUnescaper.java
b/src/main/java/org/apache/commons/text/translate/OctalUnescaper.java
index 0443128..28bea8c 100644
--- a/src/main/java/org/apache/commons/text/translate/OctalUnescaper.java
+++ b/src/main/java/org/apache/commons/text/translate/OctalUnescaper.java
@@ -35,7 +35,7 @@ public class OctalUnescaper extends CharSequenceTranslator {
* {@inheritDoc}
*/
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
final int remaining = input.length() - index - 1; // how many
characters left, ignoring the first \
final StringBuilder builder = new StringBuilder();
if (input.charAt(index) == '\\' && remaining > 0 &&
isOctalDigit(input.charAt(index + 1))) {
@@ -53,7 +53,7 @@ public class OctalUnescaper extends CharSequenceTranslator {
}
}
- out.write(Integer.parseInt(builder.toString(), 8));
+ writer.write(Integer.parseInt(builder.toString(), 8));
return 1 + builder.length();
}
return 0;
diff --git
a/src/main/java/org/apache/commons/text/translate/SinglePassTranslator.java
b/src/main/java/org/apache/commons/text/translate/SinglePassTranslator.java
index d61b584..2c9f00f 100644
--- a/src/main/java/org/apache/commons/text/translate/SinglePassTranslator.java
+++ b/src/main/java/org/apache/commons/text/translate/SinglePassTranslator.java
@@ -26,13 +26,13 @@ import java.io.Writer;
abstract class SinglePassTranslator extends CharSequenceTranslator {
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
if (index != 0) {
throw new IllegalArgumentException(getClassName() +
".translate(final CharSequence input, final int "
+ "index, final Writer out) can not handle a non-zero
index.");
}
- translateWhole(input, out);
+ translateWhole(input, writer);
return Character.codePointCount(input, index, input.length());
}
@@ -51,8 +51,8 @@ abstract class SinglePassTranslator extends
CharSequenceTranslator {
* Translate whole set of code points passed in input.
*
* @param input CharSequence that is being translated
- * @param out Writer to translate the text to
+ * @param writer Writer to translate the text to
* @throws IOException if and only if the Writer produces an IOException
*/
- abstract void translateWhole(CharSequence input, Writer out) throws
IOException;
+ abstract void translateWhole(CharSequence input, Writer writer) throws
IOException;
}
diff --git
a/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
b/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
index f3bc7b5..3c98812 100644
--- a/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
@@ -103,7 +103,7 @@ public class UnicodeEscaper extends CodePointTranslator {
* {@inheritDoc}
*/
@Override
- public boolean translate(final int codepoint, final Writer out) throws
IOException {
+ public boolean translate(final int codepoint, final Writer writer) throws
IOException {
if (between) {
if (codepoint < below || codepoint > above) {
return false;
@@ -115,13 +115,13 @@ public class UnicodeEscaper extends CodePointTranslator {
}
if (codepoint > 0xffff) {
- out.write(toUtf16Escape(codepoint));
+ writer.write(toUtf16Escape(codepoint));
} else {
- out.write("\\u");
- out.write(HEX_DIGITS[(codepoint >> 12) & 15]);
- out.write(HEX_DIGITS[(codepoint >> 8) & 15]);
- out.write(HEX_DIGITS[(codepoint >> 4) & 15]);
- out.write(HEX_DIGITS[(codepoint) & 15]);
+ writer.write("\\u");
+ writer.write(HEX_DIGITS[(codepoint >> 12) & 15]);
+ writer.write(HEX_DIGITS[(codepoint >> 8) & 15]);
+ writer.write(HEX_DIGITS[(codepoint >> 4) & 15]);
+ writer.write(HEX_DIGITS[(codepoint) & 15]);
}
return true;
}
diff --git
a/src/main/java/org/apache/commons/text/translate/UnicodeUnescaper.java
b/src/main/java/org/apache/commons/text/translate/UnicodeUnescaper.java
index 1665d91..89dda03 100644
--- a/src/main/java/org/apache/commons/text/translate/UnicodeUnescaper.java
+++ b/src/main/java/org/apache/commons/text/translate/UnicodeUnescaper.java
@@ -32,7 +32,7 @@ public class UnicodeUnescaper extends CharSequenceTranslator {
* {@inheritDoc}
*/
@Override
- public int translate(final CharSequence input, final int index, final
Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final
Writer writer) throws IOException {
if (input.charAt(index) == '\\' && index + 1 < input.length() &&
input.charAt(index + 1) == 'u') {
// consume optional additional 'u' chars
int i = 2;
@@ -50,7 +50,7 @@ public class UnicodeUnescaper extends CharSequenceTranslator {
try {
final int value = Integer.parseInt(unicode.toString(), 16);
- out.write((char) value);
+ writer.write((char) value);
} catch (final NumberFormatException nfe) {
throw new IllegalArgumentException("Unable to parse
unicode value: " + unicode, nfe);
}
diff --git
a/src/main/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemover.java
b/src/main/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemover.java
index 09d69c7..eea9ece 100644
---
a/src/main/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemover.java
+++
b/src/main/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemover.java
@@ -30,7 +30,7 @@ public class UnicodeUnpairedSurrogateRemover extends
CodePointTranslator {
* {@inheritDoc}
*/
@Override
- public boolean translate(final int codepoint, final Writer out) throws
IOException {
+ public boolean translate(final int codepoint, final Writer writer) throws
IOException {
if (codepoint >= Character.MIN_SURROGATE && codepoint <=
Character.MAX_SURROGATE) {
// It's a surrogate. Write nothing and say we've translated.
return true;
diff --git
a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
index 8b9bf02..37e2165 100644
---
a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
+++
b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
@@ -34,7 +34,7 @@ public class SinglePassTranslatorTest {
private final SinglePassTranslator dummyTranslator = new
SinglePassTranslator() {
@Override
- void translateWhole(final CharSequence input, final Writer out) throws
IOException {
+ void translateWhole(final CharSequence input, final Writer writer)
throws IOException {
// noop
}
};
