openjdk · GoeLin · Apr 2, 2025
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -129,6 +129,7 @@ java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java 8164
 java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java 8171510 macosx-all
 java/awt/dnd/DragExitBeforeDropTest.java 8242805 macosx-all
 java/awt/dnd/DragThresholdTest.java 8076299 macosx-all
+java/awt/dnd/CustomDragCursorTest.java 8242805 macosx-all
 java/awt/Focus/ChoiceFocus/ChoiceFocus.java 8169103 windows-all,macosx-all
 java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java 8198618 macosx-all
 java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java 6986252 macosx-all

diff --git a/test/jdk/java/awt/dnd/CustomDragCursorTest.java b/test/jdk/java/awt/dnd/CustomDragCursorTest.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2001, 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.
+ */
+
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Panel;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceDragEvent;
+import java.awt.dnd.DragSourceDropEvent;
+import java.awt.dnd.DragSourceEvent;
+import java.awt.dnd.DragSourceListener;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetContext;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+/*
+ * @test
+ * @bug 4451328
+ * @summary tests that a custom drag cursor is not changed
+           to the default drag cursor
+ * @key headful
+ * @run main CustomDragCursorTest
+ */
+
+public class CustomDragCursorTest {
+    private static Frame frame;
+    private static final DragSourcePanel dragSourcePanel = new DragSourcePanel();
+    private static final DropTargetPanel dropTargetPanel = new DropTargetPanel();
+
+    private static volatile Point srcPoint;
+    private static volatile Point dstPoint;
+    private static volatile boolean passed = true;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            EventQueue.invokeAndWait(CustomDragCursorTest::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            EventQueue.invokeAndWait(() -> {
+                Point p = dragSourcePanel.getLocationOnScreen();
+                Dimension d = dragSourcePanel.getSize();
+                p.translate(d.width / 2, d.height / 2);
+                srcPoint = p;
+
+                p = dropTargetPanel.getLocationOnScreen();
+                d = dropTargetPanel.getSize();
+                p.translate(d.width / 2, d.height / 2);
+                dstPoint = p;
+            });
+
+            robot.mouseMove(srcPoint.x, srcPoint.y);
+            robot.keyPress(KeyEvent.VK_CONTROL);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            for (; !srcPoint.equals(dstPoint);
+                 srcPoint.translate(sign(dstPoint.x - srcPoint.x),
+                                    sign(dstPoint.y - srcPoint.y))) {
+                robot.mouseMove(srcPoint.x, srcPoint.y);
+                robot.delay(10);
+            }
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.keyRelease(KeyEvent.VK_CONTROL);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            if (!passed) {
+                throw new RuntimeException("Custom drag cursor changed to default.");
+            }
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        frame = new Frame("CustomDragCursorTest");
+        frame.setLayout(new GridLayout(2, 1));
+        frame.add(dragSourcePanel);
+        frame.add(dropTargetPanel);
+        frame.setLocationRelativeTo(null);
+        frame.setSize(300, 400);
+        frame.setVisible(true);
+    }
+
+    public static void failed() {
+        passed = false;
+    }
+
+    private static int sign(int n) {
+        return Integer.compare(n, 0);
+    }
+
+    private static class DragSourceButton extends Button implements Serializable,
+                                                                    Transferable,
+                                                                    DragGestureListener,
+                                                                    DragSourceListener {
+        private final DataFlavor dataflavor =
+                new DataFlavor(Button.class, "DragSourceButton");
+        private final Cursor dragCursor = new Cursor(Cursor.HAND_CURSOR);
+
+        public DragSourceButton() {
+            this("DragSourceButton");
+        }
+
+        public DragSourceButton(String str) {
+            super(str);
+
+            DragSource ds = DragSource.getDefaultDragSource();
+            ds.createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY,
+                                                  this);
+        }
+
+        public void dragGestureRecognized(DragGestureEvent dge) {
+            dge.startDrag(dragCursor, this, this);
+        }
+
+        public void dragEnter(DragSourceDragEvent dsde) {
+            if (!dragCursor.equals(dsde.getDragSourceContext().getCursor())) {
+                CustomDragCursorTest.failed();
+            }
+        }
+
+        public void dragExit(DragSourceEvent dse) {
+            if (!dragCursor.equals(dse.getDragSourceContext().getCursor())) {
+                CustomDragCursorTest.failed();
+            }
+        }
+
+        public void dragOver(DragSourceDragEvent dsde) {
+            if (!dragCursor.equals(dsde.getDragSourceContext().getCursor())) {
+                CustomDragCursorTest.failed();
+            }
+        }
+
+        public void dragDropEnd(DragSourceDropEvent dsde) {
+            if (!dragCursor.equals(dsde.getDragSourceContext().getCursor())) {
+                CustomDragCursorTest.failed();
+            }
+        }
+
+        public void dropActionChanged(DragSourceDragEvent dsde) {
+            if (!dragCursor.equals(dsde.getDragSourceContext().getCursor())) {
+                CustomDragCursorTest.failed();
+            }
+        }
+
+        public Object getTransferData(DataFlavor flavor)
+                throws UnsupportedFlavorException, IOException {
+
+            if (!isDataFlavorSupported(flavor)) {
+                throw new UnsupportedFlavorException(flavor);
+            }
+
+            Object retObj;
+
+            ByteArrayOutputStream baoStream = new ByteArrayOutputStream();
+            ObjectOutputStream ooStream = new ObjectOutputStream(baoStream);
+            ooStream.writeObject(this);
+
+            ByteArrayInputStream baiStream = new ByteArrayInputStream(baoStream.toByteArray());
+            ObjectInputStream ois = new ObjectInputStream(baiStream);
+            try {
+                retObj = ois.readObject();
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+                throw new RuntimeException(e.toString());
+            }
+
+            return retObj;
+        }
+
+        public DataFlavor[] getTransferDataFlavors() {
+            return new DataFlavor[] { dataflavor };
+        }
+
+        public boolean isDataFlavorSupported(DataFlavor dflavor) {
+            return dataflavor.equals(dflavor);
+        }
+    }
+
+    private static class DragSourcePanel extends Panel {
+
+        final Dimension preferredDimension = new Dimension(200, 100);
+
+        public DragSourcePanel() {
+            setLayout(new GridLayout(1, 1));
+            add(new DragSourceButton());
+        }
+
+        public Dimension getPreferredSize() {
+            return preferredDimension;
+        }
+    }
+
+    private static class DropTargetPanel extends Panel implements DropTargetListener {
+
+        final Dimension preferredDimension = new Dimension(200, 100);
+
+        public DropTargetPanel() {
+            setDropTarget(new DropTarget(this, this));
+        }
+
+        public Dimension getPreferredSize() {
+            return preferredDimension;
+        }
+
+        public void dragEnter(DropTargetDragEvent dtde) {}
+
+        public void dragExit(DropTargetEvent dte) {}
+
+        public void dragOver(DropTargetDragEvent dtde) {}
+
+        public void dropActionChanged(DropTargetDragEvent dtde) {}
+
+        public void drop(DropTargetDropEvent dtde) {
+            DropTargetContext dtc = dtde.getDropTargetContext();
+
+            if ((dtde.getSourceActions() & DnDConstants.ACTION_COPY) != 0) {
+                dtde.acceptDrop(DnDConstants.ACTION_COPY);
+            } else {
+                dtde.rejectDrop();
+            }
+
+            DataFlavor[] dfs = dtde.getCurrentDataFlavors();
+            Component comp = null;
+
+            if(dfs != null && dfs.length >= 1) {
+                Transferable transfer = dtde.getTransferable();
+
+                try {
+                    comp = (Component)transfer.getTransferData(dfs[0]);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    dtc.dropComplete(false);
+                }
+            }
+            dtc.dropComplete(true);
+            add(comp);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/dnd/DnDAcceptanceTest/DnDAcceptanceTest.java b/test/jdk/java/awt/dnd/DnDAcceptanceTest/DnDAcceptanceTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1999, 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Frame;
+import java.awt.Panel;
+
+/*
+ * @test
+ * @bug 4166541 4225247 4297663
+ * @summary Tests Basic DnD functionality
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual DnDAcceptanceTest
+ */
+
+public class DnDAcceptanceTest {
+     private static final String INSTRUCTIONS = """
+            When test runs a Frame which contains a yellow button labeled
+            "Drag ME!" and a RED Panel will appear.
+
+            Click on the button and drag to the red panel.
+            When the mouse enters the red panel
+            during the drag the panel should turn yellow.
+
+            Release the mouse button, panel should turn red again and
+            a yellow button labeled Drag ME! should appear inside the panel.
+            You should be able to repeat this operation multiple times.
+
+            If above is true press PASS, else press FAIL.
+            """;
+
+     public static void main(String[] args) throws Exception {
+         PassFailJFrame.builder()
+                       .title("Test Instructions")
+                       .instructions(INSTRUCTIONS)
+                       .columns(38)
+                       .testUI(DnDAcceptanceTest::createUI)
+                       .build()
+                       .awaitAndCheck();
+     }
+
+     private static Frame createUI() {
+         Frame frame = new Frame("DnDAcceptanceTest");
+         Panel mainPanel;
+         Component dragSource, dropTarget;
+
+         frame.setSize(400, 400);
+         frame.setLayout(new BorderLayout());
+
+         mainPanel = new Panel();
+         mainPanel.setLayout(new BorderLayout());
+
+         mainPanel.setBackground(Color.BLACK);
+
+         dropTarget = new DnDTarget(Color.RED, Color.YELLOW);
+         dragSource = new DnDSource("Drag ME!");
+
+         mainPanel.add(dragSource, "North");
+         mainPanel.add(dropTarget, "Center");
+         frame.add(mainPanel, BorderLayout.CENTER);
+         frame.setAlwaysOnTop(true);
+         return frame;
+     }
+}