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 143932 Details for
Bug 281909
Remove obsolete code for widget pooling
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]
Replaces the previous patch
pooling.diff (text/plain), 132.99 KB, created by
Ralf Sternberg
on 2009-08-10 13:41:54 EDT
(
hide
)
Description:
Replaces the previous patch
Filename:
MIME Type:
Creator:
Ralf Sternberg
Created:
2009-08-10 13:41:54 EDT
Size:
132.99 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.ui.forms >Index: rap/org/eclipse/ui/forms/internal/widgets/hyperlinkkit/HyperlinkLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.forms/rap/org/eclipse/ui/forms/internal/widgets/hyperlinkkit/HyperlinkLCA.java,v >retrieving revision 1.7 >diff -u -r1.7 HyperlinkLCA.java >--- rap/org/eclipse/ui/forms/internal/widgets/hyperlinkkit/HyperlinkLCA.java 13 Jul 2009 12:15:38 -0000 1.7 >+++ rap/org/eclipse/ui/forms/internal/widgets/hyperlinkkit/HyperlinkLCA.java 10 Aug 2009 17:42:18 -0000 >@@ -50,15 +50,6 @@ > "org.eclipse.ui.forms.widgets.Hyperlink.onClick", //$NON-NLS-1$ > JSListenerType.ACTION ); > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > public void readData( final Widget widget ) { > ControlLCAUtil.processSelection( widget, null, false ); > WidgetLCAUtil.processHelp( widget ); >Index: rap/org/eclipse/ui/forms/internal/widgets/togglehyperlinkkit/ToggleHyperlinkLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.forms/rap/org/eclipse/ui/forms/internal/widgets/togglehyperlinkkit/ToggleHyperlinkLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 ToggleHyperlinkLCA.java >--- rap/org/eclipse/ui/forms/internal/widgets/togglehyperlinkkit/ToggleHyperlinkLCA.java 4 Jun 2009 11:45:28 -0000 1.4 >+++ rap/org/eclipse/ui/forms/internal/widgets/togglehyperlinkkit/ToggleHyperlinkLCA.java 10 Aug 2009 17:42:18 -0000 >@@ -89,15 +89,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > //////////////// > // Write changes > >Index: rap/org/eclipse/ui/forms/internal/widgets/formtextkit/FormTextLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.forms/rap/org/eclipse/ui/forms/internal/widgets/formtextkit/FormTextLCA.java,v >retrieving revision 1.6 >diff -u -r1.6 FormTextLCA.java >--- rap/org/eclipse/ui/forms/internal/widgets/formtextkit/FormTextLCA.java 30 Mar 2009 10:09:41 -0000 1.6 >+++ rap/org/eclipse/ui/forms/internal/widgets/formtextkit/FormTextLCA.java 10 Aug 2009 17:42:18 -0000 >@@ -79,15 +79,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > //////////////// > // Write changes > >#P org.eclipse.rap.rwt.q07.test >Index: src/org/eclipse/rwt/lifecycle/JSWriter_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/lifecycle/JSWriter_Test.java,v >retrieving revision 1.5 >diff -u -r1.5 JSWriter_Test.java >--- src/org/eclipse/rwt/lifecycle/JSWriter_Test.java 27 Apr 2009 18:46:13 -0000 1.5 >+++ src/org/eclipse/rwt/lifecycle/JSWriter_Test.java 10 Aug 2009 17:42:19 -0000 >@@ -102,16 +102,14 @@ > String expected > = "var wm = org.eclipse.swt.WidgetManager.getInstance();" > + "var w = wm.newWidget( \"w2\", \"w3\", true, " >- + getTypePoolIdHash( shell.button ) >- + ", \"qx.ui.form.Button\" );"; >+ + "\"qx.ui.form.Button\" );"; > assertEquals( expected, Fixture.getAllMarkup() ); > // ensure that the WidgetManager, once initialized, is not initialized > // twice > writer = JSWriter.getWriterFor( shell.button ); > writer.newWidget( "qx.ui.form.Button" ); > expected += "var w = wm.newWidget( \"w2\", \"w3\", true, " >- + getTypePoolIdHash( shell.button ) >- + ", \"qx.ui.form.Button\" );"; >+ + "\"qx.ui.form.Button\" );"; > assertEquals( expected, Fixture.getAllMarkup() ); > // ensure that obtaining the widget reference (var w =) is only rendered > // once >@@ -121,11 +119,6 @@ > display.dispose(); > } > >- private String getTypePoolId( final Widget widget ) { >- AbstractWidgetLCA lca = WidgetUtil.getLCA( widget ); >- return lca.getTypePoolId( widget ); >- } >- > public void testNewWidget() throws Exception { > Display display = new Display(); > TestShell shell = new TestShell( display ); >@@ -134,8 +127,7 @@ > String expected > = "var wm = org.eclipse.swt.WidgetManager.getInstance();" > + "var w = wm.newWidget( \"w2\", \"w3\", true, " >- + getTypePoolIdHash( shell.button ) >- + ", \"qx.ui.form.Button\" );"; >+ + "\"qx.ui.form.Button\" );"; > assertEquals( expected, Fixture.getAllMarkup() ); > // Ensures that the "widget reference is set"-flag is set > Fixture.fakeResponseWriter(); >@@ -144,56 +136,6 @@ > assertEquals( expected, Fixture.getAllMarkup() ); > display.dispose(); > } >- >- public void testNewWidgetWithTypePoolId() throws IOException { >- Display display = new Display(); >- TestShell shell = new TestShell( display ); >- Widget widget = new Widget( shell, SWT.NONE ) { >- public Object getAdapter( final Class adapter ) { >- Object result; >- if( adapter == ILifeCycleAdapter.class ) { >- result = new AbstractWidgetLCA() { >- >- public void preserveValues( Widget widget ) { >- } >- >- public void renderChanges( Widget widget ) throws IOException { >- } >- >- public void renderDispose( Widget widget ) throws IOException { >- } >- >- public void renderInitialization( Widget widget ) >- throws IOException >- { >- } >- >- public void readData( Widget widget ) { >- } >- public String getTypePoolId( Widget widget ) { >- return "myWidgetPoolId"; >- } >- >- }; >- } else { >- result = super.getAdapter( adapter ); >- } >- return result; >- } >- }; >- JSWriter writer = JSWriter.getWriterFor( widget ); >- writer.newWidget( "qx.ui.widget" ); >- String expected >- = "var wm = org.eclipse.swt.WidgetManager.getInstance();" >- + "var w = wm.newWidget( \"w2\", \"\", false, 767544711, " >- + "\"qx.ui.widget\" );"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- } >- >- private String getTypePoolIdHash( final Widget widget ) { >- String id = getTypePoolId( widget ); >- return id == null ? null : String.valueOf( id.hashCode() ); >- } > > public void testNewWidgetWithParams() throws Exception { > Display display = new Display(); >@@ -207,8 +149,7 @@ > String expected > = "var wm = org.eclipse.swt.WidgetManager.getInstance();" > + "var w = wm.newWidget( \"w2\", \"w3\", true, " >- + getTypePoolIdHash( shell.button ) >- + ", \"qx.ui.form.Button\", '\"abc\", [\"#ff0000\" ]' );"; >+ + "\"qx.ui.form.Button\", '\"abc\", [\"#ff0000\" ]' );"; > assertEquals( expected, Fixture.getAllMarkup() ); > // Ensures that the "widget reference is set"-flag is set > Fixture.fakeResponseWriter(); >@@ -222,23 +163,33 @@ > writer.newWidget( "TreeItem", null ); > expected > = "var w = wm.newWidget( \"w4\", \"\", false, " >- + getTypePoolIdHash( item ) >- + ", \"TreeItem\" );"; >+ + "\"TreeItem\" );"; > assertEquals( expected, Fixture.getAllMarkup() ); > } > > public void testResetJSProperty() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >+ Display display = new Display(); >+ Shell shell = new Shell( display ); >+ JSWriter writer = JSWriter.getWriterFor( shell ); > Fixture.fakeResponseWriter(); > writer.reset( "testProperty" ); >- assertEquals( "w.resetTestProperty();", Fixture.getAllMarkup() ); >+ String expected = "var wm = org.eclipse.swt.WidgetManager.getInstance();" >+ + "var w = wm.findWidgetById( \"" >+ + WidgetUtil.getId( shell ) >+ + "\" );w.resetTestProperty();"; >+ assertEquals( expected, Fixture.getAllMarkup() ); > } > > public void testResetJSPropertyChain() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >+ Display display = new Display(); >+ Shell shell = new Shell( display ); >+ JSWriter writer = JSWriter.getWriterFor( shell ); > Fixture.fakeResponseWriter(); > writer.reset( new String[] { "labelObject", "testProperty" } ); >- String expected = "w.getLabelObject().resetTestProperty();"; >+ String expected = "var wm = org.eclipse.swt.WidgetManager.getInstance();" >+ + "var w = wm.findWidgetById( \"" >+ + WidgetUtil.getId( shell ) >+ + "\" );w.getLabelObject().resetTestProperty();"; > assertEquals( expected, Fixture.getAllMarkup() ); > } > >Index: src/org/eclipse/rwt/lifecycle/WidgetLCAUtil_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/lifecycle/WidgetLCAUtil_Test.java,v >retrieving revision 1.8 >diff -u -r1.8 WidgetLCAUtil_Test.java >--- src/org/eclipse/rwt/lifecycle/WidgetLCAUtil_Test.java 9 Dec 2008 16:03:03 -0000 1.8 >+++ src/org/eclipse/rwt/lifecycle/WidgetLCAUtil_Test.java 10 Aug 2009 17:42:19 -0000 >@@ -129,7 +129,7 @@ > assertFalse( WidgetLCAUtil.equals( new Date[] { new Date( 3 ) }, null ) ); > } > >- public void testEscapeText() throws Exception { >+ public void testEscapeText() { > // Empty Parameter > try { > WidgetLCAUtil.escapeText( null, true ); >@@ -177,7 +177,7 @@ > assertEquals( expected, WidgetLCAUtil.escapeText( "Test\\", false ) ); > } > >- public void testTruncateZeros() throws Exception { >+ public void testTruncateZeros() { > assertEquals( ( char )0, "\000".charAt( 0 ) ); > assertEquals( "foo ", WidgetLCAUtil.escapeText( "foo \000 bar", false ) ); > assertEquals( "foo", WidgetLCAUtil.escapeText( "foo\000", false ) ); >@@ -429,49 +429,7 @@ > WidgetLCAUtil.writeBackground( control, red ); > assertEquals( "", Fixture.getAllMarkup() ); > } >- >- public void testResetCalls() throws IOException { >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetBounds(); >- String expected >- = "w.resetClipWidth();w.resetClipHeight();w.setSpace( 0, 0, 0, 0 );"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetMenu(); >- expected >- = "w.resetContextMenu();w.removeEventListener( \"contextmenu\", " >- + "org.eclipse.swt.MenuUtil.contextMenu );"; >- assertEquals( expected, Fixture.getAllMarkup() ); > >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetToolTip(); >- expected = "wm.setToolTip( w );"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetFont(); >- expected = "w.resetFont();"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetForeground(); >- expected >- = "w.resetTextColor();w.removeEventListener( \"appear\", " >- + "org.eclipse.swt.WidgetManager._onAppearSetForeground );"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetBackground(); >- expected = "w.resetBackgroundColor();"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- >- Fixture.fakeResponseWriter(); >- WidgetLCAUtil.resetEnabled(); >- expected = "w.setEnabled( true );"; >- assertEquals( expected, Fixture.getAllMarkup() ); >- } >- > public void testWriteMenu() throws IOException { > Display display = new Display(); > Composite shell = new Shell( display , SWT.NONE ); >Index: src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.test/src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java,v >retrieving revision 1.4 >diff -u -r1.4 PreserveWidgetsPhaseListener_Test.java >--- src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java 4 Jun 2009 11:48:58 -0000 1.4 >+++ src/org/eclipse/rwt/internal/lifecycle/PreserveWidgetsPhaseListener_Test.java 10 Aug 2009 17:42:19 -0000 >@@ -116,7 +116,7 @@ > Fixture.removeContext(); > } > >- public void testExecutionOrder() throws Exception { >+ public void testExecutionOrder() { > // Build test environment: > final StringBuffer log = new StringBuffer(); > Fixture.fakeResponseWriter(); >@@ -167,13 +167,6 @@ > public void renderDispose( final Widget widget ) throws IOException > { > } >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- public String getTypePoolId( final Widget widget ) { >- return null; >- } > }; > } > return result; >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.2 >diff -u -r1.2 CTabFolderLCA_Test.java >--- src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA_Test.java 12 Jun 2008 13:22:46 -0000 1.2 >+++ src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA_Test.java 10 Aug 2009 17:42:19 -0000 >@@ -65,13 +65,6 @@ > } > public void renderDispose( final Widget widget ) throws IOException { > } >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- public String getTypePoolId( final Widget widget ) { >- return null; >- } > public void renderInitialization( final Widget widget ) > throws IOException > { >Index: src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_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/DisplayLCA_Test.java,v >retrieving revision 1.4 >diff -u -r1.4 DisplayLCA_Test.java >--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_Test.java 5 Jun 2009 08:14:29 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA_Test.java 10 Aug 2009 17:42:19 -0000 >@@ -43,7 +43,6 @@ > private final List renderInitLog = new ArrayList(); > private final List renderChangesLog = new ArrayList(); > private final List renderDisposeLog = new ArrayList(); >- private final List renderDisposeHandlerRegistration = new ArrayList(); > > private final class DisposeTestButton extends Button { > >@@ -145,7 +144,7 @@ > assertEquals( new Rectangle( 0, 0, 30, 70 ), display.getBounds() ); > } > >- public void testRrenderChangedButDisposed() { >+ public void testRenderChangedButDisposed() { > Display display = new Display(); > Shell shell = new Shell( display, SWT.NONE ); > final Button button = new DisposeTestButton( shell, SWT.PUSH ); >@@ -173,14 +172,12 @@ > } ); > RWTFixture.fakeNewRequest(); > Fixture.fakeRequestParam( RequestParams.UIROOT, displayId ); >- Fixture.fakeRequestParam( RequestParams.UIROOT, displayId ); > Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED, buttonId ); > RWTFixture.executeLifeCycleFromServerThread( ); > > assertEquals( 0, renderInitLog.size() ); > assertFalse( renderChangesLog.contains( button ) ); > assertTrue( renderDisposeLog.contains( button ) ); >- assertFalse( renderDisposeHandlerRegistration.isEmpty() ); > > clearLogs(); > button2.addSelectionListener( new SelectionAdapter() { >@@ -198,7 +195,6 @@ > assertEquals( 0, renderInitLog.size() ); > assertFalse( renderChangesLog.contains( button2 ) ); > assertTrue( renderDisposeLog.contains( button2 ) ); >- assertFalse( renderDisposeHandlerRegistration.contains( button2 ) ); > > clearLogs(); > button3.addSelectionListener( new SelectionAdapter() { >@@ -216,7 +212,6 @@ > assertEquals( 0, renderInitLog.size() ); > assertFalse( renderChangesLog.contains( button3 ) ); > assertTrue( renderDisposeLog.contains( button3 ) ); >- assertFalse( renderDisposeHandlerRegistration.isEmpty() ); > } > > public void testIsInitializedState() throws IOException { >@@ -341,16 +336,6 @@ > } > > >- public String getTypePoolId( final Widget widget ) { >- return getClass().getName() + "_" + widget.getStyle(); >- } >- >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- renderDisposeHandlerRegistration.add( typePoolId ); >- } >- > public void renderDispose( final Widget widget ) throws IOException > { > renderDisposeLog.add( widget ); >@@ -392,6 +377,5 @@ > renderInitLog.clear(); > renderChangesLog.clear(); > renderDisposeLog.clear(); >- renderDisposeHandlerRegistration.clear(); > } > } >#P org.eclipse.rap.rwt >Index: src/org/eclipse/swt/custom/CTabFolder.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CTabFolder.java,v >retrieving revision 1.27 >diff -u -r1.27 CTabFolder.java >--- src/org/eclipse/swt/custom/CTabFolder.java 30 Jul 2009 12:43:41 -0000 1.27 >+++ src/org/eclipse/swt/custom/CTabFolder.java 10 Aug 2009 17:42:21 -0000 >@@ -1892,10 +1892,11 @@ > > void onDispose() { > /* >- * Usually when an item is disposed, destroyItem will change the size of the items array, >- * reset the bounds of all the tabs and manage the widget associated with the tab. >- * Since the whole folder is being disposed, this is not necessary. For speed >- * the inDispose flag is used to skip over this part of the item dispose. >+ * Usually when an item is disposed of, destroyItem will change the size of >+ * the items array, reset the bounds of all the tabs and manage the widget >+ * associated with the tab. Since the whole folder is being disposed, this >+ * is not necessary. For speed the inDispose flag is used to skip over this >+ * part of the item dispose. > */ > inDispose = true; > removeControlListener( resizeListener ); >Index: src/org/eclipse/rwt/lifecycle/AbstractWidgetLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/lifecycle/AbstractWidgetLCA.java,v >retrieving revision 1.13 >diff -u -r1.13 AbstractWidgetLCA.java >--- src/org/eclipse/rwt/lifecycle/AbstractWidgetLCA.java 4 Jun 2009 11:48:51 -0000 1.13 >+++ src/org/eclipse/rwt/lifecycle/AbstractWidgetLCA.java 10 Aug 2009 17:42:21 -0000 >@@ -91,17 +91,17 @@ > * code has been processed the client-side widget should be in a state that is > * equivalent to a newly created widget. > * </p> >- * > * <p> > * Subclasses should override this method if pooling is supported by the > * widget type this LCA belongs to. To activate pooling override > * {@link #getTypePoolId(Widget)}. > * </p> >- * >+ * > * @see #getTypePoolId(Widget) >- * > * @param typePoolId the type pool id of the widget to reset > * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method is not called anymore. > */ > public void createResetHandlerCalls( final String typePoolId ) > throws IOException >@@ -123,18 +123,18 @@ > * suffix. If this method returns <code>null</code>, the widget will not be > * stored in the widget pool and cannot be reused. > * </p> >- * > * <p> > * Subclasses may override to activate pooling. In case pooling is activated > * the method {@link #createResetHandlerCalls(String)} should also be > * overridden. > * </p> >- * >+ * > * @see #createResetHandlerCalls(String) >- * > * @param widget the widget to store in the pool > * @return the type pool id or <code>null</code> if the widget should not be > * pooled >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method is not called anymore. > */ > public String getTypePoolId( final Widget widget ) { > return null; >Index: src/org/eclipse/swt/widgets/ToolBar.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ToolBar.java,v >retrieving revision 1.18 >diff -u -r1.18 ToolBar.java >--- src/org/eclipse/swt/widgets/ToolBar.java 2 Jul 2009 17:55:08 -0000 1.18 >+++ src/org/eclipse/swt/widgets/ToolBar.java 10 Aug 2009 17:42:21 -0000 >@@ -84,13 +84,11 @@ > public ToolBar( final Composite parent, final int style ) { > super( parent, checkStyle( style ) ); > /* >- * Ensure that either of HORIZONTAL or VERTICAL is set. >- * NOTE: HORIZONTAL and VERTICAL have the same values >- * as H_SCROLL and V_SCROLL so it is necessary to first >- * clear these bits to avoid scroll bars and then reset >- * the bits using the original style supplied by the >- * programmer. >- */ >+ * Ensure that either of HORIZONTAL or VERTICAL is set. NOTE: HORIZONTAL and >+ * VERTICAL have the same values as H_SCROLL and V_SCROLL so it is necessary >+ * to first clear these bits to avoid scroll bars and then reset the bits >+ * using the original style supplied by the programmer. >+ */ > if( ( style & SWT.VERTICAL ) != 0 ) { > this.style |= SWT.VERTICAL; > } else { >#P org.eclipse.rap.rwt.q07 >Index: src/org/eclipse/swt/internal/widgets/labelkit/LabelLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/labelkit/LabelLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 LabelLCA.java >--- src/org/eclipse/swt/internal/widgets/labelkit/LabelLCA.java 12 Jun 2008 13:14:28 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/labelkit/LabelLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -11,11 +11,11 @@ > package org.eclipse.swt.internal.widgets.labelkit; > > import java.io.IOException; >-import java.text.MessageFormat; > > import org.eclipse.rwt.lifecycle.AbstractWidgetLCA; > import org.eclipse.swt.SWT; >-import org.eclipse.swt.widgets.*; >+import org.eclipse.swt.widgets.Label; >+import org.eclipse.swt.widgets.Widget; > > > public class LabelLCA extends AbstractWidgetLCA { >@@ -45,32 +45,6 @@ > getDelegate( widget ).renderDispose( ( Label )widget ); > } > >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- getDelegate( typePoolId ).createResetHandlerCalls( typePoolId ); >- } >- >- public String getTypePoolId( final Widget widget ) { >- // TODO [rh] disabled pooling, see bugs prefixed with [pooling] >- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=204107 >- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=199142 >-// return getDelegate( widget ).getTypePoolId( ( Label )widget ); >- return null; >- } >- >- private static AbstractLabelLCADelegate getDelegate( final String tpId ) { >- AbstractLabelLCADelegate result; >- if( tpId.startsWith( SeparatorLabelLCA.TYPE_POOL_ID) ) { >- result = SEPARATOR_LCA; >- } else if( tpId.startsWith( StandardLabelLCA.TYPE_POOL_ID ) ) { >- result = LABEL_LCA; >- } else { >- String txt= "The typePoolId ''{0}'' is not supported."; >- String msg = MessageFormat.format( txt, new Object[] { tpId } ); >- throw new IllegalArgumentException( msg ); >- } >- return result; >- } >- > private static AbstractLabelLCADelegate getDelegate( final Widget widget ) { > AbstractLabelLCADelegate result; > if( ( widget.getStyle() & SWT.SEPARATOR ) != 0 ) { >Index: src/org/eclipse/swt/internal/widgets/labelkit/AbstractLabelLCADelegate.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/labelkit/AbstractLabelLCADelegate.java,v >retrieving revision 1.2 >diff -u -r1.2 AbstractLabelLCADelegate.java >--- src/org/eclipse/swt/internal/widgets/labelkit/AbstractLabelLCADelegate.java 12 Jun 2008 13:14:28 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/labelkit/AbstractLabelLCADelegate.java 10 Aug 2009 17:42:23 -0000 >@@ -22,6 +22,4 @@ > abstract void renderInitialization( Label label ) throws IOException; > abstract void renderChanges( Label label ) throws IOException; > abstract void renderDispose( Label label ) throws IOException; >- abstract void createResetHandlerCalls( String typePoolId ) throws IOException; >- abstract String getTypePoolId( Label label ); > } >Index: src/org/eclipse/swt/internal/widgets/labelkit/SeparatorLabelLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/labelkit/SeparatorLabelLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 SeparatorLabelLCA.java >--- src/org/eclipse/swt/internal/widgets/labelkit/SeparatorLabelLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/labelkit/SeparatorLabelLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -23,13 +23,11 @@ > > private static final String QX_TYPE = "org.eclipse.swt.widgets.Separator"; > private static final String JS_FUNC_ADD_LINE_STYLE = "addLineStyle"; >- private static final String JS_FUNC_REMOVE_LINE_STYLE = "removeLineStyle"; > private static final String JS_FIELD_LINE_ORIENTATION = "lineOrientation"; > private static final Object[] PARAM_SHADOW_IN > = new Object[] { JSConst.JS_STYLE_FLAG_SHADOW_IN }; > private static final Object[] PARAM_SHADOW_OUT > = new Object[] { JSConst.JS_STYLE_FLAG_SHADOW_OUT }; >- static final String TYPE_POOL_ID = SeparatorLabelLCA.class.getName(); > > void preserveValues( final Label label ) { > ControlLCAUtil.preserveValues( label ); >@@ -59,16 +57,6 @@ > writer.dispose(); > } > >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- resetStyle(); >- } >- >- String getTypePoolId( final Label label ) { >- return TYPE_POOL_ID; >- } >- > private static void writeStyle( final Label label ) throws IOException { > JSWriter writer = JSWriter.getWriterFor( label ); > int style = label.getStyle(); >@@ -80,11 +68,4 @@ > writer.call( JS_FUNC_ADD_LINE_STYLE, PARAM_SHADOW_OUT ); > } > } >- >- private static void resetStyle() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.call( JS_FUNC_REMOVE_LINE_STYLE, PARAM_SHADOW_IN ); >- writer.call( JS_FUNC_REMOVE_LINE_STYLE, PARAM_SHADOW_OUT ); >- writer.reset( JS_FIELD_LINE_ORIENTATION ); >- } > } >Index: src/org/eclipse/swt/internal/widgets/labelkit/StandardLabelLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/labelkit/StandardLabelLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 StandardLabelLCA.java >--- src/org/eclipse/swt/internal/widgets/labelkit/StandardLabelLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/labelkit/StandardLabelLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -23,7 +23,6 @@ > public class StandardLabelLCA extends AbstractLabelLCADelegate { > > private static final String QX_TYPE = "qx.ui.basic.Atom"; >- static final String TYPE_POOL_ID = StandardLabelLCA.class.getName(); > > private static final String PROP_TEXT = "text"; > private static final String PROP_ALIGNMENT = "alignment"; >@@ -77,18 +76,6 @@ > writer.dispose(); > } > >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- resetAlignment(); >- resetText(); >- resetImage(); >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } >- >- String getTypePoolId( final Label label ) { >- return TYPE_POOL_ID; >- } >- > ////////////////////////////////////// > // Helping methods to write JavaScript > >@@ -103,12 +90,6 @@ > } > } > >- private static void resetText() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- Object[] args = new Object[]{ JSWriter.WIDGET_REF, null }; >- writer.callStatic( JS_FUNC_LABEL_UTIL_SET_TEXT, args ); >- } >- > private static void writeImage( final Label label ) throws IOException { > Image image = label.getImage(); > if( WidgetLCAUtil.hasChanged( label, Props.IMAGE, image, null ) ) >@@ -126,12 +107,6 @@ > } > } > >- private static void resetImage() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- Object[] args = new Object[]{ JSWriter.WIDGET_REF, null }; >- writer.callStatic( JS_FUNC_LABEL_UTIL_SET_IMAGE, args ); >- } >- > private static void writeAlignment( final Label label ) throws IOException { > Integer alignment = new Integer( label.getAlignment() ); > Integer defValue = DEFAULT_ALIGNMENT; >@@ -145,12 +120,6 @@ > } > } > >- private static void resetAlignment() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( "horizontalChildrenAlign" ); >- writer.reset( new String[] { "labelObject", "textAlign" } ); >- } >- > private static String getAlignment( final int alignment ) { > String result; > if( ( alignment & SWT.LEFT ) != 0 ) { >Index: src/org/eclipse/rwt/lifecycle/WidgetLCAUtil.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/rwt/lifecycle/WidgetLCAUtil.java,v >retrieving revision 1.6 >diff -u -r1.6 WidgetLCAUtil.java >--- src/org/eclipse/rwt/lifecycle/WidgetLCAUtil.java 6 Jul 2009 07:49:21 -0000 1.6 >+++ src/org/eclipse/rwt/lifecycle/WidgetLCAUtil.java 10 Aug 2009 17:42:22 -0000 >@@ -41,8 +41,6 @@ > > private static final String JS_PROP_HEIGHT = "height"; > private static final String JS_PROP_WIDTH = "width"; >- private static final String JS_PROP_CLIP_WIDTH = "clipWidth"; >- private static final String JS_PROP_CLIP_HEIGHT = "clipHeight"; > private static final String PARAM_X = "bounds.x"; > private static final String PARAM_Y = "bounds.y"; > private static final String PARAM_WIDTH = "bounds.width"; >@@ -446,21 +444,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the bounds of a widget. >- * This method is intended to be used by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetBounds() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JS_PROP_CLIP_WIDTH ); >- writer.reset( JS_PROP_CLIP_HEIGHT ); >- writer.set( JS_PROP_SPACE, new int[] { 0, 0, 0, 0 } ); >- } >- >- >- /** > * Determines whether the property <code>menu</code> of the given widget has > * changed during the processing of the current request and if so, writes > * JavaScript code to the response that updates the client-side menu property >@@ -488,21 +471,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>menu</code> of a widget. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetMenu() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JS_PROP_CONTEXT_MENU ); >- writer.removeListener( JSConst.QX_EVENT_CONTEXTMENU, >- JSConst.JS_CONTEXT_MENU ); >- } >- >- /** > * Determines whether the property <code>toolTip</code> of the given widget > * has changed during the processing of the current request and if so, writes > * JavaScript code to the response that updates the client-side toolTip >@@ -531,25 +499,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>toolTip</code> of a widget. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetToolTip() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.call( JSWriter.WIDGET_MANAGER_REF, >- JS_FUNC_SET_TOOL_TIP, >- new Object[] { JSWriter.WIDGET_REF } ); >- } >- >- >- ///////////////////////////////////////////////// >- // write-methods used by other ...LCAUtil classes >- >- /** > * Determines whether the property <code>image</code> of the given widget > * has changed during the processing of the current request and if so, writes > * JavaScript code to the response that updates the client-side image property >@@ -659,19 +608,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>font</code> of a widget. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetFont() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JSConst.QX_FIELD_FONT ); >- } >- >- /** > * Determines whether the property <code>foreground</code> of the given > * widget has changed during the processing of the current request and if so, > * writes JavaScript code to the response that updates the client-side >@@ -699,21 +635,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>foreground</code> of a widget. This method is intended to be used >- * by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetForeground() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( "textColor" ); >- String listener = "org.eclipse.swt.WidgetManager._onAppearSetForeground"; >- writer.removeListener( "appear", listener ); >- } >- >- /** > * Determines whether the property <code>background</code> of the given > * widget has changed during the processing of the current request and if so, > * writes JavaScript code to the response that updates the client-side >@@ -774,19 +695,6 @@ > } > > /** >- * Writes JavaScript code to the response that reset the property >- * <code>background</code> of a widget. This method is intended to be used >- * by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetBackground() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JSConst.QX_FIELD_BG_COLOR ); >- } >- >- /** > * Determines whether the background gradient properties of the > * given widget has changed during the processing of the current request and > * if so, writes JavaScript code to the response that updates the client-side >@@ -908,20 +816,6 @@ > > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>enabled</code> of a widget. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetEnabled() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- // TODO [fappel]: check whether to use reset >- writer.set( JSConst.QX_FIELD_ENABLED, true ); >- } >- >- /** > * Replaces all newline characters in the specified input string with the > * given replacement string. > * >@@ -1178,4 +1072,98 @@ > } > return result; > } >+ >+ >+ ///////////////////////////////////// >+ // deprecated pooling-related methods >+ >+ /** >+ * Writes JavaScript code to the response that resets the bounds of a widget. >+ * This method is intended to be used by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetBounds() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>menu</code> of a widget. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetMenu() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>toolTip</code> of a widget. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetToolTip() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>font</code> of a widget. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetFont() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>foreground</code> of a widget. This method is intended to be used >+ * by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetForeground() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that reset the property >+ * <code>background</code> of a widget. This method is intended to be used >+ * by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetBackground() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>enabled</code> of a widget. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetEnabled() throws IOException { >+ } > } >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.3 >diff -u -r1.3 JSWriter.java >--- src/org/eclipse/rwt/lifecycle/JSWriter.java 13 Jun 2009 11:37:34 -0000 1.3 >+++ src/org/eclipse/rwt/lifecycle/JSWriter.java 10 Aug 2009 17:42:22 -0000 >@@ -103,11 +103,12 @@ > } > > /** >- * Returns the {@link JSWriter} instance used to reset >- * a widgets attributes in order to take part in the >- * pooling mechanism. >- * >+ * Returns the {@link JSWriter} instance used to reset a widgets attributes in >+ * order to take part in the pooling mechanism. >+ * > * @return the {@link JSWriter} instance >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method should not be used anymore. > */ > public static JSWriter getWriterForResetHandler() { > return new JSWriter( null ); >@@ -148,7 +149,6 @@ > throws IOException > { > ensureWidgetManager(); >- String typePoolId = getTypePoolId( widget ); > StringBuffer buffer = new StringBuffer(); > buffer.append( "var w = wm.newWidget( \"" ); > buffer.append( WidgetUtil.getId( widget ) ); >@@ -156,10 +156,6 @@ > buffer.append( getJSParentId( widget ) ); > buffer.append( "\", " ); > buffer.append( useSetParent() ); >- buffer.append( ", " ); >- Integer poolIdHashCode >- = typePoolId == null ? null : new Integer( typePoolId.hashCode() ); >- buffer.append( poolIdHashCode ); > buffer.append( ", \"" ); > buffer.append( className ); > buffer.append( "\"" ); >@@ -656,13 +652,9 @@ > > /** > * Dispose is used to dispose of the widget of this {@link JSWriter} on the >- * client side. As todays browser have several memory issues this will only >- * dispose of the widget if there are no pooling informations available. >+ * client side. > * > * @throws IOException if an I/O error occurs >- * >- * @see AbstractWidgetLCA#getTypePoolId(Widget) >- * @see AbstractWidgetLCA#createResetHandlerCalls(String) > */ > public void dispose() throws IOException { > ensureWidgetManager(); >@@ -753,11 +745,6 @@ > : Boolean.FALSE; > } > >- private String getTypePoolId( final Widget widget ) { >- AbstractWidgetLCA lca = WidgetUtil.getLCA( widget ); >- return lca.getTypePoolId( widget ); >- } >- > private String getJSParentId( final Widget widget ) { > String result = ""; > if( !( widget instanceof Shell ) && widget instanceof Control ) { >Index: src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java,v >retrieving revision 1.10 >diff -u -r1.10 ControlLCAUtil.java >--- src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java 6 Jul 2009 07:49:21 -0000 1.10 >+++ src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java 10 Aug 2009 17:42:22 -0000 >@@ -42,12 +42,6 @@ > */ > public class ControlLCAUtil { > >- private static final Object[] PARAM_STYLE_BORDER >- = new Object[] { JSConst.JS_STYLE_FLAG_BORDER }; >- >- private static final Object[] PARAM_STYLE_FLAT >- = new Object[] { JSConst.JS_STYLE_FLAG_FLAT }; >- > private static final JSListenerInfo FOCUS_GAINED_LISTENER_INFO > = new JSListenerInfo( "focusin", > "org.eclipse.swt.EventUtil.focusGained", >@@ -196,17 +190,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the bounds of a control. >- * This method is intended to be used by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetBounds() throws IOException { >- WidgetLCAUtil.resetBounds(); >- } >- >- /** > * Determines whether the z-index of the given control has changed during the > * processing of the current request and if so, writes JavaScript code to the > * response that updates the client-side z-index. >@@ -225,18 +208,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the z-index property of >- * a control. This method is intended to be used by implementations of the >- * method {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetZIndex() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JSConst.QX_FIELD_Z_INDEX ); >- } >- >- /** > * Determines whether the visibility of the given control has changed during > * the processing of the current request and if so, writes JavaScript code to > * the response that updates the client-side visibility. >@@ -260,20 +231,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>visible</code> of a control. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetVisible() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- // TODO [fappel]: check whether to use reset >- writer.set( JSConst.QX_FIELD_VISIBLE, true ); >- } >- >- /** > * Determines whether the property <code>enabled</code> of the given control > * has changed during the processing of the current request and if so, writes > * JavaScript code to the response that updates the client-side enabled >@@ -291,18 +248,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>enabled</code> of a control. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetEnabled() throws IOException { >- WidgetLCAUtil.resetEnabled(); >- } >- >- /** > * Determines for all of the following properties of the specified control > * whether the property has changed during the processing of the current > * request and if so, writes JavaScript code to the response that updates the >@@ -359,45 +304,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the following properties >- * of a control. >- * <ul> >- * <li>bounds</li> >- * <li>z-index (except for Shells)</li> >- * <li>tab index</li> >- * <li>tool tip text</li> >- * <li>menu</li> >- * <li>visible</li> >- * <li>enabled</li> >- * <li>foreground</li> >- * <li>background</li> >- * <li>font</li> >- * <!--li>whether ControlListeners are registered</li> >- * <li>whether ActivateListeners are registered</li> >- * <li>whether FocusListeners are registered</li--> >- * </ul> >- * This method is intended to be used by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetChanges() throws IOException { >- resetFocusListener(); >- // resetting Activation Listener is automatically done by JSWriter#dispose >- // TODO [rst] What about resetting Control- and FocusListener? document this >- resetMenu(); >- resetToolTip(); >- resetFont(); >- resetBackground(); >- resetForeground(); >- resetEnabled(); >- resetVisible(); >- resetTabIndex(); >- resetZIndex(); >- resetBounds(); >- } >- >- /** > * Writes JavaScript code to the response that adds client-side resize > * listeners to a control. These listeners send notifications when the control > * is resized. >@@ -417,22 +323,6 @@ > } > > /** >- * Writes JavaScript code to the response that removes the client-side resize >- * notification listeners from a control. >- * >- * @throws IOException >- */ >- public static void resetResizeNotificator() >- throws IOException >- { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.removeListener( JSConst.QX_EVENT_CHANGE_WIDTH, >- JSConst.JS_WIDGET_RESIZED ); >- writer.removeListener( JSConst.QX_EVENT_CHANGE_HEIGHT, >- JSConst.JS_WIDGET_RESIZED ); >- } >- >- /** > * Writes JavaScript code to the response that adds client-side move listeners > * to a control. These listeners send notifications when the control is moved. > * @param control the control to add move notification listeners to >@@ -451,22 +341,6 @@ > } > > /** >- * Writes JavaScript code to the response that removes the client-side move >- * notification listeners from a control. >- * >- * @throws IOException >- */ >- public static void resetMoveNotificator() >- throws IOException >- { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.removeListener( JSConst.QX_EVENT_CHANGE_LOCATION_X, >- JSConst.JS_WIDGET_MOVED ); >- writer.removeListener( JSConst.QX_EVENT_CHANGE_LOCATION_Y, >- JSConst.JS_WIDGET_MOVED ); >- } >- >- /** > * Determines whether the property <code>menu</code> of the given control > * has changed during the processing of the current request and if so, writes > * JavaScript code to the response that updates the client-side menu >@@ -480,18 +354,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>menu</code> of a control. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetMenu() throws IOException { >- WidgetLCAUtil.resetMenu(); >- } >- >- /** > * Determines whether the tool tip of the given control has changed during the > * processing of the current request and if so, writes JavaScript code to the > * response that updates the client-side tool tip. >@@ -506,17 +368,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the tool tip of a >- * control. This method is intended to be used by implementations of the >- * method {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetToolTip() throws IOException { >- WidgetLCAUtil.resetToolTip(); >- } >- >- /** > * Determines whether the property <code>foreground</code> of the given > * control has changed during the processing of the current request and if so, > * writes JavaScript code to the response that updates the client-side >@@ -535,18 +386,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>foreground</code> of a control. This method is intended to be used >- * by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetForeground() throws IOException { >- WidgetLCAUtil.resetForeground(); >- } >- >- /** > * Determines whether the property <code>background</code> of the given > * control has changed during the processing of the current request and if so, > * writes JavaScript code to the response that updates the client-side >@@ -606,18 +445,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the property >- * <code>background</code> of a control. This method is intended to be used >- * by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetBackground() throws IOException { >- WidgetLCAUtil.resetBackground(); >- } >- >- /** > * Checks the given control for common SWT style flags (e.g. > * <code>SWT.BORDER</code>) and if present, writes code to pass the according > * states to the client. >@@ -632,19 +459,6 @@ > } > > /** >- * Writes JavaScript code to the response that resets the style flags. >- * <p>This method is intended to be used by implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}.</p> >- * >- * @throws IOException >- */ >- public static void resetStyleFlags() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.call( JSConst.QX_FUNC_REMOVE_STATE, PARAM_STYLE_BORDER ); >- writer.call( JSConst.QX_FUNC_REMOVE_STATE, PARAM_STYLE_FLAT ); >- } >- >- /** > * Determines whether the property <code>font</code> of the given control > * has changed during the processing of the current request and if so, writes > * JavaScript code to the response that updates the client-side font property. >@@ -659,18 +473,6 @@ > WidgetLCAUtil.writeFont( control, newValue ); > } > >- /** >- * Writes JavaScript code to the response that resets the property >- * <code>font</code> of a control. This method is intended to be used by >- * implementations of the method >- * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >- * >- * @throws IOException >- */ >- public static void resetFont() throws IOException { >- WidgetLCAUtil.resetFont(); >- } >- > static void writeCursor( final Control control ) throws IOException { > Cursor newValue = control.getCursor(); > if( WidgetLCAUtil.hasChanged( control, PROP_CURSOR, newValue, null ) ) { >@@ -684,11 +486,6 @@ > } > } > >- static void resetCursor() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JSConst.QX_FIELD_CURSOR ); >- } >- > public static void writeActivateListener( final Control control ) > throws IOException > { >@@ -745,14 +542,6 @@ > } > } > >- private static void resetFocusListener() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.removeListener( FOCUS_GAINED_LISTENER_INFO.getEventType(), >- FOCUS_GAINED_LISTENER_INFO.getJSListener() ); >- writer.removeListener( FOCUS_LOST_LISTENER_INFO.getEventType(), >- FOCUS_LOST_LISTENER_INFO.getJSListener() ); >- } >- > private static void writeMouseListener( final Control control ) > throws IOException > { >@@ -898,11 +687,6 @@ > } > } > >- private static void resetTabIndex() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JSConst.QX_FIELD_TAB_INDEX ); >- } >- > /** > * Recursively computes the tab indices for all child controls of a given > * composite and stores the resulting values in the control adapters. >@@ -1359,4 +1143,188 @@ > } > return result; > } >+ >+ >+ ///////////////////////////////////// >+ // deprecated pooling-related methods >+ >+ /** >+ * Writes JavaScript code to the response that resets the bounds of a control. >+ * This method is intended to be used by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetBounds() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the z-index property of >+ * a control. This method is intended to be used by implementations of the >+ * method {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetZIndex() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>visible</code> of a control. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetVisible() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>enabled</code> of a control. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetEnabled() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the following properties >+ * of a control. >+ * <ul> >+ * <li>bounds</li> >+ * <li>z-index (except for Shells)</li> >+ * <li>tab index</li> >+ * <li>tool tip text</li> >+ * <li>menu</li> >+ * <li>visible</li> >+ * <li>enabled</li> >+ * <li>foreground</li> >+ * <li>background</li> >+ * <li>font</li> >+ * <!--li>whether ControlListeners are registered</li> >+ * <li>whether ActivateListeners are registered</li> >+ * <li>whether FocusListeners are registered</li--> >+ * </ul> >+ * This method is intended to be used by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetChanges() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that removes the client-side resize >+ * notification listeners from a control. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetResizeNotificator() >+ throws IOException >+ { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that removes the client-side move >+ * notification listeners from a control. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetMoveNotificator() >+ throws IOException >+ { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>menu</code> of a control. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetMenu() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the tool tip of a >+ * control. This method is intended to be used by implementations of the >+ * method {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetToolTip() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>foreground</code> of a control. This method is intended to be used >+ * by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetForeground() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>background</code> of a control. This method is intended to be used >+ * by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetBackground() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the style flags. >+ * <p>This method is intended to be used by implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}.</p> >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetStyleFlags() throws IOException { >+ } >+ >+ /** >+ * Writes JavaScript code to the response that resets the property >+ * <code>font</code> of a control. This method is intended to be used by >+ * implementations of the method >+ * {@link AbstractWidgetLCA#createResetHandlerCalls(String)}. >+ * >+ * @throws IOException >+ * @deprecated As of 1.3, server-side widget pooling is no longer required. >+ * This method does nothing. >+ */ >+ public static void resetFont() throws IOException { >+ } > } >Index: src/org/eclipse/swt/internal/widgets/buttonkit/PushButtonDelegateLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/buttonkit/PushButtonDelegateLCA.java,v >retrieving revision 1.9 >diff -u -r1.9 PushButtonDelegateLCA.java >--- src/org/eclipse/swt/internal/widgets/buttonkit/PushButtonDelegateLCA.java 3 Aug 2009 20:15:40 -0000 1.9 >+++ src/org/eclipse/swt/internal/widgets/buttonkit/PushButtonDelegateLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -20,8 +20,6 @@ > > final class PushButtonDelegateLCA extends ButtonDelegateLCA { > >- static final String TYPE_POOL_ID >- = PushButtonDelegateLCA.class.getName(); > private static final String QX_TYPE = "org.eclipse.rwt.widgets.Button"; > > private static final Object[] PARAM_PUSH = new Object[] { "push" }; >@@ -59,11 +57,4 @@ > JSWriter writer = JSWriter.getWriterFor( button ); > writer.dispose(); > } >- >- String getTypePoolId( final Button button ) { >- return null; >- } >- >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- } > } >Index: src/org/eclipse/swt/internal/widgets/buttonkit/ButtonDelegateLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/buttonkit/ButtonDelegateLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 ButtonDelegateLCA.java >--- src/org/eclipse/swt/internal/widgets/buttonkit/ButtonDelegateLCA.java 12 Jun 2008 13:14:29 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/buttonkit/ButtonDelegateLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -20,6 +20,4 @@ > abstract void renderInitialization( Button button ) throws IOException; > abstract void renderChanges( Button button ) throws IOException; > abstract void renderDispose( Button button ) throws IOException; >- abstract void createResetHandlerCalls( String typePoolId ) throws IOException; >- abstract String getTypePoolId( Button widget ); > } >Index: src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 ButtonLCA.java >--- src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCA.java 4 Jun 2009 11:48:55 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -12,7 +12,6 @@ > package org.eclipse.swt.internal.widgets.buttonkit; > > import java.io.IOException; >-import java.text.MessageFormat; > > import org.eclipse.rwt.lifecycle.AbstractWidgetLCA; > import org.eclipse.rwt.lifecycle.JSWriter; >@@ -53,32 +52,6 @@ > getLCADelegate( widget ).renderDispose( ( Button )widget ); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- getLCADelegate( typePoolId ).createResetHandlerCalls( typePoolId ); >- } >- >- public String getTypePoolId( final Widget widget ) { >- return getLCADelegate( widget ).getTypePoolId( ( Button )widget ); >- } >- >- private static ButtonDelegateLCA getLCADelegate( final String tpId ) { >- ButtonDelegateLCA result; >- if( tpId.startsWith( CheckButtonDelegateLCA.TYPE_POOL_ID ) ) { >- result = CHECK; >- } else if( tpId.startsWith( PushButtonDelegateLCA.TYPE_POOL_ID ) ) { >- result = PUSH; >- } else if( tpId.startsWith( RadioButtonDelegateLCA.TYPE_POOL_ID ) ) { >- result = RADIO; >- } else { >- String txt= "The typePoolId ''{0}'' is not supported."; >- String msg = MessageFormat.format( txt, new Object[] { tpId } ); >- throw new IllegalArgumentException( msg ); >- } >- return result; >- } >- > private static ButtonDelegateLCA getLCADelegate( final Widget widget ) { > ButtonDelegateLCA result; > int style = ( ( Button )widget ).getStyle(); >Index: src/org/eclipse/swt/internal/widgets/buttonkit/CheckButtonDelegateLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/buttonkit/CheckButtonDelegateLCA.java,v >retrieving revision 1.11 >diff -u -r1.11 CheckButtonDelegateLCA.java >--- src/org/eclipse/swt/internal/widgets/buttonkit/CheckButtonDelegateLCA.java 3 Aug 2009 20:15:40 -0000 1.11 >+++ src/org/eclipse/swt/internal/widgets/buttonkit/CheckButtonDelegateLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -20,8 +20,6 @@ > > final class CheckButtonDelegateLCA extends ButtonDelegateLCA { > >- static final String TYPE_POOL_ID >- = CheckButtonDelegateLCA.class.getName(); > private static final String QX_TYPE = "org.eclipse.rwt.widgets.Button"; > private static final Object[] PARAM_CHECK = new Object[] { "check" }; > >@@ -63,20 +61,6 @@ > writer.dispose(); > } > >- String getTypePoolId( final Button button ) { >- // Disabled pooling, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=226099 >-// return TYPE_POOL_ID; >- return null; >- } >- >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- ButtonLCAUtil.resetAlignment(); >- ButtonLCAUtil.resetText(); >- ButtonLCAUtil.resetSelection(); >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } >- > private static void writeGrayed( final Button button ) throws IOException { > Boolean newValue = Boolean.valueOf( button.getGrayed() ); > String prop = PROP_GRAYED; >Index: src/org/eclipse/swt/internal/widgets/buttonkit/RadioButtonDelegateLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/buttonkit/RadioButtonDelegateLCA.java,v >retrieving revision 1.14 >diff -u -r1.14 RadioButtonDelegateLCA.java >--- src/org/eclipse/swt/internal/widgets/buttonkit/RadioButtonDelegateLCA.java 3 Aug 2009 20:15:40 -0000 1.14 >+++ src/org/eclipse/swt/internal/widgets/buttonkit/RadioButtonDelegateLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -22,8 +22,6 @@ > > final class RadioButtonDelegateLCA extends ButtonDelegateLCA { > >- static final String TYPE_POOL_ID >- = RadioButtonDelegateLCA.class.getName(); > private static final String QX_TYPE = "org.eclipse.rwt.widgets.Button"; > private static final Object[] PARAM_RADIO = new Object[] { "radio" }; > >@@ -60,25 +58,6 @@ > writer.dispose(); > } > >- String getTypePoolId( final Button button ) { >-// return TYPE_POOL_ID; >- return null; >- } >- >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >-// TODO [fappel]: check why removal of listener doesn't work. Seems as if >-// manager is removed already (maybe dispose call?)... >-// JSWriter writer = JSWriter.getWriterForResetHandler(); >-// writer.removeListener( JS_PROP_MANAGER, >-// JS_LISTENER_INFO.getEventType(), >-// JS_LISTENER_INFO.getJSListener() ); >- ButtonLCAUtil.resetAlignment(); >- ButtonLCAUtil.resetText(); >- ButtonLCAUtil.resetSelection(); >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } >- > private static void processSelectionEvent( final Button button ) { > if( SelectionEvent.hasListener( button ) ) { > int type = SelectionEvent.WIDGET_SELECTED; >Index: src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCAUtil.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCAUtil.java,v >retrieving revision 1.7 >diff -u -r1.7 ButtonLCAUtil.java >--- src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCAUtil.java 3 Aug 2009 20:15:40 -0000 1.7 >+++ src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCAUtil.java 10 Aug 2009 17:42:22 -0000 >@@ -76,12 +76,6 @@ > } > } > >- static void resetText() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- // Note [fappel]: reset doesn't work, so use setting to empty string >- writer.set( "text", new Object[]{ null } ); >- } >- > static void writeImage( final Button button ) throws IOException { > Image image = button.getImage(); > if( WidgetLCAUtil.hasChanged( button, Props.IMAGE, image, null ) ) { >@@ -97,11 +91,6 @@ > } > } > >- static void resetImage() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.set( "image", new Object[]{ null } ); >- } >- > static void writeAlignment( final Button button ) throws IOException { > if( ( button.getStyle() & SWT.ARROW ) == 0 ) { > Integer newValue = new Integer( button.getAlignment() ); >@@ -129,22 +118,12 @@ > } > } > >- static void resetAlignment() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JS_PROP_HORIZONTAL_CHILDREN_ALIGN ); >- } >- > static void writeSelection( final Button button ) throws IOException { > Boolean newValue = Boolean.valueOf( button.getSelection() ); > JSWriter writer = JSWriter.getWriterFor( button ); > writer.set( PROP_SELECTION, JS_PROP_SELECTION, newValue, Boolean.FALSE ); > } > >- static void resetSelection() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.set( JS_PROP_SELECTION, Boolean.FALSE ); >- } >- > // TODO [rst] Can this be moved to ShellLCA ? > static void writeDefault( final Button button ) throws IOException { > boolean isDefault = isDefaultButton( button ); >Index: js/org/eclipse/swt/LabelUtil.js >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/LabelUtil.js,v >retrieving revision 1.4 >diff -u -r1.4 LabelUtil.js >--- js/org/eclipse/swt/LabelUtil.js 16 Feb 2009 15:14:06 -0000 1.4 >+++ js/org/eclipse/swt/LabelUtil.js 10 Aug 2009 17:42:22 -0000 >@@ -24,31 +24,29 @@ > initialize : function( widget ) { > > widget.setHorizontalChildrenAlign( qx.constant.Layout.ALIGN_LEFT ); >- if( !widget.getUserData( "pooled" ) ) { >- widget.setVerticalChildrenAlign( qx.constant.Layout.ALIGN_TOP ); >- widget.setAppearance( org.eclipse.swt.LabelUtil.APPEARANCE ); >- widget.setOverflow( qx.constant.Style.OVERFLOW_HIDDEN ); >- // TODO [rh] workaround for weird getLabelObject behaviour >- widget.setLabel( "(empty)" ); >- // end workaround >- var labelObject = widget.getLabelObject(); >- labelObject.setMode( qx.constant.Style.LABEL_MODE_HTML ); >- labelObject.setTextOverflow( false ); >- labelObject.setAppearance( "label-graytext" ); >- // TODO [rh] workaround for weird getLabelObject behaviour >- widget.setLabel( "" ); >- // end workaround >- widget.setHideFocus( true ); >- // track DOM insertion state >- widget.addEventListener( "beforeRemoveDom", >- org.eclipse.swt.LabelUtil._onRemoveDom ); >- widget.addEventListener( "insertDom", >- org.eclipse.swt.LabelUtil._onInsertDom ); >- widget.addEventListener( "mouseover", >- org.eclipse.swt.LabelUtil._onMouseOver ); >- widget.addEventListener( "mouseout", >- org.eclipse.swt.LabelUtil._onMouseOut ); >- } >+ widget.setVerticalChildrenAlign( qx.constant.Layout.ALIGN_TOP ); >+ widget.setAppearance( org.eclipse.swt.LabelUtil.APPEARANCE ); >+ widget.setOverflow( qx.constant.Style.OVERFLOW_HIDDEN ); >+ // TODO [rh] workaround for weird getLabelObject behaviour >+ widget.setLabel( "(empty)" ); >+ // end workaround >+ var labelObject = widget.getLabelObject(); >+ labelObject.setMode( qx.constant.Style.LABEL_MODE_HTML ); >+ labelObject.setTextOverflow( false ); >+ labelObject.setAppearance( "label-graytext" ); >+ // TODO [rh] workaround for weird getLabelObject behaviour >+ widget.setLabel( "" ); >+ // end workaround >+ widget.setHideFocus( true ); >+ // track DOM insertion state >+ widget.addEventListener( "beforeRemoveDom", >+ org.eclipse.swt.LabelUtil._onRemoveDom ); >+ widget.addEventListener( "insertDom", >+ org.eclipse.swt.LabelUtil._onInsertDom ); >+ widget.addEventListener( "mouseover", >+ org.eclipse.swt.LabelUtil._onMouseOver ); >+ widget.addEventListener( "mouseout", >+ org.eclipse.swt.LabelUtil._onMouseOut ); > }, > > _onRemoveDom : function( evt ) { >@@ -75,12 +73,6 @@ > widget.setUserData( "setText", text ); > widget.addEventListener( "appear", > org.eclipse.swt.LabelUtil._setTextDelayed ); >- } >- // workaround for pooling problems >- else if( !widget._isInDOM && widget.getUserData( "pooled" ) ) { >- widget.setUserData( "setText", text ); >- widget.addEventListener( "insertDom", >- org.eclipse.swt.LabelUtil._setTextDelayed ); > } else { > org.eclipse.swt.LabelUtil._doSetText( widget, text ); > } >@@ -91,10 +83,6 @@ > widget.setUserData( "setImage", imagePath ); > widget.addEventListener( "appear", > org.eclipse.swt.LabelUtil._setImageDelayed ); >- } else if( !widget._isInDOM && widget.getUserData( "pooled" ) ) { >- widget.setUserData( "setImage", imagePath ); >- widget.addEventListener( "insertDom", >- org.eclipse.swt.LabelUtil._setImageDelayed ); > } else { > org.eclipse.swt.LabelUtil._doSetImage( widget, imagePath ); > } >Index: js/org/eclipse/swt/WidgetManager.js >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/WidgetManager.js,v >retrieving revision 1.8 >diff -u -r1.8 WidgetManager.js >--- js/org/eclipse/swt/WidgetManager.js 13 Jul 2009 10:12:17 -0000 1.8 >+++ js/org/eclipse/swt/WidgetManager.js 10 Aug 2009 17:42:22 -0000 >@@ -24,8 +24,6 @@ > // Key: id (string), value: widget instanace (qx.ui.core.Widget) > this._map = {}; > >- // initialize widget pool >- this._widgetPool = new Object(); > // this field is needed as Opera has some problems with > // accessing local variables in eval expressions. > this._current = null; >@@ -52,9 +50,6 @@ > * removed from this WidgetManager (see remove). > * No action is taken if there is no widget registered for the given id or > * the widget was already disposed of. >- * In case of a widget type that supports pooling the widget is disconnected >- * from its parent, its 'disposeHandler' that reinitializes the widget is >- * called and it's added to the pool to be ready for reuse. > */ > dispose : function( id ) { > var widget = this.findWidgetById( id ); >@@ -67,84 +62,26 @@ > if( parent && parent.getChildren() ) { > widget.setParent( null ); > } >- // handle widgets that can be pooled >- var typePoolId = widget.getUserData( "typePoolId" ); >- if( typePoolId != null ) { >- var typePool = this._widgetPool[ typePoolId ]; >- typePool.resetHandler( widget ); >- widget.setUserData( "pooled", true ); >- // EXPERIMENTAL: If the widget has a reset method, call it >- if( widget.rap_reset ) { >- widget.rap_reset(); >- } >- typePool.elements.push( widget ); >- // dispose of widgets that cannot be pooled >- } else { >- // [if] Replace dispose() with destroy() >- widget.destroy(); >- } >+ // [if] Replace dispose() with destroy() >+ widget.destroy(); > } > } > }, >- >- registerResetHandler : function( typePoolId, resetHandler ) { >- this._createWidgetPool( typePoolId, resetHandler ); >- }, > >- newWidget : function( widgetId, >- parentId, >- isControl, >- typePoolId, >- type, >- paramList ) >- { >+ newWidget : function( widgetId, parentId, isControl, type, paramList ) { > // Note [fappel]: Do not remove the 'wm' declaration. This is needed > // for IE if the 'newExpression' has a reference to > // the variable defined in the script from the server. > // TODO [fappel]: Think about improvement of the hardcoded expression... > var wm = this; > >- var result = null; >- // if the widget type supports pooling get a widget from the pool - >- // if available... >- if( typePoolId != null && this._widgetPool[ typePoolId ] ) { >- var typePool = this._widgetPool[ typePoolId ]; >- result = typePool.elements.pop(); >- if( result ) { >- if( paramList != null ) { >- // If paramList isn't empty we have to reinitialize the widget. >- // Luckily only our own js widgets use this... >- var expression = "org.eclipse.swt.WidgetManager.getInstance()." >- + "_current.reInit(" >- + paramList >- + ");"; >- // Assignment of the field _current is needed as Opera has some >- // problems with accessing local variables in eval expressions. >- this._current = result; >- window.eval( expression ); >- this._current = null; >- } >- // EXPERIMENTAL: If the widget has an init method, call it >- if( result.rap_init ) { >- result.rap_init(); >- } >- } >-// this.debug( "_____ recycled: " + result ); >- } >- >- // ... otherwise create a new one >- if( result == null ) { >- var newExpression; >- if( paramList != null ) { >- newExpression = "new " + type + "(" + paramList + ");"; >- } else { >- newExpression = "new " + type + "();"; >- } >- result = window.eval( newExpression ); >- result.setUserData( "typePoolId", typePoolId ); >- result.setUserData( "pooled", false ); >-// this.debug( "_____ created: " + result ); >+ var newExpression; >+ if( paramList != null ) { >+ newExpression = "new " + type + "(" + paramList + ");"; >+ } else { >+ newExpression = "new " + type + "();"; > } >+ var result = window.eval( newExpression ); > > // map the widget to the server side widgetId > if( result.classname == "org.eclipse.swt.widgets.Shell" ) { >@@ -249,16 +186,6 @@ > } > }, > >- /** >- * Creates a new caching pool for widgets with the given pooling id. >- */ >- _createWidgetPool : function( typePoolId, resetHandler ) { >- var typePool = new Object(); >- typePool.elements = new Array(); >- typePool.resetHandler = resetHandler; >- this._widgetPool[ typePoolId ] = typePool; >- }, >- > //////////////// > // Font handling > >Index: js/org/eclipse/swt/TextUtil.js >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/TextUtil.js,v >retrieving revision 1.21 >diff -u -r1.21 TextUtil.js >--- js/org/eclipse/swt/TextUtil.js 9 Jul 2009 07:37:29 -0000 1.21 >+++ js/org/eclipse/swt/TextUtil.js 10 Aug 2009 17:42:22 -0000 >@@ -76,7 +76,7 @@ > * Sets the selected text range of the given text widget. > */ > setSelection : function( text, start, length ) { >- if( text.isCreated() && !text.getUserData( "pooled" ) ) { >+ if( text.isCreated() ) { > org.eclipse.swt.TextUtil._doSetSelection( text, start, length ); > } else { > text.setUserData( "onAppear.selectionStart", start ); >Index: src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 TreeColumnLCA.java >--- src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA.java 18 Aug 2008 15:43:14 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/treecolumnkit/TreeColumnLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -119,14 +119,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > ////////////////////////////////////////// > // Helping method to write JavaScript code > >Index: src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java,v >retrieving revision 1.11 >diff -u -r1.11 TableItemLCA.java >--- src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java 4 Jun 2009 11:48:55 -0000 1.11 >+++ src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -126,16 +126,6 @@ > } > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > ////////////////// > // ReadData helper > >Index: src/org/eclipse/swt/internal/widgets/treekit/TreeLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/treekit/TreeLCA.java,v >retrieving revision 1.9 >diff -u -r1.9 TreeLCA.java >--- src/org/eclipse/swt/internal/widgets/treekit/TreeLCA.java 1 Jul 2009 14:18:22 -0000 1.9 >+++ src/org/eclipse/swt/internal/widgets/treekit/TreeLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -99,15 +99,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > public void doRedrawFake( final Control control ) { > int evtId = ControlEvent.CONTROL_RESIZED; > ControlEvent evt = new ControlEvent( control, evtId ); >Index: src/org/eclipse/swt/internal/widgets/coolitemkit/CoolItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/coolitemkit/CoolItemLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 CoolItemLCA.java >--- src/org/eclipse/swt/internal/widgets/coolitemkit/CoolItemLCA.java 20 Jul 2009 15:31:56 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/coolitemkit/CoolItemLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -91,14 +91,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > ////////////////// > // Helping methods > >Index: src/org/eclipse/swt/internal/widgets/textkit/TextLCAUtil.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/textkit/TextLCAUtil.java,v >retrieving revision 1.12 >diff -u -r1.12 TextLCAUtil.java >--- src/org/eclipse/swt/internal/widgets/textkit/TextLCAUtil.java 1 Dec 2008 13:58:08 -0000 1.12 >+++ src/org/eclipse/swt/internal/widgets/textkit/TextLCAUtil.java 10 Aug 2009 17:42:23 -0000 >@@ -116,22 +116,12 @@ > } > } > >- static void resetText() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JS_PROP_VALUE ); >- } >- > static void writeReadOnly( final Text text ) throws IOException { > JSWriter writer = JSWriter.getWriterFor( text ); > Boolean newValue = Boolean.valueOf( !text.getEditable() ); > writer.set( PROP_READONLY, JS_PROP_READ_ONLY, newValue, Boolean.FALSE ); > } > >- static void resetReadOnly() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JS_PROP_READ_ONLY ); >- } >- > static void writeTextLimit( final Text text ) throws IOException { > JSWriter writer = JSWriter.getWriterFor( text ); > Integer newValue = new Integer( text.getTextLimit() ); >@@ -147,11 +137,6 @@ > } > } > >- static void resetTextLimit() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JS_PROP_MAX_LENGTH ); >- } >- > static void writeWrap( final Text text ) throws IOException { > JSWriter writer = JSWriter.getWriterFor( text ); > Boolean value = Boolean.valueOf( ( text.getStyle() & SWT.WRAP ) != 0 ); >@@ -177,10 +162,6 @@ > } > } > >- static void resetSelection() { >- // POOLING Implement if pooling is reactivated >- } >- > static void writeAlignment( final Text text ) throws IOException { > int style = text.getStyle(); > if( ( style & SWT.RIGHT ) != 0 ) { >@@ -207,10 +188,6 @@ > } > } > >- static void resetSelectionListener() { >- // POOLING Implement if pooling is reactivated >- } >- > static void preserveVerifyAndModifyListener( final Text text ) { > IWidgetAdapter adapter = WidgetUtil.getAdapter( text ); > adapter.preserve( PROP_VERIFY_MODIFY_LISTENER, >@@ -231,10 +208,6 @@ > } > } > >- static void resetVerifyAndModifyListener() { >- // POOLING Implement if pooling is reactivated >- } >- > private static boolean hasSelectionListener( final Text text ) { > // Emulate SWT (on Windows) where a default button takes precedence over > // a SelectionListener on a text field when both are on the same shell. >Index: src/org/eclipse/swt/internal/widgets/textkit/TextLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/textkit/TextLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 TextLCA.java >--- src/org/eclipse/swt/internal/widgets/textkit/TextLCA.java 12 Jun 2008 13:14:29 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/textkit/TextLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -11,7 +11,6 @@ > package org.eclipse.swt.internal.widgets.textkit; > > import java.io.IOException; >-import java.text.MessageFormat; > > import org.eclipse.rwt.lifecycle.AbstractWidgetLCA; > import org.eclipse.rwt.lifecycle.JSWriter; >@@ -49,33 +48,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- getLCADelegate( typePoolId ).createResetHandlerCalls( typePoolId ); >- } >- >- public String getTypePoolId( final Widget widget ) { >-// return getLCADelegate( widget ).getTypePoolId( ( Text )widget ); >- // Disabled pooling, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=218466 >- // [Pooling] Text widgets occasionally don't accept keyboard entries >- return null; >- } >- >- private static AbstractTextDelegateLCA getLCADelegate( final String tpId ) { >- AbstractTextDelegateLCA result; >- if( PasswordTextLCA.TYPE_POOL_ID.equals( tpId ) ) { >- result = PASSWORD; >- } else if( SingleTextLCA.TYPE_POOL_ID.equals( tpId ) ) { >- result = SINGLE; >- } else if( MultiTextLCA.TYPE_POOL_ID.equals( tpId ) ) { >- result = MULTI; >- } else { >- String txt= "The typePoolId ''{0}'' is not supported."; >- String msg = MessageFormat.format( txt, new Object[] { tpId } ); >- throw new IllegalArgumentException( msg ); >- } >- return result; >- } >- > private static AbstractTextDelegateLCA getLCADelegate( final Widget widget ) { > AbstractTextDelegateLCA result; > int style = ( ( Text )widget ).getStyle(); >Index: src/org/eclipse/swt/internal/widgets/textkit/AbstractTextDelegateLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/textkit/AbstractTextDelegateLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 AbstractTextDelegateLCA.java >--- src/org/eclipse/swt/internal/widgets/textkit/AbstractTextDelegateLCA.java 12 Jun 2008 13:14:29 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/textkit/AbstractTextDelegateLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -20,6 +20,4 @@ > abstract void renderInitialization( Text text ) throws IOException; > abstract void renderChanges( Text text ) throws IOException; > abstract void renderDispose( Text text ) throws IOException; >- abstract void createResetHandlerCalls( String typePoolId ) throws IOException; >- abstract String getTypePoolId( Text text ); > } >Index: src/org/eclipse/swt/internal/widgets/textkit/SingleTextLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/textkit/SingleTextLCA.java,v >retrieving revision 1.9 >diff -u -r1.9 SingleTextLCA.java >--- src/org/eclipse/swt/internal/widgets/textkit/SingleTextLCA.java 1 Jul 2009 14:18:22 -0000 1.9 >+++ src/org/eclipse/swt/internal/widgets/textkit/SingleTextLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -18,8 +18,6 @@ > > final class SingleTextLCA extends AbstractTextDelegateLCA { > >- static final String TYPE_POOL_ID = SingleTextLCA.class.getName(); >- > void preserveValues( final Text text ) { > ControlLCAUtil.preserveValues( text ); > TextLCAUtil.preserveValues( text ); >@@ -65,18 +63,4 @@ > writer.dispose(); > } > >- String getTypePoolId( final Text text ) { >- return TYPE_POOL_ID; >- } >- >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- TextLCAUtil.resetSelection(); >- TextLCAUtil.resetVerifyAndModifyListener(); >- TextLCAUtil.resetSelectionListener(); >- TextLCAUtil.resetTextLimit(); >- TextLCAUtil.resetReadOnly(); >- TextLCAUtil.resetText(); >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } > } >\ No newline at end of file >Index: src/org/eclipse/swt/internal/widgets/textkit/MultiTextLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/textkit/MultiTextLCA.java,v >retrieving revision 1.12 >diff -u -r1.12 MultiTextLCA.java >--- src/org/eclipse/swt/internal/widgets/textkit/MultiTextLCA.java 1 Jul 2009 14:18:22 -0000 1.12 >+++ src/org/eclipse/swt/internal/widgets/textkit/MultiTextLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -19,8 +19,6 @@ > > final class MultiTextLCA extends AbstractTextDelegateLCA { > >- static final String TYPE_POOL_ID = MultiTextLCA.class.getName(); >- > void preserveValues( final Text text ) { > ControlLCAUtil.preserveValues( text ); > TextLCAUtil.preserveValues( text ); >@@ -65,16 +63,4 @@ > writer.dispose(); > } > >- String getTypePoolId( final Text text ) { >- return TYPE_POOL_ID; >- } >- >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- TextLCAUtil.resetVerifyAndModifyListener(); >- TextLCAUtil.resetTextLimit(); >- TextLCAUtil.resetReadOnly(); >- TextLCAUtil.resetText(); >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } > } >Index: src/org/eclipse/swt/internal/widgets/textkit/PasswordTextLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/textkit/PasswordTextLCA.java,v >retrieving revision 1.8 >diff -u -r1.8 PasswordTextLCA.java >--- src/org/eclipse/swt/internal/widgets/textkit/PasswordTextLCA.java 1 Jul 2009 14:18:22 -0000 1.8 >+++ src/org/eclipse/swt/internal/widgets/textkit/PasswordTextLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -17,8 +17,6 @@ > > final class PasswordTextLCA extends AbstractTextDelegateLCA { > >- static final String TYPE_POOL_ID = PasswordTextLCA.class.getName(); >- > void preserveValues( final Text text ) { > ControlLCAUtil.preserveValues( text ); > TextLCAUtil.preserveValues( text ); >@@ -62,18 +60,4 @@ > writer.dispose(); > } > >- String getTypePoolId( final Text text ) { >- return TYPE_POOL_ID; >- } >- >- void createResetHandlerCalls( final String typePoolId ) throws IOException { >- TextLCAUtil.resetVerifyAndModifyListener(); >- TextLCAUtil.resetSelectionListener(); >- TextLCAUtil.resetSelection(); >- TextLCAUtil.resetTextLimit(); >- TextLCAUtil.resetReadOnly(); >- TextLCAUtil.resetText(); >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } > } >Index: src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 CTabFolderLCA.java >--- src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -208,13 +208,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > public Rectangle adjustCoordinates( final Widget widget, > final Rectangle bounds ) > { >@@ -231,16 +224,6 @@ > return result; > } > >-// public Rectangle adjustCoordinates( final Rectangle bounds ) { >-// int border = 1; >-// int hTabBar = 23; >-// return new Rectangle( bounds.x - border - 10, >-// bounds.y - hTabBar - border -10, >-// bounds.width, >-// bounds.height ); >-// } >- >- > ////////////////////////////////////// > // Helping methods to write properties > >Index: src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA.java,v >retrieving revision 1.15 >diff -u -r1.15 ShellLCA.java >--- src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA.java 1 Jul 2009 14:51:11 -0000 1.15 >+++ src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -32,7 +32,6 @@ > public final class ShellLCA extends AbstractWidgetLCA { > > private static final String QX_TYPE = "org.eclipse.swt.widgets.Shell"; >-// private static final String TYPE_POOL_ID = ShellLCA.class.getName(); > > private static final String PROP_TEXT = "text"; > private static final String PROP_IMAGE = "image"; >@@ -134,28 +133,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.call( "removeState", new Object[]{ "rwt_TITLE" } ); >- // TODO [rst] If this is ever being reactivated, all Shell style-flag states >- // must be removed >- writer.set( "parentShell", ( Object )null ); >- ControlLCAUtil.resetStyleFlags(); >- ControlLCAUtil.resetResizeNotificator(); >- ControlLCAUtil.resetMoveNotificator(); >- // TODO [rh] reset close listener when shell pooling is activated >- ControlLCAUtil.resetBounds(); >- ControlLCAUtil.resetZIndex(); >- ControlLCAUtil.resetToolTip(); >- } >- >- public String getTypePoolId( final Widget widget ) { >-// return TYPE_POOL_ID; >- return null; >- } >- > ////////////////// > // Helping methods > >Index: src/org/eclipse/swt/internal/widgets/listkit/ListLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/listkit/ListLCA.java,v >retrieving revision 1.7 >diff -u -r1.7 ListLCA.java >--- src/org/eclipse/swt/internal/widgets/listkit/ListLCA.java 29 Jul 2009 11:43:38 -0000 1.7 >+++ src/org/eclipse/swt/internal/widgets/listkit/ListLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -90,17 +90,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > //////////////////////////////////// > // Helping methods to preserve state > >Index: src/org/eclipse/swt/internal/widgets/compositekit/CompositeLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/compositekit/CompositeLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 CompositeLCA.java >--- src/org/eclipse/swt/internal/widgets/compositekit/CompositeLCA.java 10 Oct 2008 15:09:24 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/compositekit/CompositeLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -21,7 +21,6 @@ > public class CompositeLCA extends AbstractWidgetLCA { > > private static final String QX_TYPE = "qx.ui.layout.CanvasLayout"; >-// private static final String TYPE_POOL_ID = CompositeLCA.class.getName(); > > public void preserveValues( final Widget widget ) { > ControlLCAUtil.preserveValues( ( Control )widget ); >@@ -52,19 +51,4 @@ > JSWriter writer = JSWriter.getWriterFor( widget ); > writer.dispose(); > } >- >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- // TODO [rh] disabled pooling, see >- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=203499 >- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=204107 >-// return TYPE_POOL_ID; >- return null; >- } > } >Index: src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 TabFolderLCA.java >--- src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -57,15 +57,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > public Rectangle adjustCoordinates( final Widget widget, > final Rectangle newBounds ) > { >Index: src/org/eclipse/swt/internal/widgets/scalekit/ScaleLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/scalekit/ScaleLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 ScaleLCA.java >--- src/org/eclipse/swt/internal/widgets/scalekit/ScaleLCA.java 1 Jul 2009 14:18:22 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/scalekit/ScaleLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -101,15 +101,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > ////////////////// > // Helping methods > >Index: src/org/eclipse/swt/internal/widgets/sliderkit/SliderLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/sliderkit/SliderLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 SliderLCA.java >--- src/org/eclipse/swt/internal/widgets/sliderkit/SliderLCA.java 1 Jul 2009 14:18:22 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/sliderkit/SliderLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -105,15 +105,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > ////////////////// > // Helping methods > private void writeMaximum( final Slider slider ) throws IOException { >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.16 >diff -u -r1.16 DisplayLCA.java >--- src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java 29 Jun 2009 19:18:50 -0000 1.16 >+++ src/org/eclipse/swt/internal/widgets/displaykit/DisplayLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -14,7 +14,8 @@ > > import java.io.IOException; > import java.text.MessageFormat; >-import java.util.*; >+import java.util.HashMap; >+import java.util.Map; > import java.util.logging.Level; > > import javax.servlet.http.HttpServletRequest; >@@ -30,7 +31,6 @@ > import org.eclipse.rwt.internal.util.HTML; > import org.eclipse.rwt.lifecycle.*; > import org.eclipse.rwt.resources.IResource; >-import org.eclipse.rwt.service.ISessionStore; > import org.eclipse.swt.events.TypedEvent; > import org.eclipse.swt.graphics.Device; > import org.eclipse.swt.graphics.Rectangle; >@@ -51,10 +51,6 @@ > private final static String PATTERN_REQUEST_COUNTER > = "var req = org.eclipse.swt.Request.getInstance();" > + "req.setRequestCounter( \"{0,number,#}\" );"; >- private static final String DISPOSE_HANDLER_REGISTRY >- = "org.eclipse.rap.disposeHandlerRegistry"; >- private static final JSVar DISPOSE_HANDLER_START >- = new JSVar( "function( " + JSWriter.WIDGET_REF + " ) {" ); > > private static final String CLIENT_LOG_LEVEL > = "org.eclipse.rwt.clientLogLevel"; >@@ -368,6 +364,8 @@ > > private static void disposeWidgets() throws IOException { > Widget[] disposedWidgets = DisposedWidgets.getAll(); >+ // TODO [rst] since widget pooling is removed, the loop should be reverted >+ // again > // [fappel]: client side disposal order is crucial for the widget > // caching mechanism - we need to dispose of children first. This > // is reverse to the server side mechanism (which is analog to >@@ -375,40 +373,10 @@ > for( int i = disposedWidgets.length - 1; i >= 0; i-- ) { > Widget toDispose = disposedWidgets[ i ]; > AbstractWidgetLCA lca = WidgetUtil.getLCA( toDispose ); >- >- Set disposeHandler = getAlreadyRegisteredHandlers(); >- String key = lca.getTypePoolId( toDispose ); >- if( key != null && !disposeHandler.contains( key ) ) { >- JSWriter writer = JSWriter.getWriterFor( toDispose ); >- Object[] params = new Object[] { >- new Integer( key.hashCode() ), >- DISPOSE_HANDLER_START >- }; >- writer.startCall( JSWriter.WIDGET_MANAGER_REF, >- "registerResetHandler", >- params ); >- try { >- lca.createResetHandlerCalls( key ); >- } finally { >- writer.endCall( new Object[] { new JSVar( "}" ) } ); >- disposeHandler.add( key ); >- } >- } >- > lca.renderDispose( toDispose ); > } > } > >- private static Set getAlreadyRegisteredHandlers() { >- ISessionStore session = ContextProvider.getSession(); >- Set result = ( Set )session.getAttribute( DISPOSE_HANDLER_REGISTRY ); >- if( result == null ) { >- result = new HashSet(); >- session.setAttribute( DISPOSE_HANDLER_REGISTRY, result ); >- } >- return result; >- } >- > private static void writeScriptTag( final HtmlResponseWriter out, > final String library ) > throws IOException >Index: src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java,v >retrieving revision 1.10 >diff -u -r1.10 TreeItemLCA.java >--- src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java 9 Jun 2009 18:09:16 -0000 1.10 >+++ src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -155,16 +155,7 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- // ///////////////////////////////// >+ //////////////////////////////////// > // Helping methods to write changes > private void writeShowItem( final TreeItem item ) throws IOException { > Tree tree = item.getParent(); >Index: src/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java,v >retrieving revision 1.8 >diff -u -r1.8 CLabelLCA.java >--- src/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java 5 Aug 2009 14:56:41 -0000 1.8 >+++ src/org/eclipse/swt/internal/custom/clabelkit/CLabelLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -75,15 +75,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > private static void writeText( final CLabel label ) throws IOException { > String text = label.getText(); > if( WidgetLCAUtil.hasChanged( label, PROP_TEXT, text, "" ) ) { >Index: src/org/eclipse/swt/internal/widgets/menukit/MenuLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/menukit/MenuLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 MenuLCA.java >--- src/org/eclipse/swt/internal/widgets/menukit/MenuLCA.java 12 Jun 2008 13:14:29 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/menukit/MenuLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -50,15 +50,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > private static MenuDelegateLCA getDelegateLCA( final Widget widget ) { > MenuDelegateLCA result; > Menu menu = ( Menu )widget; >Index: src/org/eclipse/swt/internal/custom/scrolledcompositekit/ScrolledCompositeLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/custom/scrolledcompositekit/ScrolledCompositeLCA.java,v >retrieving revision 1.6 >diff -u -r1.6 ScrolledCompositeLCA.java >--- src/org/eclipse/swt/internal/custom/scrolledcompositekit/ScrolledCompositeLCA.java 1 Jul 2009 14:18:22 -0000 1.6 >+++ src/org/eclipse/swt/internal/custom/scrolledcompositekit/ScrolledCompositeLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -25,9 +25,6 @@ > private static final String QX_TYPE > = "org.eclipse.swt.custom.ScrolledComposite"; > >-// private static final String TYPE_POOL_ID >-// = ScrolledCompositeLCA.class.getName(); >- > private static final Integer ZERO = new Integer( 0 ); > > // Request parameter names >@@ -95,23 +92,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- ControlLCAUtil.resetChanges(); >- resetClipBounds(); >- resetScrollBars(); >- resetBarSelection(); >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=226651 >-// return TYPE_POOL_ID; >- return null; >- } >- >- > /////////////////////////////////// > // Helping methods to write changes > >@@ -123,11 +103,6 @@ > writer.set( PROP_OVERFLOW, "overflow", overflow, null ); > } > >- private static void resetScrollBars() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( "overflow" ); >- } >- > private static void writeBarSelection( final ScrolledComposite composite ) > throws IOException > { >@@ -142,12 +117,6 @@ > } > } > >- private static void resetBarSelection() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.set( "hBarSelection", 0 ); >- writer.set( "vBarSelection", 0 ); >- } >- > private static void writeClipBounds( final ScrolledComposite composite ) > throws IOException > { >@@ -159,12 +128,6 @@ > } > } > >- private static void resetClipBounds() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( "clipWidth" ); >- writer.reset( "clipHeight" ); >- } >- > private static String getOverflow( final ScrolledComposite composite ) { > String result; > ScrollBar horizontalBar = composite.getHorizontalBar(); >Index: src/org/eclipse/swt/internal/widgets/combokit/ComboLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/combokit/ComboLCA.java,v >retrieving revision 1.9 >diff -u -r1.9 ComboLCA.java >--- src/org/eclipse/swt/internal/widgets/combokit/ComboLCA.java 6 Aug 2009 11:27:27 -0000 1.9 >+++ src/org/eclipse/swt/internal/widgets/combokit/ComboLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -113,20 +113,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.call( "removeAll", null ); >- } >- >- public String getTypePoolId( final Widget widget ) { >-// TODO [rst] Enable pooling when re-parenting problems with >-// qx.ui.form.ComboBox are solved >-// return TYPE_POOL_ID; >- return null; >- } >- > /////////////////////////////////////// > // Helping methods to read client state > >Index: src/org/eclipse/swt/internal/widgets/expandbarkit/ExpandBarLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/expandbarkit/ExpandBarLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 ExpandBarLCA.java >--- src/org/eclipse/swt/internal/widgets/expandbarkit/ExpandBarLCA.java 1 Jul 2009 14:18:22 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/expandbarkit/ExpandBarLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -67,15 +67,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > public static IExpandBarAdapter getExpandBarAdapter( final ExpandBar bar ) { > return ( IExpandBarAdapter )bar.getAdapter( IExpandBarAdapter.class ); > } >Index: src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 CoolBarLCA.java >--- src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/coolbarkit/CoolBarLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -55,11 +55,4 @@ > JSWriter writer = JSWriter.getWriterFor( widget ); > writer.dispose(); > } >- >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } > } >Index: src/org/eclipse/swt/internal/widgets/expanditemkit/ExpandItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/expanditemkit/ExpandItemLCA.java,v >retrieving revision 1.3 >diff -u -r1.3 ExpandItemLCA.java >--- src/org/eclipse/swt/internal/widgets/expanditemkit/ExpandItemLCA.java 16 Sep 2008 16:24:34 -0000 1.3 >+++ src/org/eclipse/swt/internal/widgets/expanditemkit/ExpandItemLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -101,15 +101,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > //////////////// > // Event helper > >Index: src/org/eclipse/swt/internal/widgets/progressbarkit/ProgressBarLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/progressbarkit/ProgressBarLCA.java,v >retrieving revision 1.6 >diff -u -r1.6 ProgressBarLCA.java >--- src/org/eclipse/swt/internal/widgets/progressbarkit/ProgressBarLCA.java 2 Aug 2009 21:12:54 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/progressbarkit/ProgressBarLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -69,15 +69,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > private static void writeState( final ProgressBar progressBar ) > throws IOException > { >Index: src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 TableColumnLCA.java >--- src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA.java 25 Jul 2009 20:18:19 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/tablecolumnkit/TableColumnLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -120,16 +120,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > ////////////////////////////////////////// > // Helping method to write JavaScript code > >Index: src/org/eclipse/swt/internal/custom/ctabitemkit/CTabItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/custom/ctabitemkit/CTabItemLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 CTabItemLCA.java >--- src/org/eclipse/swt/internal/custom/ctabitemkit/CTabItemLCA.java 18 Dec 2008 15:02:22 -0000 1.4 >+++ src/org/eclipse/swt/internal/custom/ctabitemkit/CTabItemLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -105,16 +105,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > //////////////////////////////////////////// > // Helping methods to render JavaScript code > >Index: src/org/eclipse/swt/internal/widgets/tabitemkit/TabItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tabitemkit/TabItemLCA.java,v >retrieving revision 1.6 >diff -u -r1.6 TabItemLCA.java >--- src/org/eclipse/swt/internal/widgets/tabitemkit/TabItemLCA.java 4 Jun 2009 11:48:56 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/tabitemkit/TabItemLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -85,16 +85,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- >- > ////////////////// > // helping methods > >Index: src/org/eclipse/swt/internal/widgets/toolbarkit/ToolBarLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/toolbarkit/ToolBarLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 ToolBarLCA.java >--- src/org/eclipse/swt/internal/widgets/toolbarkit/ToolBarLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/toolbarkit/ToolBarLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -60,12 +60,4 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } > } >Index: src/org/eclipse/swt/internal/widgets/tablekit/TableLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tablekit/TableLCA.java,v >retrieving revision 1.20 >diff -u -r1.20 TableLCA.java >--- src/org/eclipse/swt/internal/widgets/tablekit/TableLCA.java 1 Jul 2009 10:55:35 -0000 1.20 >+++ src/org/eclipse/swt/internal/widgets/tablekit/TableLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -150,15 +150,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > public void doRedrawFake( final Control control ) { > Table table = ( Table )control; > Object adapter = table.getAdapter( ITableAdapter.class ); >Index: src/org/eclipse/swt/internal/widgets/toolitemkit/ToolItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/toolitemkit/ToolItemLCA.java,v >retrieving revision 1.4 >diff -u -r1.4 ToolItemLCA.java >--- src/org/eclipse/swt/internal/widgets/toolitemkit/ToolItemLCA.java 4 Jun 2009 11:48:55 -0000 1.4 >+++ src/org/eclipse/swt/internal/widgets/toolitemkit/ToolItemLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -53,13 +53,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > private static ToolItemDelegateLCA getLCADelegate( final Widget widget ) { > ToolItemDelegateLCA result; > int style = ( ( ToolItem )widget ).getStyle(); >Index: src/org/eclipse/swt/internal/widgets/menuitemkit/MenuItemLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/menuitemkit/MenuItemLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 MenuItemLCA.java >--- src/org/eclipse/swt/internal/widgets/menuitemkit/MenuItemLCA.java 12 Jun 2008 13:14:29 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/menuitemkit/MenuItemLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -59,15 +59,6 @@ > getDelegateLCA( menuItem ).renderDispose( menuItem ); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > private static boolean isTopLevelMenuBarItem( final MenuItem menuItem ) { > return ( menuItem.getParent().getStyle() & SWT.BAR ) != 0; > } >Index: src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA.java,v >retrieving revision 1.2 >diff -u -r1.2 ControlLCA.java >--- src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA.java 12 Jun 2008 13:14:29 -0000 1.2 >+++ src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -40,13 +40,4 @@ > public void renderDispose( final Widget widget ) throws IOException { > // do nothing > } >- >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- // do nothing >- } >- >- public String getTypePoolId( final Widget widget ) { >- // do nothing >- return null; >- } > } >Index: src/org/eclipse/swt/internal/widgets/sashkit/SashLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/sashkit/SashLCA.java,v >retrieving revision 1.6 >diff -u -r1.6 SashLCA.java >--- src/org/eclipse/swt/internal/widgets/sashkit/SashLCA.java 1 Jul 2009 14:18:22 -0000 1.6 >+++ src/org/eclipse/swt/internal/widgets/sashkit/SashLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -25,8 +25,6 @@ > > private static final String QX_TYPE = "org.eclipse.swt.widgets.Sash"; > >-// private static final String TYPE_POOL_ID = SashLCA.class.getName(); >- > public void preserveValues( final Widget widget ) { > ControlLCAUtil.preserveValues( ( Control )widget ); > IWidgetAdapter adapter = WidgetUtil.getAdapter( widget ); >@@ -67,16 +65,4 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- ControlLCAUtil.resetChanges(); >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >-// return TYPE_POOL_ID; >- // TODO [bm] disabled due to cursor problems >- return null; >- } > } >Index: src/org/eclipse/swt/internal/widgets/groupkit/GroupLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/groupkit/GroupLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 GroupLCA.java >--- src/org/eclipse/swt/internal/widgets/groupkit/GroupLCA.java 1 Jul 2009 14:18:22 -0000 1.5 >+++ src/org/eclipse/swt/internal/widgets/groupkit/GroupLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -58,14 +58,4 @@ > JSWriter writer = JSWriter.getWriterFor( widget ); > writer.dispose(); > } >- >- public void createResetHandlerCalls( final String typePoolId ) throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( "legend" ); >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } > } >Index: src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA.java,v >retrieving revision 1.7 >diff -u -r1.7 CComboLCA.java >--- src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA.java 29 Jul 2009 14:33:06 -0000 1.7 >+++ src/org/eclipse/swt/internal/custom/ccombokit/CComboLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -120,17 +120,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.call( "removeAll", null ); >- } >- >- public String getTypePoolId( final Widget widget ) { >- return null; >- } >- > /////////////////////////////////////// > // Helping methods to read client state > >Index: src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA.java,v >retrieving revision 1.3 >diff -u -r1.3 DateTimeLCA.java >--- src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA.java 10 Oct 2008 15:09:23 -0000 1.3 >+++ src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -46,19 +46,6 @@ > getDelegate( widget ).renderDispose( ( DateTime )widget ); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- } >- >- public String getTypePoolId( final Widget widget ) { >- // TODO [rh] disabled pooling, see bugs prefixed with [pooling] >- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=204107 >- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=199142 >- // return getDelegate( widget ).getTypePoolId( ( DateTime )widget ); >- return null; >- } >- > private static AbstractDateTimeLCADelegate getDelegate( final Widget widget ) > { > AbstractDateTimeLCADelegate result; >Index: src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA.java,v >retrieving revision 1.9 >diff -u -r1.9 SpinnerLCA.java >--- src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA.java 1 Jul 2009 14:38:28 -0000 1.9 >+++ src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -23,7 +23,6 @@ > public final class SpinnerLCA extends AbstractWidgetLCA { > > private static final String QX_TYPE = "org.eclipse.swt.widgets.Spinner"; >-// private static final String TYPE_POOL_ID = SpinnerLCA.class.getName(); > > private static final Integer DEFAULT_TEXT_LIMIT > = new Integer( Spinner.LIMIT ); >@@ -95,20 +94,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- ControlLCAUtil.resetStyleFlags(); >- resetReadOnly(); >- resetValues(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=226651 >-// return TYPE_POOL_ID; >- return null; >- } >- > ////////////////////////////////////// > // Helping methods to write JavaScript > >@@ -146,16 +131,6 @@ > } > } > >- private static void resetValues() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >-// TODO [rst] Missing resetters in QX_TYPE, discuss with qooxdoo >-// writer.reset( "min" ); >-// writer.reset( "max" ); >- writer.reset( "incrementAmount" ); >- writer.reset( "pageIncrementAmount" ); >- writer.reset( "value" ); >- } >- > private static void writeSetInt( final JSWriter writer, > final String javaProperty, > final String jsProperty, >@@ -176,11 +151,6 @@ > writer.set( JSConst.QX_FIELD_EDITABLE, !readOnly ); > } > >- private static void resetReadOnly() throws IOException { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( JSConst.QX_FIELD_EDITABLE ); >- } >- > private static void writeWrap( final Spinner spinner ) throws IOException { > if( ( spinner.getStyle() & SWT.WRAP ) != 0 ) { > JSWriter writer = JSWriter.getWriterFor( spinner ); >Index: js/org/eclipse/swt/widgets/List.js >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/widgets/List.js,v >retrieving revision 1.10 >diff -u -r1.10 List.js >--- js/org/eclipse/swt/widgets/List.js 6 Aug 2009 08:56:36 -0000 1.10 >+++ js/org/eclipse/swt/widgets/List.js 10 Aug 2009 17:42:22 -0000 >@@ -19,51 +19,44 @@ > construct : function() { > this.base( arguments ); > this.setMarkLeadingItem( true ); >- this.rap_init(); >+ // Should changeSelection events passed to the server-side? >+ // state == no, action == yes >+ this._changeSelectionNotification = "state"; >+ this._topIndex = 0; >+ var selMgr = this.getManager(); >+ selMgr.addEventListener( "changeLeadItem", this._onChangeLeadItem, this ); >+ selMgr.addEventListener( "changeSelection", this._onSelectionChange, this ); >+ this.addEventListener( "focus", this._onFocusIn, this ); >+ this.addEventListener( "blur", this._onFocusOut, this ); >+ this.addEventListener( "click", this._onClick, this ); >+ this.addEventListener( "dblclick", this._onDblClick, this ); >+ this.addEventListener( "appear", this._onAppear, this ); >+ // Listen to send event of request to report topIndex >+ var req = org.eclipse.swt.Request.getInstance(); >+ req.addEventListener( "send", this._onSendRequest, this ); > }, > > destruct : function() { >- this.rap_reset(); >+ var req = org.eclipse.swt.Request.getInstance(); >+ req.removeEventListener( "send", this._onSendRequest, this ); >+ var selMgr = this.getManager(); >+ selMgr.removeEventListener( "changeLeadItem", this._onChangeLeadItem, this ); >+ selMgr.removeEventListener( "changeSelection", this._onSelectionChange, this ); >+ this.removeEventListener( "focus", this._onFocusIn, this ); >+ this.removeEventListener( "blur", this._onFocusOut, this ); >+ this.removeEventListener( "click", this._onClick, this ); >+ this.removeEventListener( "dblclick", this._onDblClick, this ); >+ this.removeEventListener( "appear", this._onAppear, this ); > }, > > members : { > >+ // TODO [rst] Move parameter to constructor and delete this method > init : function( multiSelection ) { > var manager = this.getManager(); > manager.setMultiSelection( multiSelection ); > }, > >- rap_init : function( multiSelection ) { >- // Should changeSelection events passed to the server-side? >- // state == no, action == yes >- this._changeSelectionNotification = "state"; >- this._topIndex = 0; >- var selMgr = this.getManager(); >- selMgr.addEventListener( "changeLeadItem", this._onChangeLeadItem, this ); >- selMgr.addEventListener( "changeSelection", this._onSelectionChange, this ); >- this.addEventListener( "focus", this._onFocusIn, this ); >- this.addEventListener( "blur", this._onFocusOut, this ); >- this.addEventListener( "click", this._onClick, this ); >- this.addEventListener( "dblclick", this._onDblClick, this ); >- this.addEventListener( "appear", this._onAppear, this ); >- // Listen to send event of request to report topIndex >- var req = org.eclipse.swt.Request.getInstance(); >- req.addEventListener( "send", this._onSendRequest, this ); >- }, >- >- rap_reset : function() { >- var req = org.eclipse.swt.Request.getInstance(); >- req.removeEventListener( "send", this._onSendRequest, this ); >- var selMgr = this.getManager(); >- selMgr.removeEventListener( "changeLeadItem", this._onChangeLeadItem, this ); >- selMgr.removeEventListener( "changeSelection", this._onSelectionChange, this ); >- this.removeEventListener( "focus", this._onFocusIn, this ); >- this.removeEventListener( "blur", this._onFocusOut, this ); >- this.removeEventListener( "click", this._onClick, this ); >- this.removeEventListener( "dblclick", this._onDblClick, this ); >- this.removeEventListener( "appear", this._onAppear, this ); >- }, >- > /** Sets the given array of items. */ > setItems : function( items ) { > // preserve selection and focused item >Index: src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA.java,v >retrieving revision 1.13 >diff -u -r1.13 LinkLCA.java >--- src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA.java 1 Jul 2009 14:18:22 -0000 1.13 >+++ src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA.java 10 Aug 2009 17:42:23 -0000 >@@ -79,18 +79,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=226651 >-// return TYPE_POOL_ID; >- return null; >- } >- > private static void writeSelectionListener( final Link link ) > throws IOException > { >Index: src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java,v >retrieving revision 1.5 >diff -u -r1.5 BrowserLCA.java >--- src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java 24 Nov 2008 07:44:09 -0000 1.5 >+++ src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java 10 Aug 2009 17:42:22 -0000 >@@ -28,8 +28,6 @@ > > private static final String PARAM_EXECUTE_RESULT = "executeResult"; > >-// private static final String TYPE_POOL_ID = BrowserLCA.class.getName(); >- > private static final String PROP_URL = "url"; > private static final String PROP_TEXT = "text"; > >@@ -75,21 +73,6 @@ > writer.dispose(); > } > >- public void createResetHandlerCalls( final String typePoolId ) >- throws IOException >- { >- JSWriter writer = JSWriter.getWriterForResetHandler(); >- writer.reset( QX_FIELD_SOURCE ); >- ControlLCAUtil.resetStyleFlags(); >- } >- >- public String getTypePoolId( final Widget widget ) { >- // TODO [rh] Disabled pooling. In IE7, using Browser#setText() does not >- // work when widget was pooled. The previous content is displayed. >-// return TYPE_POOL_ID; >- return null; >- } >- > private static void writeUrl( final Browser browser ) > throws IOException > {
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 281909
:
143930
| 143932 |
143933