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

8273375: Remove redundant 'new String' calls after concatenation in java.desktop

Browse Source 
Reviewed-by: aivanov
This commit is contained in:
Andrey Turbanov 2021-09-08 14:28:07 +00:00 committed by Alexey Ivanov
parent faa942c8ba
commit 59c9f75041
15 changed files with 93 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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
@ -3206,7 +3206,10 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing
}
public String toString() {
return new String("viewport.viewSize=" + viewport.getViewSize() + "\n" + "viewport.viewRectangle=" + viewport.getViewRect() + "\n" + "leadingTabIndex=" + leadingTabIndex + "\n" + "tabViewPosition=" + tabViewPosition);
return "viewport.viewSize=" + viewport.getViewSize() + "\n"
+ "viewport.viewRectangle=" + viewport.getViewRect() + "\n"
+ "leadingTabIndex=" + leadingTabIndex + "\n"
+ "tabViewPosition=" + tabViewPosition;
}
}

12
src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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
@ -87,10 +87,10 @@ public class IntegerNIORaster extends SunWritableRaster {
}
public String toString() {
return new String ("IntegerNIORaster: width = "+width
+" height = " + height
+" #Bands = " + numBands
+" xOff = "+sampleModelTranslateX
+" yOff = "+sampleModelTranslateY);
return "IntegerNIORaster: width = " + width
+ " height = " + height
+ " #Bands = " + numBands
+ " xOff = " + sampleModelTranslateX
+ " yOff = " + sampleModelTranslateY;
}
}

13
src/java.desktop/share/classes/java/awt/image/ColorModel.java
View File

