Merge branch 'upstream-master'

src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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,12 +24,21 @@
  */
 package javax.swing.plaf.nimbus;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.image.BufferedImage;
-import java.util.*;
-import javax.swing.*;
+import javax.swing.JDesktopPane;
+import javax.swing.JSlider;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.Painter;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.plaf.UIResource;
 import javax.swing.plaf.synth.SynthContext;
 import javax.swing.plaf.synth.SynthPainter;
 import javax.swing.plaf.synth.SynthConstants;
@@ -531,7 +540,11 @@ public void paintDesktopIconBorder(SynthContext context,
     public void paintDesktopPaneBackground(SynthContext context,
                                            Graphics g, int x, int y,
                                            int w, int h) {
-        paintBackground(context, g, x, y, w, h, null);
+        if (context.getComponent() instanceof JDesktopPane pane) {
+            if (pane.getBackground() instanceof UIResource) {
+                paintBackground(context, g, x, y, w, h, null);
+            }
+        }
     }
 
     /**

test/jdk/javax/swing/JInternalFrame/bug6726866.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6726866 8186617
+ * @bug 6726866 8186617 8343123
  * @summary Repainting artifacts when resizing or dragging JInternalFrames in
             non-opaque toplevel
  * @library /java/awt/regtesthelpers
@@ -34,7 +34,6 @@
 import java.awt.Color;
 import java.awt.Window;
 
-import javax.swing.JApplet;
 import javax.swing.JDesktopPane;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;

test/jdk/tools/sincechecker/modules/jdk.charsets/JdkCharsetsCheckSince.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8343777
+ * @summary Test for `@since` declaration in the module-info.java file of jdk.charsets
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.charsets
+ */

test/jdk/tools/sincechecker/modules/jdk.localedata/JdkLocaledataCheckSince.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8343777
+ * @summary Test for `@since` declaration in the module-info.java file of jdk.localedata
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker jdk.localedata
+ */