--- old/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java 2014-08-26 11:17:24.000000000 +0800 +++ new/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java 2014-08-26 11:17:24.000000000 +0800 @@ -167,9 +167,9 @@ for (int i = 0; i < allchannelnames.length; i++) { if ((channelmask & m) != 0L) { if (i < channelnames.length) { - sb.append(channelnames[i] + " "); + sb.append(channelnames[i]).append(' '); } else { - sb.append(allchannelnames[i] + " "); + sb.append(allchannelnames[i]).append(' '); } } m *= 2L; --- old/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java 2014-08-26 11:17:27.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java 2014-08-26 11:17:26.000000000 +0800 @@ -272,26 +272,25 @@ @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder sb = new StringBuilder(); //$$fb2002-11-01: fix for 4672864: AudioFileFormat.toString() throws unexpected NullPointerException if (type != null) { - buf.append(type.toString() + " (." + type.getExtension() + ") file"); + sb.append(type).append(" (.").append(type.getExtension()).append(") file"); } else { - buf.append("unknown file format"); + sb.append("unknown file format"); } if (byteLength != AudioSystem.NOT_SPECIFIED) { - buf.append(", byte length: " + byteLength); + sb.append(", byte length: ").append(byteLength); } - buf.append(", data format: " + format); + sb.append(", data format: ").append(format); if (frameLength != AudioSystem.NOT_SPECIFIED) { - buf.append(", frame length: " + frameLength); + sb.append(", frame length: ").append(frameLength); } - - return new String(buf); + return sb.toString(); } /** --- old/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java 2014-08-26 11:17:29.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/sound/sampled/DataLine.java 2014-08-26 11:17:29.000000000 +0800 @@ -472,21 +472,27 @@ StringBuilder sb = new StringBuilder(); - if ( (formats.length == 1) && (formats[0] != null) ) { - sb.append(" supporting format " + formats[0]); + if ((formats.length == 1) && (formats[0] != null)) { + sb.append(" supporting format ").append(formats[0]); } else if (getFormats().length > 1) { - sb.append(" supporting " + getFormats().length + " audio formats"); + sb.append(" supporting ").append(getFormats().length) + .append(" audio formats"); } - if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) { - sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes"); - } else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) { - sb.append(", and buffers of at least " + minBufferSize + " bytes"); + if ((minBufferSize != AudioSystem.NOT_SPECIFIED) + && (maxBufferSize != AudioSystem.NOT_SPECIFIED)) { + sb.append(", and buffers of ").append(minBufferSize) + .append(" to ").append(maxBufferSize).append(" bytes"); + } else if ((minBufferSize != AudioSystem.NOT_SPECIFIED) + && (minBufferSize > 0)) { + sb.append(", and buffers of at least ").append(minBufferSize) + .append(" bytes"); } else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) { - sb.append(", and buffers of up to " + minBufferSize + " bytes"); + sb.append(", and buffers of up to ").append(minBufferSize) + .append(" bytes"); } - return new String(super.toString() + sb); + return super.toString() + sb.toString(); } } } --- old/src/java.desktop/share/classes/javax/swing/GroupLayout.java 2014-08-26 11:17:32.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/swing/GroupLayout.java 2014-08-26 11:17:31.000000000 +0800 @@ -1213,15 +1213,15 @@ registerComponents(horizontalGroup, HORIZONTAL); registerComponents(verticalGroup, VERTICAL); } - StringBuffer buffer = new StringBuffer(); - buffer.append("HORIZONTAL\n"); - createSpringDescription(buffer, horizontalGroup, " ", HORIZONTAL); - buffer.append("\nVERTICAL\n"); - createSpringDescription(buffer, verticalGroup, " ", VERTICAL); - return buffer.toString(); + StringBuilder sb = new StringBuilder(); + sb.append("HORIZONTAL\n"); + createSpringDescription(sb, horizontalGroup, " ", HORIZONTAL); + sb.append("\nVERTICAL\n"); + createSpringDescription(sb, verticalGroup, " ", VERTICAL); + return sb.toString(); } - private void createSpringDescription(StringBuffer buffer, Spring spring, + private void createSpringDescription(StringBuilder sb, Spring spring, String indent, int axis) { String origin = ""; String padding = ""; @@ -1239,20 +1239,19 @@ padding = ", userCreated=" + paddingSpring.getUserCreated() + ", matches=" + paddingSpring.getMatchDescription(); } - buffer.append(indent + spring.getClass().getName() + " " + - Integer.toHexString(spring.hashCode()) + " " + - origin + - ", size=" + spring.getSize() + - ", alignment=" + spring.getAlignment() + - " prefs=[" + spring.getMinimumSize(axis) + - " " + spring.getPreferredSize(axis) + - " " + spring.getMaximumSize(axis) + - padding + "]\n"); + sb.append(indent).append(spring.getClass().getName()).append(' ') + .append(Integer.toHexString(spring.hashCode())).append(' ') + .append(origin).append(", size=").append(spring.getSize()) + .append(", alignment=").append(spring.getAlignment()) + .append(" prefs=[").append(spring.getMinimumSize(axis)) + .append(' ').append(spring.getPreferredSize(axis)).append(' ') + .append(spring.getMaximumSize(axis)).append(padding) + .append("]\n"); if (spring instanceof Group) { List springs = ((Group)spring).springs; indent += " "; for (int counter = 0; counter < springs.size(); counter++) { - createSpringDescription(buffer, springs.get(counter), indent, + createSpringDescription(sb, springs.get(counter), indent, axis); } } --- old/src/java.desktop/share/classes/javax/swing/JColorChooser.java 2014-08-26 11:17:34.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/swing/JColorChooser.java 2014-08-26 11:17:34.000000000 +0800 @@ -543,17 +543,17 @@ * @return a string representation of this JColorChooser */ protected String paramString() { - StringBuilder chooserPanelsString = new StringBuilder(""); - for (int i=0; i" + val + "\n"); + plainBuf.append(val).append('\n'); + htmlBuf.append("
  • ").append(val).append('\n'); } // remove the last newline --- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java 2014-08-26 11:17:46.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java 2014-08-26 11:17:46.000000000 +0800 @@ -2948,8 +2948,8 @@ for (int i = 0; i < values.length; i++) { Object obj = values[i]; String val = ((obj == null) ? "" : obj.toString()); - plainStr.append(val + "\n"); - htmlStr.append("
  • " + val + "\n"); + plainStr.append(val).append('\n'); + htmlStr.append("
  • ").append(val).append('\n'); } // remove the last newline --- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java 2014-08-26 11:17:49.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java 2014-08-26 11:17:49.000000000 +0800 @@ -2230,11 +2230,11 @@ for (int col = 0; col < cols.length; col++) { Object obj = table.getValueAt(rows[row], cols[col]); String val = ((obj == null) ? "" : obj.toString()); - plainStr.append(val + "\t"); - htmlStr.append(" " + val + "\n"); + plainStr.append(val).append('\t'); + htmlStr.append(" ").append(val).append("\n"); } // we want a newline at the end of each line and not a tab - plainStr.deleteCharAt(plainStr.length() - 1).append("\n"); + plainStr.deleteCharAt(plainStr.length() - 1).append('\n'); htmlStr.append("\n"); } --- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2014-08-26 11:17:52.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2014-08-26 11:17:51.000000000 +0800 @@ -3618,8 +3618,8 @@ boolean leaf = model.isLeaf(node); String label = getDisplayString(path, true, leaf); - plainStr.append(label + "\n"); - htmlStr.append("
  • " + label + "\n"); + plainStr.append(label).append('\n'); + htmlStr.append("
  • ").append(label).append('\n'); } // remove the last newline --- old/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java 2014-08-26 11:17:54.000000000 +0800 +++ new/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java 2014-08-26 11:17:54.000000000 +0800 @@ -1163,15 +1163,15 @@ rows = rowMapper.getRowsForPaths(selection); else rows = null; - sb.append(getClass().getName() + " " + hashCode() + " [ "); + sb.append(getClass().getName()).append(' ').append(hashCode()).append(" [ "); for(int counter = 0; counter < selCount; counter++) { if(rows != null) - sb.append(selection[counter].toString() + "@" + - Integer.toString(rows[counter])+ " "); + sb.append(selection[counter]).append('@') + .append(rows[counter]).append(' '); else - sb.append(selection[counter].toString() + " "); + sb.append(selection[counter]).append(' '); } - sb.append("]"); + sb.append(']'); return sb.toString(); } --- old/src/java.desktop/share/classes/sun/font/AttributeValues.java 2014-08-26 11:17:57.000000000 +0800 +++ new/src/java.desktop/share/classes/sun/font/AttributeValues.java 2014-08-26 11:17:56.000000000 +0800 @@ -542,7 +542,7 @@ } } } - b.append("[btx=" + baselineTransform + ", ctx=" + charTransform + "]"); + b.append("[btx=").append(baselineTransform).append(", ctx=").append(charTransform).append(']'); b.append('}'); return b.toString(); } --- old/src/java.desktop/share/classes/sun/font/Decoration.java 2014-08-26 11:17:59.000000000 +0800 +++ new/src/java.desktop/share/classes/sun/font/Decoration.java 2014-08-26 11:17:58.000000000 +0800 @@ -431,12 +431,12 @@ StringBuilder sb = new StringBuilder(); sb.append(super.toString()); sb.append("["); - if (fgPaint != null) sb.append("fgPaint: " + fgPaint); - if (bgPaint != null) sb.append(" bgPaint: " + bgPaint); + if (fgPaint != null) sb.append("fgPaint: ").append(fgPaint); + if (bgPaint != null) sb.append(" bgPaint: ").append(bgPaint); if (swapColors) sb.append(" swapColors: true"); if (strikethrough) sb.append(" strikethrough: true"); - if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline); - if (imUnderline != null) sb.append(" imUnderline: " + imUnderline); + if (stdUnderline != null) sb.append(" stdUnderline: ").append(stdUnderline); + if (imUnderline != null) sb.append(" imUnderline: ").append(imUnderline); sb.append("]"); return sb.toString(); } --- old/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java 2014-08-26 11:18:01.000000000 +0800 +++ new/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java 2014-08-26 11:18:01.000000000 +0800 @@ -1894,9 +1894,9 @@ } } catch(Exception e) { - buf.append(" " + e.getMessage()); + buf.append(' ').append(e.getMessage()); } - buf.append("}"); + buf.append('}'); return buf; }