Attachment #143930 for bug #281909

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




    }
  }

  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() );

    }
  }

  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 );

    }
  }

  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 ) {

    }
  }

  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,

    }
  }

  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.




    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 )
  {

    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





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";

    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





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 );

    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;
  }
}




    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





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;

    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();




    writer.dispose();
  }

  public void createResetHandlerCalls( final String typePoolId ) throws IOException {
  }

  public String getTypePoolId( final Widget widget ) {
    return null;
  }


  //////////////////
  // Helping methods


Return to bug 281909

Lines 116-137 Link Here

(-)src/org/eclipse/swt/internal/widgets/textkit/TextLCAUtil.java (-27 lines)
116	}	116	}
117	}	117	}
118		118
119	static void resetText() throws IOException {
120	JSWriter writer = JSWriter.getWriterForResetHandler();
121	writer.reset( JS_PROP_VALUE );
122	}
123
124	static void writeReadOnly( final Text text ) throws IOException {	119	static void writeReadOnly( final Text text ) throws IOException {
125	JSWriter writer = JSWriter.getWriterFor( text );	120	JSWriter writer = JSWriter.getWriterFor( text );
126	Boolean newValue = Boolean.valueOf( !text.getEditable() );	121	Boolean newValue = Boolean.valueOf( !text.getEditable() );
127	writer.set( PROP_READONLY, JS_PROP_READ_ONLY, newValue, Boolean.FALSE );	122	writer.set( PROP_READONLY, JS_PROP_READ_ONLY, newValue, Boolean.FALSE );
128	}	123	}
129		124
130	static void resetReadOnly() throws IOException {
131	JSWriter writer = JSWriter.getWriterForResetHandler();
132	writer.reset( JS_PROP_READ_ONLY );
133	}
134
135	static void writeTextLimit( final Text text ) throws IOException {	125	static void writeTextLimit( final Text text ) throws IOException {
136	JSWriter writer = JSWriter.getWriterFor( text );	126	JSWriter writer = JSWriter.getWriterFor( text );
137	Integer newValue = new Integer( text.getTextLimit() );	127	Integer newValue = new Integer( text.getTextLimit() );
Lines 147-157 Link Here
147	}	137	}
148	}	138	}
149		139
150	static void resetTextLimit() throws IOException {
151	JSWriter writer = JSWriter.getWriterForResetHandler();
152	writer.reset( JS_PROP_MAX_LENGTH );
153	}
154
155	static void writeWrap( final Text text ) throws IOException {	140	static void writeWrap( final Text text ) throws IOException {
156	JSWriter writer = JSWriter.getWriterFor( text );	141	JSWriter writer = JSWriter.getWriterFor( text );
157	Boolean value = Boolean.valueOf( ( text.getStyle() & SWT.WRAP ) != 0 );	142	Boolean value = Boolean.valueOf( ( text.getStyle() & SWT.WRAP ) != 0 );
Lines 177-186 Link Here
177	}	162	}
178	}	163	}
179		164
180	static void resetSelection() {
181	// POOLING Implement if pooling is reactivated
182	}
183
184	static void writeAlignment( final Text text ) throws IOException {	165	static void writeAlignment( final Text text ) throws IOException {
185	int style = text.getStyle();	166	int style = text.getStyle();
186	if( ( style & SWT.RIGHT ) != 0 ) {	167	if( ( style & SWT.RIGHT ) != 0 ) {
Lines 207-216 Link Here
207	}	188	}
208	}	189	}
209		190
210	static void resetSelectionListener() {
211	// POOLING Implement if pooling is reactivated
212	}
213
214	static void preserveVerifyAndModifyListener( final Text text ) {	191	static void preserveVerifyAndModifyListener( final Text text ) {
215	IWidgetAdapter adapter = WidgetUtil.getAdapter( text );	192	IWidgetAdapter adapter = WidgetUtil.getAdapter( text );
216	adapter.preserve( PROP_VERIFY_MODIFY_LISTENER,	193	adapter.preserve( PROP_VERIFY_MODIFY_LISTENER,
Lines 231-240 Link Here
231	}	208	}
232	}	209	}
233		210
234	static void resetVerifyAndModifyListener() {
235	// POOLING Implement if pooling is reactivated
236	}
237
238	private static boolean hasSelectionListener( final Text text ) {	211	private static boolean hasSelectionListener( final Text text ) {
239	// Emulate SWT (on Windows) where a default button takes precedence over	212	// Emulate SWT (on Windows) where a default button takes precedence over
240	// a SelectionListener on a text field when both are on the same shell.	213	// a SelectionListener on a text field when both are on the same shell.

Lines 208-220 Link Here

(-)src/org/eclipse/swt/internal/custom/ctabfolderkit/CTabFolderLCA.java (-17 lines)
208	writer.dispose();	208	writer.dispose();
209	}	209	}
210		210
211	public void createResetHandlerCalls( final String typePoolId ) throws IOException {
212	}
213
214	public String getTypePoolId( final Widget widget ) {
215	return null;
216	}
217
218	public Rectangle adjustCoordinates( final Widget widget,	211	public Rectangle adjustCoordinates( final Widget widget,
219	final Rectangle bounds )	212	final Rectangle bounds )
220	{	213	{
Lines 231-246 Link Here
231	return result;	224	return result;
232	}	225	}
233		226
234	// public Rectangle adjustCoordinates( final Rectangle bounds ) {
235	// int border = 1;
236	// int hTabBar = 23;
237	// return new Rectangle( bounds.x - border - 10,
238	// bounds.y - hTabBar - border -10,
239	// bounds.width,
240	// bounds.height );
241	// }
242
243
244	//////////////////////////////////////	227	//////////////////////////////////////
245	// Helping methods to write properties	228	// Helping methods to write properties
246		229

