Skip to content

Commit

Permalink
8322239: [macos] a11y : java.lang.NullPointerException is thrown when…
Browse files Browse the repository at this point in the history
… focus is moved on the JTabbedPane

Reviewed-by: asemenov, abhiscxk, aivanov
  • Loading branch information
Alexander Zuev committed Feb 15, 2024
1 parent 5a988a5 commit 3b1062d
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 4 deletions.
17 changes: 13 additions & 4 deletions src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 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
Expand Down Expand Up @@ -31,6 +31,7 @@
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.IllegalComponentStateException;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.FocusListener;
Expand Down Expand Up @@ -2337,15 +2338,23 @@ public boolean contains(Point p) {
}

public Point getLocationOnScreen() {
Point parentLocation = parent.getLocationOnScreen();
Point parentLocation;
try {
parentLocation = parent.getLocationOnScreen();
} catch (IllegalComponentStateException icse) {
return null;
}
Point componentLocation = getLocation();
if (parentLocation == null || componentLocation == null) {
return null;
}
componentLocation.translate(parentLocation.x, parentLocation.y);
return componentLocation;
}

public Point getLocation() {
Rectangle r = getBounds();
return new Point(r.x, r.y);
return r == null ? null : new Point(r.x, r.y);
}

public void setLocation(Point p) {
Expand All @@ -2362,7 +2371,7 @@ public void setBounds(Rectangle r) {

public Dimension getSize() {
Rectangle r = getBounds();
return new Dimension(r.width, r.height);
return r == null ? null : new Dimension(r.width, r.height);
}

public void setSize(Dimension d) {
Expand Down
102 changes: 102 additions & 0 deletions test/jdk/javax/swing/JTabbedPane/TabbedPaneNPECheck.java
@@ -0,0 +1,102 @@
/*
* 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 8322239
* @summary [macos] a11y : java.lang.NullPointerException is thrown when
* focus is moved on the JTabbedPane
* @key headful
* @run main TabbedPaneNPECheck
*/

import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.Rectangle;
import java.lang.reflect.InvocationTargetException;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleComponent;
import javax.accessibility.AccessibleContext;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.SwingUtilities;

public class TabbedPaneNPECheck {
JTabbedPane pane;
JFrame mainFrame;
public static void main(String[] args) throws InterruptedException,
InvocationTargetException {
TabbedPaneNPECheck me = new TabbedPaneNPECheck();
SwingUtilities.invokeAndWait(me::setupGUI);
try {
SwingUtilities.invokeAndWait(me::test);
} finally {
SwingUtilities.invokeAndWait(me::shutdownGUI);
}
}

public void setupGUI() {
mainFrame = new JFrame("TabbedPaneNPECheck");
pane = new JTabbedPane();
Dimension panelSize = new Dimension(200, 200);
for (int i = 0; i < 25; i++) {
JPanel p = new JPanel();
p.setMinimumSize(panelSize);
p.setMaximumSize(panelSize);
p.setSize(panelSize);
pane.addTab("Tab no." + i, p);
}
mainFrame.setLayout(new BorderLayout());
mainFrame.add(pane, BorderLayout.CENTER);
mainFrame.setLocationRelativeTo(null);
mainFrame.setSize(250, 250);
mainFrame.setVisible(true);
}

public void test() {
AccessibleContext context = pane.getAccessibleContext();
int nChild = context.getAccessibleChildrenCount();
for (int i = 0; i < nChild; i++) {
Accessible accessible = context.getAccessibleChild(i);
if (accessible instanceof AccessibleComponent) {
try {
AccessibleComponent component = (AccessibleComponent) accessible;
Point p = component.getLocationOnScreen();
Rectangle r = component.getBounds();
} catch (NullPointerException npe) {
throw new RuntimeException("Unexpected NullPointerException " +
"while getting accessible component bounds: ", npe);
}
}
}
}

public void shutdownGUI() {
if (mainFrame != null) {
mainFrame.setVisible(false);
mainFrame.dispose();
}
}
}

5 comments on commit 3b1062d

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 3b1062d Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 3b1062d Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3b1062d Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch backport-GoeLin-3b1062d4 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3b1062d4 from the openjdk/jdk repository.

The commit being backported was authored by Alexander Zuev on 15 Feb 2024 and was reviewed by Artem Semenov, Abhishek Kumar and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-3b1062d4:backport-GoeLin-3b1062d4
$ git checkout backport-GoeLin-3b1062d4
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-3b1062d4

@openjdk
Copy link

@openjdk openjdk bot commented on 3b1062d Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch backport-GoeLin-3b1062d4 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3b1062d4 from the openjdk/jdk repository.

The commit being backported was authored by Alexander Zuev on 15 Feb 2024 and was reviewed by Artem Semenov, Abhishek Kumar and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-GoeLin-3b1062d4:backport-GoeLin-3b1062d4
$ git checkout backport-GoeLin-3b1062d4
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-GoeLin-3b1062d4

Please sign in to comment.