From 9fb92f67d8752c4456878409150be2d16236e6f6 Mon Sep 17 00:00:00 2001 From: alexsch Date: Thu, 1 Aug 2013 17:09:59 +0400 Subject: [PATCH] 7161568: [macosx] api/javax_swing/JTabbedPane/index2.html#varios fails Reviewed-by: malenkov, serb --- .../laf/AquaTabbedPaneCopyFromBasicUI.java | 5 +- .../com/apple/laf/AquaTabbedPaneUI.java | 14 +++ .../swing/JTabbedPane/4361477/bug4361477.java | 100 ++++++++++++++++++ .../swing/JTabbedPane/6495408/bug6495408.java | 81 ++++++++++++++ .../swing/JTabbedPane/7161568/bug7161568.java | 90 ++++++++++++++++ 5 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 test/javax/swing/JTabbedPane/4361477/bug4361477.java create mode 100644 test/javax/swing/JTabbedPane/6495408/bug6495408.java create mode 100644 test/javax/swing/JTabbedPane/7161568/bug7161568.java diff --git a/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java index fdad818c4..5a1cf0cde 100644 --- a/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java +++ b/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java @@ -1856,7 +1856,10 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing // If we're not valid that means we will shortly be validated and // painted, which means we don't have to do anything here. if (!isRunsDirty && index >= 0 && index < tabPane.getTabCount()) { - tabPane.repaint(getTabBounds(tabPane, index)); + Rectangle rect = getTabBounds(tabPane, index); + if (rect != null) { + tabPane.repaint(rect); + } } } diff --git a/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java b/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java index 7dbc18729..39b557626 100644 --- a/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java +++ b/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java @@ -701,6 +701,20 @@ public class AquaTabbedPaneUI extends AquaTabbedPaneCopyFromBasicUI { return false; } + /** + * Returns the bounds of the specified tab index. The bounds are + * with respect to the JTabbedPane's coordinate space. If the tab at this + * index is not currently visible in the UI, then returns null. + */ + @Override + public Rectangle getTabBounds(final JTabbedPane pane, final int i) { + if (visibleTabState.needsScrollTabs() + && (visibleTabState.isBefore(i) || visibleTabState.isAfter(i))) { + return null; + } + return super.getTabBounds(pane, i); + } + /** * Returns the tab index which intersects the specified point * in the JTabbedPane's coordinate space. diff --git a/test/javax/swing/JTabbedPane/4361477/bug4361477.java b/test/javax/swing/JTabbedPane/4361477/bug4361477.java new file mode 100644 index 000000000..f41d240c5 --- /dev/null +++ b/test/javax/swing/JTabbedPane/4361477/bug4361477.java @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2013, 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. + */ + +import java.awt.*; +import java.awt.event.*; +import javax.swing.*; +import javax.swing.event.*; +import sun.awt.SunToolkit; + +/* + * @test + * @bug 4361477 + * @summary JTabbedPane throws ArrayOutOfBoundsException + * @author Oleg Mokhovikov + * @run main bug4361477 + */ +public class bug4361477 { + + static JTabbedPane tabbedPane; + volatile static boolean bStateChanged = false; + volatile static Rectangle bounds; + + public static void main(String args[]) throws Exception { + + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + Robot robot = new Robot(); + robot.setAutoDelay(50); + + SwingUtilities.invokeAndWait(new Runnable() { + + @Override + public void run() { + createAndShowUI(); + } + }); + + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + + @Override + public void run() { + bounds = tabbedPane.getUI().getTabBounds(tabbedPane, 0); + } + }); + + Point location = bounds.getLocation(); + SwingUtilities.convertPointToScreen(location, tabbedPane); + robot.mouseMove(location.x + 1, location.y + 1); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + if (!bStateChanged) { + throw new RuntimeException("Tabbed pane state is not changed"); + } + } + + static void createAndShowUI() { + + final JFrame frame = new JFrame(); + tabbedPane = new JTabbedPane(); + tabbedPane.add("Tab0", new JPanel()); + tabbedPane.add("Tab1", new JPanel()); + tabbedPane.add("Tab2", new JPanel()); + tabbedPane.setSelectedIndex(2); + tabbedPane.addChangeListener(new ChangeListener() { + + public void stateChanged(final ChangeEvent pick) { + bStateChanged = true; + if (tabbedPane.getTabCount() == 3) { + tabbedPane.remove(2); + } + } + }); + + frame.getContentPane().add(tabbedPane); + frame.setSize(300, 200); + frame.setVisible(true); + } +} diff --git a/test/javax/swing/JTabbedPane/6495408/bug6495408.java b/test/javax/swing/JTabbedPane/6495408/bug6495408.java new file mode 100644 index 000000000..40f69d53f --- /dev/null +++ b/test/javax/swing/JTabbedPane/6495408/bug6495408.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2013, 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. + */ + +import javax.swing.*; +import java.awt.*; +import sun.awt.SunToolkit; +/* + * @test + * @bug 6495408 + * @summary REGRESSION: JTabbedPane throws ArrayIndexOutOfBoundsException + * @author Alexander Potochkin + * @run main bug6495408 + */ + +public class bug6495408 { + + static JTabbedPane tabbedPane; + + public static void main(String[] args) throws Exception { + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + final Robot robot = new Robot(); + robot.setAutoDelay(50); + + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + final JFrame frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + tabbedPane = new JTabbedPane(); + tabbedPane.setTabPlacement(JTabbedPane.LEFT); + tabbedPane.addTab("Hello", null); + frame.add(tabbedPane); + frame.setSize(400, 400); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } + }); + + toolkit.realSync(); + + final Rectangle d = new Rectangle(); + final Point p = new Point(); + + for (int i = 0; i < 7; i++) { + SwingUtilities.invokeLater(new Runnable() { + + public void run() { + int tab = tabbedPane.getTabCount() - 1; + Rectangle bounds = tabbedPane.getBoundsAt(tab); + if (bounds != null) { + d.setBounds(bounds); + p.setLocation(d.x + d.width / 2, d.y + d.height / 2); + SwingUtilities.convertPointToScreen(p, tabbedPane); + robot.mouseMove(p.x, p.y + d.height); + tabbedPane.addTab("Hello", null); + } + } + }); + } + } +} diff --git a/test/javax/swing/JTabbedPane/7161568/bug7161568.java b/test/javax/swing/JTabbedPane/7161568/bug7161568.java new file mode 100644 index 000000000..73ecbf9dd --- /dev/null +++ b/test/javax/swing/JTabbedPane/7161568/bug7161568.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2013, 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. + */ +import java.awt.*; +import javax.swing.*; +import java.awt.event.*; +import sun.awt.SunToolkit; + +/** + * @test + * @bug 7161568 + * @author Alexander Scherbatiy + * @summary Tests that navigating tabs in the JTAbbedPane does not throw NPE + * @run main bug7161568 + */ +public class bug7161568 { + + private static final int N = 50; + private static JTabbedPane tabbedPane; + + public static void main(String[] args) throws Exception { + UIManager.put("TabbedPane.selectionFollowsFocus", Boolean.FALSE); + + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + Robot robot = new Robot(); + robot.setAutoDelay(50); + + SwingUtilities.invokeAndWait(new Runnable() { + + @Override + public void run() { + createAndShowUI(); + } + }); + + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + + @Override + public void run() { + tabbedPane.requestFocus(); + } + }); + + toolkit.realSync(); + + for (int i = 0; i < N; i++) { + robot.keyPress(KeyEvent.VK_LEFT); + robot.keyRelease(KeyEvent.VK_LEFT); + toolkit.realSync(); + } + } + + static void createAndShowUI() { + JFrame frame = new JFrame("Test"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setSize(100, 100); + + tabbedPane = new JTabbedPane(); + + for (int i = 0; i < N; i++) { + tabbedPane.addTab("Tab: " + i, new JLabel("Test")); + } + + tabbedPane.setSelectedIndex(0); + + frame.getContentPane().add(tabbedPane); + frame.setVisible(true); + } +} -- GitLab