This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git
commit 9df029915390a516a59233b2bcecebdd921a822f
Author: olivier lamy <ol...@apache.org>
AuthorDate: Sat Apr 11 11:29:11 2020 +1000
use StringBuilder instead of StringBuffer
Signed-off-by: olivier lamy <ol...@apache.org>
---
.../org/apache/taglibs/standard/tag/common/core/ImportSupport.java | 4 ++--
.../org/apache/taglibs/standard/tag/common/core/ParamSupport.java | 4 ++--
.../apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java | 2 +-
.../java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java | 2 +-
.../java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java | 6 +++---
.../org/apache/taglibs/standard/lang/jstl/ExpressionString.java | 4 ++--
.../org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java | 2 +-
.../java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java | 4 ++--
.../apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java | 2 +-
.../apache/taglibs/standard/lang/jstl/parser/ParseException.java | 2 +-
.../org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java | 2 +-
.../java/org/apache/taglibs/standard/examples/beans/Address.java | 2 +-
.../java/org/apache/taglibs/standard/examples/beans/Customer.java | 2 +-
.../java/org/apache/taglibs/standard/examples/taglib/Functions.java | 2 +-
14 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
index 681fa3e..57fbd54 100644
---
a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+++
b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -240,7 +240,7 @@ public abstract class ImportSupport extends BodyTagSupport
if (isAbsoluteUrl) {
// for absolute URLs, delegate to our peer
BufferedReader r = new BufferedReader(acquireReader());
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int i;
// under JIT, testing seems to show this simple loop is as fast
@@ -574,7 +574,7 @@ public abstract class ImportSupport extends BodyTagSupport
* and either EOS or a subsequent ';' (exclusive).
*/
public static String stripSession(String url) {
- StringBuffer u = new StringBuffer(url);
+ StringBuilder u = new StringBuilder(url);
int sessionStart;
while ((sessionStart = u.toString().indexOf(";jsessionid=")) != -1) {
int sessionEnd = u.toString().indexOf(";", sessionStart + 1);
diff --git
a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
index a2dd06d..b7ae13f 100644
---
a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
+++
b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
@@ -170,7 +170,7 @@ public abstract class ParamSupport extends BodyTagSupport {
// Collections.reverse(this.values);
// build a string from the parameter list
- StringBuffer newParams = new StringBuffer();
+ StringBuilder newParams = new StringBuilder();
for (int i = 0; i < names.size(); i++) {
newParams.append(names.get(i) + "=" + values.get(i));
if (i < (names.size() - 1)) {
@@ -184,7 +184,7 @@ public abstract class ParamSupport extends BodyTagSupport {
if (questionMark == -1) {
return (url + "?" + newParams);
} else {
- StringBuffer workingUrl = new StringBuffer(url);
+ StringBuilder workingUrl = new StringBuilder(url);
workingUrl.insert(questionMark + 1, (newParams + "&"));
return workingUrl.toString();
}
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
index 26db108..f8fa551 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
@@ -91,7 +91,7 @@ public class BinaryOperatorExpression
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("(");
buf.append(mExpression.getExpressionString());
for (int i = 0; i < mOperators.size(); i++) {
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
index 23a66a2..39e544b 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
@@ -79,7 +79,7 @@ public class ComplexValue
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(mPrefix.getExpressionString());
for (int i = 0; mSuffixes != null && i < mSuffixes.size(); i++) {
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
index 43299ba..0afe6ef 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
@@ -407,7 +407,7 @@ public class ELEvaluator {
static String formatParseException(String pExpressionString,
ParseException pExc) {
// Generate the String of expected tokens
- StringBuffer expectedBuf = new StringBuffer();
+ StringBuilder expectedBuf = new StringBuilder();
int maxSize = 0;
boolean printedOne = false;
@@ -431,7 +431,7 @@ public class ELEvaluator {
String expected = expectedBuf.toString();
// Generate the String of encountered tokens
- StringBuffer encounteredBuf = new StringBuffer();
+ StringBuilder encounteredBuf = new StringBuilder();
Token tok = pExc.currentToken.next;
for (int i = 0; i < maxSize; i++) {
if (i != 0) {
@@ -463,7 +463,7 @@ public class ELEvaluator {
* literal.
*/
static String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i)) {
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
index 1dfe71f..cae523f 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
@@ -65,7 +65,7 @@ public class ExpressionString {
String defaultPrefix,
Logger pLogger)
throws ELException {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < mElements.length; i++) {
Object elem = mElements[i];
if (elem instanceof String) {
@@ -91,7 +91,7 @@ public class ExpressionString {
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < mElements.length; i++) {
Object elem = mElements[i];
if (elem instanceof String) {
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
index d99a797..117196e 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
@@ -73,7 +73,7 @@ public class FunctionInvocation
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
b.append(functionName);
b.append("(");
Iterator i = argumentList.iterator();
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
index 4200d08..3940d10 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
@@ -59,7 +59,7 @@ public class StringLiteral
* Parses the given token into the literal value
*/
public static String getValueFromToken(String pToken) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int len = pToken.length() - 1;
boolean escaping = false;
for (int i = 1; i < len; i++) {
@@ -91,7 +91,7 @@ public class StringLiteral
// Escaping is needed
else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append('\"');
int len = pValue.length();
for (int i = 0; i < len; i++) {
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
index 833721e..a4fc419 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
@@ -92,7 +92,7 @@ public class UnaryOperatorExpression
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("(");
if (mOperator != null) {
buf.append(mOperator.getOperatorSymbol());
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
index 38df170..16ebc59 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
@@ -146,7 +146,7 @@ public class ParseException extends Exception {
* string literal.
*/
protected String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
diff --git
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
index f58e11d..b96927e 100644
---
a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
+++
b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
@@ -39,7 +39,7 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
diff --git
a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
index cb3b455..18b9e87 100644
---
a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
+++
b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
@@ -189,7 +189,7 @@ public class Address {
* Return a String representation of this object.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(line1).append(" ");
sb.append(city).append(" ");
sb.append(country);
diff --git
a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
index 5f7fe6c..106e6a4 100644
---
a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
+++
b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
@@ -237,7 +237,7 @@ public class Customer {
* Return a String representation of this object.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("[").append(key).append("] ");
sb.append(getLastName()).append(", ");
sb.append(getFirstName()).append(" ");
diff --git
a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
index 5bf0e37..dd5b923 100644
---
a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
+++
b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
@@ -62,7 +62,7 @@ public class Functions {
}
*/
try {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int count = Array.getLength(obj);
for (int i = 0; i < count; i++) {
buf.append(Array.get(obj, i).toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
