diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedLengthList.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedLengthList.java index 8e71538723..7b69c4e570 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedLengthList.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedLengthList.java @@ -411,7 +411,7 @@ protected String getValueAsString() { if (itemList.size() == 0) { return ""; } - StringBuffer sb = new StringBuffer( itemList.size() * 8 ); + StringBuilder sb = new StringBuilder( itemList.size() * 8 ); Iterator i = itemList.iterator(); if (i.hasNext()) { sb.append(((SVGItem) i.next()).getValueAsString()); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java index 20ddfa320b..5cf3523c70 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java @@ -391,7 +391,7 @@ protected String getValueAsString() { if (itemList.size() == 0) { return ""; } - StringBuffer sb = new StringBuffer( itemList.size() * 8 ); + StringBuilder sb = new StringBuilder( itemList.size() * 8 ); Iterator i = itemList.iterator(); if (i.hasNext()) { sb.append(((SVGItem) i.next()).getValueAsString()); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java index 4c9d879206..147e01f5c8 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java @@ -526,7 +526,7 @@ protected String getValueAsString() { if (itemList.size() == 0) { return ""; } - StringBuffer sb = new StringBuffer( itemList.size() * 8 ); + StringBuilder sb = new StringBuilder( itemList.size() * 8 ); Iterator i = itemList.iterator(); if (i.hasNext()) { sb.append(((SVGItem) i.next()).getValueAsString()); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java index dfa82c56c1..b1fc4bb54e 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java @@ -362,7 +362,7 @@ protected String getValueAsString() { if (itemList.size() == 0) { return ""; } - StringBuffer sb = new StringBuffer( itemList.size() * 8 ); + StringBuilder sb = new StringBuilder( itemList.size() * 8 ); Iterator i = itemList.iterator(); if (i.hasNext()) { sb.append(((SVGItem) i.next()).getValueAsString()); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedTransformList.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedTransformList.java index 424996ef75..80f5999da0 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedTransformList.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedTransformList.java @@ -360,7 +360,7 @@ protected String getValueAsString() { if (itemList.size() == 0) { return ""; } - StringBuffer sb = new StringBuffer( itemList.size() * 8 ); + StringBuilder sb = new StringBuilder( itemList.size() * 8 ); Iterator i = itemList.iterator(); if (i.hasNext()) { sb.append(((SVGItem) i.next()).getValueAsString()); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java index 26ef46e7a1..e7ba2dcdeb 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java @@ -178,7 +178,7 @@ public String formatMessage(String key, Object[] args) * DOM: Implements {@link SVGDocument#getTitle()}. */ public String getTitle() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean preserve = false; for (Node n = getDocumentElement().getFirstChild(); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMStyleElement.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMStyleElement.java index 336f27aaf4..e5372ae76b 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMStyleElement.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMStyleElement.java @@ -122,7 +122,7 @@ public StyleSheet getCSSStyleSheet() { String text = ""; Node n = getFirstChild(); if (n != null) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (n != null) { if (n.getNodeType() == Node.CDATA_SECTION_NODE || n.getNodeType() == Node.TEXT_NODE) diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableLengthListValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableLengthListValue.java index 3ac4a199db..490bcd8190 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableLengthListValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableLengthListValue.java @@ -209,7 +209,7 @@ public AnimatableValue getZeroValue() { * Length lists can never be used for CSS properties. */ public String getCssText() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (lengthValues.length > 0) { sb.append(formatNumber(lengthValues[0])); sb.append(AnimatableLengthValue.UNITS[lengthTypes[0] - 1]); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableMotionPointValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableMotionPointValue.java index 835ebc0edd..7d0c46baee 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableMotionPointValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableMotionPointValue.java @@ -157,7 +157,7 @@ public AnimatableValue getZeroValue() { * Returns a string representation of this object. */ public String toStringRep() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(formatNumber(x)); sb.append(','); sb.append(formatNumber(y)); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberListValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberListValue.java index b40661c84a..091fe5b75c 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberListValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberListValue.java @@ -140,7 +140,7 @@ public AnimatableValue getZeroValue() { * Returns the CSS text representation of the value. */ public String getCssText() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(numbers[0]); for (int i = 1; i < numbers.length; i++) { sb.append(' '); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java index 98acc816c7..cfa6c13f77 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOptionalNumberValue.java @@ -163,7 +163,7 @@ public AnimatableValue getZeroValue() { * Returns the CSS text representation of the value. */ public String getCssText() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(formatNumber(number)); if (hasOptionalNumber) { sb.append(' '); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java index 6273bbed5d..fea2c4a4d6 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableNumberOrPercentageValue.java @@ -145,7 +145,7 @@ public AnimatableValue getZeroValue() { * Returns the CSS text representation of the value. */ public String getCssText() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(formatNumber(value)); if (isPercentage) { sb.append('%'); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java index 236b1559d8..db28658042 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java @@ -184,7 +184,7 @@ public AnimatableValue getZeroValue() { * Returns a string representation of this object. */ public String toStringRep() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int k = 0; for (short command : commands) { sb.append(PATH_COMMANDS[command]); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableRectValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableRectValue.java index 9c143a53ff..711c463815 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableRectValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableRectValue.java @@ -164,7 +164,7 @@ public AnimatableValue getZeroValue() { * Returns a string representation of this object. */ public String toStringRep() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(x); sb.append(','); sb.append(y); diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableTransformListValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableTransformListValue.java index bd7c9cd8f3..649b914308 100644 --- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableTransformListValue.java +++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatableTransformListValue.java @@ -557,7 +557,7 @@ public AnimatableValue getZeroValue() { * Returns the CSS text representation of the value. */ public String toStringRep() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); Iterator i = transforms.iterator(); while (i.hasNext()) { AbstractSVGTransform t = (AbstractSVGTransform) i.next(); diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java index 2c59f8a1e2..9f00eb82a1 100644 --- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java +++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java @@ -267,7 +267,7 @@ private void normalize( int splitChannel, int[] counts ){ // if ( flagChangedLo || flagChangedHi ){ // System.out.println("old min:" + min[ splitChannel ] + "/max:" + max[ splitChannel ] // + " new: " + loBound + "/" + hiBound ); -// StringBuffer buff = new StringBuffer( 100 ); +// StringBuilder buff = new StringBuilder( 100 ); // for( int i= min[ splitChannel ]; i <= max[ splitChannel]; i++ ){ // buff.append( counts[ i ] ); // buff.append( ',' ); @@ -592,7 +592,7 @@ static byte[][] computeRGB( int nCubes, Cube[] cubes ){ */ static void logRGB( byte[] r, byte[] g, byte[] b ){ - StringBuffer buff = new StringBuffer( 100 ); + StringBuilder buff = new StringBuilder( 100 ); int nColors = r.length; for( int i= 0; i < nColors; i++ ) { String rgbStr= "(" + (r[i]+128) + ',' + (g[i] +128 ) + ',' + (b[i] + 128) + ")," ; diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java b/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java index f58de80089..6e075d6e06 100644 --- a/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java +++ b/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java @@ -65,7 +65,7 @@ public void insertString(int offs, String str, AttributeSet a) // Now, test that new value is within range. String added = new String(digit, 0, j); try{ - StringBuffer val = new StringBuffer(curVal); + StringBuilder val = new StringBuilder(curVal); val.insert(offs, added); String valStr = val.toString(); if( valStr.equals(".") || valStr.equals("-") || valStr.equals("-.")) diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java b/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java index 72eb7ac944..d50314f51e 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java @@ -544,7 +544,7 @@ protected void loadScript(AbstractElement script) { // Inline script. Node n = script.getFirstChild(); if (n != null) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (n != null) { if (n.getNodeType() == Node.CDATA_SECTION_NODE || n.getNodeType() == Node.TEXT_NODE) diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/RhinoInterpreter.java b/batik-bridge/src/main/java/org/apache/batik/bridge/RhinoInterpreter.java index 2a7a837ebd..ba272d907b 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/RhinoInterpreter.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/RhinoInterpreter.java @@ -182,7 +182,7 @@ public Object run(Context cx) { if (ii == null) ii = ImportInfo.getImports(); // import Java lang package & DOM Level 3 & SVG DOM packages - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); Iterator iter; iter = ii.getPackages(); while (iter.hasNext()) { diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontElementBridge.java index 320298b610..958d29d4ab 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontElementBridge.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontElementBridge.java @@ -81,7 +81,7 @@ public SVGGVTFont createFont(BridgeContext ctx, if (glyphCodes[i].length() > 1) { // ligature, may need to reverse if arabic so that it is in visual order if (ArabicTextHandler.arabicChar(glyphCodes[i].charAt(0))) { - glyphCodes[i] = (new StringBuffer(glyphCodes[i])).reverse().toString(); + glyphCodes[i] = (new StringBuilder(glyphCodes[i])).reverse().toString(); } } glyphNames[i] = glyphElement.getAttributeNS(null, SVG_GLYPH_NAME_ATTRIBUTE); diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java index 7997492f71..3a7838a838 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java @@ -681,7 +681,7 @@ public GVTGlyphVector createGlyphVector(FontRenderContext frc, CharacterIterator ci) { // construct a string from the glyphCodes int nGlyphs = glyphCodes.length; - StringBuffer workBuff = new StringBuffer( nGlyphs ); + StringBuilder workBuff = new StringBuilder( nGlyphs ); for (int glyphCode : glyphCodes) { workBuff.append(glyphUnicodes[glyphCode]); } diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java index e3bbe440a7..944e4e6577 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java @@ -846,8 +846,8 @@ int getElementEndIndex(Element element) { protected AttributedString buildAttributedString(BridgeContext ctx, Element element) { - AttributedStringBuffer asb = new AttributedStringBuffer(); - fillAttributedStringBuffer(ctx, element, true, null, null, null, asb); + AttributedStringBuilder asb = new AttributedStringBuilder(); + fillAttributedStringBuilder(ctx, element, true, null, null, null, asb); return asb.toAttributedString(); } @@ -861,15 +861,15 @@ protected AttributedString buildAttributedString(BridgeContext ctx, protected int endLimit; /** - * Fills the given AttributedStringBuffer. + * Fills the given AttributedStringBuilder. */ - protected void fillAttributedStringBuffer(BridgeContext ctx, + protected void fillAttributedStringBuilder(BridgeContext ctx, Element element, boolean top, TextPath textPath, Integer bidiLevel, Map initialAttributes, - AttributedStringBuffer asb) { + AttributedStringBuilder asb) { // 'requiredFeatures', 'requiredExtensions', 'systemLanguage' & // 'display="none". if ((!SVGUtilities.matchUserAgent(element, ctx.getUserAgent())) || @@ -927,7 +927,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, if (ln.equals(SVG_TSPAN_TAG) || ln.equals(SVG_ALT_GLYPH_TAG)) { int before = asb.count; - fillAttributedStringBuffer(ctx, + fillAttributedStringBuilder(ctx, nodeElement, false, textPath, @@ -944,7 +944,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, = textPathBridge.createTextPath(ctx, nodeElement); if (newTextPath != null) { int before = asb.count; - fillAttributedStringBuffer(ctx, + fillAttributedStringBuilder(ctx, nodeElement, false, newTextPath, @@ -991,7 +991,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, SVG_EVENT_CLICK, l, false); int before = asb.count; - fillAttributedStringBuffer(ctx, + fillAttributedStringBuilder(ctx, nodeElement, false, textPath, @@ -1046,7 +1046,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, protected String normalizeString(String s, boolean preserve, boolean stripfirst) { - StringBuffer sb = new StringBuffer(s.length()); + StringBuilder sb = new StringBuilder(s.length()); if (preserve) { for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); @@ -1104,7 +1104,7 @@ protected String normalizeString(String s, /** * This class is used to build an AttributedString. */ - protected static class AttributedStringBuffer { + protected static class AttributedStringBuilder { /** * The strings. @@ -1127,9 +1127,9 @@ protected static class AttributedStringBuffer { protected int length; /** - * Creates a new empty AttributedStringBuffer. + * Creates a new empty AttributedStringBuilder. */ - public AttributedStringBuffer() { + public AttributedStringBuilder() { strings = new ArrayList(); attributes = new ArrayList(); count = 0; @@ -1137,7 +1137,7 @@ public AttributedStringBuffer() { } /** - * Tells whether this AttributedStringBuffer is empty. + * Tells whether this AttributedStringBuilder is empty. */ public boolean isEmpty() { return count == 0; @@ -1224,7 +1224,7 @@ public AttributedString toAttributedString() { (Map)attributes.get(0)); } - StringBuffer sb = new StringBuffer( strings.size() * 5 ); + StringBuilder sb = new StringBuilder( strings.size() * 5 ); for (Object string : strings) { sb.append((String) string); } @@ -1261,7 +1261,7 @@ public String toString() { return (String)strings.get(0); } - StringBuffer sb = new StringBuffer( strings.size() * 5 ); + StringBuilder sb = new StringBuilder( strings.size() * 5 ); for (Object string : strings) { sb.append((String) string); } diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java b/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java index 2ed30ea72c..d9a01196f3 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java @@ -1097,7 +1097,7 @@ public void run() { } } r = new BufferedReader(r); - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); int read; char[] buf = new char[4096]; while ((read = r.read(buf, 0, buf.length)) != -1) { @@ -1224,7 +1224,7 @@ public void run() { r = new InputStreamReader(is, e); r = new BufferedReader(r); - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); int read; char[] buf = new char[4096]; while ((read = r.read(buf, 0, buf.length)) != -1) { diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java b/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java index d6938ca6a2..395a8a7339 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java @@ -153,7 +153,7 @@ public String getText() { if (aci == null) { text = ""; } else { - StringBuffer buf = new StringBuffer(aci.getEndIndex()); + StringBuilder buf = new StringBuilder(aci.getEndIndex()); for (char c = aci.first(); c != CharacterIterator.DONE; c = aci.next()) { diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/TextUtilities.java b/batik-bridge/src/main/java/org/apache/batik/bridge/TextUtilities.java index bb05ec35c6..dd52cef108 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/TextUtilities.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/TextUtilities.java @@ -42,7 +42,7 @@ public abstract class TextUtilities implements CSSConstants, ErrorConstants { * Returns the content of the given element. */ public static String getElementContent(Element e) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); for (Node n = e.getFirstChild(); n != null; n = n.getNextSibling()) { diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java index bdee7bc039..60a190bc23 100644 --- a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java +++ b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java @@ -427,8 +427,8 @@ protected AttributedString buildAttributedString(BridgeContext ctx, protected void dumpACIWord(AttributedString as) { if (as == null) return; - StringBuffer chars = new StringBuffer(); - StringBuffer brkStr = new StringBuffer(); + StringBuilder chars = new StringBuilder(); + StringBuilder brkStr = new StringBuilder(); AttributedCharacterIterator aci = as.getIterator(); AttributedCharacterIterator.Attribute WORD_LIMIT = TextLineBreaks.WORD_LIMIT; @@ -488,7 +488,7 @@ protected AttributedString getFlowDiv(BridgeContext ctx, Element element) { divTPI.fillPaint = Color.black; elemTPI.put(div, divTPI); - AttributedStringBuffer asb = new AttributedStringBuffer(); + AttributedStringBuilder asb = new AttributedStringBuilder(); List paraEnds = new ArrayList(); List paraElems = new ArrayList(); List lnLocs = new ArrayList(); @@ -504,13 +504,13 @@ protected AttributedString getFlowDiv(BridgeContext ctx, Element element) { String ln = e.getLocalName(); if (ln.equals(SVG12Constants.SVG_FLOW_PARA_TAG)) { - fillAttributedStringBuffer + fillAttributedStringBuilder (ctx, e, true, null, null, asb, lnLocs); paraElems.add(e); paraEnds.add(asb.length()); } else if (ln.equals(SVG12Constants.SVG_FLOW_REGION_BREAK_TAG)) { - fillAttributedStringBuffer + fillAttributedStringBuilder (ctx, e, true, null, null, asb, lnLocs); paraElems.add(e); @@ -619,14 +619,14 @@ protected void gatherRegionInfo(BridgeContext ctx, Element rgn, protected int startLen; /** - * Fills the given AttributedStringBuffer. + * Fills the given AttributedStringBuilder. */ - protected void fillAttributedStringBuffer(BridgeContext ctx, + protected void fillAttributedStringBuilder(BridgeContext ctx, Element element, boolean top, Integer bidiLevel, Map initialAttributes, - AttributedStringBuffer asb, + AttributedStringBuilder asb, List lnLocs) { // 'requiredFeatures', 'requiredExtensions', 'systemLanguage' & // 'display="none". @@ -698,7 +698,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, if (ln.equals(SVG12Constants.SVG_FLOW_LINE_TAG)) { int before = asb.length(); - fillAttributedStringBuffer(ctx, nodeElement, false, + fillAttributedStringBuilder(ctx, nodeElement, false, subBidiLevel, initialAttributes, asb, lnLocs); // System.out.println("Line: " + asb.length() + @@ -711,7 +711,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, } else if (ln.equals(SVG12Constants.SVG_FLOW_SPAN_TAG) || ln.equals(SVG12Constants.SVG_ALT_GLYPH_TAG)) { int before = asb.length(); - fillAttributedStringBuffer(ctx, nodeElement, false, + fillAttributedStringBuilder(ctx, nodeElement, false, subBidiLevel, initialAttributes, asb, lnLocs); if (asb.length() != before) { @@ -743,7 +743,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, false, null); } int before = asb.length(); - fillAttributedStringBuffer(ctx, nodeElement, false, + fillAttributedStringBuilder(ctx, nodeElement, false, subBidiLevel, initialAttributes, asb, lnLocs); if (asb.length() != before) { diff --git a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java index a2293916cd..9e2cd0bb7e 100644 --- a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java +++ b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java @@ -1221,13 +1221,13 @@ private void parse_sRGB_chunk(PNGChunk chunk) { private void parse_tEXt_chunk(PNGChunk chunk) { byte b; - StringBuffer key = new StringBuffer(); + StringBuilder key = new StringBuilder(); int textIndex = 0; while ((b = chunk.getByte(textIndex++)) != 0) { key.append( (char)b ); } - StringBuffer value= new StringBuffer(); + StringBuilder value= new StringBuilder(); for (int i = textIndex; i < chunk.getLength(); i++) { value.append( (char)chunk.getByte(i) ); } @@ -1340,14 +1340,14 @@ private void parse_tRNS_chunk(PNGChunk chunk) { private void parse_zTXt_chunk(PNGChunk chunk) { int textIndex = 0; - StringBuffer key = new StringBuffer(); + StringBuilder key = new StringBuilder(); byte b; while ((b = chunk.getByte(textIndex++)) != 0) { key.append( (char)b ); } /* int method = */ chunk.getByte(textIndex++); - StringBuffer value = new StringBuffer(); + StringBuilder value = new StringBuilder(); try { int length = chunk.getLength() - textIndex; byte[] data = chunk.getData(); diff --git a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGRed.java b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGRed.java index d198626443..7be2201d7c 100644 --- a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGRed.java +++ b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGRed.java @@ -1230,8 +1230,8 @@ private void parse_sRGB_chunk(PNGChunk chunk) { } private void parse_tEXt_chunk(PNGChunk chunk) { - StringBuffer key = new StringBuffer(); - StringBuffer value = new StringBuffer(); + StringBuilder key = new StringBuilder(); + StringBuilder value = new StringBuilder(); byte b; int textIndex = 0; @@ -1349,8 +1349,8 @@ private void parse_tRNS_chunk(PNGChunk chunk) { } private void parse_zTXt_chunk(PNGChunk chunk) { - StringBuffer key = new StringBuffer(); - StringBuffer value = new StringBuffer(); + StringBuilder key = new StringBuilder(); + StringBuilder value = new StringBuilder(); byte b; int textIndex = 0; diff --git a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java index f2ae2fe8c1..ca47743ccd 100644 --- a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java +++ b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java @@ -867,7 +867,7 @@ public final double readDoubleLE() throws IOException { * @exception IOException if an I/O error occurs. */ public final String readLine() throws IOException { - StringBuffer input = new StringBuffer(); + StringBuilder input = new StringBuilder(); int c = -1; boolean eol = false; diff --git a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMComputedStyle.java b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMComputedStyle.java index 3b05e312e4..0ccd50dd74 100644 --- a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMComputedStyle.java +++ b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMComputedStyle.java @@ -73,7 +73,7 @@ public CSSOMComputedStyle(CSSEngine e, * org.w3c.dom.css.CSSStyleDeclaration#getCssText()}. */ public String getCssText() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < cssEngine.getNumberOfProperties(); i++) { sb.append(cssEngine.getPropertyName(i)); sb.append(": "); diff --git a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGColor.java b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGColor.java index a90c0c70ed..f11eec8193 100644 --- a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGColor.java +++ b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGColor.java @@ -639,7 +639,7 @@ public abstract class AbstractModificationHandler * Called when the red value text has changed. */ public void redTextChanged(String text) throws DOMException { - StringBuffer sb = new StringBuffer(40); + StringBuilder sb = new StringBuilder(40); Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR: @@ -671,7 +671,7 @@ public void redTextChanged(String text) throws DOMException { */ public void redFloatValueChanged(short unit, float fValue) throws DOMException { - StringBuffer sb = new StringBuffer(40); + StringBuilder sb = new StringBuilder(40); Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR: @@ -703,7 +703,7 @@ public void redFloatValueChanged(short unit, float fValue) * Called when the green value text has changed. */ public void greenTextChanged(String text) throws DOMException { - StringBuffer sb = new StringBuffer(40); + StringBuilder sb = new StringBuilder(40); Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR: @@ -736,7 +736,7 @@ public void greenTextChanged(String text) throws DOMException { */ public void greenFloatValueChanged(short unit, float fValue) throws DOMException { - StringBuffer sb = new StringBuffer(40); + StringBuilder sb = new StringBuilder(40); Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR: @@ -768,7 +768,7 @@ public void greenFloatValueChanged(short unit, float fValue) * Called when the blue value text has changed. */ public void blueTextChanged(String text) throws DOMException { - StringBuffer sb = new StringBuffer(40); + StringBuilder sb = new StringBuilder(40); Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR: @@ -801,7 +801,7 @@ public void blueTextChanged(String text) throws DOMException { */ public void blueFloatValueChanged(short unit, float fValue) throws DOMException { - StringBuffer sb = new StringBuffer(40); + StringBuilder sb = new StringBuilder(40); Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR: @@ -894,8 +894,8 @@ public void colorProfileChanged(String cp) throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); sb.append(cp); ICCColor iccc = (ICCColor)value.item(1); @@ -920,8 +920,8 @@ public void colorsCleared() throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)value.item(1); sb.append(iccc.getColorProfile()); @@ -942,8 +942,8 @@ public void colorsInitialized(float f) throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)value.item(1); sb.append(iccc.getColorProfile()); @@ -966,8 +966,8 @@ public void colorInsertedBefore(float f, int idx) throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)value.item(1); sb.append(iccc.getColorProfile()); @@ -998,8 +998,8 @@ public void colorReplaced(float f, int idx) throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)value.item(1); sb.append(iccc.getColorProfile()); @@ -1030,8 +1030,8 @@ public void colorRemoved(int idx) throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)value.item(1); sb.append(iccc.getColorProfile()); @@ -1060,8 +1060,8 @@ public void colorAppend(float f) throws DOMException { Value value = getValue(); switch (getColorType()) { case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer( value.item(0).getCssText()); + StringBuilder sb = + new StringBuilder( value.item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)value.item(1); sb.append(iccc.getColorProfile()); diff --git a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGPaint.java b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGPaint.java index cbba171ddc..45ec4b6d90 100644 --- a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGPaint.java +++ b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMSVGPaint.java @@ -540,8 +540,8 @@ public void colorChanged(short type, String rgb, String icc) public void colorProfileChanged(String cp) throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); sb.append(cp); ICCColor iccc = (ICCColor)getValue().item(1); @@ -554,7 +554,7 @@ public void colorProfileChanged(String cp) throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); @@ -580,8 +580,8 @@ public void colorProfileChanged(String cp) throws DOMException { public void colorsCleared() throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)getValue().item(1); sb.append(iccc.getColorProfile()); @@ -590,7 +590,7 @@ public void colorsCleared() throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); @@ -612,8 +612,8 @@ public void colorsCleared() throws DOMException { public void colorsInitialized(float f) throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)getValue().item(1); sb.append(iccc.getColorProfile()); @@ -624,7 +624,7 @@ public void colorsInitialized(float f) throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); @@ -648,8 +648,8 @@ public void colorsInitialized(float f) throws DOMException { public void colorInsertedBefore(float f, int idx) throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)getValue().item(1); sb.append(iccc.getColorProfile()); @@ -668,7 +668,7 @@ public void colorInsertedBefore(float f, int idx) throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); @@ -700,8 +700,8 @@ public void colorInsertedBefore(float f, int idx) throws DOMException { public void colorReplaced(float f, int idx) throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)getValue().item(1); sb.append(iccc.getColorProfile()); @@ -720,7 +720,7 @@ public void colorReplaced(float f, int idx) throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); @@ -752,8 +752,8 @@ public void colorReplaced(float f, int idx) throws DOMException { public void colorRemoved(int idx) throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)getValue().item(1); sb.append(iccc.getColorProfile()); @@ -770,7 +770,7 @@ public void colorRemoved(int idx) throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); @@ -800,8 +800,8 @@ public void colorRemoved(int idx) throws DOMException { public void colorAppend(float f) throws DOMException { switch (getPaintType()) { case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuffer sb = - new StringBuffer(getValue().item(0).getCssText()); + StringBuilder sb = + new StringBuilder(getValue().item(0).getCssText()); sb.append(" icc-color("); ICCColor iccc = (ICCColor)getValue().item(1); sb.append(iccc.getColorProfile()); @@ -816,7 +816,7 @@ public void colorAppend(float f) throws DOMException { break; case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuffer(getValue().item(0).getCssText()); + sb = new StringBuilder(getValue().item(0).getCssText()); sb.append( ' ' ); sb.append(getValue().item(1).getCssText()); sb.append(" icc-color("); diff --git a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMValue.java b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMValue.java index 656e865038..c48ee066b2 100644 --- a/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMValue.java +++ b/batik-css/src/main/java/org/apache/batik/css/dom/CSSOMValue.java @@ -939,7 +939,7 @@ public void blueFloatValueChanged(short unit, float value) public void listTextChanged(int idx, String text) throws DOMException { ListValue lv = (ListValue)getValue(); int len = lv.getLength(); - StringBuffer sb = new StringBuffer( len * 8 ); + StringBuilder sb = new StringBuilder( len * 8 ); for (int i = 0; i < idx; i++) { sb.append(lv.item(i).getCssText()); sb.append(lv.getSeparatorChar()); @@ -960,7 +960,7 @@ public void listFloatValueChanged(int idx, short unit, float value) throws DOMException { ListValue lv = (ListValue)getValue(); int len = lv.getLength(); - StringBuffer sb = new StringBuffer( len * 8 ); + StringBuilder sb = new StringBuilder( len * 8 ); for (int i = 0; i < idx; i++) { sb.append(lv.item(i).getCssText()); sb.append(lv.getSeparatorChar()); @@ -980,7 +980,7 @@ public void listStringValueChanged(int idx, short unit, String value) throws DOMException { ListValue lv = (ListValue)getValue(); int len = lv.getLength(); - StringBuffer sb = new StringBuffer( len * 8 ); + StringBuilder sb = new StringBuilder( len * 8 ); for (int i = 0; i < idx; i++) { sb.append(lv.item(i).getCssText()); sb.append(lv.getSeparatorChar()); diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/FontFaceRule.java b/batik-css/src/main/java/org/apache/batik/css/engine/FontFaceRule.java index fd0c25e1c3..f7267ff956 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/FontFaceRule.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/FontFaceRule.java @@ -65,7 +65,7 @@ public StyleMap getStyleMap() { * Returns a printable representation of this rule. */ public String toString(CSSEngine eng) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("@font-face { "); sb.append(sm.toString(eng)); sb.append(" }\n"); diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/ImportRule.java b/batik-css/src/main/java/org/apache/batik/css/engine/ImportRule.java index 549b0f281e..9462fb0530 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/ImportRule.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/ImportRule.java @@ -63,7 +63,7 @@ public ParsedURL getURI() { * Returns a printable representation of this import rule. */ public String toString(CSSEngine eng) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("@import \""); sb.append(uri); sb.append("\""); diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/MediaRule.java b/batik-css/src/main/java/org/apache/batik/css/engine/MediaRule.java index 2fb6075d34..f238144724 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/MediaRule.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/MediaRule.java @@ -63,7 +63,7 @@ public SACMediaList getMediaList() { * Returns a printable representation of this media rule. */ public String toString(CSSEngine eng) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("@media"); if (mediaList != null) { for (int i = 0; i < mediaList.getLength(); i++) { diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/StyleDeclaration.java b/batik-css/src/main/java/org/apache/batik/css/engine/StyleDeclaration.java index 19f2f7f5ca..a7d2eb32f2 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/StyleDeclaration.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/StyleDeclaration.java @@ -149,7 +149,7 @@ public void append(Value v, int idx, boolean prio) { * Returns a printable representation of this style rule. */ public String toString(CSSEngine eng) { - StringBuffer sb = new StringBuffer( count * 8 ); + StringBuilder sb = new StringBuilder( count * 8 ); for (int i = 0; i < count; i++) { sb.append(eng.getPropertyName(indexes[i])); sb.append(": "); diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/StyleMap.java b/batik-css/src/main/java/org/apache/batik/css/engine/StyleMap.java index 7f0d563edc..0a1f941bc4 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/StyleMap.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/StyleMap.java @@ -304,7 +304,7 @@ public String toString(CSSEngine eng) { // eng.getNumberOfProperties() for StyleMaps that were created // by that CSSEngine. int nSlots = values.length; - StringBuffer sb = new StringBuffer(nSlots * 8); + StringBuilder sb = new StringBuilder(nSlots * 8); for (int i = 0; i < nSlots; i++) { Value v = values[i]; if (v == null) continue; diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/StyleRule.java b/batik-css/src/main/java/org/apache/batik/css/engine/StyleRule.java index 9b64036929..56894a3453 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/StyleRule.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/StyleRule.java @@ -82,7 +82,7 @@ public StyleDeclaration getStyleDeclaration() { * Returns a printable representation of this style rule. */ public String toString(CSSEngine eng) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (selectorList != null) { sb.append(selectorList.item(0)); for (int i = 1; i < selectorList.getLength(); i++) { diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/StyleSheet.java b/batik-css/src/main/java/org/apache/batik/css/engine/StyleSheet.java index 0be9f83df0..ee97afbd31 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/StyleSheet.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/StyleSheet.java @@ -152,7 +152,7 @@ public void append(Rule r) { * Returns a printable representation of this style-sheet. */ public String toString(CSSEngine eng) { - StringBuffer sb = new StringBuffer( size * 8 ); + StringBuilder sb = new StringBuilder( size * 8 ); for (int i = 0; i < size; i++) { sb.append(rules[i].toString(eng)); } diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/ListValue.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/ListValue.java index 14541b241f..0af3b0d36a 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/ListValue.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/ListValue.java @@ -75,7 +75,7 @@ public short getCssValueType() { * A string representation of the current value. */ public String getCssText() { - StringBuffer sb = new StringBuffer( length * 8 ); + StringBuilder sb = new StringBuilder( length * 8 ); if (length > 0) { sb.append(items[0].getCssText()); } diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/FontFamilyManager.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/FontFamilyManager.java index 2a9030b848..0625142730 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/FontFamilyManager.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/FontFamilyManager.java @@ -145,7 +145,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) break; case LexicalUnit.SAC_IDENT: - StringBuffer sb = new StringBuffer(lu.getStringValue()); + StringBuilder sb = new StringBuilder(lu.getStringValue()); lu = lu.getNextLexicalUnit(); if (lu != null && isIdentOrNumber(lu)) { do { diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/SrcManager.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/SrcManager.java index 17d169b545..dd60765b14 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/SrcManager.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/css2/SrcManager.java @@ -150,7 +150,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) break; case LexicalUnit.SAC_IDENT: - StringBuffer sb = new StringBuffer(lu.getStringValue()); + StringBuilder sb = new StringBuilder(lu.getStringValue()); lu = lu.getNextLexicalUnit(); if (lu != null && lu.getLexicalUnitType() == LexicalUnit.SAC_IDENT) { diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg/ICCColor.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg/ICCColor.java index 4ae8b4dda6..b71740d1da 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg/ICCColor.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg/ICCColor.java @@ -87,7 +87,7 @@ public float getColor(int i) throws DOMException { * A string representation of the current value. */ public String getCssText() { - StringBuffer sb = new StringBuffer( count * 8 ); + StringBuilder sb = new StringBuilder( count * 8 ); sb.append(ICC_COLOR_FUNCTION).append('('); sb.append(colorProfile); for (int i = 0; i < count; i++) { diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/AbstractCIEColor.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/AbstractCIEColor.java index b0ed190b76..36560da315 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/AbstractCIEColor.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/AbstractCIEColor.java @@ -83,7 +83,7 @@ public short getCssValueType() { * A string representation of the current value. */ public String getCssText() { - StringBuffer sb = new StringBuffer(getFunctionName()); + StringBuilder sb = new StringBuilder(getFunctionName()); sb.append('('); sb.append(values[0]); sb.append(", "); diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/DeviceColor.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/DeviceColor.java index a8d2080aac..0987bf794c 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/DeviceColor.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/DeviceColor.java @@ -88,7 +88,7 @@ public float getColor(int i) throws DOMException { * A string representation of the current value. */ public String getCssText() { - StringBuffer sb = new StringBuffer( count * 8 ); + StringBuilder sb = new StringBuilder( count * 8 ); if (nChannel) { sb.append(DEVICE_NCHANNEL_COLOR_FUNCTION); } else { diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/ICCNamedColor.java b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/ICCNamedColor.java index c74b6b6bd7..3f48d914f3 100644 --- a/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/ICCNamedColor.java +++ b/batik-css/src/main/java/org/apache/batik/css/engine/value/svg12/ICCNamedColor.java @@ -75,7 +75,7 @@ public String getColorName() throws DOMException { * A string representation of the current value. */ public String getCssText() { - StringBuffer sb = new StringBuffer(ICC_NAMED_COLOR_FUNCTION); + StringBuilder sb = new StringBuilder(ICC_NAMED_COLOR_FUNCTION); sb.append('('); sb.append(colorProfile); sb.append(", "); diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractAttr.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractAttr.java index 6d9d2ab8fd..61fb3470bd 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractAttr.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractAttr.java @@ -119,7 +119,7 @@ public String getNodeValue() throws DOMException { if (n == null) { return first.getNodeValue(); } - StringBuffer result = new StringBuffer(first.getNodeValue()); + StringBuilder result = new StringBuilder(first.getNodeValue()); do { result.append(n.getNodeValue()); n = n.getNextSibling(); diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java index 31319eb83d..c4994b3c04 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java @@ -1296,7 +1296,7 @@ protected boolean normalizeDocument(Element e, || !cdataSections && nt == Node.CDATA_SECTION_NODE) { // coalesce text nodes Node t = n; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(t.getNodeValue()); n = n.getNextSibling(); while (n != null && (n.getNodeType() == Node.TEXT_NODE diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractParentNode.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractParentNode.java index 3fe1e06aa0..09a3fe9d2a 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractParentNode.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractParentNode.java @@ -304,7 +304,7 @@ public NodeList getElementsByTagNameNS(String namespaceURI, * DOM: Implements {@link org.w3c.dom.Node#getTextContent()}. */ public String getTextContent() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Node n = getFirstChild(); n != null; n = n.getNextSibling()) { switch (n.getNodeType()) { case COMMENT_NODE: diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractText.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractText.java index 603b9856d1..6e36182a2c 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractText.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractText.java @@ -130,7 +130,7 @@ protected Node getNextLogicallyAdjacentTextNode(Node n) { * DOM: Implements {@link org.w3c.dom.Text#getWholeText()}. */ public String getWholeText() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Node n = this; n != null; n = getPreviousLogicallyAdjacentTextNode(n)) { diff --git a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java index a717b662f9..d93a367cb9 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java @@ -157,7 +157,7 @@ public String getModifiersString() { if (modifierKeys.isEmpty()) { return ""; } - StringBuffer sb = new StringBuffer(modifierKeys.size() * 8); + StringBuilder sb = new StringBuilder(modifierKeys.size() * 8); Iterator i = modifierKeys.iterator(); sb.append((String) i.next()); while (i.hasNext()) { diff --git a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMUIEvent.java b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMUIEvent.java index 95925c97ac..e400601bb8 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMUIEvent.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMUIEvent.java @@ -100,7 +100,7 @@ public void initUIEventNS(String namespaceURIArg, */ protected String[] split(String s) { List a = new ArrayList(8); - StringBuffer sb; + StringBuilder sb; int i = 0; int len = s.length(); while (i < len) { @@ -108,7 +108,7 @@ protected String[] split(String s) { if (XMLUtilities.isXMLSpace(c)) { continue; } - sb = new StringBuffer(); + sb = new StringBuilder(); sb.append(c); while (i < len) { c = s.charAt(i++); diff --git a/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java b/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java index 66ac538872..f0ddc9a238 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java @@ -442,7 +442,7 @@ protected static String assertValidCharacters(String s, boolean isXML11) public static String contentToString(String s, boolean isXML11) throws IOException { - StringBuffer result = new StringBuffer(s.length()); + StringBuilder result = new StringBuilder(s.length()); int len = s.length(); for (int i = 0; i < len; i++) { @@ -702,7 +702,7 @@ public static Node parseXML(String text, Document doc, String uri, } // Try and parse as a document fragment - StringBuffer sb = new StringBuffer(wrapperElementPrefix.length() + StringBuilder sb = new StringBuilder(wrapperElementPrefix.length() + text.length() + wrapperElementSuffix.length()); sb.append(wrapperElementPrefix); sb.append(text); @@ -873,7 +873,7 @@ public static void parseStyleSheetPIData(String data, HashMap ta throw new DOMException(DOMException.INVALID_CHARACTER_ERR, "Wrong name initial: " + c); } - StringBuffer ident = new StringBuffer(); + StringBuilder ident = new StringBuilder(); ident.append(c); while (++i < data.length()) { c = data.charAt(i); @@ -921,7 +921,7 @@ public static void parseStyleSheetPIData(String data, HashMap ta // The next char must be '\'' or '"' c = data.charAt(i); i++; - StringBuffer value = new StringBuffer(); + StringBuilder value = new StringBuilder(); if (c == '\'') { while (i < data.length()) { c = data.charAt(i); diff --git a/batik-dom/src/main/java/org/apache/batik/dom/util/SAXDocumentFactory.java b/batik-dom/src/main/java/org/apache/batik/dom/util/SAXDocumentFactory.java index 633070a0e1..4ee3f884a5 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/util/SAXDocumentFactory.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/util/SAXDocumentFactory.java @@ -106,7 +106,7 @@ public class SAXDocumentFactory /** * Contains collected string data. May be Text, CDATA or Comment. */ - protected StringBuffer stringBuffer = new StringBuffer(); + protected StringBuilder stringBuilder = new StringBuilder(); /** * The DTD to use when the document is created. @@ -114,7 +114,7 @@ public class SAXDocumentFactory protected DocumentType doctype; /** - * Indicates if stringBuffer has content, needed in case of + * Indicates if stringBuilder has content, needed in case of * zero sized "text" content. */ protected boolean stringContent; @@ -558,7 +558,7 @@ public void startDocument() throws SAXException { isStandalone = false; xmlVersion = XMLConstants.XML_VERSION_10; - stringBuffer.setLength(0); + stringBuilder.setLength(0); stringContent = false; if (createDocumentDescriptor) { @@ -693,8 +693,8 @@ public void endElement(String uri, String localName, String rawName) public void appendStringData() { if (!stringContent) return; - String str = stringBuffer.toString(); - stringBuffer.setLength(0); // reuse buffer. + String str = stringBuilder.toString(); + stringBuilder.setLength(0); // reuse buffer. stringContent = false; if (currentNode == null) { if (inCDATA) preInfo.add(new CDataInfo(str)); @@ -713,7 +713,7 @@ public void appendStringData() { */ public void characters(char[] ch, int start, int length) throws SAXException { - stringBuffer.append(ch, start, length); + stringBuilder.append(ch, start, length); stringContent = true; } @@ -726,7 +726,7 @@ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { - stringBuffer.append(ch, start, length); + stringBuilder.append(ch, start, length); stringContent = true; } diff --git a/batik-dom/src/main/java/org/apache/batik/dom/util/XMLSupport.java b/batik-dom/src/main/java/org/apache/batik/dom/util/XMLSupport.java index 1f6588635f..6eafa50785 100644 --- a/batik-dom/src/main/java/org/apache/batik/dom/util/XMLSupport.java +++ b/batik-dom/src/main/java/org/apache/batik/dom/util/XMLSupport.java @@ -84,7 +84,7 @@ public static String getXMLSpace(Element elt) { */ public static String defaultXMLSpace(String data) { int nChars = data.length(); - StringBuffer result = new StringBuffer( nChars ); + StringBuilder result = new StringBuilder( nChars ); boolean space = false; for (int i = 0; i < nChars; i++) { char c = data.charAt(i); @@ -114,7 +114,7 @@ public static String defaultXMLSpace(String data) { */ public static String preserveXMLSpace(String data) { int nChars = data.length(); - StringBuffer result = new StringBuffer( nChars ); + StringBuilder result = new StringBuilder( nChars ); for (int i = 0; i < data.length(); i++) { char c = data.charAt(i); switch (c) { diff --git a/batik-extension/src/main/java/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java b/batik-extension/src/main/java/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java index fa37a0c41c..4368057a8a 100644 --- a/batik-extension/src/main/java/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java +++ b/batik-extension/src/main/java/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java @@ -321,7 +321,7 @@ protected void addChildPaintAttributes(AttributedString as, divTPI.fillPaint = Color.black; elemTPI.put(div, divTPI); - AttributedStringBuffer asb = new AttributedStringBuffer(); + AttributedStringBuilder asb = new AttributedStringBuilder(); List paraEnds = new ArrayList(); List paraElems = new ArrayList(); List lnLocs = new ArrayList(); @@ -337,13 +337,13 @@ protected void addChildPaintAttributes(AttributedString as, String ln = e.getLocalName(); if (ln.equals(BATIK_EXT_FLOW_PARA_TAG)) { - fillAttributedStringBuffer + fillAttributedStringBuilder (ctx, e, true, null, null, asb, lnLocs); paraElems.add(e); paraEnds.add(asb.length()); } else if (ln.equals(BATIK_EXT_FLOW_REGION_BREAK_TAG)) { - fillAttributedStringBuffer + fillAttributedStringBuilder (ctx, e, true, null, null, asb, lnLocs); paraElems.add(e); @@ -510,14 +510,14 @@ protected RegionInfo buildRegion(UnitProcessor.Context uctx, } /** - * Fills the given AttributedStringBuffer. + * Fills the given AttributedStringBuilder. */ - protected void fillAttributedStringBuffer(BridgeContext ctx, + protected void fillAttributedStringBuilder(BridgeContext ctx, Element element, boolean top, Integer bidiLevel, Map initialAttributes, - AttributedStringBuffer asb, + AttributedStringBuilder asb, List lnLocs) { // 'requiredFeatures', 'requiredExtensions', 'systemLanguage' & // 'display="none". @@ -574,7 +574,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, if (ln.equals(BATIK_EXT_FLOW_LINE_TAG)) { int before = asb.length(); - fillAttributedStringBuffer(ctx, nodeElement, false, + fillAttributedStringBuilder(ctx, nodeElement, false, subBidiLevel, initialAttributes, asb, lnLocs); // System.out.println("Line: " + asb.length() + @@ -586,7 +586,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, } else if (ln.equals(BATIK_EXT_FLOW_SPAN_TAG) || ln.equals(SVG_ALT_GLYPH_TAG)) { int before = asb.length(); - fillAttributedStringBuffer(ctx, nodeElement, false, + fillAttributedStringBuilder(ctx, nodeElement, false, subBidiLevel, initialAttributes, asb, lnLocs); if (asb.length() != before) { @@ -618,7 +618,7 @@ protected void fillAttributedStringBuffer(BridgeContext ctx, false, null); } int before = asb.length(); - fillAttributedStringBuffer(ctx, nodeElement, false, + fillAttributedStringBuilder(ctx, nodeElement, false, subBidiLevel, initialAttributes, asb, lnLocs); if (asb.length() != before) { diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java index ad8752f02c..db2bd03525 100644 --- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java +++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java @@ -216,7 +216,7 @@ public List getMedia() { * Returns the media list as a string separated by space. */ public String getMediaAsString() { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); Enumeration e = listModel.elements(); while (e.hasMoreElements()) { buffer.append((String)e.nextElement()); diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/LanguageDialog.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/LanguageDialog.java index 2c7730a9c0..2912619a2a 100644 --- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/LanguageDialog.java +++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/LanguageDialog.java @@ -367,7 +367,7 @@ public static synchronized void initCountryIcons() * Returns the selected user languages. */ public String getLanguages() { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); if (userListModel.getSize() > 0) { result.append(userListModel.getElementAt(0)); diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java b/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java index 4ab75db694..4ba2bc127e 100644 --- a/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java +++ b/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java @@ -106,7 +106,7 @@ public static AttributedString assignArabicForms(AttributedString as) { if (charOrder != null) { // need to reconstruct the reordered attributed string - StringBuffer reorderedString = new StringBuffer(numChars); + StringBuilder reorderedString = new StringBuilder(numChars); char c; for (int i = 0; i < numChars; i++) { c = aci.setIndex(charOrder[i]); @@ -435,7 +435,7 @@ public static String createSubstituteString(AttributedCharacterIterator aci) { int start = aci.getBeginIndex(); int end = aci.getEndIndex(); int numChar = end-start; - StringBuffer substString = new StringBuffer(numChar); + StringBuilder substString = new StringBuilder(numChar); for (int i=start; i< end; i++) { char c = aci.setIndex(i); if (!arabicChar(c)) { diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java b/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java index f7b6167074..bb4b3c0c66 100644 --- a/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java +++ b/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java @@ -83,7 +83,7 @@ public BidiAttributedCharacterIterator(AttributedCharacterIterator aci, // of null keys/values). as = new AttributedString(aci); } else { - StringBuffer strB = new StringBuffer( numChars ); + StringBuilder strB = new StringBuilder( numChars ); char c = aci.first(); for (int i = 0; i < numChars; i++) { strB.append(c); @@ -164,7 +164,7 @@ public BidiAttributedCharacterIterator(AttributedCharacterIterator aci, numChars, maxBiDi); // construct the string in the new order - StringBuffer reorderedString = new StringBuffer( numChars ); + StringBuilder reorderedString = new StringBuilder( numChars ); int reorderedFirstChar = 0; for (int i = 0; i < numChars; i++) { int srcIdx = newCharOrder[i]; diff --git a/batik-parser/src/main/java/org/apache/batik/parser/TimingParser.java b/batik-parser/src/main/java/org/apache/batik/parser/TimingParser.java index 1ae192f48a..bea847ba16 100644 --- a/batik-parser/src/main/java/org/apache/batik/parser/TimingParser.java +++ b/batik-parser/src/main/java/org/apache/batik/parser/TimingParser.java @@ -107,7 +107,7 @@ protected Object[] parseTimingSpecifier() throws ParseException, IOException { * Parses an XML name with optional escaping in the middle. */ protected String parseName() throws ParseException, IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean midEscaped = false; do { sb.append((char) current); @@ -158,7 +158,7 @@ protected Object[] parseIDValue(boolean escaped) reportUnexpectedCharacterError( current ); } current = reader.read(); - StringBuffer keyName = new StringBuffer(); + StringBuilder keyName = new StringBuilder(); while (current >= 'A' && current <= 'Z' || current >= 'a' && current <= 'z' || current >= '0' && current <= '9' @@ -431,7 +431,7 @@ protected Calendar parseWallclockValue() tzn = "UTC"; current = reader.read(); } else if (current == '+' || current == '-') { - StringBuffer tznb = new StringBuffer(); + StringBuilder tznb = new StringBuilder(); tzSpecified = true; if (current == '-') { tzNegative = true; diff --git a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreter.java b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreter.java index 055774653b..609b654dfe 100644 --- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreter.java +++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreter.java @@ -63,7 +63,7 @@ public Object evaluate(Reader scriptreader) throws IOException { public Object evaluate(Reader scriptreader, String description) throws IOException { // oops jacl doesn't accept reader in its eval method :-( - StringBuffer sbuffer = new StringBuffer(); + StringBuilder sbuffer = new StringBuilder(); char[] buffer = new char[1024]; int val = 0; while ((val = scriptreader.read(buffer)) != -1) { diff --git a/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java b/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java index 24d92af6bf..27107bafde 100644 --- a/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java +++ b/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java @@ -58,7 +58,7 @@ public Object evaluate(Reader scriptreader, String description) throws IOException { // oups jpython doesn't accept reader in its eval method :-( - StringBuffer sbuffer = new StringBuffer(); + StringBuilder sbuffer = new StringBuilder(); char[] buffer = new char[1024]; int val = 0; while ((val = scriptreader.read(buffer)) != -1) { diff --git a/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java b/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java index 043ed49622..18a13229fd 100644 --- a/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java +++ b/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java @@ -423,7 +423,7 @@ protected void setValueAsString(List value) throws DOMException { Iterator it = value.iterator(); if (it.hasNext()) { SVGItem item = (SVGItem) it.next(); - StringBuffer buf = new StringBuffer( value.size() * 8 ); + StringBuilder buf = new StringBuilder( value.size() * 8 ); buf.append( item.getValueAsString() ); while (it.hasNext()) { item = (SVGItem) it.next(); diff --git a/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGTransformList.java b/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGTransformList.java index 162ae5fc83..dc565fa2aa 100644 --- a/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGTransformList.java +++ b/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGTransformList.java @@ -440,7 +440,7 @@ public void setF(float f) throws DOMException { * Returns the string representation of this transform. */ protected String getStringValue(){ - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); switch(type) { case SVGTransform.SVG_TRANSFORM_TRANSLATE: buf.append("translate("); diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java index ce553b549f..d66881263d 100644 --- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java +++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java @@ -1808,7 +1808,7 @@ public void valueChanged(TreeSelectionEvent ev) { } protected String createDocumentText(Document doc) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Nodes: "); sb.append(nodeCount(doc)); return sb.toString(); diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java index f1b2d05fad..e8a5923ad7 100644 --- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java +++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java @@ -955,7 +955,7 @@ public void addVisitedURI(String uri) { } // Now, save the list of visited URL into the preferences - StringBuffer lastVisitedBuffer = new StringBuffer( lastVisited.size() * 8 ); + StringBuilder lastVisitedBuffer = new StringBuilder( lastVisited.size() * 8 ); for (Object aLastVisited : lastVisited) { try { diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java index dd8e6f0ef3..b28a2d1113 100644 --- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java +++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java @@ -639,7 +639,7 @@ protected void savePreferences() { host.getText()); model.setString(PREFERENCE_KEY_PROXY_PORT, port.getText()); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); Enumeration e = mediaListModel.elements(); while (e.hasMoreElements()) { sb.append((String) e.nextElement()); diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SquiggleInputHandlerFilter.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SquiggleInputHandlerFilter.java index 57b0e97827..3adca11148 100644 --- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SquiggleInputHandlerFilter.java +++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SquiggleInputHandlerFilter.java @@ -40,7 +40,7 @@ public boolean accept(File f) { } public String getDescription() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String[] extensions = handler.getHandledExtensions(); int n = extensions != null ? extensions.length : 0; for (int i=0; i 0) dashArrayBuf.append(doubleString(dashArray[0])); diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java index 0bc40767f1..0351c5d16c 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java @@ -54,7 +54,7 @@ public static void style(Node node){ // Has to be an Element, as it has attributes // According to spec. Element element = (Element)node; - StringBuffer styleAttrBuffer = new StringBuffer(); + StringBuilder styleAttrBuffer = new StringBuilder(); int nAttr = attributes.getLength(); List toBeRemoved = new ArrayList(); for(int i=0; i= 3){ // // Process filter attribute -// StringBuffer filterAttrBuf = new StringBuffer(URL_PREFIX); +// StringBuilder filterAttrBuf = new StringBuilder(URL_PREFIX); // filterAttrBuf.append(SIGN_POUND); // filterAttrBuf.append(filterDef.getAttributeNS(null, SVG_ID_ATTRIBUTE)); // filterAttrBuf.append(URL_SUFFIX); @@ -223,9 +223,9 @@ private String[] convertLookupTables(LookupOp lookupOp){ if((nComponents != 1) && (nComponents != 3) && (nComponents != 4)) throw new SVGGraphics2DRuntimeException(ERR_ILLEGAL_BUFFERED_IMAGE_LOOKUP_OP); - StringBuffer[] lookupTableBuf = new StringBuffer[nComponents]; + StringBuilder[] lookupTableBuf = new StringBuilder[nComponents]; for(int i=0; i= 3){ // // Process filter attribute -// StringBuffer filterAttrBuf = new StringBuffer(URL_PREFIX); +// StringBuilder filterAttrBuf = new StringBuilder(URL_PREFIX); // filterAttrBuf.append(SIGN_POUND); // filterAttrBuf.append(filterDef.getAttributeNS(null, SVG_ID_ATTRIBUTE)); // filterAttrBuf.append(URL_SUFFIX); diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTexturePaint.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTexturePaint.java index 1a80af6992..f20eb9ea39 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTexturePaint.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTexturePaint.java @@ -148,7 +148,7 @@ public SVGPaintDescriptor toSVG(TexturePaint texture) { generatorContext.idGenerator. generateID(ID_PREFIX_PATTERN)); -// StringBuffer patternAttrBuf = new StringBuffer(URL_PREFIX); +// StringBuilder patternAttrBuf = new StringBuilder(URL_PREFIX); // patternAttrBuf.append(SIGN_POUND); // patternAttrBuf.append(patternDef.getAttributeNS(null, SVG_ID_ATTRIBUTE)); // patternAttrBuf.append(URL_SUFFIX); diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTransform.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTransform.java index b1fc8e3245..ec85ac154b 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTransform.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGTransform.java @@ -172,7 +172,7 @@ public Object pop() { // int nPresentations = presentation.size(); - StringBuffer transformStackBuffer = new StringBuffer( nPresentations * 8 ); + StringBuilder transformStackBuffer = new StringBuilder( nPresentations * 8 ); for(i = 0; i < nPresentations; i++) { transformStackBuffer.append(convertTransform((TransformStackElement) presentation.get(i))); transformStackBuffer.append(SPACE); @@ -186,7 +186,7 @@ public Object pop() { * Converts an AffineTransform to an SVG transform string */ final String convertTransform(TransformStackElement transformElement){ - StringBuffer transformString = new StringBuffer(); + StringBuilder transformString = new StringBuilder(); double[] transformParameters = transformElement.getTransformParameters(); switch(transformElement.getType().toInt()){ case TransformType.TRANSFORM_TRANSLATE: diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/SVGFont.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/SVGFont.java index 70201218e8..3efe794162 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/SVGFont.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/SVGFont.java @@ -97,7 +97,7 @@ public class SVGFont implements XMLConstants, SVGConstants, ScriptTags, FeatureT "SVGFont.config.svg.test.card.end"; protected static String encodeEntities(String s) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < s.length(); i++) { if (s.charAt(i) == XML_CHAR_LT) { sb.append(XML_ENTITY_LT); @@ -123,7 +123,7 @@ protected static String getContourAsSVGPathData(Glyph glyph, int startIndex, int return ""; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int offset = 0; while (offset < count) { @@ -198,7 +198,7 @@ protected static String getContourAsSVGPathData(Glyph glyph, int startIndex, int } protected static String getSVGFontFaceElement(Font font) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String fontFamily = font.getNameTable().getRecord(Table.nameFontFamilyName); short unitsPerEm = font.getHeadTable().getUnitsPerEm(); String panose = font.getOS2Table().getPanose().toString(); @@ -273,7 +273,7 @@ protected static String getSVGFontFaceElement(Font font) { */ protected static void writeFontAsSVGFragment(PrintStream ps, Font font, String id, int first, int last, boolean autoRange, boolean forceAscii) throws Exception { - // StringBuffer sb = new StringBuffer(); + // StringBuilder sb = new StringBuilder(); // int horiz_advance_x = font.getHmtxTable().getAdvanceWidth( // font.getHheaTable().getNumberOfHMetrics() - 1); int horiz_advance_x = font.getOS2Table().getAvgCharWidth(); @@ -427,7 +427,7 @@ protected static String getGlyphAsSVG( String attrib, String code) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int firstIndex = 0; int count = 0; int i; @@ -486,7 +486,7 @@ protected static String getGlyphAsSVG( // sb.append("/>"); // Chop-up the string into 255 character lines - chopUpStringBuffer(sb); + chopUpStringBuilder(sb); return sb.toString(); } @@ -501,7 +501,7 @@ protected static String getGlyphAsSVG( SingleSubst arabTermSubst, String code) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean substituted = false; // arabic = "initial | medial | terminal | isolated" @@ -590,7 +590,7 @@ protected static String getKerningPairAsSVG(KerningPair kp, PostTable post) { String leftGlyphName = post.getGlyphName(kp.getLeft()); String rightGlyphName = post.getGlyphName(kp.getRight()); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); // sb.append(">24)&0xff)) .append((char)((tag>>16)&0xff)) .append((char)((tag>>8)&0xff)) diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/HeadTable.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/HeadTable.java index 835e76ba95..0b433914bf 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/HeadTable.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/HeadTable.java @@ -135,7 +135,7 @@ public short getYMin() { } public String toString() { - return new StringBuffer() + return new StringBuilder() .append("head\n\tversionNumber: ").append(versionNumber) .append("\n\tfontRevision: ").append(fontRevision) .append("\n\tcheckSumAdjustment: ").append(checkSumAdjustment) diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/NameRecord.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/NameRecord.java index 56fb4f3e72..831421bee5 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/NameRecord.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/NameRecord.java @@ -65,7 +65,7 @@ public String getRecordString() { } protected void loadString(RandomAccessFile raf, int stringStorageOffset) throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); raf.seek(stringStorageOffset + stringOffset); if (platformId == Table.platformAppleUnicode) { diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/Panose.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/Panose.java index 63527daff8..89068181c1 100644 --- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/Panose.java +++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/Panose.java @@ -90,7 +90,7 @@ public byte getXHeight() { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(String.valueOf(bFamilyType)).append(" ") .append(String.valueOf(bSerifStyle)).append(" ") .append(String.valueOf(bWeight)).append(" ") diff --git a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java index bbf4927913..7f2a3cc8cd 100644 --- a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java +++ b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java @@ -964,7 +964,7 @@ public void execute(){ } protected String toString( String[] v){ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int n = v != null ? v.length:0; for (int i=0; i 0){ - sb = new StringBuffer(); + sb = new StringBuilder(); sb.append(ui[0].toString()); for(int i=1; i 0){ sb.append(array[0]); @@ -260,7 +260,7 @@ protected String arrayToString(Object[] array){ } protected String reportIdsToString(TestReport r){ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if(r != null){ sb.append(r.getTest().getQualifiedId()); if(r instanceof TestSuiteReport){ @@ -279,7 +279,7 @@ protected String reportIdsToString(TestReport r){ return sb.toString(); } - protected void appendReportIds(TestReport r, StringBuffer sb){ + protected void appendReportIds(TestReport r, StringBuilder sb){ if(r != null){ sb.append(", "); sb.append(r.getTest().getQualifiedId()); diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java index ac5653e050..33b9ccbfde 100644 --- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java +++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java @@ -52,7 +52,7 @@ public class OutputManager { /** * The margin. */ - protected StringBuffer margin = new StringBuffer(); + protected StringBuilder margin = new StringBuilder(); /** * The current line. @@ -762,7 +762,7 @@ protected boolean formatText(char[] text, String margin, startsWithSpace = true; i++; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { if (i >= text.length || XMLUtilities.isXMLSpace(text[i])) { break; diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/PrettyPrinter.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/PrettyPrinter.java index 216588d461..a4819521b2 100644 --- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/PrettyPrinter.java +++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/PrettyPrinter.java @@ -866,7 +866,7 @@ protected String printElement() char valueDelim = scanner.getStringDelimiter(); boolean hasEntityRef = false; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getCurrentValue()); loop: for (;;) { scanner.clearBuffer(); diff --git a/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java b/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java index a7331757b2..e3428089bf 100644 --- a/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java +++ b/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java @@ -413,7 +413,7 @@ protected static Set getDescriptorClasses(String desc) { case 'L': c = desc.charAt(++i); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (c != ';') { sb.append(c); c = desc.charAt(++i); @@ -440,7 +440,7 @@ protected static Set getDescriptorClasses(String desc) { case 'L': c = desc.charAt(++i); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (c != ';') { sb.append(c); c = desc.charAt(++i); @@ -463,7 +463,7 @@ protected static Set getDescriptorClasses(String desc) { case 'L': c = desc.charAt(++i); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (c != ';') { sb.append(c); c = desc.charAt(++i); diff --git a/batik-util/src/main/java/org/apache/batik/util/ParsedURLDefaultProtocolHandler.java b/batik-util/src/main/java/org/apache/batik/util/ParsedURLDefaultProtocolHandler.java index 0dc8b25d5e..c79fe107f6 100644 --- a/batik-util/src/main/java/org/apache/batik/util/ParsedURLDefaultProtocolHandler.java +++ b/batik-util/src/main/java/org/apache/batik/util/ParsedURLDefaultProtocolHandler.java @@ -195,7 +195,7 @@ public static String unescapeStr(String str) { if (idx == -1) return str; // quick out.. int prev=0; - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); while (idx != -1) { if (idx != prev) ret.append(str.substring(prev, idx)); diff --git a/batik-util/src/test/java/org/apache/batik/util/ParsedURLDataTest.java b/batik-util/src/test/java/org/apache/batik/util/ParsedURLDataTest.java index 14d11ce954..9dd5cbe4f5 100644 --- a/batik-util/src/test/java/org/apache/batik/util/ParsedURLDataTest.java +++ b/batik-util/src/test/java/org/apache/batik/util/ParsedURLDataTest.java @@ -110,7 +110,7 @@ public TestReport runImpl() throws Exception { } catch (IOException ioe) { ioe.printStackTrace(); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i=0; i