Attachment 157928 Details for Bug 301276 – fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] fix

dndSupportRetro.txt (text/plain), 4.83 KB, created by Tim Buschtoens

on 2010-02-02 11:48:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Buschtoens

Created: 2010-02-02 11:48:50 EST

Size: 4.83 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/rwt/DNDSupport.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/rwt/DNDSupport.js,v
>retrieving revision 1.9
>diff -u -r1.9 DNDSupport.js
>--- js/org/eclipse/rwt/DNDSupport.js	13 Jan 2010 11:37:45 -0000	1.9
>+++ js/org/eclipse/rwt/DNDSupport.js	2 Feb 2010 14:38:10 -0000
>@@ -248,6 +248,17 @@
>       delete this._dropTargetEventQueue[ type ];
>     },
>     
>+    _setPropertyRetroactively : function( dropTarget, property, value ) {
>+      var wm = org.eclipse.swt.WidgetManager.getInstance();
>+      for( var type in this._dropTargetEventQueue ) {
>+        var event = this._dropTargetEventQueue[ type ];
>+        if( event[ "id" ] == wm.findIdByWidget( dropTarget ) ) {
>+          var eventName = event[ "eventName" ];
>+          event[ "param" ][ eventName + "." + property ] = value;
>+        }
>+      } 
>+    },
>+    
>     _attachTropTargetEvents : function() {
>       var req = org.eclipse.swt.Request.getInstance();
>       var events = this._dropTargetEventQueue;
>@@ -574,6 +585,7 @@
>         this._setAction( action, null );
>         dndHandler._renderCursor();
>       }
>+      this._setPropertyRetroactively( widget, "operation", operation );
>     },
>     
>     /*
>@@ -606,6 +618,7 @@
>       if( widget == this._currentDropTarget ) {
>         this._dataTypeOverwrite = type;
>       }
>+      this._setPropertyRetroactively( widget, "dataType", type );
>     }
>   
>   }
>#P org.eclipse.rap.rwt.q07.jstest
>Index: js/org/eclipse/rwt/test/tests/DNDTest.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/DNDTest.js,v
>retrieving revision 1.4
>diff -u -r1.4 DNDTest.js
>--- js/org/eclipse/rwt/test/tests/DNDTest.js	13 Jan 2010 11:37:47 -0000	1.4
>+++ js/org/eclipse/rwt/test/tests/DNDTest.js	2 Feb 2010 14:38:11 -0000
>@@ -205,6 +205,62 @@
>       testUtil.flush();
>     },
> 
>+    // See Bug 301276
>+    testSetPropertyRetroactively : function() {
>+      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>+      var dndSupport = org.eclipse.rwt.DNDSupport.getInstance();
>+      var dndHandler = qx.event.handler.DragAndDropHandler.getInstance()
>+      var leftButton = qx.event.type.MouseEvent.buttons.left;
>+      // request uses SWT-like event-names: 
>+      var dragOver = "org.eclipse.swt.dnd.dragEnter";
>+      var dragMove = "org.eclipse.swt.dnd.dragOver";
>+      testUtil.prepareTimerUse();
>+      testUtil.initRequestLog();
>+      var source = this.createSource();
>+      var target = this.createTarget();
>+      var sourceNode = source._getTargetNode();
>+      var targetNode = target._getTargetNode();
>+      var doc = document.body;
>+      // drag
>+      testUtil.fakeMouseEventDOM( sourceNode, "mousedown", leftButton, 11, 11 );
>+      testUtil.clearRequestLog();
>+      testUtil.fakeMouseEventDOM( doc, "mousemove", leftButton, 25, 15 );
>+      // Over
>+      testUtil.fakeMouseEventDOM( targetNode, "mouseover", leftButton, 31, 15 );
>+      testUtil.fakeMouseEventDOM( targetNode, "mousemove", leftButton, 32, 15 );
>+      testUtil.forceTimerOnce();
>+      assertEquals( 2, testUtil.getRequestsSend() );
>+      var request = testUtil.getRequestLog()[ 1 ];      
>+      assertTrue( request.search( dragOver + "=w2" ) != -1 );
>+      assertTrue( request.search( dragOver + ".dataType=null" ) != -1 );
>+      assertTrue( request.search( dragOver + ".operation=move" ) != -1 );
>+      testUtil.clearTimerOnceLog();
>+      testUtil.clearRequestLog();
>+      // Move
>+      testUtil.fakeMouseEventDOM( targetNode, "mousemove", leftButton, 33, 15 );
>+      assertTrue( testUtil.getTimerOnceLog().length > 0 );
>+      // set properties
>+      dndSupport.setDataType( target, "76135" );
>+      dndSupport.setOperationOverwrite( target, "copy" );
>+      // send event:
>+      testUtil.forceTimerOnce();
>+      assertEquals( 1, testUtil.getRequestsSend() );
>+      var request = testUtil.getRequestLog()[ 0 ];
>+      assertTrue( request.search( dragMove + "=w2" ) != -1 );      
>+      assertTrue( request.search( dragMove + ".operation=copy" ) != -1 );
>+      assertTrue( request.search( dragMove + ".dataType=76135" ) != -1 );
>+      testUtil.clearTimerOnceLog();
>+      testUtil.clearRequestLog();
>+      dndSupport.cancel();
>+      dndSupport.deregisterDragSource( source );
>+      dndSupport.deregisterDropTarget( target );
>+      source.setParent( null );
>+      source.destroy();
>+      target.setParent( null );
>+      target.destroy();
>+      testUtil.flush();
>+    },
>+
>     // for Bug 299034
>     testStopDropEventPropagation : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;

Actions: View | Diff

Attachments on bug 301276: 157928