Attachment #156365 for bug #299914

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

View | Details | Raw Unified | Return to bug 299914
Collapse All | Expand All




    adapter.preserve( PROP_TAB_INDEX, new Integer( getTabIndex( control ) ) );
    WidgetLCAUtil.preserveToolTipText( control, control.getToolTipText() );
    adapter.preserve( Props.MENU, control.getMenu() );
    adapter.preserve( Props.VISIBLE, Boolean.valueOf( getVisible( control ) ) );
    WidgetLCAUtil.preserveEnabled( control, control.getEnabled() );
    IControlAdapter controlAdapter
      = ( IControlAdapter )control.getAdapter( IControlAdapter.class );

  {
    // we only need getVisible here (not isVisible), as qooxdoo also hides/shows
    // contained controls
    Boolean newValue = Boolean.valueOf( getVisible( control ) );
    Boolean defValue = control instanceof Shell ? Boolean.FALSE : Boolean.TRUE;
    JSWriter writer = JSWriter.getWriterFor( control );
    writer.set( Props.VISIBLE, JSConst.QX_FIELD_VISIBLE, newValue, defValue );
  }

  // [if] Fix for bug 263025, 297466, 223873 and more
  // some qooxdoo widget with size (0,0) are not invisible
  private static boolean getVisible( final Control control ) {
    Point size = control.getSize();
    return control.getVisible() && size.x > 0 && size.y > 0;
  }

  /**
   * Determines whether the property <code>enabled</code> of the given control
   * has changed during the processing of the current request and if so, writes

Lines 103-108 Link Here

(-)src/org/eclipse/swt/internal/widgets/spinnerkit/SpinnerLCA_Test.java (+1 lines)
103	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	103	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
104	Fixture.clearPreserved();	104	Fixture.clearPreserved();
105	// visible	105	// visible
		106	spinner.setSize( 10, 10 );
106	Fixture.preserveWidgets();	107	Fixture.preserveWidgets();
107	adapter = WidgetUtil.getAdapter( spinner );	108	adapter = WidgetUtil.getAdapter( spinner );
108	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	109	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

Lines 197-202 Link Here

(-)src/org/eclipse/swt/internal/widgets/datetimekit/DateTimeLCA_Test.java (+1 lines)
197	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	197	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
198	Fixture.clearPreserved();	198	Fixture.clearPreserved();
199	// visible	199	// visible
		200	dateTime.setSize( 10, 10 );
200	Fixture.preserveWidgets();	201	Fixture.preserveWidgets();
201	adapter = WidgetUtil.getAdapter( dateTime );	202	adapter = WidgetUtil.getAdapter( dateTime );
202	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	203	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

Lines 68-73 Link Here

(-)src/org/eclipse/swt/internal/widgets/linkkit/LinkLCA_Test.java (+1 lines)
68	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	68	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
69	Fixture.clearPreserved();	69	Fixture.clearPreserved();
70	//visible	70	//visible
		71	link.setSize( 10, 10 );
71	Fixture.preserveWidgets();	72	Fixture.preserveWidgets();
72	adapter = WidgetUtil.getAdapter( link );	73	adapter = WidgetUtil.getAdapter( link );
73	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	74	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

Lines 107-112 Link Here

(-)src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java (+1 lines)
107	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	107	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
108	Fixture.clearPreserved();	108	Fixture.clearPreserved();
109	// visible	109	// visible
		110	tree.setSize( 10, 10 );
110	Fixture.preserveWidgets();	111	Fixture.preserveWidgets();
111	adapter = WidgetUtil.getAdapter( tree );	112	adapter = WidgetUtil.getAdapter( tree );
112	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	113	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

Lines 162-167 Link Here

(-)src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java (+1 lines)
162	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	162	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
163	Fixture.clearPreserved();	163	Fixture.clearPreserved();
164	// visible	164	// visible
		165	table.setSize( 10, 10 );
165	Fixture.preserveWidgets();	166	Fixture.preserveWidgets();
166	adapter = WidgetUtil.getAdapter( table );	167	adapter = WidgetUtil.getAdapter( table );
167	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	168	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );




    assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
    Fixture.clearPreserved();
    //visible
    tabfolder.setSize( 10, 10 );
    Fixture.preserveWidgets();
    adapter = WidgetUtil.getAdapter( tabfolder );
    assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

    assertFalse( control0.getVisible() );
    assertTrue( control1.getVisible() );
  }

  public void testSelectionWithListener() {
    final java.util.List events = new ArrayList();
    Display display = new Display();
    Shell shell = new Shell( display );
    shell.setLayout( new FillLayout() );

        events.add( event );
      }
    } );

    RWTLifeCycle lifeCycle = ( RWTLifeCycle )LifeCycleFactory.getLifeCycle();
    lifeCycle.addPhaseListener( new PreserveWidgetsPhaseListener() );
    String displayId = DisplayUtil.getAdapter( display ).getId();

    Fixture.fakeNewRequest();
    Fixture.fakeRequestParam( RequestParams.UIROOT, displayId );
    Fixture.executeLifeCycleFromServerThread( );

    events.clear();
    Fixture.fakeNewRequest();
    Fixture.fakeRequestParam( RequestParams.UIROOT, displayId );
    Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED, folderId );
    Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_SELECTED_ITEM, item1Id );

    Fixture.executeLifeCycleFromServerThread( );
    assertEquals( 1, folder.getSelectionIndex() );
    assertFalse( control0.getVisible() );

Lines 152-157 Link Here

(-)src/org/eclipse/swt/internal/widgets/controlkit/ControlLCA_Test.java (+1 lines)
152	Display display = new Display();	152	Display display = new Display();
153	Shell shell = new Shell( display , SWT.NONE );	153	Shell shell = new Shell( display , SWT.NONE );
154	Button button = new Button( shell, SWT.PUSH );	154	Button button = new Button( shell, SWT.PUSH );
		155	button.setSize( 10, 10 );
155	shell.open();	156	shell.open();
156	AbstractWidgetLCA lca = WidgetUtil.getLCA( button );	157	AbstractWidgetLCA lca = WidgetUtil.getLCA( button );
157		158

Lines 62-67 Link Here

(-)src/org/eclipse/swt/internal/widgets/sashkit/SashLCA_Test.java (-1 / +2 lines)
62	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	62	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
63	Fixture.clearPreserved();	63	Fixture.clearPreserved();
64	//visible	64	//visible
		65	sash.setSize( 10, 10 );
65	Fixture.preserveWidgets();	66	Fixture.preserveWidgets();
66	adapter = WidgetUtil.getAdapter( sash );	67	adapter = WidgetUtil.getAdapter( sash );
67	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	68	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );
Lines 191-197 Link Here
191	SashLCA sashLCA = new SashLCA();	192	SashLCA sashLCA = new SashLCA();
192	sashLCA.renderChanges( sash );	193	sashLCA.renderChanges( sash );
193	assertTrue( Fixture.getAllMarkup()	194	assertTrue( Fixture.getAllMarkup()
194	.endsWith( "setSpace( 20, 50, 100, 60 );" ) );	195	.indexOf( "setSpace( 20, 50, 100, 60 );" ) != -1 );
195	Fixture.clearPreserved();	196	Fixture.clearPreserved();
196	Fixture.fakeResponseWriter();	197	Fixture.fakeResponseWriter();
197	Fixture.preserveWidgets();	198	Fixture.preserveWidgets();




    assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
    Fixture.clearPreserved();
    // visible
    bar.setSize( 10, 10 );
    lca.preserveValues( bar );
    adapter = WidgetUtil.getAdapter( bar );
    assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

    // get adapter to set item order
    Object adapter = bar.getAdapter( ICoolBarAdapter.class );
    ICoolBarAdapter cba = (ICoolBarAdapter) adapter;

    // ensure initial state
    assertEquals( 0, bar.getItemOrder()[ 0 ] );
    assertEquals( 1, bar.getItemOrder()[ 1 ] );
    assertEquals( 2, bar.getItemOrder()[ 2 ] );

    // Simulate that item2 is dragged left of item1
    int newX = item1.getBounds().x - 4;
    Fixture.fakeRequestParam( JSConst.EVENT_WIDGET_MOVED, item2Id );

    assertEquals( 0, bar.getItemOrder()[ 0 ] );
    assertEquals( 2, bar.getItemOrder()[ 1 ] );
    assertEquals( 1, bar.getItemOrder()[ 2 ] );

    // Simulate that item0 is dragged after the last item
    cba.setItemOrder( new int[] { 0, 1, 2, } );
    newX = item2.getBounds().x + item2.getBounds().width + 10;

    assertEquals( 1, bar.getItemOrder()[ 0 ] );
    assertEquals( 2, bar.getItemOrder()[ 1 ] );
    assertEquals( 0, bar.getItemOrder()[ 2 ] );

    // Simulate that item0 is dragged onto itself -> nothing should change
    cba.setItemOrder( new int[] { 0, 1, 2, } );
    newX = item0.getBounds().x + 2;

    assertEquals( 0, bar.getItemOrder()[ 0 ] );
    assertEquals( 1, bar.getItemOrder()[ 1 ] );
    assertEquals( 2, bar.getItemOrder()[ 2 ] );

    // Simulate that item1 is before the first item
    cba.setItemOrder( new int[] { 0, 1, 2, } );
    newX = item0.getBounds().x - 5;

    assertEquals( 0, bar.getItemOrder()[ 1 ] );
    assertEquals( 2, bar.getItemOrder()[ 2 ] );
  }

  public void testItemReordering2() {
    Display display = new Display();
    Shell shell = new Shell( display, SWT.NONE );

    Fixture.markInitialized( item0.getControl() );
    Fixture.markInitialized( item1 );
    Fixture.markInitialized( item1.getControl() );

    // get adapter to set item order
    Object adapter = bar.getAdapter( ICoolBarAdapter.class );
    ICoolBarAdapter cba = (ICoolBarAdapter) adapter;

    Fixture.executeLifeCycleFromServerThread();
    assertEquals( 1, bar.getItemOrder()[ 0 ] );
    assertEquals( 0, bar.getItemOrder()[ 1 ] );

    // Drag item0 and drop it beyond the bounds of item1
    cba.setItemOrder( new int[] { 0, 1 } );
    Fixture.fakeNewRequest();

    assertEquals( 1, bar.getItemOrder()[ 0 ] );
    assertEquals( 0, bar.getItemOrder()[ 1 ] );
  }

  public void testSnapBackItemMoved() {
    Display display = new Display();
    Shell shell = new Shell( display, SWT.NONE );

    Fixture.markInitialized( item0.getControl() );
    Fixture.markInitialized( item1 );
    Fixture.markInitialized( item1.getControl() );

    // get adapter to set item order
    Object adapter = bar.getAdapter( ICoolBarAdapter.class );
    ICoolBarAdapter cba = (ICoolBarAdapter) adapter;

    // Simulate that fist item is dragged around but dropped at its original
    // position
    cba.setItemOrder( new int[] { 0, 1 } );

Lines 99-104 Link Here

(-)src/org/eclipse/swt/internal/widgets/listkit/ListLCA_Test.java (+1 lines)
99	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );	99	assertEquals( Boolean.FALSE, adapter.getPreserved( Props.ENABLED ) );
100	Fixture.clearPreserved();	100	Fixture.clearPreserved();
101	// visible	101	// visible
		102	list.setSize( 10, 10 );
102	Fixture.preserveWidgets();	103	Fixture.preserveWidgets();
103	adapter = WidgetUtil.getAdapter( list );	104	adapter = WidgetUtil.getAdapter( list );
104	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );	105	assertEquals( Boolean.TRUE, adapter.getPreserved( Props.VISIBLE ) );

Return to bug 299914

Lines 128-134 Link Here

(-)src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java (-2 / +9 lines)
128	adapter.preserve( PROP_TAB_INDEX, new Integer( getTabIndex( control ) ) );	128	adapter.preserve( PROP_TAB_INDEX, new Integer( getTabIndex( control ) ) );
129	WidgetLCAUtil.preserveToolTipText( control, control.getToolTipText() );	129	WidgetLCAUtil.preserveToolTipText( control, control.getToolTipText() );
130	adapter.preserve( Props.MENU, control.getMenu() );	130	adapter.preserve( Props.MENU, control.getMenu() );
131	adapter.preserve( Props.VISIBLE, Boolean.valueOf( control.getVisible() ) );	131	adapter.preserve( Props.VISIBLE, Boolean.valueOf( getVisible( control ) ) );
132	WidgetLCAUtil.preserveEnabled( control, control.getEnabled() );	132	WidgetLCAUtil.preserveEnabled( control, control.getEnabled() );
133	IControlAdapter controlAdapter	133	IControlAdapter controlAdapter
134	= ( IControlAdapter )control.getAdapter( IControlAdapter.class );	134	= ( IControlAdapter )control.getAdapter( IControlAdapter.class );
Lines 220-231 Link Here
220	{	220	{
221	// we only need getVisible here (not isVisible), as qooxdoo also hides/shows	221	// we only need getVisible here (not isVisible), as qooxdoo also hides/shows
222	// contained controls	222	// contained controls
223	Boolean newValue = Boolean.valueOf( control.getVisible() );	223	Boolean newValue = Boolean.valueOf( getVisible( control ) );
224	Boolean defValue = control instanceof Shell ? Boolean.FALSE : Boolean.TRUE;	224	Boolean defValue = control instanceof Shell ? Boolean.FALSE : Boolean.TRUE;
225	JSWriter writer = JSWriter.getWriterFor( control );	225	JSWriter writer = JSWriter.getWriterFor( control );
226	writer.set( Props.VISIBLE, JSConst.QX_FIELD_VISIBLE, newValue, defValue );	226	writer.set( Props.VISIBLE, JSConst.QX_FIELD_VISIBLE, newValue, defValue );
227	}	227	}
228		228
		229	// [if] Fix for bug 263025, 297466, 223873 and more
		230	// some qooxdoo widget with size (0,0) are not invisible
		231	private static boolean getVisible( final Control control ) {
		232	Point size = control.getSize();
		233	return control.getVisible() && size.x > 0 && size.y > 0;
		234	}
		235
229	/**	236	/**
230	* Determines whether the property <code>enabled</code> of the given control	237	* Determines whether the property <code>enabled</code> of the given control
231	* has changed during the processing of the current request and if so, writes	238	* has changed during the processing of the current request and if so, writes