diff --git a/serializer/src/main/java/org/apache/xml/serializer/CharInfo.java b/serializer/src/main/java/org/apache/xml/serializer/CharInfo.java index 0035f0d87..f8ef629ee 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/CharInfo.java +++ b/serializer/src/main/java/org/apache/xml/serializer/CharInfo.java @@ -363,7 +363,7 @@ private CharInfo(String entitiesResource, String method, boolean internal) */ private boolean defineEntity(String name, char value) { - StringBuffer sb = new StringBuffer("&"); + StringBuilder sb = new StringBuilder("&"); sb.append(name); sb.append(';'); String entityString = sb.toString(); diff --git a/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java index c0c3585c0..583944f1d 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java +++ b/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java @@ -75,7 +75,7 @@ public abstract class SerializerBase PKG_NAME = fullyQualifiedName.substring(0, lastDot); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < PKG_NAME.length(); i++) { char ch = PKG_NAME.charAt(i); if (ch == '.') @@ -1365,7 +1365,7 @@ void initCdataElems(String s) // true if we found a URI but haven't yet processed the local name boolean foundURI = false; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); String uri = null; String localName = null; diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToStream.java index b30a3ac6a..95ee15f88 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/ToStream.java +++ b/serializer/src/main/java/org/apache/xml/serializer/ToStream.java @@ -2799,7 +2799,7 @@ private void setCdataSectionElements(String key, Properties props) Vector v = new Vector(); int l = s.length(); boolean inCurly = false; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); // parse through string, breaking on whitespaces. I do this instead // of a tokenizer so I can track whitespace inside of curly brackets, @@ -2883,7 +2883,7 @@ public void setCdataSectionElements(Vector URI_and_localNames) final int len = URI_and_localNames.size() - 1; if (len > 0) { - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); for (int i = 0; i < len; i += 2) { // whitspace separated "{uri1}local1 {uri2}local2 ..." diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java index b4777772a..9ddd0f8f6 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java +++ b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java @@ -1289,7 +1289,7 @@ protected void firePseudoElement(String elementName) { if (m_tracer != null) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append('<'); sb.append(elementName); diff --git a/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java index 7dba2249b..bae4d5fea 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java +++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java @@ -512,7 +512,7 @@ protected void serializeDocType(DocumentType node, boolean bStart) // DOCTYPE internal subset via an event call, so we write it // out here. Writer writer = fSerializer.getWriter(); - StringBuffer dtd = new StringBuffer(); + StringBuilder dtd = new StringBuilder(); dtd.append(" 1) private static String replaceDash(String name) { char dash = '-'; - StringBuffer buff = new StringBuffer(""); + StringBuilder buff = new StringBuilder(""); for (int i=0; i= 6) private static String strip(String symbols, String pattern) { int i = 0; - StringBuffer result = new StringBuffer(pattern.length()); + StringBuilder result = new StringBuilder(pattern.length()); while (i < pattern.length()) { diff --git a/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java index 5285837d5..a703e2128 100644 --- a/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java +++ b/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java @@ -116,7 +116,7 @@ public static String align(String targetStr, String paddingStr) */ public static String concat(NodeList nl) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < nl.getLength(); i++) { Node node = nl.item(i); @@ -149,7 +149,7 @@ public static String padding(double length, String pattern) if (pattern == null || pattern.length() == 0) return ""; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int len = (int)length; int numAdded = 0; int index = 0; diff --git a/xalan/src/main/java/org/apache/xalan/lib/sql/SQLQueryParser.java b/xalan/src/main/java/org/apache/xalan/lib/sql/SQLQueryParser.java index 8860e7abf..abaab0736 100644 --- a/xalan/src/main/java/org/apache/xalan/lib/sql/SQLQueryParser.java +++ b/xalan/src/main/java/org/apache/xalan/lib/sql/SQLQueryParser.java @@ -301,7 +301,7 @@ protected void inlineParser() { QueryParameter curParm = null; int state = 0; - StringBuffer tok = new StringBuffer(); + StringBuilder tok = new StringBuilder(); boolean firstword = true; if (m_Parameters == null) m_Parameters = new Vector(); @@ -351,7 +351,7 @@ else if ( firstword && (Character.isLetterOrDigit(ch) || ch == '#') ) } } firstword = false; - tok = new StringBuffer(); + tok = new StringBuilder(); if ( ch == '\'' ) state = 1; else if ( ch == '?' ) state = 4; else state = 0; @@ -379,7 +379,7 @@ else if ( tok.length() > 0 ) curParm.setTypeName(tok.toString()); // curParm.type = map_type(curParm.typeName); m_Parameters.addElement(curParm); - tok = new StringBuffer(); + tok = new StringBuilder(); if ( ch == '=' ) state = 7; else state = 6; } @@ -394,7 +394,7 @@ else if ( tok.length() > 0 ) else if ( tok.length() > 0 ) { curParm.setName(tok.toString()); - tok = new StringBuffer(); + tok = new StringBuilder(); if ( ch == ']' ) { //param_output.addElement(new Boolean(false)); @@ -418,7 +418,7 @@ else if ( tok.length() > 0 ) m_hasOutput = true; } - tok = new StringBuffer(); + tok = new StringBuilder(); if ( ch == ']' ) { state = 0; diff --git a/xalan/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java b/xalan/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java index 07554134d..9aeee8186 100644 --- a/xalan/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java +++ b/xalan/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java @@ -456,7 +456,7 @@ else if (m_name.equals("*")) return m_setterString; } - StringBuffer outBuf = new StringBuffer(); + StringBuilder outBuf = new StringBuilder(); outBuf.append("set"); @@ -643,7 +643,7 @@ Object processENUM(StylesheetHandler handler, String uri, String name, if (retVal == StringToIntTable.INVALID_KEY) { - StringBuffer enumNamesList = getListOfEnums(); + StringBuilder enumNamesList = getListOfEnums(); handleError(handler, XSLTErrorResources.INVALID_ENUM,new Object[]{name, value, enumNamesList.toString() },null); return null; } @@ -706,7 +706,7 @@ Object processENUM_OR_PQNAME(StylesheetHandler handler, String uri, String name, if (objToReturn == null) objToReturn = qname; if (qname.getPrefix() == null) { - StringBuffer enumNamesList = getListOfEnums(); + StringBuilder enumNamesList = getListOfEnums(); enumNamesList.append(" "); handleError(handler,XSLTErrorResources.INVALID_ENUM,new Object[]{name, value, enumNamesList.toString() },null); @@ -716,7 +716,7 @@ Object processENUM_OR_PQNAME(StylesheetHandler handler, String uri, String name, } catch (IllegalArgumentException ie) { - StringBuffer enumNamesList = getListOfEnums(); + StringBuilder enumNamesList = getListOfEnums(); enumNamesList.append(" "); handleError(handler,XSLTErrorResources.INVALID_ENUM,new Object[]{name, value, enumNamesList.toString() },ie); @@ -725,7 +725,7 @@ Object processENUM_OR_PQNAME(StylesheetHandler handler, String uri, String name, } catch (RuntimeException re) { - StringBuffer enumNamesList = getListOfEnums(); + StringBuilder enumNamesList = getListOfEnums(); enumNamesList.append(" "); handleError(handler,XSLTErrorResources.INVALID_ENUM,new Object[]{name, value, enumNamesList.toString() },re); @@ -1532,12 +1532,12 @@ else if (cl == Long.class) } /** - * StringBuffer containing comma delimited list of valid values for ENUM type. + * StringBuilder containing comma delimited list of valid values for ENUM type. * Used to build error message. */ - private StringBuffer getListOfEnums() + private StringBuilder getListOfEnums() { - StringBuffer enumNamesList = new StringBuffer(); + StringBuilder enumNamesList = new StringBuilder(); String [] enumValues = this.getEnumNames(); for (int i = 0; i < enumValues.length; i++) diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java index eaa2b7221..461e20a4e 100644 --- a/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java +++ b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java @@ -1219,7 +1219,7 @@ String formatNumberList( // then append the formatToken. else if (formatTokenizer.isLetterOrDigitAhead()) { - final StringBuffer formatTokenStringBuffer = new StringBuffer(formatToken); + final StringBuilder formatTokenStringBuffer = new StringBuilder(formatToken); // Append the formatToken string... // For instance [2][1][5] with a format value of "1--1. " @@ -1949,7 +1949,7 @@ protected String long2roman(long val, boolean prefixesAreOK) if (val <= 3999L) { - StringBuffer romanBuffer = new StringBuffer(); + StringBuilder romanBuffer = new StringBuilder(); do { while (val >= m_romanConvertTable[place].m_postValue) diff --git a/xalan/src/main/java/org/apache/xalan/transformer/NumeratorFormatter.java b/xalan/src/main/java/org/apache/xalan/transformer/NumeratorFormatter.java index 97d025a34..3ed0d7cd0 100644 --- a/xalan/src/main/java/org/apache/xalan/transformer/NumeratorFormatter.java +++ b/xalan/src/main/java/org/apache/xalan/transformer/NumeratorFormatter.java @@ -192,7 +192,7 @@ String long2roman(long val, boolean prefixesAreOK) if (val <= 3999L) { - StringBuffer romanBuffer = new StringBuffer(); + StringBuilder romanBuffer = new StringBuilder(); do { while (val >= m_romanConvertTable[place].m_postValue) diff --git a/xalan/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java b/xalan/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java index 2f9a0a108..ecd2365ae 100644 --- a/xalan/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java +++ b/xalan/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java @@ -843,7 +843,7 @@ protected void checkProcessorVersion(Hashtable h) XALAN1_VERSION_CLASS, ObjectFactory.findClassLoader(), true); // Found Xalan-J 1.x, grab it's version fields - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); Field f = clazz.getField("PRODUCT"); buf.append(f.get(null)); @@ -876,7 +876,7 @@ protected void checkProcessorVersion(Hashtable h) XALAN2_VERSION_CLASS, ObjectFactory.findClassLoader(), true); // Found Xalan-J 2.x, grab it's version fields - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); Field f = clazz.getField("S_VERSION"); buf.append(f.get(null)); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Compile.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Compile.java index c25fc1f37..2252654c5 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Compile.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Compile.java @@ -45,7 +45,7 @@ public final class Compile { public static void printUsage() { - StringBuffer vers = new StringBuffer("XSLTC version " + VERSION_MAJOR + StringBuilder vers = new StringBuilder("XSLTC version " + VERSION_MAJOR + "." + VERSION_MINOR + ((VERSION_DELTA > 0) ? ("." + VERSION_DELTA) : (""))); System.err.println(vers + "\n" diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeSet.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeSet.java index 1900bb0a0..668f185cb 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeSet.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeSet.java @@ -193,7 +193,7 @@ public void translate(ClassGenerator classGen, MethodGenerator methodGen) { } public String toString() { - StringBuffer buf = new StringBuffer("attribute-set: "); + StringBuilder buf = new StringBuilder("attribute-set: "); // Translate all local attributes final Enumeration attributes = elements(); while (attributes.hasMoreElements()) { diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java index 2b5f6b850..d0887ef83 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java @@ -82,7 +82,7 @@ private void parseAVTemplate(String text, Parser parser) { */ String t = null; String lookahead = null; - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); int state = OUT_EXPR; while (tokenizer.hasMoreTokens()) { @@ -216,7 +216,7 @@ public Type typeCheck(SymbolTable stable) throws TypeCheckError { } public String toString() { - final StringBuffer buffer = new StringBuffer("AVT:["); + final StringBuilder buffer = new StringBuilder("AVT:["); final int count = elementCount(); for (int i = 0; i < count; i++) { buffer.append(elementAt(i).toString()); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CallTemplate.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CallTemplate.java index 37edeab19..b2c79e8e9 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CallTemplate.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CallTemplate.java @@ -137,7 +137,7 @@ public void translate(ClassGenerator classGen, MethodGenerator methodGen) { il.append(methodGen.loadCurrentNode()); // Initialize prefix of method signature - StringBuffer methodSig = new StringBuffer("(" + DOM_INTF_SIG + StringBuilder methodSig = new StringBuilder("(" + DOM_INTF_SIG + NODE_ITERATOR_SIG + TRANSLET_OUTPUT_SIG + NODE_SIG); // If calling a simply named template, push actual arguments diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java index 9ca1ecef1..7e1ac3f5f 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java @@ -787,7 +787,7 @@ else if (_isExtConstructor) { il.append(arg.getType().LOAD(paramTemp[i].getIndex()))); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append('('); for (int i = 0; i < paramTypes.length; i++) { buffer.append(getSignature(paramTypes[i])); @@ -826,7 +826,7 @@ else if (_isExtConstructor) { exp.getType().translateTo(classGen, methodGen, paramTypes[i]); } - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append('('); for (int i = 0; i < paramTypes.length; i++) { buffer.append(getSignature(paramTypes[i])); @@ -967,7 +967,7 @@ private Vector findConstructors() { */ static final String getSignature(Class clazz) { if (clazz.isArray()) { - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); Class cl = clazz; while (cl.isArray()) { sb.append("["); @@ -1019,7 +1019,7 @@ else if (clazz == Void.TYPE) { * Compute the JVM method descriptor for the method. */ static final String getSignature(Method meth) { - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); sb.append('('); final Class[] params = meth.getParameterTypes(); // avoid clone for (int j = 0; j < params.length; j++) { @@ -1033,7 +1033,7 @@ static final String getSignature(Method meth) { * Compute the JVM constructor descriptor for the constructor. */ static final String getSignature(Constructor cons) { - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); sb.append('('); final Class[] params = cons.getParameterTypes(); // avoid clone for (int j = 0; j < params.length; j++) { @@ -1046,7 +1046,7 @@ static final String getSignature(Constructor cons) { * Return the signature of the current method */ private String getMethodSignature(Vector argsType) { - final StringBuffer buf = new StringBuffer(_className); + final StringBuilder buf = new StringBuilder(_className); buf.append('.').append(_fname.getLocalPart()).append('('); int nArgs = argsType.size(); @@ -1068,7 +1068,7 @@ private String getMethodSignature(Vector argsType) { protected static String replaceDash(String name) { char dash = '-'; - StringBuffer buff = new StringBuffer(""); + StringBuilder buff = new StringBuilder(""); for (int i = 0; i < name.length(); i++) { if (i > 0 && name.charAt(i-1) == dash) buff.append(Character.toUpperCase(name.charAt(i))); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Output.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Output.java index 3813ad3e8..07f9b3197 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Output.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Output.java @@ -239,7 +239,7 @@ public void parseContents(Parser parser) { _cdata = null; } else { - StringBuffer expandedNames = new StringBuffer(); + StringBuilder expandedNames = new StringBuilder(); StringTokenizer tokens = new StringTokenizer(_cdata); // Make sure to store names in expanded form diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Step.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Step.java index 6a3edcfff..7248eb811 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Step.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Step.java @@ -507,7 +507,7 @@ else if (predicate.isNthPositionFilter()) { * Returns a string representation of this step. */ public String toString() { - final StringBuffer buffer = new StringBuffer("step(\""); + final StringBuilder buffer = new StringBuilder("step(\""); buffer.append(Axis.getNames(_axis)).append("\", ").append(_nodeType); if (_predicates != null) { final int n = _predicates.size(); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StepPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StepPattern.java index ebf20cb91..044de0f71 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StepPattern.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StepPattern.java @@ -148,7 +148,7 @@ public void reduceKernelPattern() { } public String toString() { - final StringBuffer buffer = new StringBuffer("stepPattern(\""); + final StringBuilder buffer = new StringBuilder("stepPattern(\""); buffer.append(Axis.getNames(_axis)) .append("\", ") .append(_isEpsilon ? diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TestSeq.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TestSeq.java index d8821d857..24b8f5e53 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TestSeq.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TestSeq.java @@ -99,7 +99,7 @@ public TestSeq(Vector patterns, int kernelType, Mode mode) { */ public String toString() { final int count = _patterns.size(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); for (int i = 0; i < count; i++) { final LocationPathPattern pattern = diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Whitespace.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Whitespace.java index f327beaed..e10d41e2b 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Whitespace.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Whitespace.java @@ -144,7 +144,7 @@ public void parseContents(Parser parser) { final SymbolTable stable = parser.getSymbolTable(); StringTokenizer list = new StringTokenizer(_elementList); - StringBuffer elements = new StringBuffer(Constants.EMPTYSTRING); + StringBuilder elements = new StringBuilder(Constants.EMPTYSTRING); while (list.hasMoreElements()) { String token = list.nextToken(); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslElement.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslElement.java index ecf59ad15..ad329c204 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslElement.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslElement.java @@ -127,7 +127,7 @@ public void parseContents(Parser parser) { } // Prepend prefix to local name - final StringBuffer newName = new StringBuffer(prefix); + final StringBuilder newName = new StringBuilder(prefix); if (prefix != EMPTYSTRING) { newName.append(':'); } diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java index acd55a56f..3c89c98d7 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java @@ -251,7 +251,7 @@ private String getFileName(SyntaxTreeNode node) { } private String formatLine() { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); if (_url != null) { result.append(_url); result.append(": "); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodType.java index 6d44a0bc6..f0745fbf6 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodType.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodType.java @@ -68,7 +68,7 @@ public MethodType(Type resultType, Vector argsType) { } public String toString() { - StringBuffer result = new StringBuffer("method{"); + StringBuilder result = new StringBuilder("method{"); if (_argsType != null) { final int count = _argsType.size(); for (int i=0; ilastArgSig to the end of the argument list. */ public String toSignature(String lastArgSig) { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); buffer.append('('); if (_argsType != null) { final int n = _argsType.size(); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectType.java index e9282f7d7..1f1b71d00 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectType.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectType.java @@ -93,7 +93,7 @@ public boolean identicalTo(Type other) { } public String toSignature() { - final StringBuffer result = new StringBuffer("L"); + final StringBuilder result = new StringBuilder("L"); result.append(_javaClassName.replace('.', '/')).append(';'); return result.toString(); } diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Util.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Util.java index 13bf03c3e..9e007f465 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Util.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Util.java @@ -82,7 +82,7 @@ public static String pathName(String name) { */ public static String toJavaName(String name) { if (name.length() > 0) { - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); char ch = name.charAt(0); result.append(Character.isJavaIdentifierStart(ch) ? ch : '_'); @@ -135,7 +135,7 @@ public static String replace(String base, char ch, String str) { public static String replace(String base, String delim, String[] str) { final int len = base.length(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); for (int i = 0; i < len; i++) { final char ch = base.charAt(i); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java index 697f2db5e..11aad2f9a 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java @@ -630,7 +630,7 @@ public void endDocument() throws SAXException if (_size == 1) _text = _textArray[0]; else { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); for (int i = 0; i < _size; i++) { buffer.append(_textArray[i]); } diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/runtime/BasisLibrary.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/BasisLibrary.java index d049df2c0..73458d9e4 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/runtime/BasisLibrary.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/BasisLibrary.java @@ -319,7 +319,7 @@ public static String translateF(String value, String from, String to) { final int froml = from.length(); final int valuel = value.length(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); for (int j, i = 0; i < valuel; i++) { final char ch = value.charAt(i); for (j = 0; j < froml; j++) { @@ -347,7 +347,7 @@ public static String normalize_spaceF(int node, DOM dom) { */ public static String normalize_spaceF(String value) { int i = 0, n = value.length(); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); while (i < n && isWhiteSpace(value.charAt(i))) i++; @@ -1693,7 +1693,7 @@ public static String replace(String base, char ch, String str) { public static String replace(String base, String delim, String[] str) { final int len = base.length(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); for (int i = 0; i < len; i++) { final char ch = base.charAt(i); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Hashtable.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Hashtable.java index f8315d815..7290dd7ac 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Hashtable.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Hashtable.java @@ -284,7 +284,7 @@ public void clear() { public String toString() { int i; int max = size() - 1; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); Enumeration k = keys(); Enumeration e = elements(); buf.append("{"); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/runtime/StringValueHandler.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/StringValueHandler.java index 4b111aba2..db6800e19 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/runtime/StringValueHandler.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/StringValueHandler.java @@ -107,7 +107,7 @@ public String getValueOfPI() { if (value.indexOf("?>") > 0) { final int n = value.length(); - final StringBuffer valueOfPI = new StringBuffer(); + final StringBuilder valueOfPI = new StringBuilder(); for (int i = 0; i < n;) { final char ch = value.charAt(i++); diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java index cda21d3bd..b25f16064 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java @@ -258,7 +258,7 @@ public void endDocument() throws SAXException { } } else { - StringBuffer errorMessage = new StringBuffer(); + StringBuilder errorMessage = new StringBuilder(); Vector errors = _parser.getErrors(); final int count = errors.size(); for (int i = 0; i < count; i++) { diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerImpl.java index 443ec71e2..c319a3e3c 100644 --- a/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerImpl.java +++ b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerImpl.java @@ -716,7 +716,7 @@ private String makeCDATAString(Hashtable cdata) { // Return a 'null' string if no CDATA section elements were specified if (cdata == null) return null; - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); // Get an enumeration of all the elements in the hashtable Enumeration elements = cdata.keys(); diff --git a/xalan/src/main/java/org/apache/xml/dtm/DTMException.java b/xalan/src/main/java/org/apache/xml/dtm/DTMException.java index 8ac7dda78..b762c98ee 100644 --- a/xalan/src/main/java/org/apache/xml/dtm/DTMException.java +++ b/xalan/src/main/java/org/apache/xml/dtm/DTMException.java @@ -214,7 +214,7 @@ public DTMException(String message, SourceLocator locator, */ public String getMessageAndLocation() { - StringBuffer sbuffer = new StringBuffer(); + StringBuilder sbuffer = new StringBuilder(); String message = super.getMessage(); if (null != message) { @@ -254,7 +254,7 @@ public String getMessageAndLocation() { public String getLocationAsString() { if (null != locator) { - StringBuffer sbuffer = new StringBuffer(); + StringBuilder sbuffer = new StringBuilder(); String systemID = locator.getSystemId(); int line = locator.getLineNumber(); int column = locator.getColumnNumber(); diff --git a/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java index c86f4572d..bf3d8fc09 100644 --- a/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java +++ b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java @@ -842,7 +842,7 @@ public String dumpNode(int nodeHandle) break; } - StringBuffer sb=new StringBuffer(); + StringBuilder sb=new StringBuilder(); sb.append("["+nodeHandle+": "+typestring+ "(0x"+Integer.toHexString(getExpandedTypeID(nodeHandle))+") "+ getNodeNameX(nodeHandle)+" {"+getNamespaceURI(nodeHandle)+"}"+ diff --git a/xalan/src/main/java/org/apache/xml/utils/ListingErrorHandler.java b/xalan/src/main/java/org/apache/xml/utils/ListingErrorHandler.java index a23205d76..0f360e669 100644 --- a/xalan/src/main/java/org/apache/xml/utils/ListingErrorHandler.java +++ b/xalan/src/main/java/org/apache/xml/utils/ListingErrorHandler.java @@ -384,7 +384,7 @@ public static void logSourceLine(PrintWriter pw, SourceLocator locator) int line = locator.getLineNumber(); int column = locator.getColumnNumber(); pw.println("line: " + getSourceLine(url, line)); - StringBuffer buf = new StringBuffer("line: "); + StringBuilder buf = new StringBuilder("line: "); for (int i = 1; i < column; i++) { buf.append(' '); diff --git a/xalan/src/main/java/org/apache/xml/utils/SystemIDResolver.java b/xalan/src/main/java/org/apache/xml/utils/SystemIDResolver.java index 8d61e2cb4..4eedca88c 100644 --- a/xalan/src/main/java/org/apache/xml/utils/SystemIDResolver.java +++ b/xalan/src/main/java/org/apache/xml/utils/SystemIDResolver.java @@ -183,7 +183,7 @@ private static boolean isWindowsAbsolutePath(String systemId) */ private static String replaceChars(String str) { - StringBuffer buf = new StringBuffer(str); + StringBuilder buf = new StringBuilder(str); int length = buf.length(); for (int i = 0; i < length; i++) { diff --git a/xalan/src/main/java/org/apache/xml/utils/URI.java b/xalan/src/main/java/org/apache/xml/utils/URI.java index b08c75775..5590a5ef7 100644 --- a/xalan/src/main/java/org/apache/xml/utils/URI.java +++ b/xalan/src/main/java/org/apache/xml/utils/URI.java @@ -880,7 +880,7 @@ public String getScheme() public String getSchemeSpecificPart() { - StringBuffer schemespec = new StringBuffer(); + StringBuilder schemespec = new StringBuilder(); if (m_userinfo != null || m_host != null || m_port != -1) { @@ -972,7 +972,7 @@ public String getPath(boolean p_includeQueryString, boolean p_includeFragment) { - StringBuffer pathString = new StringBuffer(m_path); + StringBuilder pathString = new StringBuilder(m_path); if (p_includeQueryString && m_queryString != null) { @@ -1368,7 +1368,7 @@ public boolean equals(Object p_test) public String toString() { - StringBuffer uriSpecString = new StringBuffer(); + StringBuilder uriSpecString = new StringBuilder(); if (m_scheme != null) { diff --git a/xalan/src/main/java/org/apache/xpath/axes/WalkerFactory.java b/xalan/src/main/java/org/apache/xpath/axes/WalkerFactory.java index 5117d489f..411291ffb 100644 --- a/xalan/src/main/java/org/apache/xpath/axes/WalkerFactory.java +++ b/xalan/src/main/java/org/apache/xpath/axes/WalkerFactory.java @@ -1282,7 +1282,7 @@ private static AxesWalker createDefaultWalker(Compiler compiler, int opPos, public static String getAnalysisString(int analysis) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("count: "+getStepCount(analysis)+" "); if((analysis & BIT_NODETEST_ANY) != 0) { diff --git a/xalan/src/main/java/org/apache/xpath/functions/FuncConcat.java b/xalan/src/main/java/org/apache/xpath/functions/FuncConcat.java index 4099225cf..1c99920fe 100644 --- a/xalan/src/main/java/org/apache/xpath/functions/FuncConcat.java +++ b/xalan/src/main/java/org/apache/xpath/functions/FuncConcat.java @@ -44,7 +44,7 @@ public class FuncConcat extends FunctionMultiArgs public XObject execute(XPathContext xctxt) throws javax.xml.transform.TransformerException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); // Compiler says we must have at least two arguments. sb.append(m_arg0.execute(xctxt).str()); diff --git a/xalan/src/main/java/org/apache/xpath/functions/FuncTranslate.java b/xalan/src/main/java/org/apache/xpath/functions/FuncTranslate.java index 1d82de2ab..66c0e0806 100644 --- a/xalan/src/main/java/org/apache/xpath/functions/FuncTranslate.java +++ b/xalan/src/main/java/org/apache/xpath/functions/FuncTranslate.java @@ -51,7 +51,7 @@ public XObject execute(XPathContext xctxt) throws javax.xml.transform.Transforme // A vector to contain the new characters. We'll use it to construct // the result string. - StringBuffer sbuffer = new StringBuffer(); + StringBuilder sbuffer = new StringBuilder(); for (int i = 0; i < theFirstStringLength; i++) { diff --git a/xalan/src/main/java/org/apache/xpath/patterns/StepPattern.java b/xalan/src/main/java/org/apache/xpath/patterns/StepPattern.java index 8ae713d69..0433facc9 100644 --- a/xalan/src/main/java/org/apache/xpath/patterns/StepPattern.java +++ b/xalan/src/main/java/org/apache/xpath/patterns/StepPattern.java @@ -787,7 +787,7 @@ else if (!pred.boolWithSideEffects()) public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (StepPattern pat = this; pat != null; pat = pat.m_relativePathPattern) { diff --git a/xalanservlet/src/main/java/servlet/ApplyXSLT.java b/xalanservlet/src/main/java/servlet/ApplyXSLT.java index e326a6758..ff5910421 100644 --- a/xalanservlet/src/main/java/servlet/ApplyXSLT.java +++ b/xalanservlet/src/main/java/servlet/ApplyXSLT.java @@ -656,7 +656,7 @@ protected void displayException(HttpServletResponse response, ApplyXSLTException mesg = ""; else mesg = "" + mesg + ""; StringTokenizer tokens = new StringTokenizer(mesg, EOL); - StringBuffer strBuf = new StringBuffer(); + StringBuilder strBuf = new StringBuilder(); while (tokens.hasMoreTokens()) strBuf.append(tokens.nextToken() + EOL + "
"); mesg = strBuf.toString();