Attachment 143930 Details for Bug 281909 – Patch

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

[patch] Patch

clipboard.txt (text/plain), 10.62 KB, created by Ralf Sternberg

on 2009-08-10 13:31:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Sternberg

Created: 2009-08-10 13:31:04 EDT

Size: 10.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>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:32:05 -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/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:32:05 -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:32:05 -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/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:32:05 -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/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:32:05 -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/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:32:05 -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/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:32:05 -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
>

Actions: View | Diff

Attachments on bug 281909: 143930 | 143932 | 143933