stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8264428: Cleanup usages of StringBuffer in java.desktop

Browse Source 
Reviewed-by: azvegint, aivanov
This commit is contained in:
Andrey Turbanov 2021-04-08 21:23:30 +00:00 committed by Alexander Zvegintsev
parent 308f6796da
commit 8a2358074f
11 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.desktop/aix/classes/sun/awt/X11InputMethod.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -231,7 +231,7 @@ public abstract class X11InputMethod extends X11InputMethodBase {
// Replace control character with a square box
if (chgText != null) {
StringBuffer newChgText = new StringBuffer();
StringBuilder newChgText = new StringBuilder();
for (int i=0; i < chgText.length(); i++){
char c = chgText.charAt(i);
if (Character.isISOControl(c)){

6
src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -122,9 +122,9 @@ public class TIFFFieldNode extends IIOMetadataNode {
child = new IIOMetadataNode("TIFFUndefined");
byte[] data = field.getAsBytes();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < count; i++) {
sb.append(Integer.toString(data[i] & 0xff));
sb.append(data[i] & 0xff);
if (i < count - 1) {
sb.append(",");
}

14
src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -327,7 +327,7 @@ public class TIFFImageMetadata extends IIOMetadata {
if (times == 1) {
return s;
}
StringBuffer sb = new StringBuffer((s.length() + 1)*times - 1);
StringBuilder sb = new StringBuilder((s.length() + 1)*times - 1);
sb.append(s);
for (int i = 1; i < times; i++) {
sb.append(" ");
@ -422,12 +422,12 @@ public class TIFFImageMetadata extends IIOMetadata {
bitsPerSample = new int[] {1};
}
}
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < bitsPerSample.length; i++) {
if (i > 0) {
sb.append(" ");
}
sb.append(Integer.toString(bitsPerSample[i]));
sb.append(bitsPerSample[i]);
}
node = new IIOMetadataNode("BitsPerSample");
if(isPaletteColor) {
@ -441,7 +441,7 @@ public class TIFFImageMetadata extends IIOMetadata {
f = getTIFFField(BaselineTIFFTagSet.TAG_FILL_ORDER);
int fillOrder = f != null ?
f.getAsInt(0) : BaselineTIFFTagSet.FILL_ORDER_LEFT_TO_RIGHT;
sb = new StringBuffer();
sb = new StringBuilder();
for (int i = 0; i < bitsPerSample.length; i++) {
if (i > 0) {
sb.append(" ");
@ -451,7 +451,7 @@ public class TIFFImageMetadata extends IIOMetadata {
int msb =
fillOrder == BaselineTIFFTagSet.FILL_ORDER_LEFT_TO_RIGHT ?
maxBitIndex : 0;
sb.append(Integer.toString(msb));
sb.append(msb);
}
node = new IIOMetadataNode("SampleMSB");
if(isPaletteColor) {
@ -1225,7 +1225,7 @@ public class TIFFImageMetadata extends IIOMetadata {
String minute = getAttribute(child, "minute");
String second = getAttribute(child, "second");
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
sb.append(year);
sb.append(":");
if(month.length() == 1) {

4
src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
View File

@ -2414,13 +2414,13 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
int nch;
boolean lastWasCR = false;
int last;
StringBuffer sbuff = null;
StringBuilder sbuff = null;
// Read in a block at a time, mapping \r\n to \n, as well as single
// \r to \n.
while ((nch = in.read(buff, 0, buff.length)) != -1) {
if (sbuff == null) {
sbuff = new StringBuffer(nch);
sbuff = new StringBuilder(nch);
}
last = 0;
for(int counter = 0; counter < nch; counter++) {

4
src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -155,7 +155,7 @@ class XAtomList {
}
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("[");
Iterator<XAtom> iter = atoms.iterator();
while (iter.hasNext()) {

9
src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -81,11 +81,14 @@ public class XCreateWindowParams extends HashMap<Object, Object> {
return this;
}
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
Iterator<Map.Entry<Object, Object>> eIter = entrySet().iterator();
while (eIter.hasNext()) {
Map.Entry<Object, Object> entry = eIter.next();
buf.append(entry.getKey() + ": " + entry.getValue() + "\n");
buf.append(entry.getKey())
.append(": ")
.append(entry.getValue())
.append("\n");
}
return buf.toString();
}

4
src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -610,7 +610,7 @@ static native String XSetLocaleModifiers(String modifier_list);
}
static String hintsToString(long flags) {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
if ((flags & XUtilConstants.PMaxSize) != 0) {
buf.append("PMaxSize ");
}

25
src/java.desktop/unix/classes/sun/awt/X11FontManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -481,11 +481,9 @@ public final class X11FontManager extends FcFontManager {
return name; // what else can we do?
}
StringBuffer sb =
new StringBuffer(name.substring(hPos[FAMILY_NAME_FIELD-1],
hPos[SETWIDTH_NAME_FIELD]));
sb.append(name.substring(hPos[CHARSET_REGISTRY_FIELD-1]));
String retval = sb.toString().toLowerCase (Locale.ENGLISH);
String sb = name.substring(hPos[FAMILY_NAME_FIELD-1], hPos[SETWIDTH_NAME_FIELD])
+ name.substring(hPos[CHARSET_REGISTRY_FIELD-1]);
String retval = sb.toLowerCase(Locale.ENGLISH);
return retval;
}
@ -529,15 +527,12 @@ public final class X11FontManager extends FcFontManager {
&& encoding.equals("fontspecific")){
registry = "adobe";
}
StringBuffer sb =
new StringBuffer(name.substring(hPos[FAMILY_NAME_FIELD-1],
hPos[SLANT_FIELD-1]+1));
sb.append(slant);
sb.append(name.substring(hPos[SLANT_FIELD],
hPos[SETWIDTH_NAME_FIELD]+1));
sb.append(registry);
sb.append(name.substring(hPos[CHARSET_ENCODING_FIELD-1]));
String retval = sb.toString().toLowerCase (Locale.ENGLISH);
String sb = name.substring(hPos[FAMILY_NAME_FIELD-1], hPos[SLANT_FIELD-1]+1)
+ slant
+ name.substring(hPos[SLANT_FIELD], hPos[SETWIDTH_NAME_FIELD]+1)
+ registry
+ name.substring(hPos[CHARSET_ENCODING_FIELD-1]);
String retval = sb.toLowerCase(Locale.ENGLISH);
return retval;
}

4
src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -787,7 +787,7 @@ public abstract class X11InputMethodBase extends InputMethodAdapter {
}
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
for (int i = 0; i < size;) {
s.append(intArray[i++]);
if (i < size)

7
src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -575,10 +575,7 @@ class HTMLCodec extends InputStream {
if (n >= 0 && len < width) {
char[] array = new char[width - len];
Arrays.fill(array, '0');
StringBuffer buffer = new StringBuffer(width);
buffer.append(array);
buffer.append(string);
string = buffer.toString();
string = String.valueOf(array) + string;
}
return string;
}

4
src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -136,7 +136,7 @@ final class D3DContext extends BufferedContext {
@Override
public String toString() {
StringBuffer buf = new StringBuffer(super.toString());
StringBuilder buf = new StringBuilder(super.toString());
if ((caps & CAPS_LCD_SHADER) != 0) {
buf.append("CAPS_LCD_SHADER|");
}