Attachment 147727 Details for Bug 286183 – Fix

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

[patch] Fix

clipboard.txt (text/plain), 3.46 KB, created by Rüdiger Herrmann

on 2009-09-21 15:03:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-09-21 15:03:34 EDT

Size: 3.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java,v
>retrieving revision 1.18
>diff -u -r1.18 DisplayLCA.java
>--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java	17 Aug 2009 20:17:07 -0000	1.18
>+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java	21 Sep 2009 19:06:04 -0000
>@@ -135,7 +135,6 @@
>       writeClientDocument( display );
>     } else {
>       response.setContentType( HTML.CONTENT_TEXT_JAVASCRIPT_UTF_8 );
>-      out.write( "org.eclipse.swt.EventUtil.suspendEventHandling();" );
>       out.write( getRequestCounter() );
>       disposeWidgets();
>       writeTheme( display );
>@@ -150,8 +149,6 @@
>       }
>       writeActiveControls( display );
>       writeFocus( display );
>-      out.write( "qx.ui.core.Widget.flushGlobalQueues();" );
>-      out.write( "org.eclipse.swt.EventUtil.resumeEventHandling();" );
>       markInitialized( display );
>     }
>   }
>Index: js/org/eclipse/swt/Request.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/Request.js,v
>retrieving revision 1.15
>diff -u -r1.15 Request.js
>--- js/org/eclipse/swt/Request.js	4 Jun 2009 11:48:55 -0000	1.15
>+++ js/org/eclipse/swt/Request.js	21 Sep 2009 19:06:04 -0000
>@@ -296,7 +296,10 @@
>         var errorOccured = false;
>         try {
>           if( text && text.length > 0 ) {
>+            org.eclipse.swt.EventUtil.suspendEventHandling();
>             window.eval( text );
>+            qx.ui.core.Widget.flushGlobalQueues();
>+            org.eclipse.swt.EventUtil.resumeEventHandling();
>           }
>           this._runningRequestCount--;
>           this._hideWaitHint();
>#P org.eclipse.rap.rwt.q07.test
>Index: src/org/eclipse/rwt/internal/lifecycle/RenderDispose_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/internal/lifecycle/RenderDispose_Test.java,v
>retrieving revision 1.3
>diff -u -r1.3 RenderDispose_Test.java
>--- src/org/eclipse/rwt/internal/lifecycle/RenderDispose_Test.java	10 Aug 2009 22:05:35 -0000	1.3
>+++ src/org/eclipse/rwt/internal/lifecycle/RenderDispose_Test.java	21 Sep 2009 19:06:06 -0000
>@@ -9,7 +9,6 @@
>  *     Innoopract Informationssysteme GmbH - initial API and implementation
>  *     EclipseSource - ongoing development
>  ******************************************************************************/
>-
> package org.eclipse.rwt.internal.lifecycle;
> 
> import junit.framework.TestCase;
>@@ -61,15 +60,10 @@
>     } );
>     RWTFixture.executeLifeCycleFromServerThread( );
>     String expectedStart
>-      =   "org.eclipse.swt.EventUtil.suspendEventHandling();"
>-        + "var req = org.eclipse.swt.Request.getInstance();"
>+      =   "var req = org.eclipse.swt.Request.getInstance();"
>         + "req.setRequestCounter(";
>-    String expectedEnd
>-      =   ");qx.ui.core.Widget.flushGlobalQueues();"
>-        + "org.eclipse.swt.EventUtil.resumeEventHandling();";
>     String allMarkup = Fixture.getAllMarkup();
>     assertTrue( allMarkup.startsWith( expectedStart ) );
>-    assertTrue( allMarkup.endsWith( expectedEnd ) );
>   }
> 
>   protected void setUp() throws Exception {

Actions: View | Diff

Attachments on bug 286183: 147727