@ -1673,13 +1673,12 @@ public abstract class ColorModel implements Transparency{
* {@code ColorModel} object.
*/
public String toString() {
return new String("ColorModel: #pixelBits = "+pixel_bits
+ " numComponents = "+numComponents
+ " color space = "+colorSpace
+ " transparency = "+transparency
+ " has alpha = "+supportsAlpha
+ " isAlphaPre = "+isAlphaPremultiplied
);
return "ColorModel: #pixelBits = " + pixel_bits
+ " numComponents = " + numComponents
+ " color space = " + colorSpace
+ " transparency = " + transparency
+ " has alpha = " + supportsAlpha
+ " isAlphaPre = " + isAlphaPremultiplied;
}
static int getDefaultTransferType(int pixel_bits) {

11
src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 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
@ -1407,10 +1407,9 @@ public class DirectColorModel extends PackedColorModel {
* {@code DirectColorModel}.
*/
public String toString() {
return new String("DirectColorModel: rmask="
+Integer.toHexString(red_mask)+" gmask="
+Integer.toHexString(green_mask)+" bmask="
+Integer.toHexString(blue_mask)+" amask="
+Integer.toHexString(alpha_mask));
return "DirectColorModel: rmask=" + Integer.toHexString(red_mask)
+ " gmask=" + Integer.toHexString(green_mask)
+ " bmask=" + Integer.toHexString(blue_mask)
+ " amask=" + Integer.toHexString(alpha_mask);
}
}

17
src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 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
@ -1536,14 +1536,13 @@ public class IndexColorModel extends ColorModel {
* {@code ColorModel} object.
*/
public String toString() {
return new String("IndexColorModel: #pixelBits = "+pixel_bits
+ " numComponents = "+numComponents
+ " color space = "+colorSpace
+ " transparency = "+transparency
+ " transIndex = "+transparent_index
+ " has alpha = "+supportsAlpha
+ " isAlphaPre = "+isAlphaPremultiplied
);
return "IndexColorModel: #pixelBits = " + pixel_bits
+ " numComponents = " + numComponents
+ " color space = " + colorSpace
+ " transparency = " + transparency
+ " transIndex = " + transparent_index
+ " has alpha = " + supportsAlpha
+ " isAlphaPre = " + isAlphaPremultiplied;
}
/**

12
src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -818,10 +819,11 @@ public class ByteBandedRaster extends SunWritableRaster {
}
public String toString() {
return new String ("ByteBandedRaster: width = "+width+" height = "
+ height
+" #bands "+numDataElements
+" minX = "+minX+" minY = "+minY);
return "ByteBandedRaster: width = " + width
+ " height = " + height
+ " #bands " + numDataElements
+ " minX = " + minX
+ " minY = " + minY;
}
}

13
src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -945,11 +946,11 @@ public class ByteComponentRaster extends SunWritableRaster {
}
public String toString() {
return new String ("ByteComponentRaster: width = "+width+" height = "
+ height
+" #numDataElements "+numDataElements
// +" xOff = "+xOffset+" yOff = "+yOffset
+" dataOff[0] = "+dataOffsets[0]);
return "ByteComponentRaster: width = " + width
+ " height = " + height
+ " #numDataElements " + numDataElements
// +" xOff = "+xOffset+" yOff = "+yOffset
+ " dataOff[0] = " + dataOffsets[0];
}
// /**

13
src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -1288,11 +1289,11 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
}
public String toString() {
return new String ("ByteInterleavedRaster: width = "+width+" height = "
+ height
+" #numDataElements "+numDataElements
// +" xOff = "+xOffset+" yOff = "+yOffset
+" dataOff[0] = "+dataOffsets[0]);
return "ByteInterleavedRaster: width = " + width
+ " height = " + height
+ " #numDataElements " + numDataElements
// +" xOff = "+xOffset+" yOff = "+yOffset
+ " dataOff[0] = " + dataOffsets[0];
}
// /**

11
src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.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
@ -1425,9 +1425,10 @@ public class BytePackedRaster extends SunWritableRaster {
}
public String toString() {
return new String ("BytePackedRaster: width = "+width+" height = "+height
+" #channels "+numBands
+" xOff = "+sampleModelTranslateX
+" yOff = "+sampleModelTranslateY);
return "BytePackedRaster: width = " + width
+ " height = " + height
+ " #channels " + numBands
+ " xOff = " + sampleModelTranslateX
+ " yOff = " + sampleModelTranslateY;
}
}

17
src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -714,13 +715,13 @@ public class IntegerComponentRaster extends SunWritableRaster {
}
public String toString() {
return new String ("IntegerComponentRaster: width = "+width
+" height = " + height
+" #Bands = " + numBands
+" #DataElements "+numDataElements
+" xOff = "+sampleModelTranslateX
+" yOff = "+sampleModelTranslateY
+" dataOffset[0] "+dataOffsets[0]);
return "IntegerComponentRaster: width = " + width
+ " height = " + height
+ " #Bands = " + numBands
+ " #DataElements " + numDataElements
+ " xOff = " + sampleModelTranslateX
+ " yOff = " + sampleModelTranslateY
+ " dataOffset[0] " + dataOffsets[0];
}
// /**

15
src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -537,12 +538,12 @@ public class IntegerInterleavedRaster extends IntegerComponentRaster {
}
public String toString() {
return new String ("IntegerInterleavedRaster: width = "+width
+" height = " + height
+" #Bands = " + numBands
+" xOff = "+sampleModelTranslateX
+" yOff = "+sampleModelTranslateY
+" dataOffset[0] "+dataOffsets[0]);
return "IntegerInterleavedRaster: width = " + width
+ " height = " + height
+ " #Bands = " + numBands
+ " xOff = " + sampleModelTranslateX
+ " yOff = " + sampleModelTranslateY
+ " dataOffset[0] " + dataOffsets[0];
}
// /**

11
src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -802,10 +803,10 @@ public class ShortBandedRaster extends SunWritableRaster {
}
public String toString() {
return new String ("ShortBandedRaster: width = "+width+" height = "
+ height
+" #numBands " + numBands
+" #dataElements "+numDataElements);
return "ShortBandedRaster: width = " + width
+ " height = " + height
+ " #numBands " + numBands
+ " #dataElements " + numDataElements;
}

11
src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -877,10 +878,10 @@ public class ShortComponentRaster extends SunWritableRaster {
}
public String toString() {
return new String ("ShortComponentRaster: width = "+width
+" height = " + height
+" #numDataElements "+numDataElements);
// +" xOff = "+xOffset+" yOff = "+yOffset);
return "ShortComponentRaster: width = " + width
+ " height = " + height
+ " #numDataElements " + numDataElements;
// +" xOff = "+xOffset+" yOff = "+yOffset);
}
}

11
src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -24,6 +24,7 @@
*/
package sun.awt.image;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.RasterFormatException;
@ -758,10 +759,10 @@ public class ShortInterleavedRaster extends ShortComponentRaster {
}
public String toString() {
return new String ("ShortInterleavedRaster: width = "+width
+" height = " + height
+" #numDataElements "+numDataElements);
// +" xOff = "+xOffset+" yOff = "+yOffset);
return "ShortInterleavedRaster: width = " + width
+ " height = " + height
+ " #numDataElements " + numDataElements;
// +" xOff = "+xOffset+" yOff = "+yOffset);
}
}

2
src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
View File

@ -389,7 +389,7 @@ public abstract class InfoWindow extends Window {
if (nLines == BALLOON_WORD_LINE_MAX_COUNT) {
if (end != BreakIterator.DONE) {
lineLabels[nLines - 1].setText(
new String(lineLabels[nLines - 1].getText() + " ..."));
lineLabels[nLines - 1].getText() + " ...");
}
break;
}