Lines 32-38 Link Here

(-)src/org/eclipse/swt/internal/widgets/shellkit/ShellLCA.java (-23 lines)
32	public final class ShellLCA extends AbstractWidgetLCA {	32	public final class ShellLCA extends AbstractWidgetLCA {
33		33
34	private static final String QX_TYPE = "org.eclipse.swt.widgets.Shell";	34	private static final String QX_TYPE = "org.eclipse.swt.widgets.Shell";
35	// private static final String TYPE_POOL_ID = ShellLCA.class.getName();
36		35
37	private static final String PROP_TEXT = "text";	36	private static final String PROP_TEXT = "text";
38	private static final String PROP_IMAGE = "image";	37	private static final String PROP_IMAGE = "image";
Lines 134-161 Link Here
134	writer.dispose();	133	writer.dispose();
135	}	134	}
136		135
137	public void createResetHandlerCalls( final String typePoolId )
138	throws IOException
139	{
140	JSWriter writer = JSWriter.getWriterForResetHandler();
141	writer.call( "removeState", new Object[]{ "rwt_TITLE" } );
142	// TODO [rst] If this is ever being reactivated, all Shell style-flag states
143	// must be removed
144	writer.set( "parentShell", ( Object )null );
145	ControlLCAUtil.resetStyleFlags();
146	ControlLCAUtil.resetResizeNotificator();
147	ControlLCAUtil.resetMoveNotificator();
148	// TODO [rh] reset close listener when shell pooling is activated
149	ControlLCAUtil.resetBounds();
150	ControlLCAUtil.resetZIndex();
151	ControlLCAUtil.resetToolTip();
152	}
153
154	public String getTypePoolId( final Widget widget ) {
155	// return TYPE_POOL_ID;
156	return null;
157	}
158
159	//////////////////	136	//////////////////
160	// Helping methods	137	// Helping methods
161		138

Lines 21-27 Link Here

