Attachment #137304 for bug #276713

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




  
  private static final String ATTR_SESSION_DISPLAY
    = RWTLifeCycle.class.getName() + "#sessionDisplay";
  private static final String ATTR_REDRAW_CONTROLS
    = RWTLifeCycle.class.getName() + "#redrawControls";
    = RWTLifeCycle.class.getName() + ".RedrawWidgets";
  private static final String INITIALIZED
    = RWTLifeCycle.class.getName() + "Initialized";
  private static final String CURRENT_PHASE

                                 final boolean redraw )
  {
    IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
    Set set = ( Set )stateInfo.getAttribute( ATTR_REDRAW_CONTROLS );
    if( set == null ) {
      set = new HashSet();
      stateInfo.setAttribute( ATTR_REDRAW_CONTROLS, set );
    }
    if( redraw ) {
      set.add( control );

      set.remove( control );
    }
  }
  
  public static boolean needsFakeRedraw( final Control control ) {
    IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
    Set set = ( Set )stateInfo.getAttribute( ATTR_REDRAW_CONTROLS );
    return set != null && set.contains( control );
  }

  private static void doRedrawFake() {
    IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
    Set set = ( Set )stateInfo.getAttribute( ATTR_REDRAW_CONTROLS );
    if( set != null ) {
      Object[] controls = set.toArray();
      for( int i = 0; i < controls.length; i++ ) {

Lines 2061-2066 Link Here

(-)src/org/eclipse/swt/widgets/Table.java (+3 lines)
2061	adjustFocusIndex();	2061	adjustFocusIndex();
2062	}	2062	}
2063	updateScrollBars();	2063	updateScrollBars();
		2064	if( ( style & SWT.VIRTUAL ) != 0 ) {
		2065	redraw();
		2066	}
2064	}	2067	}
2065		2068
2066	////////////////	2069	////////////////




import junit.framework.TestCase;

import org.eclipse.rwt.graphics.Graphics;
import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle;
import org.eclipse.rwt.lifecycle.PhaseId;
import org.eclipse.swt.*;
import org.eclipse.swt.events.*;

    }
  }

  private static boolean find( final int element, final int[] array ) {
    boolean result = false;
    for( int i = 0; i < array.length; i++ ) {
      if( element == array[ i ] ) {
        result = true;
      }
    }
    return result;
  }

  public void testReduceSetItemCountWithSelection() {
    // Create a table that is populated with setItemCount with all selected
    RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );

    assertEquals( 0, table.getColumnOrder()[ 0 ] );
    assertEquals( 1, table.getColumnOrder()[ 1 ] );
  }
  
  public void testRedrawAfterDisposeVirtual() {
    RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
    Display display = new Display();
    Shell shell = new Shell( display );
    Table table = new Table( shell, SWT.VIRTUAL );
    table.setSize( 100, 100 );
    table.setItemCount( 150 );
    // dispose the first item, this must cause a "redraw" which in turn triggers 
    // a SetData event to populate the newly appeared item at the bottom of the
    // table
    table.getItem( 0 ).dispose();
    assertTrue( RWTLifeCycle.needsFakeRedraw( table ) );
  }

  public void testSetColumnOrderWithInvalidArguments() {
    Display display = new Display();

    table.remove( 5 );
  }

  private static boolean find( final int element, final int[] array ) {
    boolean result = false;
    for( int i = 0; i < array.length; i++ ) {
      if( element == array[ i ] ) {
        result = true;
      }
    }
    return result;
  }

  private static int countResolvedItems( final Table table ) {
    Object adapter = table.getAdapter( ITableAdapter.class );
    ITableAdapter tableAdapter = ( ITableAdapter )adapter;

Return to bug 276713

Lines 41-49 Link Here

(-)src/org/eclipse/rwt/internal/lifecycle/RWTLifeCycle.java (-7 / +12 lines)
41		41
42	private static final String ATTR_SESSION_DISPLAY	42	private static final String ATTR_SESSION_DISPLAY
43	= RWTLifeCycle.class.getName() + "#sessionDisplay";	43	= RWTLifeCycle.class.getName() + "#sessionDisplay";
44		44	private static final String ATTR_REDRAW_CONTROLS
45	private static final String REDRAW_CONTROLS	45	= RWTLifeCycle.class.getName() + "#redrawControls";
46	= RWTLifeCycle.class.getName() + ".RedrawWidgets";
47	private static final String INITIALIZED	46	private static final String INITIALIZED
48	= RWTLifeCycle.class.getName() + "Initialized";	47	= RWTLifeCycle.class.getName() + "Initialized";
49	private static final String CURRENT_PHASE	48	private static final String CURRENT_PHASE
Lines 439-448 Link Here
439	final boolean redraw )	438	final boolean redraw )
440	{	439	{
441	IServiceStateInfo stateInfo = ContextProvider.getStateInfo();	440	IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
442	Set set = ( Set )stateInfo.getAttribute( REDRAW_CONTROLS );	441	Set set = ( Set )stateInfo.getAttribute( ATTR_REDRAW_CONTROLS );
443	if( set == null ) {	442	if( set == null ) {
444	set = new HashSet();	443	set = new HashSet();
445	stateInfo.setAttribute( REDRAW_CONTROLS, set );	444	stateInfo.setAttribute( ATTR_REDRAW_CONTROLS, set );
446	}	445	}
447	if( redraw ) {	446	if( redraw ) {
448	set.add( control );	447	set.add( control );
Lines 450-459 Link Here
450	set.remove( control );	449	set.remove( control );
451	}	450	}
452	}	451	}
		452
		453	public static boolean needsFakeRedraw( final Control control ) {
		454	IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
		455	Set set = ( Set )stateInfo.getAttribute( ATTR_REDRAW_CONTROLS );
		456	return set != null && set.contains( control );
		457	}
