Attachment 192452 Details for Bug 341768 – Proposed changes

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

[patch] Proposed changes

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

on 2011-04-04 08:45:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2011-04-04 08:45:09 EDT

Size: 5.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/lifecycle/IDisplayLifeCycleAdapter.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/IDisplayLifeCycleAdapter.java,v
>retrieving revision 1.3
>diff -u -r1.3 IDisplayLifeCycleAdapter.java
>--- src/org/eclipse/rwt/internal/lifecycle/IDisplayLifeCycleAdapter.java	12 Jun 2008 13:12:18 -0000	1.3
>+++ src/org/eclipse/rwt/internal/lifecycle/IDisplayLifeCycleAdapter.java	4 Apr 2011 12:37:46 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2007 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,21 +7,18 @@
>  *
>  * Contributors:
>  *     Innoopract Informationssysteme GmbH - initial API and implementation
>+ *     EclipseSource - ongoing development
>  ******************************************************************************/
>-
> package org.eclipse.rwt.internal.lifecycle;
> 
> import java.io.IOException;
> 
> import org.eclipse.rwt.lifecycle.ILifeCycleAdapter;
>-import org.eclipse.swt.graphics.Device;
> import org.eclipse.swt.widgets.Display;
> 
> 
> public interface IDisplayLifeCycleAdapter extends ILifeCycleAdapter {
>-
>   void preserveValues( Display display );
>   void readData( Display display );
>-  void processAction( Device display );
>   void render( Display display ) throws IOException;
> }
>Index: src/org/eclipse/rwt/internal/lifecycle/ProcessAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/ProcessAction.java,v
>retrieving revision 1.4
>diff -u -r1.4 ProcessAction.java
>--- src/org/eclipse/rwt/internal/lifecycle/ProcessAction.java	4 Jun 2009 11:48:51 -0000	1.4
>+++ src/org/eclipse/rwt/internal/lifecycle/ProcessAction.java	4 Apr 2011 12:37:46 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2009 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -23,7 +23,8 @@
> 
>   public PhaseId execute() {
>     Display display = RWTLifeCycle.getSessionDisplay();
>-    DisplayUtil.getLCA( display ).processAction( display );
>+    while( display.readAndDispatch() ) {
>+    }
>     return PhaseId.RENDER;
>   }
> }
>\ No newline at end of file
>#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.39
>diff -u -r1.39 DisplayLCA.java
>--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java	30 Mar 2011 10:59:33 -0000	1.39
>+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java	4 Apr 2011 12:37:47 -0000
>@@ -29,8 +29,6 @@
> import org.eclipse.rwt.lifecycle.*;
> import org.eclipse.swt.dnd.DragSource;
> import org.eclipse.swt.dnd.DropTarget;
>-import org.eclipse.swt.events.TypedEvent;
>-import org.eclipse.swt.graphics.Device;
> import org.eclipse.swt.graphics.Rectangle;
> import org.eclipse.swt.internal.widgets.*;
> import org.eclipse.swt.internal.widgets.WidgetTreeVisitor.AllWidgetTreeVisitor;
>@@ -256,11 +254,6 @@
>     DNDSupport.processEvents();
>   }
> 
>-  public void processAction( final Device display ) {
>-    ProcessActionRunner.execute();
>-    TypedEvent.processScheduledEvents();
>-  }
>-
>   /////////////////////////////
>   // Helping methods for render
> 
>#P org.eclipse.rap.rwt.testfixture
>Index: src/org/eclipse/rwt/Fixture.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.testfixture/src/org/eclipse/rwt/Fixture.java,v
>retrieving revision 1.23
>diff -u -r1.23 Fixture.java
>--- src/org/eclipse/rwt/Fixture.java	30 Mar 2011 10:59:31 -0000	1.23
>+++ src/org/eclipse/rwt/Fixture.java	4 Apr 2011 12:37:48 -0000
>@@ -239,7 +239,8 @@
>     displayLCA.readData( display );
>     Fixture.preserveWidgets();
>     fakePhase( PhaseId.PROCESS_ACTION );
>-    displayLCA.processAction( display );
>+    while( Display.getCurrent().readAndDispatch() ) {
>+    }
>   }
> 
>   public static void readDataAndProcessAction( final Widget widget ) {
>@@ -247,9 +248,8 @@
>     fakePhase( PhaseId.READ_DATA );
>     widgetLCA.readData( widget );
>     fakePhase( PhaseId.PROCESS_ACTION );
>-    Display display = widget.getDisplay();
>-    IDisplayLifeCycleAdapter displayLCA = DisplayUtil.getLCA( display );
>-    displayLCA.processAction( display );
>+    while( Display.getCurrent().readAndDispatch() ) {
>+    }
>   }
> 
>   public static void markInitialized( final Widget widget ) {

Actions: View | Diff

Attachments on bug 341768: 192452