changeset 2386:9b247a6290a4

6889007: No resize cursor during hovering mouse over JTable Reviewed-by: rupashka
author alexp
date Fri, 28 May 2010 19:46:26 +0400
parents e2b1bab101d2
children 82524b068f77
files src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java test/javax/swing/JTableHeader/6889007/bug6889007.java
diffstat 2 files changed, 106 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java	Fri May 28 13:32:40 2010 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java	Fri May 28 19:46:26 2010 +0400
@@ -98,7 +98,7 @@
         private Cursor otherCursor = resizeCursor;
 
         public void mouseClicked(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             if (e.getClickCount() % 2 == 1 &&
@@ -143,7 +143,7 @@
         }
 
         public void mousePressed(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             header.setDraggedColumn(null);
@@ -188,7 +188,7 @@
         }
 
         public void mouseMoved(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             if (canResize(getResizingColumn(e.getPoint()), header) !=
@@ -199,7 +199,7 @@
        }
 
         public void mouseDragged(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             int mouseX = e.getX();
@@ -258,7 +258,7 @@
         }
 
         public void mouseReleased(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             setDraggedDistance(0, viewIndexForColumn(header.getDraggedColumn()));
@@ -270,14 +270,14 @@
         }
 
         public void mouseEntered(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             updateRolloverColumn(e);
         }
 
         public void mouseExited(MouseEvent e) {
-            if (SwingUtilities2.shouldIgnore(e, header)) {
+            if (!header.isEnabled()) {
                 return;
             }
             int oldRolloverColumn = rolloverColumn;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JTableHeader/6889007/bug6889007.java	Fri May 28 19:46:26 2010 +0400
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @bug 6889007
+   @summary No resize cursor during hovering mouse over JTable
+   @author Alexander Potochkin
+*/
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicTableHeaderUI;
+import javax.swing.table.JTableHeader;
+import java.awt.*;
+
+public class bug6889007 {
+
+    public static void main(String[] args) throws Exception {
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+        Robot robot = new Robot();
+        robot.setAutoDelay(20);
+
+        final JFrame frame = new JFrame();
+        frame.setUndecorated(true);
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+                JTableHeader th = new JTableHeader();
+                th.setColumnModel(new JTable(20, 5).getColumnModel());
+
+                th.setUI(new MyTableHeaderUI());
+
+                frame.add(th);
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            }
+        });
+        toolkit.realSync();
+        Point point = frame.getLocationOnScreen();
+        int shift = 10;
+        int x = point.x;
+        int y = point.y + frame.getHeight()/2;
+        for(int i = -shift; i < frame.getWidth() + 2*shift; i++) {
+            robot.mouseMove(x++, y);
+        }
+        toolkit.realSync();
+        // 9 is a magic test number
+        if (MyTableHeaderUI.getTestValue() != 9) {
+            throw new RuntimeException("Unexpected test number "
+                    + MyTableHeaderUI.getTestValue());
+        }
+        System.out.println("ok");
+    }
+
+    static class MyTableHeaderUI extends BasicTableHeaderUI {
+        private static int testValue;
+
+        protected void rolloverColumnUpdated(int oldColumn, int newColumn) {
+            increaseTestValue(newColumn);
+            Cursor cursor = Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR);
+            if (oldColumn != -1 && newColumn != -1 &&
+                    header.getCursor() != cursor) {
+                throw new RuntimeException("Wrong type of cursor!");
+            }
+        }
+
+        private static synchronized void increaseTestValue(int increment) {
+            testValue += increment;
+        }
+
+        public static synchronized int getTestValue() {
+            return testValue;
+        }
+    }
+}