Merge master jdk-17.0.7+3 into openj9-staging

Signed-off-by: J9 Build <[email protected]>

Author: j9build

make/conf/github-actions.conf

@@ -29,13 +29,13 @@ GTEST_VERSION=1.8.1
 JTREG_VERSION=6.1+3
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48
+LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_windows_hotspot_17.0.2_8.zip
-WINDOWS_X64_BOOT_JDK_SHA256=d083479ca927dce2f586f779373d895e8bf668c632505740279390384edf03fa
+WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jdk_x64_windows_hotspot_17.0.6_10.zip
+WINDOWS_X64_BOOT_JDK_SHA256=d544c4f00d414a1484c0a5c1758544f30f308c4df33f9a28bd4a404215d0d444
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32
+MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jdk_x64_mac_hotspot_17.0.6_10.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=faa2927584cf2bd0a35d2ac727b9f22725e23b2b24abfb3b2ac7140f4d65fbb4

src/java.desktop/share/classes/javax/swing/LayoutComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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,8 +24,8 @@
  */
 package javax.swing;
 
+import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.LinkedList;
 import java.util.ListIterator;
 import java.awt.Component;
 import java.awt.ComponentOrientation;
@@ -63,7 +63,7 @@ public int compare(Component a, Component b) {
         // each Component and then search from the Window down until the
         // hierarchy branches.
         if (a.getParent() != b.getParent()) {
-            LinkedList<Component> aAncestory = new LinkedList<Component>();
+            ArrayList<Component> aAncestory = new ArrayList<>();
 
             for(; a != null; a = a.getParent()) {
                 aAncestory.add(a);
@@ -76,7 +76,7 @@ public int compare(Component a, Component b) {
                 throw new ClassCastException();
             }
 
-            LinkedList<Component> bAncestory = new LinkedList<Component>();
+            ArrayList<Component> bAncestory = new ArrayList<>();
 
             for(; b != null; b = b.getParent()) {
                 bAncestory.add(b);

src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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,11 +24,14 @@
  */
 package javax.swing.border;
 
+import java.awt.BasicStroke;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Insets;
-import java.awt.Rectangle;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Stroke;
+import java.awt.geom.AffineTransform;
 import java.beans.ConstructorProperties;
 
 /**
@@ -119,6 +122,22 @@ public EtchedBorder(int etchType, Color highlight, Color shadow)    {
         this.shadow = shadow;
     }
 
+    private void paintBorderHighlight(Graphics g, Color c, int w, int h, int stkWidth) {
+        g.setColor(c);
+        g.drawRect(stkWidth/2, stkWidth/2, w-(2*stkWidth), h-(2*stkWidth));
+    }
+
+    private void paintBorderShadow(Graphics g, Color c, int w, int h, int stkWidth) {
+        g.setColor(c);
+        g.drawLine(((3*stkWidth)/2), h-((3*stkWidth)/2), ((3*stkWidth)/2), ((3*stkWidth)/2)); // left line
+        g.drawLine(((3*stkWidth)/2), ((3*stkWidth)/2), w-((3*stkWidth)/2), ((3*stkWidth)/2)); // top line
+
+        g.drawLine((stkWidth/2), h-(stkWidth-stkWidth/2),
+                w-(stkWidth-stkWidth/2), h-(stkWidth-stkWidth/2)); // bottom line
+        g.drawLine(w-(stkWidth-stkWidth/2), h-(stkWidth-stkWidth/2),
+                w-(stkWidth-stkWidth/2), stkWidth/2); // right line
+    }
+
     /**
      * Paints the border for the specified component with the
      * specified position and size.
@@ -131,22 +150,59 @@ public EtchedBorder(int etchType, Color highlight, Color shadow)    {
      * @param height the height of the painted border
      */
     public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
-        int w = width;
-        int h = height;
+        // We remove any initial transforms to prevent rounding errors
+        // when drawing in non-integer scales
+        AffineTransform at = null;
+        Stroke oldStk = null;
+        int stkWidth = 1;
+        boolean resetTransform = false;
+        if (g instanceof Graphics2D) {
+            Graphics2D g2d = (Graphics2D) g;
+            at = g2d.getTransform();
+            oldStk = g2d.getStroke();
+            // if m01 or m10 is non-zero, then there is a rotation or shear
+            // skip resetting the transform
+            resetTransform = (at.getShearX() == 0) && (at.getShearY() == 0);
+            if (resetTransform) {
+                g2d.setTransform(new AffineTransform());
+                stkWidth = (int) Math.floor(Math.min(at.getScaleX(), at.getScaleY()));
+                g2d.setStroke(new BasicStroke((float) stkWidth));
+            }
+        }
 
-        g.translate(x, y);
+        int w;
+        int h;
+        int xtranslation;
+        int ytranslation;
+        if (resetTransform) {
+            w = (int) Math.floor(at.getScaleX() * width - 1);
+            h = (int) Math.floor(at.getScaleY() * height - 1);
+            xtranslation = (int) Math.ceil(at.getScaleX()*x+at.getTranslateX());
+            ytranslation = (int) Math.ceil(at.getScaleY()*y+at.getTranslateY());
+        } else {
+            w = width;
+            h = height;
+            xtranslation = x;
+            ytranslation = y;
+        }
 
-        g.setColor(etchType == LOWERED? getShadowColor(c) : getHighlightColor(c));
-        g.drawRect(0, 0, w-2, h-2);
+        g.translate(xtranslation, ytranslation);
 
-        g.setColor(etchType == LOWERED? getHighlightColor(c) : getShadowColor(c));
-        g.drawLine(1, h-3, 1, 1);
-        g.drawLine(1, 1, w-3, 1);
+        paintBorderShadow(g, (etchType == LOWERED) ? getHighlightColor(c)
+                                                   : getShadowColor(c),
+                          w, h, stkWidth);
+        paintBorderHighlight(g, (etchType == LOWERED) ? getShadowColor(c)
+                                                      : getHighlightColor(c),
+                             w, h, stkWidth);
 
-        g.drawLine(0, h-1, w-1, h-1);
-        g.drawLine(w-1, h-1, w-1, 0);
+        g.translate(-xtranslation, -ytranslation);
 
-        g.translate(-x, -y);
+        // Set the transform we removed earlier
+        if (resetTransform) {
+            Graphics2D g2d = (Graphics2D) g;
+            g2d.setTransform(at);
+            g2d.setStroke(oldStk);
+        }
     }
 
     /**

src/java.desktop/share/classes/javax/swing/border/LineBorder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -34,6 +34,9 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
 import java.beans.ConstructorProperties;
+import java.awt.geom.AffineTransform;
+
+import static sun.java2d.pipe.Region.clipRound;
 
 /**
  * A class which implements a line border of arbitrary thickness
@@ -144,28 +147,70 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
         if ((this.thickness > 0) && (g instanceof Graphics2D)) {
             Graphics2D g2d = (Graphics2D) g;
 
+            AffineTransform at = g2d.getTransform();
+
+            // if m01 or m10 is non-zero, then there is a rotation or shear
+            // or if no Scaling enabled,
+            // skip resetting the transform
+            boolean resetTransform = ((at.getShearX() == 0) && (at.getShearY() == 0)) &&
+                    ((at.getScaleX() > 1) || (at.getScaleY() > 1));
+
+            int xtranslation;
+            int ytranslation;
+            int w;
+            int h;
+            int offs;
+
+            if (resetTransform) {
+                /* Deactivate the HiDPI scaling transform,
+                 * so we can do paint operations in the device
+                 * pixel coordinate system instead of the logical coordinate system.
+                 */
+                g2d.setTransform(new AffineTransform());
+                double xx = at.getScaleX() * x + at.getTranslateX();
+                double yy = at.getScaleY() * y + at.getTranslateY();
+                xtranslation = clipRound(xx);
+                ytranslation = clipRound(yy);
+                w = clipRound(at.getScaleX() * width + xx) - xtranslation;
+                h = clipRound(at.getScaleY() * height + yy) - ytranslation;
+                offs = this.thickness * (int) at.getScaleX();
+            } else {
+                w = width;
+                h = height;
+                xtranslation = x;
+                ytranslation = y;
+                offs = this.thickness;
+            }
+
+            g2d.translate(xtranslation, ytranslation);
+
             Color oldColor = g2d.getColor();
             g2d.setColor(this.lineColor);
 
             Shape outer;
             Shape inner;
 
-            int offs = this.thickness;
             int size = offs + offs;
             if (this.roundedCorners) {
                 float arc = .2f * offs;
-                outer = new RoundRectangle2D.Float(x, y, width, height, offs, offs);
-                inner = new RoundRectangle2D.Float(x + offs, y + offs, width - size, height - size, arc, arc);
+                outer = new RoundRectangle2D.Float(0, 0, w, h, offs, offs);
+                inner = new RoundRectangle2D.Float(offs, offs, w - size, h - size, arc, arc);
             }
             else {
-                outer = new Rectangle2D.Float(x, y, width, height);
-                inner = new Rectangle2D.Float(x + offs, y + offs, width - size, height - size);
+                outer = new Rectangle2D.Float(0, 0, w, h);
+                inner = new Rectangle2D.Float(offs, offs, w - size, h - size);
             }
             Path2D path = new Path2D.Float(Path2D.WIND_EVEN_ODD);
             path.append(outer, false);
             path.append(inner, false);
             g2d.fill(path);
             g2d.setColor(oldColor);
+
+            g2d.translate(-xtranslation, -ytranslation);
+
+            if (resetTransform) {
+                g2d.setTransform(at);
+            }
         }
     }