Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 193574 Details for
Bug 341760
Replace PreserveWidgetsPhaseListener by preserving widgets in READ_DATA phase
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
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), 65.92 KB, created by
RĂ¼diger Herrmann
on 2011-04-19 08:48:36 EDT
(
hide
)
Description:
Proposed changes
Filename:
MIME Type:
Creator:
RĂ¼diger Herrmann
Created:
2011-04-19 08:48:36 EDT
Size:
65.92 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.rwt >Index: src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java,v >retrieving revision 1.31 >diff -u -r1.31 RWTServletContextListener.java >--- src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java 12 Apr 2011 17:57:05 -0000 1.31 >+++ src/org/eclipse/rwt/internal/engine/RWTServletContextListener.java 19 Apr 2011 12:46:21 -0000 >@@ -289,7 +289,6 @@ > } > } > } else { >- phaseListeners.add( new PreserveWidgetsPhaseListener() ); > phaseListeners.add( new CurrentPhase.Listener() ); > } > PhaseListenerRegistry phaseListenerRegistry = RWTFactory.getPhaseListenerRegistry(); >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.4 >diff -u -r1.4 IDisplayLifeCycleAdapter.java >--- src/org/eclipse/rwt/internal/lifecycle/IDisplayLifeCycleAdapter.java 6 Apr 2011 10:33:38 -0000 1.4 >+++ src/org/eclipse/rwt/internal/lifecycle/IDisplayLifeCycleAdapter.java 19 Apr 2011 12:46:21 -0000 >@@ -18,7 +18,8 @@ > > > public interface IDisplayLifeCycleAdapter extends ILifeCycleAdapter { >- void preserveValues( Display display ); > void readData( Display display ); >+ void preserveValues( Display display ); > void render( Display display ) throws IOException; >+ void clearPreserved( Display display ); > } >Index: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener.java >=================================================================== >RCS file: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener.java >diff -N src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener.java >--- src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener.java 7 Oct 2009 13:29:34 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,85 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2009 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Innoopract Informationssysteme GmbH - initial API and implementation >- * EclipseSource - ongoing development >- ******************************************************************************/ >-package org.eclipse.rwt.internal.lifecycle; >- >-import org.eclipse.rwt.lifecycle.*; >-import org.eclipse.swt.internal.widgets.*; >-import org.eclipse.swt.internal.widgets.WidgetTreeVisitor.AllWidgetTreeVisitor; >-import org.eclipse.swt.widgets.*; >- >-public final class PreserveWidgetsPhaseListener implements PhaseListener { >- >- private static final long serialVersionUID = 1L; >- >- public void beforePhase( final PhaseEvent event ) { >- } >- >- public void afterPhase( final PhaseEvent event ) { >- if( PhaseId.READ_DATA.equals( event.getPhaseId() ) ) { >- Display display = RWTLifeCycle.getSessionDisplay(); >- if( display != null ) { >- preserve( display ); >- } >- } else if( PhaseId.RENDER.equals( event.getPhaseId() ) ) { >- Display display = RWTLifeCycle.getSessionDisplay(); >- if( display != null ) { >- clearPreserved( display ); >- } >- } >- } >- >- public PhaseId getPhaseId() { >- return PhaseId.ANY; >- } >- >- ///////////////////////////////////////////////////// >- // Helping methods to preserve widget property values >- >- private static void preserve( final Display display ) { >- IDisplayLifeCycleAdapter displayLCA = DisplayUtil.getLCA( display ); >- IWidgetAdapter adapter = DisplayUtil.getAdapter( display ); >- if( adapter.isInitialized() ) { >- displayLCA.preserveValues( display ); >- IDisplayAdapter displayAdapter >- = ( IDisplayAdapter )display.getAdapter( IDisplayAdapter.class ); >- Composite[] shells = displayAdapter.getShells(); >- for( int i = 0; i < shells.length; i++ ) { >- WidgetTreeVisitor.accept( shells[ i ], new AllWidgetTreeVisitor() { >- public boolean doVisit( final Widget widget ) { >- AbstractWidgetLCA widgetLCA = WidgetUtil.getLCA( widget ); >- widgetLCA.preserveValues( widget ); >- return true; >- } >- } ); >- } >- } >- } >- >- static void clearPreserved( final Display display ) { >- WidgetAdapter widgetAdapter >- = ( WidgetAdapter )DisplayUtil.getAdapter( display ); >- widgetAdapter.clearPreserved(); >- IDisplayAdapter displayAdapter >- = ( IDisplayAdapter )display.getAdapter( IDisplayAdapter.class ); >- Composite[] shells = displayAdapter.getShells(); >- for( int i = 0; i < shells.length; i++ ) { >- WidgetTreeVisitor.accept( shells[ i ], new AllWidgetTreeVisitor() { >- public boolean doVisit( final Widget widget ) { >- WidgetAdapter widgetAdapter >- = ( WidgetAdapter )WidgetUtil.getAdapter( widget ); >- widgetAdapter.clearPreserved(); >- return true; >- } >- } ); >- } >- } >-} >Index: src/org/eclipse/rwt/internal/lifecycle/ReadData.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/ReadData.java,v >retrieving revision 1.5 >diff -u -r1.5 ReadData.java >--- src/org/eclipse/rwt/internal/lifecycle/ReadData.java 16 Apr 2011 20:54:20 -0000 1.5 >+++ src/org/eclipse/rwt/internal/lifecycle/ReadData.java 19 Apr 2011 12:46:21 -0000 >@@ -23,7 +23,9 @@ > > public PhaseId execute() { > Display display = RWTLifeCycle.getSessionDisplay(); >- DisplayUtil.getLCA( display ).readData( display ); >+ IDisplayLifeCycleAdapter displayLCA = DisplayUtil.getLCA( display ); >+ displayLCA.readData( display ); >+ displayLCA.preserveValues( display ); > return PhaseId.PROCESS_ACTION; > } > } >Index: src/org/eclipse/rwt/internal/lifecycle/Render.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/lifecycle/Render.java,v >retrieving revision 1.5 >diff -u -r1.5 Render.java >--- src/org/eclipse/rwt/internal/lifecycle/Render.java 16 Apr 2011 20:54:20 -0000 1.5 >+++ src/org/eclipse/rwt/internal/lifecycle/Render.java 19 Apr 2011 12:46:21 -0000 >@@ -25,7 +25,9 @@ > > public PhaseId execute() throws IOException { > Display display = RWTLifeCycle.getSessionDisplay(); >- DisplayUtil.getLCA( display ).render( display ); >+ IDisplayLifeCycleAdapter displayLCA = DisplayUtil.getLCA( display ); >+ displayLCA.render( display ); >+ displayLCA.clearPreserved( display ); > return null; > } > } >\ No newline at end of file >#P org.eclipse.rap.rwt.q07 >Index: src/org/eclipse/rwt/lifecycle/JSWriter.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/rwt/lifecycle/JSWriter.java,v >retrieving revision 1.11 >diff -u -r1.11 JSWriter.java >--- src/org/eclipse/rwt/lifecycle/JSWriter.java 10 Apr 2011 22:34:09 -0000 1.11 >+++ src/org/eclipse/rwt/lifecycle/JSWriter.java 19 Apr 2011 12:46:23 -0000 >@@ -66,8 +66,8 @@ > > private static final String WRITER_MAP > = JSWriter.class.getName() + "#map"; >- private static final String HAS_WINDOW_MANAGER >- = JSWriter.class.getName() + "#hasWindowManager"; >+ private static final String HAS_WIDGET_MANAGER >+ = JSWriter.class.getName() + "#hasWidgetManager"; > private static final String CURRENT_WIDGET_REF > = JSWriter.class.getName() + "#currentWidgetRef"; > >@@ -749,11 +749,11 @@ > IServiceStateInfo stateInfo = ContextProvider.getStateInfo(); > if( currentPhaseIsRender() > && widget != null >- && stateInfo.getAttribute( HAS_WINDOW_MANAGER ) == null ) >+ && stateInfo.getAttribute( HAS_WIDGET_MANAGER ) == null ) > { > writeVarAssignment( WIDGET_MANAGER_REF, > "org.eclipse.swt.WidgetManager.getInstance()" ); >- stateInfo.setAttribute( HAS_WINDOW_MANAGER, Boolean.TRUE ); >+ stateInfo.setAttribute( HAS_WIDGET_MANAGER, Boolean.TRUE ); > } > } > >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.44 >diff -u -r1.44 DisplayLCA.java >--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java 18 Apr 2011 12:23:41 -0000 1.44 >+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java 19 Apr 2011 12:46:23 -0000 >@@ -86,6 +86,33 @@ > //////////////////////////////////////////////////////// > // interface implementation of IDisplayLifeCycleAdapter > >+ public void readData( Display display ) { >+ readBounds( display ); >+ readCursorLocation( display ); >+ readFocusControl( display ); >+ KeyBindingUtil.readKeyBindingEvents( display ); >+ WidgetTreeVisitor visitor = new AllWidgetTreeVisitor() { >+ public boolean doVisit( final Widget widget ) { >+ IWidgetLifeCycleAdapter adapter = WidgetUtil.getLCA( widget ); >+ adapter.readData( widget ); >+ return true; >+ } >+ }; >+ Shell[] shells = getShells( display ); >+ for( int i = 0; i < shells.length; i++ ) { >+ Composite shell = shells[ i ]; >+ WidgetTreeVisitor.accept( shell, visitor ); >+ } >+ for( int i = 0; i < shells.length; i++ ) { >+ if( shells[ i ].getMaximized() || shells[ i ].getFullScreen() ) { >+ Object adapter = shells[ i ].getAdapter( IShellAdapter.class ); >+ IShellAdapter shellAdapter = ( IShellAdapter )adapter; >+ shellAdapter.setBounds( display.getBounds() ); >+ } >+ } >+ DNDSupport.processEvents(); >+ } >+ > public void preserveValues( final Display display ) { > IWidgetAdapter adapter = DisplayUtil.getAdapter( display ); > adapter.preserve( PROP_FOCUS_CONTROL, display.getFocusControl() ); >@@ -93,6 +120,18 @@ > adapter.preserve( PROP_TIMEOUT_PAGE, getTimeoutPage() ); > adapter.preserve( PROP_EXIT_CONFIRMATION, getExitConfirmation() ); > KeyBindingUtil.preserveKeyBindings( display ); >+ if( adapter.isInitialized() ) { >+ Shell[] shells = getShells( display ); >+ for( int i = 0; i < shells.length; i++ ) { >+ WidgetTreeVisitor.accept( shells[ i ], new AllWidgetTreeVisitor() { >+ public boolean doVisit( final Widget widget ) { >+ AbstractWidgetLCA widgetLCA = WidgetUtil.getLCA( widget ); >+ widgetLCA.preserveValues( widget ); >+ return true; >+ } >+ } ); >+ } >+ } > } > > public void render( final Display display ) throws IOException { >@@ -113,6 +152,21 @@ > KeyBindingUtil.writeKeyBindings( display ); > } > } >+ >+ public void clearPreserved( Display display ) { >+ WidgetAdapter widgetAdapter = ( WidgetAdapter )DisplayUtil.getAdapter( display ); >+ widgetAdapter.clearPreserved(); >+ Composite[] shells = getShells( display ); >+ for( int i = 0; i < shells.length; i++ ) { >+ WidgetTreeVisitor.accept( shells[ i ], new AllWidgetTreeVisitor() { >+ public boolean doVisit( final Widget widget ) { >+ WidgetAdapter widgetAdapter = ( WidgetAdapter )WidgetUtil.getAdapter( widget ); >+ widgetAdapter.clearPreserved(); >+ return true; >+ } >+ } ); >+ } >+ } > > private static void renderShells( Display display ) throws IOException { > RenderVisitor visitor = new RenderVisitor(); >@@ -151,8 +205,7 @@ > IWidgetAdapter adapter = DisplayUtil.getAdapter( display ); > Object oldTimeoutPage = adapter.getPreserved( PROP_TIMEOUT_PAGE ); > if( !timeoutPage.equals( oldTimeoutPage ) ) { >- String pattern >- = "org.eclipse.swt.Request.getInstance().setTimeoutPage( \"{0}\" );"; >+ String pattern = "org.eclipse.swt.Request.getInstance().setTimeoutPage( \"{0}\" );"; > Object[] param = new Object[] { timeoutPage }; > String jsCode = MessageFormat.format( pattern, param ); > IServiceStateInfo stateInfo = ContextProvider.getStateInfo(); >@@ -162,10 +215,8 @@ > } > > private static String getTimeoutPage() { >- String timeoutTitle >- = RWTMessages.getMessage( "RWT_SessionTimeoutPageTitle" ); >- String timeoutHeadline >- = RWTMessages.getMessage( "RWT_SessionTimeoutPageHeadline" ); >+ String timeoutTitle = RWTMessages.getMessage( "RWT_SessionTimeoutPageTitle" ); >+ String timeoutHeadline = RWTMessages.getMessage( "RWT_SessionTimeoutPageHeadline" ); > String pattern = RWTMessages.getMessage( "RWT_SessionTimeoutPageMessage" ); > Object[] arguments = new Object[]{ "<a {HREF_URL}>", "</a>" }; > String timeoutMessage = MessageFormat.format( pattern, arguments ); >@@ -218,33 +269,6 @@ > ThemeManager.getInstance().registerResources(); > } > >- public void readData( Display display ) { >- readBounds( display ); >- readCursorLocation( display ); >- readFocusControl( display ); >- KeyBindingUtil.readKeyBindingEvents( display ); >- WidgetTreeVisitor visitor = new AllWidgetTreeVisitor() { >- public boolean doVisit( final Widget widget ) { >- IWidgetLifeCycleAdapter adapter = WidgetUtil.getLCA( widget ); >- adapter.readData( widget ); >- return true; >- } >- }; >- Shell[] shells = getShells( display ); >- for( int i = 0; i < shells.length; i++ ) { >- Composite shell = shells[ i ]; >- WidgetTreeVisitor.accept( shell, visitor ); >- } >- for( int i = 0; i < shells.length; i++ ) { >- if( shells[ i ].getMaximized() || shells[ i ].getFullScreen() ) { >- Object adapter = shells[ i ].getAdapter( IShellAdapter.class ); >- IShellAdapter shellAdapter = ( IShellAdapter )adapter; >- shellAdapter.setBounds( display.getBounds() ); >- } >- } >- DNDSupport.processEvents(); >- } >- > ///////////////////////////// > // Helping methods for render > >#P org.eclipse.rap.rwt.q07.test >Index: src/org/eclipse/RWTQ07TestSuite.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/RWTQ07TestSuite.java,v >retrieving revision 1.41 >diff -u -r1.41 RWTQ07TestSuite.java >--- src/org/eclipse/RWTQ07TestSuite.java 18 Apr 2011 20:22:19 -0000 1.41 >+++ src/org/eclipse/RWTQ07TestSuite.java 19 Apr 2011 12:46:24 -0000 >@@ -75,7 +75,7 @@ > // RWT core tests, but there is still some refactoring > // necessary to achieve this, so they've been moved > // temporarily to the q07 fragment tests.. >- suite.addTestSuite( PreserveWidgetsPhaseListener_Test.class ); >+ suite.addTestSuite( PreserveWidgets_Test.class ); > suite.addTestSuite( WidgetAdapter_Test.class ); > suite.addTestSuite( DuplicateRequest_Test.class ); > suite.addTestSuite( MouseEvent_Test.class ); >Index: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java >=================================================================== >RCS file: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java >diff -N src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java >--- src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java 11 Apr 2011 21:11:56 -0000 1.15 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,183 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH and others. >- * 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 >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * Innoopract Informationssysteme GmbH - initial API and implementation >- * EclipseSource - ongoing development >- * Frank Appel - replaced singletons and static fields (Bug 337787) >- ******************************************************************************/ >-package org.eclipse.rwt.internal.lifecycle; >- >-import java.io.IOException; >- >-import junit.framework.TestCase; >- >-import org.eclipse.rwt.AdapterFactory; >-import org.eclipse.rwt.Fixture; >-import org.eclipse.rwt.internal.AdapterManager; >-import org.eclipse.rwt.internal.AdapterManagerImpl; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.service.RequestParams; >-import org.eclipse.rwt.lifecycle.*; >-import org.eclipse.swt.SWT; >-import org.eclipse.swt.internal.widgets.Props; >-import org.eclipse.swt.widgets.*; >- >-public class PreserveWidgetsPhaseListener_Test extends TestCase { >- >- public static final class TestEntryPointWithShell implements IEntryPoint { >- public int createUI() { >- Display display = new Display(); >- new Shell( display, SWT.NONE ); >- int count = 0; >- while( count < 1 ) { >- if( !display.readAndDispatch() ) { >- display.sleep(); >- } >- count++; >- } >- return 0; >- } >- } >- >- protected void setUp() throws Exception { >- Fixture.setUp(); >- Fixture.fakeNewRequest(); >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); >- } >- >- protected void tearDown() throws Exception { >- Fixture.tearDown(); >- } >- >- public void testInitialization() throws Exception { >- // ensures that the default WidgetCopyPhaseListener is registered >- // and executes at the designated phases >- Display display = new Display(); >- Composite shell = new Shell( display , SWT.NONE ); >- final Text text = new Text( shell, SWT.NONE ); >- text.setText( "hello" ); >- Fixture.markInitialized( display ); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- final StringBuffer log = new StringBuffer(); >- lifeCycle.addPhaseListener( new PhaseListener() { >- >- private static final long serialVersionUID = 1L; >- >- public void beforePhase( final PhaseEvent event ) { >- if( PhaseId.PROCESS_ACTION.equals( event.getPhaseId() ) ) { >- IWidgetAdapter adapter = WidgetUtil.getAdapter( text ); >- if( "hello".equals( adapter.getPreserved( Props.TEXT ) ) ) { >- log.append( "copy created" ); >- } >- } >- } >- >- public void afterPhase( final PhaseEvent event ) { >- } >- >- public PhaseId getPhaseId() { >- return PhaseId.ANY; >- } >- } ); >- Fixture.executeLifeCycleFromServerThread( ); >- assertEquals( "copy created", log.toString() ); >- } >- >- public void testExecutionOrder() { >- final StringBuffer log = new StringBuffer(); >- Fixture.fakeResponseWriter(); >- AdapterFactory lifeCycleAdapterFactory = new AdapterFactory() { >- >- private AdapterFactory factory = new LifeCycleAdapterFactory(); >- >- public Object getAdapter( final Object adaptable, final Class adapter ) { >- Object result = null; >- if( adaptable instanceof Display && adapter == ILifeCycleAdapter.class ) >- { >- result = new IDisplayLifeCycleAdapter() { >- public void preserveValues( final Display display ) { >- log.append( display.getClass().getName() ); >- } >- public void readData( Display display ) { >- } >- public void render( Display display ) throws IOException { >- } >- }; >- } else { >- result = new AbstractWidgetLCA() { >- public void preserveValues( final Widget widget ) { >- log.append( widget.getClass().getName() ); >- } >- public void readData( final Widget widget ) { >- } >- public void renderInitialization( final Widget widget ) throws IOException { >- } >- public void renderChanges( final Widget widget ) throws IOException >- { >- } >- public void renderDispose( final Widget widget ) throws IOException { >- } >- }; >- } >- return result; >- } >- >- public Class[] getAdapterList() { >- return factory.getAdapterList(); >- } >- }; >- Fixture.disposeOfServiceContext(); >- Fixture.createServiceContext(); >- AdapterManager manager = AdapterManagerImpl.getInstance(); >- manager.registerAdapters( lifeCycleAdapterFactory, Display.class ); >- manager.registerAdapters( lifeCycleAdapterFactory, Widget.class ); >- >- // Create test widget hierarchy >- Display display = new Display(); >- Composite shell = new Shell( display , SWT.NONE ); >- new Text( shell, SWT.NONE ); >- // Execute life cycle >- Fixture.markInitialized( display ); >- Fixture.executeLifeCycleFromServerThread( ); >- String expected = Display.class.getName() >- + Shell.class.getName() >- + Text.class.getName(); >- assertEquals( expected, log.toString() ); >- } >- >- public void testStartup() throws Exception { >- // Simulate startup with no startup entry point set >- // First request: (renders html skeletion that contains 'application') >- RWTFactory.getEntryPointManager().register( EntryPointManager.DEFAULT, TestEntryPointWithShell.class ); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); >- lifeCycle.execute(); >- // Second request: first 'real' one that writes JavaScript to create display >- Fixture.fakeResponseWriter(); >- fakeUIRootRequestParam( RWTLifeCycle.getSessionDisplay() ); >- lifeCycle.execute(); >- assertTrue( Fixture.getAllMarkup().indexOf( "setSpace" ) != -1 ); >- } >- >- public void testClearPreservedWithDisposedDisplay() { >- Fixture.fakePhase( PhaseId.RENDER ); >- Display display = new Display(); >- display.dispose(); >- try { >- PreserveWidgetsPhaseListener.clearPreserved( display ); >- } catch( Exception e ) { >- fail( "Preserve-phase-listener must succeed even with disposed display" ); >- } >- } >- >- private static void fakeUIRootRequestParam( final Display display ) { >- Object adapter = display.getAdapter( IWidgetAdapter.class ); >- IWidgetAdapter displayAdapter = ( IWidgetAdapter )adapter; >- Fixture.fakeRequestParam( RequestParams.UIROOT, displayAdapter.getId() ); >- } >-} >Index: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgets_Test.java >=================================================================== >RCS file: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgets_Test.java >diff -N src/org/eclipse/rwt/internal/lifecycle/PreserveWidgets_Test.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/rwt/internal/lifecycle/PreserveWidgets_Test.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,187 @@ >+/******************************************************************************* >+ * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH and others. >+ * 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 >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Innoopract Informationssysteme GmbH - initial API and implementation >+ * EclipseSource - ongoing development >+ * Frank Appel - replaced singletons and static fields (Bug 337787) >+ ******************************************************************************/ >+package org.eclipse.rwt.internal.lifecycle; >+ >+import java.io.IOException; >+ >+import junit.framework.TestCase; >+ >+import org.eclipse.rwt.AdapterFactory; >+import org.eclipse.rwt.Fixture; >+import org.eclipse.rwt.internal.AdapterManager; >+import org.eclipse.rwt.internal.AdapterManagerImpl; >+import org.eclipse.rwt.internal.engine.RWTFactory; >+import org.eclipse.rwt.lifecycle.*; >+import org.eclipse.swt.SWT; >+import org.eclipse.swt.internal.widgets.Props; >+import org.eclipse.swt.internal.widgets.displaykit.DisplayLCA; >+import org.eclipse.swt.widgets.*; >+ >+public class PreserveWidgets_Test extends TestCase { >+ >+ public static final class TestEntryPointWithShell implements IEntryPoint { >+ public int createUI() { >+ Display display = new Display(); >+ new Shell( display, SWT.NONE ); >+ int count = 0; >+ while( count < 1 ) { >+ if( !display.readAndDispatch() ) { >+ display.sleep(); >+ } >+ count++; >+ } >+ return 0; >+ } >+ } >+ >+ private static class LoggingLifeCycleAdapterFactory implements AdapterFactory { >+ >+ private final StringBuffer log; >+ >+ private LoggingLifeCycleAdapterFactory( StringBuffer log ) { >+ this.log = log; >+ } >+ >+ public Object getAdapter( final Object adaptable, final Class adapter ) { >+ Object result = null; >+ if( adaptable instanceof Display && adapter == ILifeCycleAdapter.class ) { >+ result = new IDisplayLifeCycleAdapter() { >+ public void preserveValues( final Display display ) { >+ log.append( display.getClass().getName() ); >+ } >+ public void readData( Display display ) { >+ } >+ public void render( Display display ) throws IOException { >+ } >+ public void clearPreserved( Display display ) { >+ } >+ }; >+ } else { >+ result = new AbstractWidgetLCA() { >+ public void preserveValues( final Widget widget ) { >+ log.append( widget.getClass().getName() ); >+ } >+ public void readData( final Widget widget ) { >+ } >+ public void renderInitialization( final Widget widget ) throws IOException { >+ } >+ public void renderChanges( final Widget widget ) throws IOException >+ { >+ } >+ public void renderDispose( final Widget widget ) throws IOException { >+ } >+ }; >+ } >+ return result; >+ } >+ >+ public Class[] getAdapterList() { >+ return new LifeCycleAdapterFactory().getAdapterList(); >+ } >+ } >+ >+ protected void setUp() throws Exception { >+ Fixture.setUp(); >+ Fixture.fakeNewRequest(); >+ } >+ >+ protected void tearDown() throws Exception { >+ Fixture.tearDown(); >+ } >+ >+ public void testInitialization() throws Exception { >+ // ensures that the default WidgetCopyPhaseListener is registered >+ // and executes at the designated phases >+ Display display = new Display(); >+ Composite shell = new Shell( display , SWT.NONE ); >+ final Text text = new Text( shell, SWT.NONE ); >+ text.setText( "hello" ); >+ Fixture.markInitialized( display ); >+ RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >+ final StringBuffer log = new StringBuffer(); >+ lifeCycle.addPhaseListener( new PhaseListener() { >+ private static final long serialVersionUID = 1L; >+ public void beforePhase( final PhaseEvent event ) { >+ if( PhaseId.PROCESS_ACTION.equals( event.getPhaseId() ) ) { >+ IWidgetAdapter adapter = WidgetUtil.getAdapter( text ); >+ if( "hello".equals( adapter.getPreserved( Props.TEXT ) ) ) { >+ log.append( "copy created" ); >+ } >+ } >+ } >+ public void afterPhase( final PhaseEvent event ) { >+ } >+ public PhaseId getPhaseId() { >+ return PhaseId.ANY; >+ } >+ } ); >+ Fixture.executeLifeCycleFromServerThread( ); >+ assertEquals( "copy created", log.toString() ); >+ } >+ >+ public void testExecutionOrder() { >+ StringBuffer log = new StringBuffer(); >+ installLoggingLifeCycleAdapterFactory( log ); >+ Display display = new Display(); >+ Composite shell = new Shell( display ); >+ new Text( shell, SWT.NONE ); >+ Fixture.markInitialized( display ); >+ new DisplayLCA().preserveValues( display ); >+ String expected = Shell.class.getName() + Text.class.getName(); >+ assertEquals( expected, log.toString() ); >+ } >+ >+ public void testPreserveValuesWhenDisplayIsUninitialized() { >+ StringBuffer log = new StringBuffer(); >+ installLoggingLifeCycleAdapterFactory( log ); >+ Display display = new Display(); >+ Composite shell = new Shell( display ); >+ new Text( shell, SWT.NONE ); >+ new DisplayLCA().preserveValues( display ); >+ assertEquals( "", log.toString() ); >+ } >+ >+ public void testStartup() throws Exception { >+ // Simulate startup with no startup entry point set >+ // First request: (renders html skeletion that contains 'application') >+ RWTFactory.getEntryPointManager().register( EntryPointManager.DEFAULT, >+ TestEntryPointWithShell.class ); >+ RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >+ lifeCycle.execute(); >+ // Second request: first 'real' one that writes JavaScript to create display >+ Fixture.fakeResponseWriter(); >+ Fixture.fakeNewRequest( RWTLifeCycle.getSessionDisplay() ); >+ lifeCycle.execute(); >+ assertTrue( Fixture.getAllMarkup().indexOf( "setSpace" ) != -1 ); >+ } >+ >+ public void testClearPreservedWithDisposedDisplay() { >+ Display display = new Display(); >+ display.dispose(); >+ Fixture.fakePhase( PhaseId.RENDER ); >+ try { >+ new DisplayLCA().clearPreserved( display ); >+ } catch( Exception e ) { >+ fail( "Preserve-phase-listener must succeed even with disposed display" ); >+ } >+ } >+ >+ private static void installLoggingLifeCycleAdapterFactory( StringBuffer log ) { >+ AdapterFactory lifeCycleAdapterFactory = new LoggingLifeCycleAdapterFactory( log ); >+ Fixture.disposeOfServiceContext(); >+ Fixture.createServiceContext(); >+ AdapterManager manager = AdapterManagerImpl.getInstance(); >+ manager.registerAdapters( lifeCycleAdapterFactory, Display.class ); >+ manager.registerAdapters( lifeCycleAdapterFactory, Widget.class ); >+ } >+} >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.8 >diff -u -r1.8 RenderDispose_Test.java >--- src/org/eclipse/rwt/internal/lifecycle/RenderDispose_Test.java 11 Apr 2011 21:11:56 -0000 1.8 >+++ src/org/eclipse/rwt/internal/lifecycle/RenderDispose_Test.java 19 Apr 2011 12:46:26 -0000 >@@ -22,9 +22,6 @@ > > public class RenderDispose_Test extends TestCase { > >- private final PreserveWidgetsPhaseListener preserveWidgetsPhaseListener >- = new PreserveWidgetsPhaseListener(); >- > public void testDisposeNotYetInitialized() { > // set up the test widget hierarchy > Display display = new Display(); >@@ -68,7 +65,6 @@ > protected void setUp() throws Exception { > Fixture.setUp(); > Fixture.fakeResponseWriter(); >- RWTFactory.getPhaseListenerRegistry().add( preserveWidgetsPhaseListener ); > } > > protected void tearDown() throws Exception { >Index: src/org/eclipse/rwt/internal/textsize/MeasurementHandler_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/internal/textsize/MeasurementHandler_Test.java,v >retrieving revision 1.1 >diff -u -r1.1 MeasurementHandler_Test.java >--- src/org/eclipse/rwt/internal/textsize/MeasurementHandler_Test.java 18 Apr 2011 11:59:11 -0000 1.1 >+++ src/org/eclipse/rwt/internal/textsize/MeasurementHandler_Test.java 19 Apr 2011 12:46:26 -0000 >@@ -31,7 +31,6 @@ > > // Let pass one startup request to init the 'system' > Fixture.fakeNewRequest( display ); >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > RWTFactory.getPhaseListenerRegistry().add( new CurrentPhase.Listener() ); > RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); > ISessionStore session = ContextProvider.getSession(); >Index: src/org/eclipse/rwt/lifecycle/ControlLCAUtil_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/lifecycle/ControlLCAUtil_Test.java,v >retrieving revision 1.31 >diff -u -r1.31 ControlLCAUtil_Test.java >--- src/org/eclipse/rwt/lifecycle/ControlLCAUtil_Test.java 18 Apr 2011 07:53:23 -0000 1.31 >+++ src/org/eclipse/rwt/lifecycle/ControlLCAUtil_Test.java 19 Apr 2011 12:46:26 -0000 >@@ -348,7 +348,6 @@ > } > > public void testProcessKeyEventsWithDoItFlag() { >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > RWTFactory.getPhaseListenerRegistry().add( new CurrentPhase.Listener() ); > final java.util.List eventLog = new ArrayList(); > Listener doitTrueListener = new Listener() { >@@ -409,7 +408,6 @@ > } > > public void testProcessTraverseEventsWithDoItFlag() { >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > RWTFactory.getPhaseListenerRegistry().add( new CurrentPhase.Listener() ); > final java.util.List eventLog = new ArrayList(); > Listener doitTrueListener = new Listener() { >@@ -461,7 +459,6 @@ > } > > public void testKeyAndTraverseEvents() { >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > RWTFactory.getPhaseListenerRegistry().add( new CurrentPhase.Listener() ); > final java.util.List eventLog = new ArrayList(); > Display display = new Display(); >Index: src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA_Test.java,v >retrieving revision 1.9 >diff -u -r1.9 CComboLCA_Test.java >--- src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA_Test.java 18 Apr 2011 09:59:11 -0000 1.9 >+++ src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA_Test.java 19 Apr 2011 12:46:26 -0000 >@@ -18,8 +18,7 @@ > > import org.eclipse.rwt.Fixture; > import org.eclipse.rwt.graphics.Graphics; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.*; >+import org.eclipse.rwt.internal.lifecycle.JSConst; > import org.eclipse.rwt.lifecycle.*; > import org.eclipse.swt.SWT; > import org.eclipse.swt.custom.CCombo; >@@ -261,8 +260,6 @@ > } > > public void testReadText() { >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); > final CCombo ccombo = new CCombo( shell, SWT.NONE ); >@@ -302,9 +299,6 @@ > > public void testTextSelectionWithVerifyEvent() { > final java.util.List log = new ArrayList(); >- // register preserve-values phase-listener >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); > final CCombo ccombo = new CCombo( shell, SWT.NONE ); >@@ -429,8 +423,6 @@ > } ); > > String buttonId = WidgetUtil.getId( button ); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > > // Execute life cycle once to simulate startup request > Fixture.fakeNewRequest( display ); >Index: src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA_Test.java,v >retrieving revision 1.11 >diff -u -r1.11 CTabFolderLCA_Test.java >--- src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA_Test.java 18 Apr 2011 07:53:23 -0000 1.11 >+++ src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -359,7 +359,6 @@ > > // Let pass one startup request to init the 'system' > Fixture.fakeNewRequest( display ); >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > RWTFactory.getPhaseListenerRegistry().add( new CurrentPhase.Listener() ); > Fixture.executeLifeCycleFromServerThread( ); > >Index: src/org/eclipse/swt/internal/dnd/dragsourcekit/DragSourceLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/dnd/dragsourcekit/DragSourceLCA_Test.java,v >retrieving revision 1.5 >diff -u -r1.5 DragSourceLCA_Test.java >--- src/org/eclipse/swt/internal/dnd/dragsourcekit/DragSourceLCA_Test.java 18 Apr 2011 07:53:24 -0000 1.5 >+++ src/org/eclipse/swt/internal/dnd/dragsourcekit/DragSourceLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -12,8 +12,6 @@ > import junit.framework.TestCase; > > import org.eclipse.rwt.Fixture; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener; > import org.eclipse.rwt.lifecycle.PhaseId; > import org.eclipse.swt.SWT; > import org.eclipse.swt.dnd.DND; >@@ -25,7 +23,6 @@ > > protected void setUp() throws Exception { > Fixture.setUp(); >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > } > > protected void tearDown() throws Exception { >Index: src/org/eclipse/swt/internal/widgets/combokit/ComboLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/combokit/ComboLCA_Test.java,v >retrieving revision 1.13 >diff -u -r1.13 ComboLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/combokit/ComboLCA_Test.java 18 Apr 2011 09:59:11 -0000 1.13 >+++ src/org/eclipse/swt/internal/widgets/combokit/ComboLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -19,7 +19,6 @@ > > import org.eclipse.rwt.Fixture; > import org.eclipse.rwt.graphics.Graphics; >-import org.eclipse.rwt.internal.engine.RWTFactory; > import org.eclipse.rwt.internal.lifecycle.*; > import org.eclipse.rwt.lifecycle.*; > import org.eclipse.swt.SWT; >@@ -257,8 +256,6 @@ > } > > public void testReadText() { >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); > final Combo combo = new Combo( shell, SWT.BORDER ); >@@ -299,9 +296,6 @@ > > public void testTextSelectionWithVerifyEvent() { > final java.util.List log = new ArrayList(); >- // register preserve-values phase-listener >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); > final Combo combo = new Combo( shell, SWT.NONE ); >@@ -394,8 +388,6 @@ > } ); > > String buttonId = WidgetUtil.getId( button ); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > > // Execute life cycle once to simulate startup request > Fixture.fakeNewRequest( display ); >Index: src/org/eclipse/swt/internal/widgets/displaykit/DNDSupport_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/displaykit/DNDSupport_Test.java,v >retrieving revision 1.10 >diff -u -r1.10 DNDSupport_Test.java >--- src/org/eclipse/swt/internal/widgets/displaykit/DNDSupport_Test.java 18 Apr 2011 07:53:23 -0000 1.10 >+++ src/org/eclipse/swt/internal/widgets/displaykit/DNDSupport_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -15,8 +15,6 @@ > import junit.framework.TestCase; > > import org.eclipse.rwt.Fixture; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener; > import org.eclipse.rwt.lifecycle.PhaseId; > import org.eclipse.rwt.lifecycle.WidgetUtil; > import org.eclipse.swt.SWT; >@@ -63,7 +61,6 @@ > > protected void setUp() throws Exception { > Fixture.setUp(); >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > Fixture.fakePhase( PhaseId.PROCESS_ACTION ); > display = new Display(); > shell = new Shell( display ); >Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFocus_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFocus_Test.java,v >retrieving revision 1.5 >diff -u -r1.5 DisplayLCAFocus_Test.java >--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFocus_Test.java 18 Apr 2011 07:53:23 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFocus_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -14,7 +14,6 @@ > import junit.framework.TestCase; > > import org.eclipse.rwt.Fixture; >-import org.eclipse.rwt.internal.engine.RWTFactory; > import org.eclipse.rwt.internal.lifecycle.*; > import org.eclipse.rwt.lifecycle.WidgetUtil; > import org.eclipse.swt.SWT; >@@ -39,8 +38,6 @@ > shell.layout(); > shell.open(); > >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > String button1Id = WidgetUtil.getId( button1 ); > > // Simulate initial request that constructs UI >@@ -75,8 +72,6 @@ > shell.layout(); > shell.open(); > >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > String buttonId = WidgetUtil.getId( button ); > > // Simulate initial request that constructs UI >Index: src/org/eclipse/swt/internal/widgets/menukit/MenuLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/menukit/MenuLCA_Test.java,v >retrieving revision 1.7 >diff -u -r1.7 MenuLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/menukit/MenuLCA_Test.java 18 Apr 2011 07:53:23 -0000 1.7 >+++ src/org/eclipse/swt/internal/widgets/menukit/MenuLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -15,9 +15,6 @@ > import junit.framework.TestCase; > > import org.eclipse.rwt.Fixture; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener; >-import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle; > import org.eclipse.rwt.lifecycle.IWidgetAdapter; > import org.eclipse.rwt.lifecycle.WidgetUtil; > import org.eclipse.swt.SWT; >@@ -156,10 +153,6 @@ > assertTrue( Fixture.getAllMarkup().indexOf( "setSpace" ) == -1 ); > // Simulate client-side size-change of shell: menuBar must render new size > Fixture.clearPreserved(); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- PreserveWidgetsPhaseListener preserveListener >- = new PreserveWidgetsPhaseListener(); >- lifeCycle.addPhaseListener( preserveListener ); > shell.setMenuBar( menuBar ); > String shellId = WidgetUtil.getId( shell ); > String menuId = WidgetUtil.getId( menuBar ); >@@ -173,7 +166,6 @@ > Fixture.executeLifeCycleFromServerThread( ); > String expected = "wm.findWidgetById( \"" + menuId + "\" );w.setSpace"; > assertTrue( Fixture.getAllMarkup().indexOf( expected ) != -1 ); >- lifeCycle.removePhaseListener( preserveListener ); > } > > private void testPreserveMenuListener( final Menu menu ) { >Index: src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA_Test.java,v >retrieving revision 1.21 >diff -u -r1.21 ShellLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA_Test.java 18 Apr 2011 07:53:23 -0000 1.21 >+++ src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -11,13 +11,13 @@ > ******************************************************************************/ > package org.eclipse.swt.internal.widgets.shellkit; > >+import java.io.IOException; >+ > import junit.framework.TestCase; > > import org.eclipse.rwt.Fixture; > import org.eclipse.rwt.graphics.Graphics; >-import org.eclipse.rwt.internal.engine.RWTFactory; > import org.eclipse.rwt.internal.lifecycle.JSConst; >-import org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener; > import org.eclipse.rwt.lifecycle.*; > import org.eclipse.swt.SWT; > import org.eclipse.swt.events.*; >@@ -25,6 +25,7 @@ > import org.eclipse.swt.internal.events.*; > import org.eclipse.swt.internal.graphics.ImageFactory; > import org.eclipse.swt.internal.widgets.*; >+import org.eclipse.swt.internal.widgets.displaykit.DisplayLCA; > import org.eclipse.swt.widgets.*; > > >@@ -287,7 +288,6 @@ > activeShell.open(); > String shellToActivateId = WidgetUtil.getId( shellToActivate ); > // Set precondition and assert it >- RWTFactory.getPhaseListenerRegistry().add( new PreserveWidgetsPhaseListener() ); > activeShell.setActive(); > assertSame( activeShell, display.getActiveShell() ); > // Simulate shell activation without event listeners >@@ -447,17 +447,15 @@ > } > > // see bug 223879 >- public void testRenderPopupMenu() { >+ public void testRenderPopupMenu() throws IOException { > Fixture.markInitialized( display ); > Shell shell = new Shell( display , SWT.NONE ); > shell.setMinimumSize( 100, 100 ); > Menu menu = new Menu( shell, SWT.POP_UP ); >- MenuItem item = new MenuItem( menu, SWT.PUSH ); >- item.setText( "Popup" ); > shell.setMenu( menu ); > Fixture.fakeResponseWriter(); > Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ new DisplayLCA().render( display ); > String markup = Fixture.getAllMarkup(); > String createMenuScript > = "var w = new org.eclipse.rwt.widgets.Menu();" >Index: src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java,v >retrieving revision 1.8 >diff -u -r1.8 TabFolderLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java 11 Apr 2011 14:58:47 -0000 1.8 >+++ src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -17,7 +17,6 @@ > > import org.eclipse.rwt.Fixture; > import org.eclipse.rwt.graphics.Graphics; >-import org.eclipse.rwt.internal.engine.RWTFactory; > import org.eclipse.rwt.internal.lifecycle.*; > import org.eclipse.rwt.internal.service.RequestParams; > import org.eclipse.rwt.lifecycle.IWidgetAdapter; >@@ -165,14 +164,10 @@ > item1.setControl( control1 ); > shell.open(); > >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); >- String displayId = DisplayUtil.getAdapter( display ).getId(); > String folderId = WidgetUtil.getId( folder ); > String item1Id = WidgetUtil.getId( item1 ); > >- Fixture.fakeNewRequest(); >- Fixture.fakeRequestParam( RequestParams.UIROOT, displayId ); >+ Fixture.fakeNewRequest( display ); > Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED, folderId ); > Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED_ITEM, item1Id ); > Fixture.readDataAndProcessAction( display ); >@@ -203,8 +198,6 @@ > } > } ); > >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > String displayId = DisplayUtil.getAdapter( display ).getId(); > String item1Id = WidgetUtil.getId( item1 ); > String folderId = WidgetUtil.getId( folder ); >Index: src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA_Test.java,v >retrieving revision 1.9 >diff -u -r1.9 TableColumnLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA_Test.java 18 Apr 2011 09:59:11 -0000 1.9 >+++ src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -16,9 +16,6 @@ > > import org.eclipse.rwt.Fixture; > import org.eclipse.rwt.graphics.Graphics; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener; >-import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle; > import org.eclipse.rwt.lifecycle.IWidgetAdapter; > import org.eclipse.rwt.lifecycle.WidgetUtil; > import org.eclipse.swt.SWT; >@@ -157,8 +154,6 @@ > } > } ); > String columnId = WidgetUtil.getId( column ); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > // > Fixture.fakeNewRequest( display ); > Fixture.executeLifeCycleFromServerThread( ); >Index: src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java,v >retrieving revision 1.39 >diff -u -r1.39 TableLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java 18 Apr 2011 07:53:23 -0000 1.39 >+++ src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java 19 Apr 2011 12:46:27 -0000 >@@ -502,7 +502,6 @@ > public void testClearVirtual() { > Fixture.fakePhase( PhaseId.PROCESS_ACTION ); > RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > shell.setSize( 100, 100 ); > shell.setLayout( new FillLayout() ); > final Table table = new Table( shell, SWT.VIRTUAL ); >Index: src/org/eclipse/swt/internal/widgets/textkit/TextLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/textkit/TextLCA_Test.java,v >retrieving revision 1.17 >diff -u -r1.17 TextLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/textkit/TextLCA_Test.java 18 Apr 2011 07:53:24 -0000 1.17 >+++ src/org/eclipse/swt/internal/widgets/textkit/TextLCA_Test.java 19 Apr 2011 12:46:28 -0000 >@@ -18,8 +18,7 @@ > import junit.framework.TestCase; > > import org.eclipse.rwt.Fixture; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.*; >+import org.eclipse.rwt.internal.lifecycle.JSConst; > import org.eclipse.rwt.lifecycle.*; > import org.eclipse.swt.SWT; > import org.eclipse.swt.events.*; >@@ -32,11 +31,13 @@ > > private Display display; > private Shell shell; >+ private TextLCA textLCA; > > protected void setUp() throws Exception { > Fixture.setUp(); > Fixture.fakePhase( PhaseId.PROCESS_ACTION ); > Fixture.fakeResponseWriter(); >+ textLCA = new TextLCA(); > display = new Display(); > shell = new Shell( display ); > } >@@ -96,7 +97,6 @@ > Fixture.markInitialized( text ); > Fixture.clearPreserved(); > Fixture.preserveWidgets(); >- TextLCA textLCA = new TextLCA(); > text.setText( "hello" ); > textLCA.renderChanges( text ); > assertTrue( Fixture.getAllMarkup().endsWith( "setValue( \"hello\" );" ) ); >@@ -114,7 +114,6 @@ > Fixture.markInitialized( text ); > Fixture.clearPreserved(); > Fixture.preserveWidgets(); >- TextLCA textLCA = new TextLCA(); > char[] value = new char[] { 'h', 'e', 'l', 0, 'l', 'o' }; > text.setText( String.valueOf( value ) ); > textLCA.renderChanges( text ); >@@ -163,8 +162,6 @@ > public void testSelectionWithVerifyEvent() { > final java.util.List log = new ArrayList(); > // register preserve-values phase-listener >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > final Text text = new Text( shell, SWT.NONE ); > shell.open(); > String textId = WidgetUtil.getId( text ); >@@ -240,8 +237,6 @@ > } > > public void testPreserveText() { >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > Text text = new Text( shell, SWT.SINGLE ); > shell.open(); > Fixture.markInitialized( display ); >@@ -262,9 +257,6 @@ > > public void testVerifyAndModifyEvent() { > final java.util.List log = new ArrayList(); >- // register preserve-values phase-listener >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > // set up widgets to be tested > final Text text = new Text( shell, SWT.NONE ); > shell.open(); >@@ -294,12 +286,11 @@ > > public void testTextLimit() throws IOException { > Text text = new Text( shell, SWT.NONE ); >- TextLCA lca = new TextLCA(); > // run LCA one to dump the here uninteresting prolog >- lca.renderChanges( text ); >+ textLCA.renderChanges( text ); > // Initially no textLimit must be rendered if the initial value is untouched > Fixture.fakeResponseWriter(); >- lca.renderChanges( text ); >+ textLCA.renderChanges( text ); > assertEquals( -1, Fixture.getAllMarkup().indexOf( "setMaxLength" ) ); > // Positive textLimit is written as setMaxLength( ... ) > Fixture.fakeResponseWriter(); >@@ -307,7 +298,7 @@ > Fixture.clearPreserved(); > Fixture.preserveWidgets(); > text.setTextLimit( 12 ); >- lca.renderChanges( text ); >+ textLCA.renderChanges( text ); > String expected = "setMaxLength( 12 );"; > assertTrue( Fixture.getAllMarkup().indexOf( expected ) != -1 ); > // Negative textLimit is tread as 'no limit' >@@ -316,56 +307,58 @@ > Fixture.clearPreserved(); > Fixture.preserveWidgets(); > text.setTextLimit( -50 ); >- lca.renderChanges( text ); >+ textLCA.renderChanges( text ); > expected = "setMaxLength( null );"; > assertTrue( Fixture.getAllMarkup().indexOf( expected ) != -1 ); > } > >- public void testEchoCharMultiLine() { >+ public void testEchoCharMultiLine() throws IOException { > Fixture.fakeNewRequest( display ); > Text text = new Text( shell, SWT.MULTI ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > String markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode" ) == -1 ); >+ >+ Fixture.preserveWidgets(); > text.setEchoChar( ( char )27 ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > assertTrue( markup.indexOf( "setPasswordMode" ) == -1 ); > } > >- public void testEchoCharSingleLine() { >+ public void testEchoCharSingleLine() throws IOException { > Text text = new Text( shell, SWT.SINGLE ); >- Fixture.markInitialized( display ); >- Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > String markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode" ) == -1 ); >+ >+ Fixture.preserveWidgets(); > text.setEchoChar( ( char )27 ); >- Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode( true )" ) != -1 ); >+ >+ Fixture.preserveWidgets(); > text.setEchoChar( ( char )0 ); >- Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode( false )" ) != -1 ); > } > >- public void testEchoCharPassword() { >+ public void testEchoCharPassword() throws IOException { > Text text = new Text( shell, SWT.PASSWORD ); >- Fixture.markInitialized( display ); >- Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > String markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode( true )" ) != -1 ); >+ >+ Fixture.preserveWidgets(); > text.setEchoChar( ( char )0 ); >- Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode( false )" ) != -1 ); >+ >+ Fixture.preserveWidgets(); > text.setEchoChar( ( char )27 ); >- Fixture.fakeNewRequest( display ); >- Fixture.executeLifeCycleFromServerThread(); >+ textLCA.render( text ); > markup = Fixture.getAllMarkup(); > assertTrue( markup.indexOf( "setPasswordMode( true )" ) != -1 ); > } >@@ -493,7 +486,7 @@ > = "org.eclipse.swt.TextUtil.setHasVerifyOrModifyListener( w, true )"; > Text text = new Text( shell, SWT.READ_ONLY ); > text.addModifyListener( createModifyListener() ); >- new TextLCA().renderChanges( text ); >+ textLCA.renderChanges( text ); > assertTrue( Fixture.getAllMarkup().indexOf( setHasModifyListener ) != -1 ); > } > >@@ -506,7 +499,7 @@ > Fixture.markInitialized( text ); > Fixture.preserveWidgets(); > text.setEditable( true ); >- new TextLCA().renderChanges( text ); >+ textLCA.renderChanges( text ); > assertTrue( Fixture.getAllMarkup().indexOf( setHasModifyListener ) != -1 ); > } > >@@ -515,7 +508,7 @@ > Fixture.markInitialized( text ); > Fixture.preserveWidgets(); > text.setText( "abc\u2028abc\u2029abc" ); >- new TextLCA().renderChanges( text ); >+ textLCA.renderChanges( text ); > String expected = "w.setValue( \"abcabcabc\" );"; > assertTrue( Fixture.getAllMarkup().indexOf( expected ) != -1 ); > } >@@ -525,7 +518,7 @@ > Fixture.markInitialized( text ); > Fixture.preserveWidgets(); > text.setText( "abc\u2028abc\u2029abc" ); >- new TextLCA().renderChanges( text ); >+ textLCA.renderChanges( text ); > String expected = "w.setValue( \"abcabcabc\" );"; > assertTrue( Fixture.getAllMarkup().indexOf( expected ) != -1 ); > } >@@ -535,7 +528,7 @@ > Fixture.markInitialized( text ); > Fixture.preserveWidgets(); > text.setText( "abc\u2028abc\u2029abc" ); >- new TextLCA().renderChanges( text ); >+ textLCA.renderChanges( text ); > String expected = "w.setValue( \"abcabcabc\" );"; > assertTrue( Fixture.getAllMarkup().indexOf( expected ) != -1 ); > } >Index: src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA_Test.java,v >retrieving revision 1.10 >diff -u -r1.10 TreeColumnLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA_Test.java 18 Apr 2011 09:59:11 -0000 1.10 >+++ src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA_Test.java 19 Apr 2011 12:46:28 -0000 >@@ -17,9 +17,6 @@ > > import org.eclipse.rwt.Fixture; > import org.eclipse.rwt.graphics.Graphics; >-import org.eclipse.rwt.internal.engine.RWTFactory; >-import org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener; >-import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle; > import org.eclipse.rwt.lifecycle.IWidgetAdapter; > import org.eclipse.rwt.lifecycle.WidgetUtil; > import org.eclipse.swt.SWT; >@@ -155,8 +152,6 @@ > } > } ); > String columnId = WidgetUtil.getId( column ); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() ); > // > Fixture.fakeNewRequest( display ); > Fixture.executeLifeCycleFromServerThread(); >#P org.eclipse.rap.rwt.test >Index: src/org/eclipse/rwt/internal/engine/PhaseListenerRegistry_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/rwt/internal/engine/PhaseListenerRegistry_Test.java,v >retrieving revision 1.11 >diff -u -r1.11 PhaseListenerRegistry_Test.java >--- src/org/eclipse/rwt/internal/engine/PhaseListenerRegistry_Test.java 17 Apr 2011 12:21:58 -0000 1.11 >+++ src/org/eclipse/rwt/internal/engine/PhaseListenerRegistry_Test.java 19 Apr 2011 12:46:30 -0000 >@@ -51,7 +51,6 @@ > Fixture.createServiceContext(); > > assertEquals( true, findPhaseListener( CurrentPhase.Listener.class ) ); >- assertEquals( true, findPhaseListener( PreserveWidgetsPhaseListener.class ) ); > } > > public void testAdd() { >#P org.eclipse.rap.rwt.test.mockup >Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test.mockup/src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java,v >retrieving revision 1.8 >diff -u -r1.8 DisplayLCAFacadeImpl.java >--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java 11 Apr 2011 21:12:00 -0000 1.8 >+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCAFacadeImpl.java 19 Apr 2011 12:46:31 -0000 >@@ -35,6 +35,8 @@ > JavaScriptResponseWriter responseWriter = stateInfo.getResponseWriter(); > responseWriter.write( "Render Fake" ); > } >+ public void clearPreserved( Display display ) { >+ } > }; > } > >#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.32 >diff -u -r1.32 Fixture.java >--- src/org/eclipse/rwt/Fixture.java 18 Apr 2011 12:23:38 -0000 1.32 >+++ src/org/eclipse/rwt/Fixture.java 19 Apr 2011 12:46:33 -0000 >@@ -260,17 +260,21 @@ > } > > public static void preserveWidgets() { >- PreserveWidgetsPhaseListener listener = new PreserveWidgetsPhaseListener(); >- RWTLifeCycle lifeCycle = ( RWTLifeCycle )RWTFactory.getLifeCycleFactory().getLifeCycle(); >- PhaseEvent event = new PhaseEvent( lifeCycle, PhaseId.READ_DATA ); >- listener.afterPhase( event ); >+ Display display = RWTLifeCycle.getSessionDisplay(); >+ IDisplayLifeCycleAdapter displayLCA = DisplayUtil.getLCA( display ); >+ PhaseId bufferedPhaseId = CurrentPhase.get(); >+ fakePhase( PhaseId.READ_DATA ); >+ displayLCA.preserveValues( display ); >+ fakePhase( bufferedPhaseId ); > } > > public static void clearPreserved() { >- PreserveWidgetsPhaseListener listener = new PreserveWidgetsPhaseListener(); >- ILifeCycle lifeCycle = RWTFactory.getLifeCycleFactory().getLifeCycle(); >- PhaseEvent event = new PhaseEvent( lifeCycle, PhaseId.RENDER ); >- listener.afterPhase( event ); >+ Display display = RWTLifeCycle.getSessionDisplay(); >+ IDisplayLifeCycleAdapter displayLCA = DisplayUtil.getLCA( display ); >+ PhaseId bufferedPhaseId = CurrentPhase.get(); >+ fakePhase( PhaseId.RENDER ); >+ displayLCA.clearPreserved( display ); >+ fakePhase( bufferedPhaseId ); > } > > public static String getAllMarkup() { >#P org.eclipse.rap.ui >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui/plugin.xml,v >retrieving revision 1.34 >diff -u -r1.34 plugin.xml >--- plugin.xml 3 Mar 2011 12:29:01 -0000 1.34 >+++ plugin.xml 19 Apr 2011 12:46:35 -0000 >@@ -2394,12 +2394,6 @@ > </extension> > > <extension >- id="org.eclipse.ui.workbench.preserveWidgetValues" >- point="org.eclipse.rap.ui.phaselistener"> >- <listener class="org.eclipse.rwt.internal.lifecycle.PreserveWidgetsPhaseListener"/> >- </extension> >- >- <extension > id="org.eclipse.ui.workbench.currentPhase" > point="org.eclipse.rap.ui.phaselistener"> > <listener class="org.eclipse.rwt.internal.lifecycle.CurrentPhase$Listener"/>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 341760
: 193574