453		458
454	private void doRedrawFake() {	459	private static void doRedrawFake() {
455	IServiceStateInfo stateInfo = ContextProvider.getStateInfo();	460	IServiceStateInfo stateInfo = ContextProvider.getStateInfo();
456	Set set = ( Set )stateInfo.getAttribute( REDRAW_CONTROLS );	461	Set set = ( Set )stateInfo.getAttribute( ATTR_REDRAW_CONTROLS );
457	if( set != null ) {	462	if( set != null ) {
458	Object[] controls = set.toArray();	463	Object[] controls = set.toArray();
459	for( int i = 0; i < controls.length; i++ ) {	464	for( int i = 0; i < controls.length; i++ ) {

Lines 13-18 Link Here

(-)src/org/eclipse/swt/widgets/Table_Test.java (-10 / +25 lines)
13	import junit.framework.TestCase;	13	import junit.framework.TestCase;
14		14
15	import org.eclipse.rwt.graphics.Graphics;	15	import org.eclipse.rwt.graphics.Graphics;
		16	import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle;
16	import org.eclipse.rwt.lifecycle.PhaseId;	17	import org.eclipse.rwt.lifecycle.PhaseId;
17	import org.eclipse.swt.*;	18	import org.eclipse.swt.*;
18	import org.eclipse.swt.events.*;	19	import org.eclipse.swt.events.*;
Lines 329-344 Link Here
329	}	330	}
330	}	331	}
331		332
332	private static boolean find( final int element, final int[] array ) {
333	boolean result = false;
334	for( int i = 0; i < array.length; i++ ) {
335	if( element == array[ i ] ) {
336	result = true;
337	}
338	}
339	return result;
340	}
341
342	public void testReduceSetItemCountWithSelection() {	333	public void testReduceSetItemCountWithSelection() {
343	// Create a table that is populated with setItemCount with all selected	334	// Create a table that is populated with setItemCount with all selected
344	RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );	335	RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
Lines 1438-1443 Link Here
1438	assertEquals( 0, table.getColumnOrder()[ 0 ] );	1429	assertEquals( 0, table.getColumnOrder()[ 0 ] );
1439	assertEquals( 1, table.getColumnOrder()[ 1 ] );	1430	assertEquals( 1, table.getColumnOrder()[ 1 ] );
1440	}	1431	}
		1432
		1433	public void testRedrawAfterDisposeVirtual() {
		1434	RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
		1435	Display display = new Display();
		1436	Shell shell = new Shell( display );
		1437	Table table = new Table( shell, SWT.VIRTUAL );
		1438	table.setSize( 100, 100 );
		1439	table.setItemCount( 150 );
		1440	// dispose the first item, this must cause a "redraw" which in turn triggers
		1441	// a SetData event to populate the newly appeared item at the bottom of the
		1442	// table
		1443	table.getItem( 0 ).dispose();
		1444	assertTrue( RWTLifeCycle.needsFakeRedraw( table ) );
		1445	}
1441		1446
1442	public void testSetColumnOrderWithInvalidArguments() {	1447	public void testSetColumnOrderWithInvalidArguments() {
1443	Display display = new Display();	1448	Display display = new Display();
Lines 2190-2195 Link Here
2190	table.remove( 5 );	2195	table.remove( 5 );
2191	}	2196	}
2192		2197
		2198	private static boolean find( final int element, final int[] array ) {
		2199	boolean result = false;
		2200	for( int i = 0; i < array.length; i++ ) {
		2201	if( element == array[ i ] ) {
		2202	result = true;
		2203	}
		2204	}
		2205	return result;
		2206	}
		2207
2193	private static int countResolvedItems( final Table table ) {	2208	private static int countResolvedItems( final Table table ) {
2194	Object adapter = table.getAdapter( ITableAdapter.class );	2209	Object adapter = table.getAdapter( ITableAdapter.class );
2195	ITableAdapter tableAdapter = ( ITableAdapter )adapter;	2210	ITableAdapter tableAdapter = ( ITableAdapter )adapter;