Mercurial > hg > openjdk > icedtea > jdk7 > jdk

changeset 5459:7cb9be8b6478

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7178079: REGRESSION: Some AWT Drag-n-Drop tests fail since JDK 7u6 b13 Reviewed-by: anthony, serb
author kizune
date Mon, 09 Jul 2012 11:40:07 +0400
parents 0d320971b2c2
children 38d2807c7801
files src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java	Fri Jul 06 15:03:19 2012 -0700
+++ b/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java	Mon Jul 09 11:40:07 2012 +0400
@@ -128,6 +128,15 @@
         }
     }
 
+    @Override
+    protected int postDropTargetEvent(Component component, int x, int y, int dropAction,
+                                      int actions, long[] formats, long nativeCtxt, int eventID,
+                                      boolean dispatchType) {
+        // On MacOS X all the DnD events should be synchronous
+        return super.postDropTargetEvent(component, x, y, dropAction, actions, formats, nativeCtxt,
+                eventID, SunDropTargetContextPeer.DISPATCH_SYNC);
+    }
+
     // Signal drop complete:
     protected void doDropDone(boolean success, int dropAction, boolean isLocal) {
         long nativeDropTarget = this.getNativeDragContext();
--- a/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java	Fri Jul 06 15:03:19 2012 -0700
+++ b/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java	Mon Jul 09 11:40:07 2012 +0400
@@ -498,7 +498,7 @@
         postDropTargetEvent(component, x, y, dropAction, actions,
                             formats, nativeCtxt,
                             SunDropTargetEvent.MOUSE_DROPPED,
-                            SunDropTargetContextPeer.DISPATCH_SYNC);
+                            !SunDropTargetContextPeer.DISPATCH_SYNC);
     }
 
     /**