8273375: Remove redundant 'new String' calls after concatenation in java.desktop
Backport-of: 59c9f750414e4f131c906a5bc20f32f2f9cfe9ec
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
index ddfbe76..5722b28 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java
@@ -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 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;
}
}
diff --git a/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
index d3d040e..a09bf9b 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
@@ -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 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;
}
}
diff --git a/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
index 0a1f874..37c6a5d 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
@@ -1673,13 +1673,12 @@
* {@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) {
diff --git a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
index cb83727..bf7ad07 100644
--- a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
@@ -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 @@
* {@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);
}
}
diff --git a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
index 51b5504..1d9e6e5 100644
--- a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java
@@ -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 @@
* {@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;
}
/**
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
index b2145ee..882881f 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
@@ -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 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;
}
}
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
index d8c4fdf..6a92748 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
@@ -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 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];
}
// /**
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
index 2d0e167..796f083 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
@@ -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 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];
}
// /**
diff --git a/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java b/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
index 0d77e94..d721eee 100644
--- a/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
@@ -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 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;
}
}
diff --git a/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
index 09d066e..3b110e7 100644
--- a/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
@@ -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 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];
}
// /**
diff --git a/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
index 808b6aa..cb84024 100644
--- a/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
@@ -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 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];
}
// /**
diff --git a/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
index 328758f..d840392 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
@@ -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 String toString() {
- return new String ("ShortBandedRaster: width = "+width+" height = "
- + height
- +" #numBands " + numBands
- +" #dataElements "+numDataElements);
+ return "ShortBandedRaster: width = " + width
+ + " height = " + height
+ + " #numBands " + numBands
+ + " #dataElements " + numDataElements;
}
diff --git a/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
index aa1c1c8..3e95f65 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
@@ -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 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);
}
}
diff --git a/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
index 33f779f..d4926bb 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
@@ -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 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);
}
}
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
index 7052e60..f6739cb 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
@@ -389,7 +389,7 @@
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;
}