(-)src/org/eclipse/swt/internal/widgets/compositekit/CompositeLCA.java (-16 lines)
21	public class CompositeLCA extends AbstractWidgetLCA {	21	public class CompositeLCA extends AbstractWidgetLCA {
22		22
23	private static final String QX_TYPE = "qx.ui.layout.CanvasLayout";	23	private static final String QX_TYPE = "qx.ui.layout.CanvasLayout";
24	// private static final String TYPE_POOL_ID = CompositeLCA.class.getName();
25		24
26	public void preserveValues( final Widget widget ) {	25	public void preserveValues( final Widget widget ) {
27	ControlLCAUtil.preserveValues( ( Control )widget );	26	ControlLCAUtil.preserveValues( ( Control )widget );
Lines 52-70 Link Here
52	JSWriter writer = JSWriter.getWriterFor( widget );	51	JSWriter writer = JSWriter.getWriterFor( widget );
53	writer.dispose();	52	writer.dispose();
54	}	53	}
55
56	public void createResetHandlerCalls( final String typePoolId )
57	throws IOException
58	{
59	ControlLCAUtil.resetChanges();
60	ControlLCAUtil.resetStyleFlags();
61	}
62
63	public String getTypePoolId( final Widget widget ) {
64	// TODO [rh] disabled pooling, see
65	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=203499
66	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=204107
67	// return TYPE_POOL_ID;
68	return null;
69	}
70	}	54	}

Lines 90-106 Link Here

(-)src/org/eclipse/swt/internal/widgets/listkit/ListLCA.java (-11 lines)
90	writer.dispose();	90	writer.dispose();
91	}	91	}
92		92
93	public void createResetHandlerCalls( final String typePoolId )
94	throws IOException
95	{
96	ControlLCAUtil.resetStyleFlags();
97	}
98
99	public String getTypePoolId( final Widget widget ) {
100	return null;
101	}
102
103
104	////////////////////////////////////	93	////////////////////////////////////
105	// Helping methods to preserve state	94	// Helping methods to preserve state
106		95

Lines 12-18 Link Here

(-)src/org/eclipse/swt/internal/widgets/buttonkit/ButtonLCA.java (-27 lines)
12	package org.eclipse.swt.internal.widgets.buttonkit;	12	package org.eclipse.swt.internal.widgets.buttonkit;
13		13
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.text.MessageFormat;
16		15
17	import org.eclipse.rwt.lifecycle.AbstractWidgetLCA;	16	import org.eclipse.rwt.lifecycle.AbstractWidgetLCA;
18	import org.eclipse.rwt.lifecycle.JSWriter;	17	import org.eclipse.rwt.lifecycle.JSWriter;
Lines 53-84 Link Here
53	getLCADelegate( widget ).renderDispose( ( Button )widget );	52	getLCADelegate( widget ).renderDispose( ( Button )widget );
54	}	53	}
55		54
56	public void createResetHandlerCalls( final String typePoolId )
57	throws IOException
58	{
59	getLCADelegate( typePoolId ).createResetHandlerCalls( typePoolId );
60	}
61
62	public String getTypePoolId( final Widget widget ) {
63	return getLCADelegate( widget ).getTypePoolId( ( Button )widget );
64	}
65
66	private static ButtonDelegateLCA getLCADelegate( final String tpId ) {
67	ButtonDelegateLCA result;
68	if( tpId.startsWith( CheckButtonDelegateLCA.TYPE_POOL_ID ) ) {
69	result = CHECK;
70	} else if( tpId.startsWith( PushButtonDelegateLCA.TYPE_POOL_ID ) ) {
71	result = PUSH;
72	} else if( tpId.startsWith( RadioButtonDelegateLCA.TYPE_POOL_ID ) ) {
73	result = RADIO;
74	} else {
75	String txt= "The typePoolId ''{0}'' is not supported.";
76	String msg = MessageFormat.format( txt, new Object[] { tpId } );
77	throw new IllegalArgumentException( msg );
78	}
79	return result;
80	}
81
82	private static ButtonDelegateLCA getLCADelegate( final Widget widget ) {	55	private static ButtonDelegateLCA getLCADelegate( final Widget widget ) {
83	ButtonDelegateLCA result;	56	ButtonDelegateLCA result;
84	int style = ( ( Button )widget ).getStyle();	57	int style = ( ( Button )widget ).getStyle();