changeset 4790:45eb5a61da07

Merge
author lana
date Wed, 30 Nov 2011 12:06:49 -0800
parents 4b416a0180dc 7dd4395fe4a5
children 79b5c5a8c7e9
files
diffstat 2 files changed, 358 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JScrollBar/4865918/bug4865918.java	Wed Nov 30 12:06:49 2011 -0800
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2011, 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 4865918
+ * @summary REGRESSION:JCK1.4a-runtime api/javax_swing/interactive/JScrollBarTests.html#JScrollBar
+ * @author Andrey Pikalev
+ * @run main bug4865918
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import sun.awt.SunToolkit;
+
+public class bug4865918 {
+
+    private static TestScrollBar sbar;
+
+    public static void main(String[] argv) throws Exception {
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            public void run() {
+                createAndShowGUI();
+            }
+        });
+
+        toolkit.realSync();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                sbar.pressMouse();
+            }
+        });
+
+        toolkit.realSync();
+
+        int value = getValue();
+
+        if (value != 9) {
+            throw new Error("The scrollbar block increment is incorect");
+        }
+    }
+
+    private static int getValue() throws Exception {
+        final int[] result = new int[1];
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                result[0] = sbar.getValue();
+            }
+        });
+
+        return result[0];
+    }
+
+    private static void createAndShowGUI() {
+        JFrame frame = new JFrame("bug4865918");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        sbar = new TestScrollBar(JScrollBar.HORIZONTAL, -1, 10, -100, 100);
+        sbar.setPreferredSize(new Dimension(200, 20));
+        sbar.setBlockIncrement(10);
+
+        frame.getContentPane().add(sbar);
+        frame.pack();
+        frame.setVisible(true);
+
+    }
+
+    static class TestScrollBar extends JScrollBar {
+
+        public TestScrollBar(int orientation, int value, int extent,
+                int min, int max) {
+            super(orientation, value, extent, min, max);
+
+        }
+
+        public void pressMouse() {
+            MouseEvent me = new MouseEvent(sbar,
+                    MouseEvent.MOUSE_PRESSED,
+                    (new Date()).getTime(),
+                    MouseEvent.BUTTON1_MASK,
+                    3 * getWidth() / 4, getHeight() / 2,
+                    1, true);
+            processMouseEvent(me);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JTable/6263446/bug6263446.java	Wed Nov 30 12:06:49 2011 -0800
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2011, 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 6263446
+ * @summary Tests that double-clicking to edit a cell doesn't select the content.
+ * @author Shannon Hickey
+ * @run main bug6263446
+ */
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.table.*;
+import sun.awt.SunToolkit;
+
+public class bug6263446 {
+
+    private static JTable table;
+    private static final String FIRST = "AAAAA";
+    private static final String SECOND = "BB";
+    private static final String ALL = FIRST + " " + SECOND;
+    private static Robot robot;
+
+    public static void main(String[] args) throws Exception {
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+        robot = new Robot();
+        robot.setAutoDelay(50);
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            public void run() {
+                createAndShowGUI();
+            }
+        });
+
+
+        toolkit.realSync();
+
+        Point point = getClickPoint();
+        robot.mouseMove(point.x, point.y);
+        toolkit.realSync();
+
+        click(1);
+        toolkit.realSync();
+        assertEditing(false);
+
+        click(2);
+        toolkit.realSync();
+        checkSelectedText(null);
+
+        click(3);
+        toolkit.realSync();
+        checkSelectedText(FIRST);
+
+
+        click(4);
+        toolkit.realSync();
+        checkSelectedText(ALL);
+
+        setClickCountToStart(1);
+
+        click(1);
+        toolkit.realSync();
+        checkSelectedText(null);
+
+        click(2);
+        toolkit.realSync();
+        checkSelectedText(FIRST);
+
+        click(3);
+        toolkit.realSync();
+        checkSelectedText(ALL);
+
+        setClickCountToStart(3);
+
+        click(1);
+        toolkit.realSync();
+        assertEditing(false);
+
+        click(2);
+        toolkit.realSync();
+        assertEditing(false);
+
+        click(3);
+        toolkit.realSync();
+        checkSelectedText(null);
+
+        click(4);
+        toolkit.realSync();
+        checkSelectedText(FIRST);
+
+        click(5);
+        toolkit.realSync();
+        checkSelectedText(ALL);
+
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                table.editCellAt(0, 0);
+            }
+        });
+
+        toolkit.realSync();
+        assertEditing(true);
+
+        click(2);
+        toolkit.realSync();
+        checkSelectedText(FIRST);
+
+    }
+
+    private static void checkSelectedText(String sel) throws Exception {
+        assertEditing(true);
+        checkSelection(sel);
+        cancelCellEditing();
+        assertEditing(false);
+    }
+
+    private static void setClickCountToStart(final int clicks) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                DefaultCellEditor editor =
+                        (DefaultCellEditor) table.getDefaultEditor(String.class);
+                editor.setClickCountToStart(clicks);
+            }
+        });
+
+    }
+
+    private static void cancelCellEditing() throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                table.getCellEditor().cancelCellEditing();
+            }
+        });
+    }
+
+    private static void checkSelection(final String sel) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                DefaultCellEditor editor =
+                        (DefaultCellEditor) table.getDefaultEditor(String.class);
+                JTextField field = (JTextField) editor.getComponent();
+                String text = field.getSelectedText();
+                if (sel == null) {
+                    if (text != null && text.length() != 0) {
+                        throw new RuntimeException("Nothing should be selected,"
+                                + " but \"" + text + "\" is selected.");
+                    }
+                } else if (!sel.equals(text)) {
+                    throw new RuntimeException("\"" + sel + "\" should be "
+                            + "selected, but \"" + text + "\" is selected.");
+                }
+            }
+        });
+    }
+
+    private static void assertEditing(final boolean editing) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                if (editing && !table.isEditing()) {
+                    throw new RuntimeException("Table should be editing");
+                }
+                if (!editing && table.isEditing()) {
+                    throw new RuntimeException("Table should not be editing");
+                }
+            }
+        });
+    }
+
+    private static Point getClickPoint() throws Exception {
+        final Point[] result = new Point[1];
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                Rectangle rect = table.getCellRect(0, 0, false);
+                Point point = new Point(rect.x + rect.width / 5,
+                        rect.y + rect.height / 2);
+                SwingUtilities.convertPointToScreen(point, table);
+                result[0] = point;
+            }
+        });
+
+        return result[0];
+    }
+
+    private static void click(int times) {
+        robot.delay(500);
+        for (int i = 0; i < times; i++) {
+            robot.mousePress(InputEvent.BUTTON1_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        }
+    }
+
+    private static TableModel createTableModel() {
+        String[] columnNames = {"Column 0"};
+        String[][] data = {{ALL}};
+
+        return new DefaultTableModel(data, columnNames);
+    }
+
+    private static void createAndShowGUI() {
+        JFrame frame = new JFrame("bug6263446");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        table = new JTable(createTableModel());
+        frame.add(table);
+        frame.pack();
+        frame.setVisible(true);
+    }
+}