8277497: Last column cell in the JTable row is read as empty cell

Backport-of: 70bad89b012eb200ca1e76f384a6e5fb307cf26d
openjdk · Nov 11, 2022 · 03fa471 · 03fa471 · openjdk-notifier · Nov 11, 2022
1 parent 7c664bc
commit 03fa471
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java
@@ -1052,6 +1052,10 @@ protected class AccessibleJLabel extends AccessibleJComponent
          * @see AccessibleContext#setAccessibleName
          */
         public String getAccessibleName() {
+            return getAccessibleNameCheckIcon(getAccessibleNameImpl());
+        }
+
+        private String getAccessibleNameImpl() {
             String name = accessibleName;
 
             if (name == null) {
@@ -1066,6 +1070,19 @@ public String getAccessibleName() {
             return name;
         }
 
+        private String getAccessibleNameCheckIcon(String name) {
+            if (((name == null) || name.isEmpty()) &&
+                    (JLabel.this.getIcon() != null)) {
+                if (JLabel.this.getIcon() instanceof Accessible) {
+                    AccessibleContext ac = ((Accessible) JLabel.this.getIcon()).getAccessibleContext();
+                    if (ac != null) {
+                        name = ac.getAccessibleName();
+                    }
+                }
+            }
+            return name;
+        }
+
         /**
          * Get the role of this object.
          *
@@ -1074,6 +1091,11 @@ public String getAccessibleName() {
          * @see AccessibleRole
          */
         public AccessibleRole getAccessibleRole() {
+            String name = getAccessibleNameImpl();
+            if (((name == null) || name.isEmpty()) &&
+                    (JLabel.this.getIcon() != null)) {
+                return AccessibleRole.ICON;
+            }
             return AccessibleRole.LABEL;
         }