Attachment #187649 for bug #334675

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 334675
Collapse All | Expand All

Lines 231-236 Link Here

(-)src/org/eclipse/jface/viewers/CellLabelProvider.java (+6 lines)
231	* @since 1.1	231	* @since 1.1
232	*/	232	*/
233	protected void initialize(ColumnViewer viewer, ViewerColumn column) {	233	protected void initialize(ColumnViewer viewer, ViewerColumn column) {
		234	// RAP: [if] Cell tooltips support
		235	CellToolTipProvider.attach( viewer, this );
		236	// RAPEND: [if]
234	}	237	}
235		238
236	/**	239	/**
Lines 248-253 Link Here
248	*/	251	*/
249	public void dispose(ColumnViewer viewer, ViewerColumn column) {	252	public void dispose(ColumnViewer viewer, ViewerColumn column) {
250	dispose();	253	dispose();
		254	// RAP: [if] Cell tooltips support
		255	CellToolTipProvider.attach( viewer, null );
		256	// RAPEND: [if]
251	}	257	}
252		258
253	}	259	}




/*******************************************************************************
 * Copyright (c) 2009, 2011 EclipseSource and others. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 * and is available at http://www.eclipse.org/legal/epl-v10.html

 ******************************************************************************/
package org.eclipse.jface.viewers;

import org.eclipse.swt.internal.widgets.ICellToolTipAdapter;
import org.eclipse.swt.internal.widgets.ITableAdapter;
import org.eclipse.swt.internal.widgets.ICellToolTipProvider;
import org.eclipse.swt.internal.widgets.ITreeAdapter;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Tree;

/**
 * Support for table/tree tool-tips in RAP
 */
final class CellToolTipProvider implements ICellToolTipProvider {
  private ColumnViewer viewer;

  CellToolTipProvider( final ColumnViewer viewer ) {
    this.viewer = viewer;
  }

  static void attach( final ColumnViewer viewer,
                      final CellLabelProvider labelProvider )
  {
    ICellToolTipAdapter adapter = getAdapter( viewer );
    if( labelProvider != null ) {
      CellToolTipProvider provider = new CellToolTipProvider( viewer );
      adapter.setCellToolTipProvider( provider );
      CellToolTipProvider provider = new CellToolTipProvider( tableViewer );
      tableAdapter.setCellToolTipProvider( provider );
    } else {
      adapter.setCellToolTipProvider( null );
    }
  }

  private static ICellToolTipAdapter getAdapter( final ColumnViewer viewer ) {
    ICellToolTipAdapter result = null;
    if( viewer instanceof TableViewer ) {
      Table table = ( ( TableViewer )viewer ).getTable();
      result = ( ICellToolTipAdapter )table.getAdapter( ITableAdapter.class );
    } else if( viewer instanceof TreeViewer ) {
      Tree tree = ( ( TreeViewer )viewer ).getTree();
      result = ( ICellToolTipAdapter )tree.getAdapter( ITreeAdapter.class );
    }
    return result;
  }

  public void getToolTipText( final Item item, final int columnIndex ) {
    Object element =  item.getData();
    ViewerColumn column = viewer.getViewerColumn( columnIndex );
    CellLabelProvider labelProvider = column.getLabelProvider();
    String text = labelProvider.getToolTipText( element );
    ICellToolTipAdapter adapter = getAdapter( viewer );
    adapter.setToolTipText( text );
    tableAdapter.setToolTipText( text );
  }

}




//import org.eclipse.swt.graphics.Point;
//import org.eclipse.swt.widgets.Composite;
//import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.internal.widgets.ICellToolTipProvider;

/**
 * The ColumnViewerTooltipSupport is the class that provides tool tips for

 * @since 1.3
 *
 */
// RAP [rh] RAP provides tooltip support for the table and tree widgets
//     In addition RAP cannot reuse the DefaultToolTip and ToolTip as these  
//     classes make heavy use of mouse events 
public class ColumnViewerToolTipSupport 

	 * @param viewer
	 *            the viewer the support is attached to
	 */
    public static void enableFor(ColumnViewer viewer) {
//      new ColumnViewerToolTipSupport(viewer, ToolTip.NO_RECREATE, false);
        viewer.getControl().setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP,
                                     Boolean.TRUE );
    }
}

// RAP [rh] ToolTip style not supported 
//	/**

Lines 87-96 Link Here

(-)src/org/eclipse/jface/viewers/TableViewerColumn.java (-6 lines)
87	return column;	87	return column;
88	}	88	}
89		89
90	// RAP: [if] Table cell tooltips support
91	public void setLabelProvider( final CellLabelProvider labelProvider ) {
92	super.setLabelProvider( labelProvider );
93	CellToolTipProvider.attach( ( TableViewer )getViewer(), labelProvider );
94	}
95	// RAPEND: [if]
96	}	90	}




/*******************************************************************************
 * Copyright (c) 2011 EclipseSource and others. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 * and is available at http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   EclipseSource - initial API and implementation
 ******************************************************************************/
package org.eclipse.swt.internal.widgets;

public interface ICellToolTipAdapter {

  ICellToolTipProvider getCellToolTipProvider();
  void setCellToolTipProvider( ICellToolTipProvider provider );

  String getToolTipText();
  void setToolTipText( String toolTipText );

}

Lines 1-5 Link Here

(-)src/org/eclipse/swt/internal/widgets/ICellToolTipProvider.java (-2 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 EclipseSource and others. All rights reserved.	2	* Copyright (c) 2009, 2011 EclipseSource and others. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,	4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html	5	* and is available at http://www.eclipse.org/legal/epl-v10.html
Lines 9-17 Link Here
9	******************************************************************************/	9	******************************************************************************/
10	package org.eclipse.swt.internal.widgets;	10	package org.eclipse.swt.internal.widgets;
11		11
		12	import org.eclipse.swt.widgets.Item;
		13
12		14
13	public interface ICellToolTipProvider {	15	public interface ICellToolTipProvider {
14		16
15	void getToolTipText( int itemIndex, int columnIndex );	17	public static final String ENABLE_CELL_TOOLTIP
		18	= ICellToolTipProvider.class.getName() + "#enableCellToolTip";
		19
		20	void getToolTipText( Item item, int columnIndex );
16		21
17	}	22	}




/*******************************************************************************
 * Copyright (c) 2007, 2011 Innoopract Informationssysteme GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;

public interface ITableAdapter extends ICellToolTipAdapter {

  int getCheckWidth();
  int getItemImageWidth( int columnIndex );

  boolean hasVScrollBar();

  TableItem getMeasureItem();

  ICellToolTipProvider getCellToolTipProvider();
  void setCellToolTipProvider( ICellToolTipProvider provider );

  String getToolTipText();
  void setToolTipText( String toolTipText );
}

Lines 1-5 Link Here

(-)src/org/eclipse/swt/internal/widgets/ITreeAdapter.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 15-21 Link Here
15	import org.eclipse.swt.graphics.Rectangle;	15	import org.eclipse.swt.graphics.Rectangle;
16	import org.eclipse.swt.widgets.*;	16	import org.eclipse.swt.widgets.*;
17		17
18	public interface ITreeAdapter {	18	public interface ITreeAdapter extends ICellToolTipAdapter {
19		19
20	void setScrollLeft( final int left );	20	void setScrollLeft( final int left );
21	int getScrollLeft();	21	int getScrollLeft();




/*******************************************************************************
 * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

  public static final String ALWAYS_HIDE_SELECTION
    = Table.class.getName() + "#alwaysHideSelection";

  /**
   * <strong>IMPORTANT:</strong> This field is <em>not</em> part of the SWT
   * public API. It is marked public only so that it can be shared
   * within the packages provided by SWT. It should never be accessed from
   * application code.
   */
  public static final String ENABLE_CELL_TOOLTIP
    = Table.class.getName() + "#enableCellToolTip";

  private static final int GRID_WIDTH = 1;

  private static final int[] EMPTY_SELECTION = new int[ 0 ];

Lines 1-5 Link Here

(-)src/org/eclipse/swt/widgets/Tree.java (-1 / +20 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 155-160 Link Here
155	}	155	}
156	private final class InternalTreeAdapter implements ITreeAdapter {	156	private final class InternalTreeAdapter implements ITreeAdapter {
157		157
		158	private String toolTipText;
		159	private ICellToolTipProvider provider;
		160
158	public void setScrollLeft( final int left ) {	161	public void setScrollLeft( final int left ) {
159	Tree.this.scrollLeft = left;	162	Tree.this.scrollLeft = left;
160	}	163	}
Lines 232-237 Link Here
232	return Tree.this.getColumn( index ).getLeft();	235	return Tree.this.getColumn( index ).getLeft();
233	}	236	}
234		237
		238	public ICellToolTipProvider getCellToolTipProvider() {
		239	return provider;
		240	}
		241
		242	public void setCellToolTipProvider( final ICellToolTipProvider provider ) {
		243	this.provider = provider;
		244	}
		245
		246	public String getToolTipText() {
		247	return toolTipText;
		248	}
		249
		250	public void setToolTipText( final String toolTipText ) {
		251	this.toolTipText = toolTipText;
		252	}
		253
235	}	254	}
236		255
237	private static final class ResizeListener extends ControlAdapter {	256	private static final class ResizeListener extends ControlAdapter {

Lines 71-76 Link Here

(-)js/org/eclipse/rwt/widgets/Tree.js (-1 / +62 lines)
71	this.add( this._clientArea );	71	this.add( this._clientArea );
72	this.add( this._horzScrollBar );	72	this.add( this._horzScrollBar );
73	this.add( this._vertScrollBar );	73	this.add( this._vertScrollBar );
		74	// Cell tooltip
		75	this._cellToolTip = null;
74	// Configure:	76	// Configure:
75	this.setCursor( "default" );	77	this.setCursor( "default" );
76	this.setOverflow( "hidden" );	78	this.setOverflow( "hidden" );
Lines 102-107 Link Here
102	this._hoverItem = null;	104	this._hoverItem = null;
103	this._hoverElement = null;	105	this._hoverElement = null;
104	this._resizeLine = null;	106	this._resizeLine = null;
		107	if( this._cellToolTip ) {
		108	this._cellToolTip.destroy();
		109	this._cellToolTip = null;
		110	}
105	},	111	},
106		112
107	members : {	113	members : {
Lines 448-454 Link Here
448	getColumnCount : function() {	454	getColumnCount : function() {
449	return Math.max( 1, this._columnCount );	455	return Math.max( 1, this._columnCount );
450	},	456	},
451		457
		458	getColumns : function() {
		459	return this._columnArea.getChildren().slice( 1 );
		460	},
		461
452	getRootItem : function() {	462	getRootItem : function() {
453	return this._rootItem;	463	return this._rootItem;
454	},	464	},
Lines 1653-1658 Link Here
1653		1663
1654	_isDragSource : function() {	1664	_isDragSource : function() {
1655	return this.hasEventListeners( "dragstart" );	1665	return this.hasEventListeners( "dragstart" );
		1666	},
		1667
		1668	////////////////////////
		1669	// Cell tooltip handling
		1670
		1671	setEnableCellToolTip : function( value ) {
		1672	if( value ) {
		1673	var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
		1674	var id = widgetManager.findIdByWidget( this );
		1675	this._cellToolTip = new org.eclipse.swt.widgets.TableCellToolTip( id );
		1676	this._clientArea.addEventListener( "mousemove",
		1677	this._onClientAreaMouseMove,
		1678	this );
		1679	this._clientArea.setToolTip( this._cellToolTip );
		1680	} else {
		1681	this._clientArea.removeEventListener( "mousemove",
		1682	this._onClientAreaMouseMove,
		1683	this );
		1684	this._clientArea.setToolTip( null );
		1685	this._cellToolTip.destroy();
		1686	this._cellToolTip = null;
		1687	}
		1688	},
		1689
		1690	_onClientAreaMouseMove : function( evt ) {
		1691	if( this._cellToolTip != null ) {
		1692	var pageX = evt.getPageX();
		1693	var pageY = evt.getPageY();
		1694	if( this._hoverItem ) {
		1695	var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
		1696	var itemId = widgetManager.findIdByWidget( this._hoverItem );
		1697	var columnIndex = -1;
		1698	var columns = this.getColumns();
		1699	var element = this._clientArea.getElement();
		1700	var leftOffset = qx.bom.element.Location.getLeft( element );
		1701	for( var i = 0; columnIndex == -1 && i < columns.length; i++ ) {
		1702	var pageLeft = leftOffset + this._itemLeft[ i ];
		1703	if( pageX >= pageLeft && pageX < pageLeft + this._itemWidth[ i ] ) {
		1704	columnIndex = i;
		1705	}
		1706	}
		1707	this._cellToolTip.setCell( itemId, columnIndex );
		1708	}
		1709	}
		1710	},
		1711
		1712	/** Only called by server-side */
		1713	setCellToolTipText : function( text ) {
		1714	if( this._cellToolTip != null ) {
		1715	this._cellToolTip.setText( text );
		1716	}
1656	}	1717	}
1657		1718
1658	}	1719	}




/*******************************************************************************
 * Copyright (c) 2007, 2011 Innoopract Informationssysteme GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

    this.add( this._clientArea );
    // Cell tooltip
    this._cellToolTip = null;
    if( qx.lang.String.contains( style, "enableCellToolTip" ) ) {
      this._cellToolTip = new org.eclipse.swt.widgets.TableCellToolTip();
      this._cellToolTip.setTableId( id );
      this._clientArea.addEventListener( "mousemove", this._onClientAreaMouseMove, this );
      this._clientArea.setToolTip( this._cellToolTip );
    }
    // Disable scrolling (see bug 279460)
    qx.ui.core.Widget.disableScrolling( this );
    // Fix for bug Bug 297202

      this._clientArea = null;
    }
    if( this._cellToolTip ) {
      this._cellToolTip.destroy();
      this._cellToolTip = null;
    }
    if( this._columnArea ) {

    ////////////////////////
    // Cell tooltip handling

    setEnableCellToolTip : function( value ) {
      if( value ) {
        var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
        var id = widgetManager.findIdByWidget( this );
        this._cellToolTip = new org.eclipse.swt.widgets.TableCellToolTip( id );
        this._clientArea.addEventListener( "mousemove",
                                           this._onClientAreaMouseMove,
                                           this );
        this._clientArea.setToolTip( this._cellToolTip );
      } else {
        this._clientArea.removeEventListener( "mousemove",
                                              this._onClientAreaMouseMove,
                                              this );
        this._clientArea.setToolTip( null );
        this._cellToolTip.destroy();
        this._cellToolTip = null;
      }
    },

    _onClientAreaMouseMove : function( evt ) {
      if( this._cellToolTip != null ) {
        var pageX = evt.getPageX();
        var pageY = evt.getPageY();
        var row = this._getRowAtPoint( pageX, pageY );
        var itemIndex = row.getItemIndex();
        if( itemIndex != -1 ) {
	        var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
	        var itemId = widgetManager.findIdByWidget( this._items[ itemIndex ] );
	        var columnIndex = -1;
	        var columns = this.getColumns();
	        var element = this._clientArea.getElement();
	        var leftOffset = qx.bom.element.Location.getLeft( element );
	        for( var i = 0; columnIndex == -1 && i < columns.length; i++ ) {
	          var pageLeft = leftOffset + this._itemLeft[ i ];
	          if( pageX >= pageLeft && pageX < pageLeft + this._itemWidth[ i ] ) {
	            columnIndex = i;
	          }
	        }        
	        this._cellToolTip.setCell( itemId, columnIndex );
        }
        this._cellToolTip.setCell( itemIndex, columnIndex );
      }
    },





/*******************************************************************************
 * Copyright (c) 2009, 2011 EclipseSource and others. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 * and is available at http://www.eclipse.org/legal/epl-v10.html

  extend : qx.ui.popup.ToolTip,
  include : org.eclipse.rwt.FadeAnimationMixin,

  construct : function( controlId ) {
    this.base( arguments );
    this._controlId = controlId;
    this._itemId = null;
    this._columnIndex = -1;
  },


      }
    },

    setCell : function( itemId, columnIndex ) {
      if( this._itemId != itemId || this._columnIndex != columnIndex ) {
        this._itemId = itemId;

    setCell : function( itemIndex, columnIndex ) {
      if( this._itemIndex != itemIndex || this._columnIndex != columnIndex ) {
        this._itemIndex = itemIndex;
        this._columnIndex = columnIndex;
        this.hide();
        if(   !this._showTimer.getEnabled()
            && itemId != null
            && columnIndex != -1 )
        {
          this._showTimer.start();

    },

    _requestCellToolTipText : function() {
      if( this._itemId != null && this._columnIndex != -1 ) {
        var req = org.eclipse.swt.Request.getInstance();
        req.addEvent( "org.eclipse.swt.events.cellToolTipTextRequested",
                      this._controlId );
        var cell = this._itemId + "," + this._columnIndex;
        req.addParameter( "org.eclipse.swt.events.cellToolTipTextRequested.cell",
                          cell );
        req.send();

Lines 1-5 Link Here

(-)src/org/eclipse/rwt/internal/lifecycle/JSConst.java (-3 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-20 Link Here
13		13
14	import org.eclipse.rwt.lifecycle.JSVar;	14	import org.eclipse.rwt.lifecycle.JSVar;
15		15
16
17
18	/**	16	/**
19	* Commonly used request parameter names and JavaScript names.	17	* Commonly used request parameter names and JavaScript names.
20	*/	18	*/
Lines 61-66 Link Here
61	public static final String EVENT_MENU_DETECT	59	public static final String EVENT_MENU_DETECT
62	= "org.eclipse.swt.events.menuDetect";	60	= "org.eclipse.swt.events.menuDetect";
63		61
		62	// Request cell tooltip text event
		63	public static final String EVENT_CELL_TOOLTIP_REQUESTED
		64	= "org.eclipse.swt.events.cellToolTipTextRequested";
64		65
65	// Parameter names that specify further event details	66	// Parameter names that specify further event details
66	public static final String EVENT_WIDGET_SELECTED_DETAIL	67	public static final String EVENT_WIDGET_SELECTED_DETAIL
Lines 114-119 Link Here
114	public static final String EVENT_MENU_DETECT_Y	115	public static final String EVENT_MENU_DETECT_Y
115	= "org.eclipse.swt.events.menuDetect.y";	116	= "org.eclipse.swt.events.menuDetect.y";
116		117
		118	// Request cell tooltip text event details
		119	public static final String EVENT_CELL_TOOLTIP_DETAILS
		120	= "org.eclipse.swt.events.cellToolTipTextRequested.cell";
		121
117	// Indicates that a shell was closed on the client side. The parameter	122	// Indicates that a shell was closed on the client side. The parameter
118	// value holds the id of the shell that was closed.	123	// value holds the id of the shell that was closed.
119	public static final String EVENT_SHELL_CLOSED	124	public static final String EVENT_SHELL_CLOSED




/*******************************************************************************
 * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.internal.events.EventLCAUtil;
import org.eclipse.swt.internal.widgets.*;
import org.eclipse.swt.internal.widgets.ICellToolTipProvider;
import org.eclipse.swt.widgets.*;


public final class TableLCA extends AbstractWidgetLCA {

  // Request cell tooltip text event
  static final String EVENT_CELL_TOOLTIP_REQUESTED
    = "org.eclipse.swt.events.cellToolTipTextRequested";
  // Parameter names that specify further event details
  static final String EVENT_CELL_TOOLTIP_DETAILS
    = "org.eclipse.swt.events.cellToolTipTextRequested.cell";

  // Property names to preserve values
  static final String PROP_HEADER_HEIGHT = "headerHeight";
  static final String PROP_HEADER_VISIBLE = "headerVisible";

  static final String PROP_LEFT_OFFSET = "leftOffset";
  static final String PROP_SCROLLBARS_SELECTION_LISTENER
    = "scrollBarsSelectionListeners";
  static final String PROP_ENABLE_CELL_TOOLTIP
    = "enableCellToolTip";

  private static final Integer DEFAULT_TOP_INDEX = new Integer( 0 );
  private static final Integer DEFAULT_ITEM_COUNT = new Integer( 0 );

    adapter.preserve( PROP_LEFT_OFFSET, getLeftOffset( table ) );
    adapter.preserve( PROP_SCROLLBARS_SELECTION_LISTENER,
                      hasScrollBarsSelectionListener( table ) );
    adapter.preserve( PROP_ENABLE_CELL_TOOLTIP,
                      isCellToolTipEnabled( table ) );
  }

  public void readData( final Widget widget ) {

    if( ( table.getStyle() & SWT.MULTI ) != 0 ) {
      style += "|multi";
    }
    if( Boolean.TRUE.equals( table.getData( Table.ENABLE_CELL_TOOLTIP ) ) ) {
      style += "|enableCellToolTip";
    }
    if( ( table.getStyle() & SWT.HIDE_SELECTION ) != 0 ) {
      style += "|hideSelection";
    }

    writeAlwaysHideSelection( table );
    writeScrollBarsVisible( table );
    writeLeftOffset( table );
    writeEnableCellToolTip( table );
    writeCellToolTipText( table );
    WidgetLCAUtil.writeCustomVariant( table );
  }

    return result;
  }

  private static void readCellToolTipTextRequested( final Table table ) {
    Object adapter = table.getAdapter( ITableAdapter.class );
    ITableAdapter tableAdapter = ( ITableAdapter )adapter;
    tableAdapter.setToolTipText( null );
    String event = EVENT_CELL_TOOLTIP_REQUESTED;
    if( WidgetLCAUtil.wasEventSent( table, event ) ) {
      ICellToolTipProvider provider = tableAdapter.getCellToolTipProvider();
      if( provider != null ) {
        HttpServletRequest request = ContextProvider.getRequest();
        String cell = request.getParameter( EVENT_CELL_TOOLTIP_DETAILS );
        String[] indices = cell.split( "," );
        int itemIndex = Integer.parseInt( indices[ 0 ] );
        int columnIndex = Integer.parseInt( indices[ 1 ] );
        // Bug 321119: Sometimes the client can request tooltips for already
        //             disposed cells.
        if(    itemIndex < table.getItemCount()
            && ( columnIndex == 0 || columnIndex < table.getColumnCount() ) )
        {
          provider.getToolTipText( itemIndex, columnIndex );
        }
      }
    }
  }

  ///////////////////////////////////////////
  // Helping methods to write JavaScript code


    writer.set( PROP_LEFT_OFFSET, "leftOffset", newValue, DEFAULT_LEFT_OFFSET );
  }

  ////////////////
  // Cell tooltips

  private static Boolean isCellToolTipEnabled( final Table table ) {
    Boolean result = Boolean.FALSE;
    Object data = table.getData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP );
    if( Boolean.TRUE.equals( data ) ) {
      result = Boolean.TRUE;
    }
    return result;
  }

  private static void writeEnableCellToolTip( final Table table )
    throws IOException
  {
    JSWriter writer = JSWriter.getWriterFor( table );
    Boolean newValue = isCellToolTipEnabled( table );
    Boolean defValue = Boolean.FALSE;
    String prop = PROP_ENABLE_CELL_TOOLTIP;
    writer.set( prop, "enableCellToolTip", newValue, defValue );
  }

  private static void readCellToolTipTextRequested( final Table table ) {
    Object adapter = table.getAdapter( ITableAdapter.class );
    ITableAdapter tableAdapter = ( ITableAdapter )adapter;
    tableAdapter.setToolTipText( null );
    String event = JSConst.EVENT_CELL_TOOLTIP_REQUESTED;
    if( WidgetLCAUtil.wasEventSent( table, event ) ) {
      ICellToolTipProvider provider = tableAdapter.getCellToolTipProvider();
      if( provider != null ) {
        HttpServletRequest request = ContextProvider.getRequest();
        String cell = request.getParameter( JSConst.EVENT_CELL_TOOLTIP_DETAILS );
        String[] details = cell.split( "," );
        String itemId = details[ 0 ];
        int columnIndex = Integer.parseInt( details[ 1 ] );
        TableItem item = getItemById( table, itemId );
        // Bug 321119: Sometimes the client can request tooltips for already
        //             disposed cells.
        if(    item != null
            && ( columnIndex == 0 || columnIndex < table.getColumnCount() ) )
        {
          provider.getToolTipText( item, columnIndex );
        }
      }
    }
  }

  private static void writeCellToolTipText( final Table table )
    throws IOException
  {
    Object adapter = table.getAdapter( ITableAdapter.class );
    ITableAdapter tableAdapter = ( ITableAdapter )adapter;
    String text = tableAdapter.getToolTipText();
    if( text != null ) {
      JSWriter writer = JSWriter.getWriterFor( table );
      text = WidgetLCAUtil.escapeText( text, false );
      text = WidgetLCAUtil.replaceNewLines( text, "<br/>" );
      writer.call( "setCellToolTipText", new String[]{ text } );
    }
  }

  private static TableItem getItemById( final Table table, final String itemId )
  {
    TableItem result = null;
    TableItem[] items = table.getItems();
    for( int i = 0; i < items.length && result == null; i++ ) {
      if( WidgetUtil.getId( items[ i ] ).equals( itemId ) ) {
        result = items[ i ];
      }
    }
    return result;
  }

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


Lines 1-5 Link Here

(-)src/org/eclipse/swt/internal/widgets/treekit/TreeLCA.java (-2 / +82 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 22-28 Link Here
22	import org.eclipse.swt.events.*;	22	import org.eclipse.swt.events.*;
23	import org.eclipse.swt.graphics.Rectangle;	23	import org.eclipse.swt.graphics.Rectangle;
24	import org.eclipse.swt.internal.events.EventLCAUtil;	24	import org.eclipse.swt.internal.events.EventLCAUtil;
25	import org.eclipse.swt.internal.widgets.ITreeAdapter;	25	import org.eclipse.swt.internal.widgets.*;
26	import org.eclipse.swt.widgets.*;	26	import org.eclipse.swt.widgets.*;
27		27
28	public final class TreeLCA extends AbstractWidgetLCA {	28	public final class TreeLCA extends AbstractWidgetLCA {
Lines 42-47 Link Here
42	static final String PROP_LINES_VISIBLE = "linesVisible";	42	static final String PROP_LINES_VISIBLE = "linesVisible";
43	static final String PROP_SCROLLBARS_SELECTION_LISTENER	43	static final String PROP_SCROLLBARS_SELECTION_LISTENER
44	= "scrollBarsSelectionListeners";	44	= "scrollBarsSelectionListeners";
		45	static final String PROP_ENABLE_CELL_TOOLTIP
		46	= "enableCellToolTip";
45		47
46	private static final Integer DEFAULT_SCROLL_LEFT = new Integer( 0 );	48	private static final Integer DEFAULT_SCROLL_LEFT = new Integer( 0 );
47		49
Lines 67-72 Link Here
67	adapter.preserve( PROP_HAS_V_SCROLL_BAR, hasVScrollBar( tree ) );	69	adapter.preserve( PROP_HAS_V_SCROLL_BAR, hasVScrollBar( tree ) );
68	adapter.preserve( PROP_SCROLLBARS_SELECTION_LISTENER,	70	adapter.preserve( PROP_SCROLLBARS_SELECTION_LISTENER,
69	hasScrollBarsSelectionListener( tree ) );	71	hasScrollBarsSelectionListener( tree ) );
		72	adapter.preserve( PROP_ENABLE_CELL_TOOLTIP,
		73	isCellToolTipEnabled( tree ) );
70	WidgetLCAUtil.preserveCustomVariant( tree );	74	WidgetLCAUtil.preserveCustomVariant( tree );
71	}	75	}
72		76
Lines 77-82 Link Here
77	readTopItemIndex( tree );	81	readTopItemIndex( tree );
78	processWidgetSelectedEvent( tree );	82	processWidgetSelectedEvent( tree );
79	processWidgetDefaultSelectedEvent( tree );	83	processWidgetDefaultSelectedEvent( tree );
		84	readCellToolTipTextRequested( tree );
80	ControlLCAUtil.processMouseEvents( tree );	85	ControlLCAUtil.processMouseEvents( tree );
81	ControlLCAUtil.processKeyEvents( tree );	86	ControlLCAUtil.processKeyEvents( tree );
82	ControlLCAUtil.processMenuDetect( tree );	87	ControlLCAUtil.processMenuDetect( tree );
Lines 132-137 Link Here
132	writeHeaderHeight( tree );	137	writeHeaderHeight( tree );
133	writeHeaderVisible( tree );	138	writeHeaderVisible( tree );
134	writeScrollLeft( tree );	139	writeScrollLeft( tree );
		140	writeEnableCellToolTip( tree );
		141	writeCellToolTipText( tree );
135	WidgetLCAUtil.writeCustomVariant( tree );	142	WidgetLCAUtil.writeCustomVariant( tree );
136	}	143	}
137		144
Lines 366-371 Link Here
366	}	373	}
367	}	374	}
368		375
		376	////////////////
		377	// Cell tooltips
		378
		379	private static Boolean isCellToolTipEnabled( final Tree tree ) {
		380	Boolean result = Boolean.FALSE;
		381	Object data = tree.getData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP );
		382	if( Boolean.TRUE.equals( data ) ) {
		383	result = Boolean.TRUE;
		384	}
		385	return result;
		386	}
		387
		388	private static void writeEnableCellToolTip( final Tree tree )
		389	throws IOException
		390	{
		391	JSWriter writer = JSWriter.getWriterFor( tree );
		392	Boolean newValue = isCellToolTipEnabled( tree );
		393	Boolean defValue = Boolean.FALSE;
		394	String prop = PROP_ENABLE_CELL_TOOLTIP;
		395	writer.set( prop, "enableCellToolTip", newValue, defValue );
		396	}
		397
		398	private static void readCellToolTipTextRequested( final Tree tree ) {
		399	Object adapter = tree.getAdapter( ITreeAdapter.class );
		400	ITreeAdapter treeAdapter = ( ITreeAdapter )adapter;
		401	treeAdapter.setToolTipText( null );
		402	String event = JSConst.EVENT_CELL_TOOLTIP_REQUESTED;
		403	if( WidgetLCAUtil.wasEventSent( tree, event ) ) {
		404	ICellToolTipProvider provider = treeAdapter.getCellToolTipProvider();
		405	if( provider != null ) {
		406	HttpServletRequest request = ContextProvider.getRequest();
		407	String cell = request.getParameter( JSConst.EVENT_CELL_TOOLTIP_DETAILS );
		408	String[] details = cell.split( "," );
		409	String itemId = details[ 0 ];
		410	int columnIndex = Integer.parseInt( details[ 1 ] );
		411	TreeItem item = getItemById( tree.getItems(), itemId );
		412	if( item != null
		413	&& ( columnIndex == 0 \|\| columnIndex < tree.getColumnCount() ) )
		414	{
		415	provider.getToolTipText( item, columnIndex );
		416	}
		417	}
		418	}
		419	}
		420
		421	private static void writeCellToolTipText( final Tree tree )
		422	throws IOException
		423	{
		424	Object adapter = tree.getAdapter( ITreeAdapter.class );
		425	ITreeAdapter treeAdapter = ( ITreeAdapter )adapter;
		426	String text = treeAdapter.getToolTipText();
		427	if( text != null ) {
		428	JSWriter writer = JSWriter.getWriterFor( tree );
		429	text = WidgetLCAUtil.escapeText( text, false );
		430	text = WidgetLCAUtil.replaceNewLines( text, "<br/>" );
		431	writer.call( "setCellToolTipText", new String[]{ text } );
		432	}
		433	}
		434
		435	private static TreeItem getItemById( final TreeItem[] items,
		436	final String itemId )
		437	{
		438	TreeItem result = null;
		439	for( int i = 0; i < items.length && result == null; i++ ) {
440	if( WidgetUtil.getId( items[ i ] ).equals( itemId ) ) {
441	result = items[ i ];
442	} else if( items[ i ].getExpanded() ) {
443	result = getItemById( items[ i ].getItems(), itemId );
444	}
445	}
446	return result;
447	}
448
369	//////////////////	449	//////////////////
370	// Helping methods	450	// Helping methods
371		451




/*******************************************************************************
 * Copyright (c) 2010, 2011 EclipseSource and others. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 * and is available at http://www.eclipse.org/legal/epl-v10.html

      table.destroy();
    },

    testEnableCellToolTip : function() {
      var table = this._createDefaultTable();
      assertNull( table._cellToolTip );
      assertNull( table._clientArea.getToolTip() );
      table.setEnableCellToolTip( true );
      assertNotNull( table._cellToolTip );
      assertNotNull( table._clientArea.getToolTip() );
      table.setEnableCellToolTip( false );
      assertNull( table._cellToolTip );
      assertNull( table._clientArea.getToolTip() );
      table.destroy();
    },

    testRequestCellToolTipText : function() {
      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
      var table = this._createDefaultTable();
      var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
      widgetManager.add( table, "w3", true );
      table.setEnableCellToolTip( true );
      testUtil.prepareTimerUse();
      testUtil.initRequestLog();      
      table._cellToolTip.setCell( "w45", 5 );
      testUtil.forceInterval( table._cellToolTip._showTimer );
      var msg = testUtil.getMessage();
      var param1 = "org.eclipse.swt.events.cellToolTipTextRequested=w3";
      var param2 = "org.eclipse.swt.events.cellToolTipTextRequested.cell=w45%2C5";
      assertTrue( msg.indexOf( param1 ) != -1 );
      assertTrue( msg.indexOf( param2 ) != -1 );
      table.destroy();
    },

    
    /////////
    // Helper
    




/*******************************************************************************
 * Copyright (c) 2010, 2011 EclipseSource and others. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 * and is available at http://www.eclipse.org/legal/epl-v10.html

      tree.destroy();
    },

    testEnableCellToolTip : function() {
      var tree = this._createDefaultTree();
      assertNull( tree._cellToolTip );
      assertNull( tree._clientArea.getToolTip() );
      tree.setEnableCellToolTip( true );
      assertNotNull( tree._cellToolTip );
      assertNotNull( tree._clientArea.getToolTip() );
      tree.setEnableCellToolTip( false );
      assertNull( tree._cellToolTip );
      assertNull( tree._clientArea.getToolTip() );
      tree.destroy();
    },

    testRequestCellToolTipText : function() {
      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
      var tree = this._createDefaultTree();
      var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
      widgetManager.add( tree, "w3", true );
      tree.setEnableCellToolTip( true );
      testUtil.prepareTimerUse();
      testUtil.initRequestLog();      
      tree._cellToolTip.setCell( "w45", 5 );
      testUtil.forceInterval( tree._cellToolTip._showTimer );
      var msg = testUtil.getMessage();
      var param1 = "org.eclipse.swt.events.cellToolTipTextRequested=w3";
      var param2 = "org.eclipse.swt.events.cellToolTipTextRequested.cell=w45%2C5";
      assertTrue( msg.indexOf( param1 ) != -1 );
      assertTrue( msg.indexOf( param2 ) != -1 );
      tree.destroy();
    },

    /////////
    // helper




/*******************************************************************************
 * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

    Fixture.clearPreserved();
  }

  public void testPreserveEnableCellToolTip() {
    Table table = new Table( shell, SWT.BORDER );
    Fixture.markInitialized( display );
    Fixture.preserveWidgets();
    IWidgetAdapter adapter = WidgetUtil.getAdapter( table );
    Boolean preserved
      = ( Boolean )adapter.getPreserved( TableLCA.PROP_ENABLE_CELL_TOOLTIP );
    assertEquals( Boolean.FALSE, preserved );
    Fixture.clearPreserved();
    table.setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP, Boolean.TRUE );
    Fixture.preserveWidgets();
    adapter = WidgetUtil.getAdapter( table );
    preserved
      = ( Boolean )adapter.getPreserved( TableLCA.PROP_ENABLE_CELL_TOOLTIP );
    assertEquals( Boolean.TRUE, preserved );
    Fixture.clearPreserved();
  }

  public void testSetDataEvent() {
    final StringBuffer log = new StringBuffer();
    final Table table = new Table( shell, SWT.VIRTUAL );

    assertEquals( 0, table.getTopIndex() );
  }

  public void testWriteEnableCellToolTip() throws IOException {
    Table table = new Table( shell, SWT.NONE );
    createTableItems( table, 5 );
    Fixture.fakeNewRequest();
    table.setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP, Boolean.TRUE );
    TableLCA tableLCA = new TableLCA();
    tableLCA.renderChanges( table );
    String markup = Fixture.getAllMarkup();
    String expected = "w.setEnableCellToolTip( true )";
    assertTrue( markup.indexOf( expected ) != -1 );
  }

  public void testGetCellToolTipText() {
    Table table = new Table( shell, SWT.NONE );
    createTableItems( table, 5 );
    Object adapter = table.getAdapter( ITableAdapter.class );
    final ITableAdapter tableAdapter = ( ITableAdapter )adapter;
    tableAdapter.setCellToolTipProvider( new ICellToolTipProvider() {
      public void getToolTipText( final Item item,
                                  final int columnIndex )
      {
        StringBuffer buffer = new StringBuffer();
        buffer.append( "[" );
        buffer.append( WidgetUtil.getId( item ) );
        buffer.append( "," );
        buffer.append( columnIndex );
        buffer.append( "]" );
        tableAdapter.setToolTipText( buffer.toString() );
      }
    } );
    Fixture.fakeNewRequest();

    String markup = Fixture.getAllMarkup();
    String expected = "w.setCellToolTipText(";
    assertTrue( markup.indexOf( expected ) == -1 );
    String itemId = WidgetUtil.getId( table.getItem( 2 ) );
    processCellToolTipRequest( table, itemId, 0 );
    markup = Fixture.getAllMarkup();
    expected = "w.setCellToolTipText( \"[" + itemId + ",0]\" );";
    assertTrue( markup.indexOf( expected ) != -1 );
  }


      = ( ITableAdapter )table.getAdapter( ITableAdapter.class );
    tableAdapter.setCellToolTipProvider( new ICellToolTipProvider() {

      public void getToolTipText( final Item item, final int columnIndex ) {
        StringBuffer buffer = new StringBuffer();
        buffer.append( "[" );
        buffer.append( WidgetUtil.getId( item ) );
        buffer.append( "," );
        buffer.append( columnIndex );
        buffer.append( "]" );
        log.append( buffer.toString() );
      }
    } );
    String itemId = WidgetUtil.getId( table.getItem( 0 ) );
    processCellToolTipRequest( table, itemId, 0 );
    String expected = "[" + itemId + ",0]";
    assertEquals( expected, log.toString() );
    log.setLength( 0 );
    itemId = WidgetUtil.getId( table.getItem( 2 ) );
    processCellToolTipRequest( table, itemId, 0 );
    expected = "[" + itemId + ",0]";
    assertEquals( expected, log.toString() );
    log.setLength( 0 );
    processCellToolTipRequest( table, "xyz", 0 );
    assertEquals( "", log.toString() );
    processCellToolTipRequest( table, itemId, 1 );
    assertEquals( "", log.toString() );
    createTableColumns( table, 2 );
    processCellToolTipRequest( table, itemId, 1 );
    expected = "[" + itemId + ",1]";
    assertEquals( expected, log.toString() );
    log.setLength( 0 );
    processCellToolTipRequest( table, itemId, 2 );
    assertEquals( "", log.toString() );
  }


  }

  private static void processCellToolTipRequest( final Table table,
                                                 final String itemId,
                                                 final int column )
  {
    Fixture.fakeNewRequest();
    String displayId = DisplayUtil.getId( table.getDisplay() );
    Fixture.fakeRequestParam( RequestParams.UIROOT, displayId );
    String tableId = WidgetUtil.getId( table );
    Fixture.fakeRequestParam( JSConst.EVENT_CELL_TOOLTIP_REQUESTED, tableId );
    String cellString = itemId + "," + column;
    Fixture.fakeRequestParam( JSConst.EVENT_CELL_TOOLTIP_DETAILS, cellString );
    Fixture.executeLifeCycleFromServerThread();
  }





/*******************************************************************************
 * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.events.ActivateAdapter;
import org.eclipse.swt.internal.events.ActivateEvent;
import org.eclipse.swt.internal.widgets.*;
import org.eclipse.swt.internal.widgets.Props;
import org.eclipse.swt.internal.widgets.treekit.TreeLCA.ItemMetrics;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.*;

    hasListeners = ( Boolean )adapter.getPreserved( Props.ACTIVATE_LISTENER );
    assertEquals( Boolean.TRUE, hasListeners );
  }
  
  public void testPreserveEnableCellToolTip() {
    Tree tree = new Tree( shell, SWT.BORDER );
    Fixture.markInitialized( display );
    Fixture.preserveWidgets();
    IWidgetAdapter adapter = WidgetUtil.getAdapter( tree );
    Boolean preserved
      = ( Boolean )adapter.getPreserved( TreeLCA.PROP_ENABLE_CELL_TOOLTIP );
    assertEquals( Boolean.FALSE, preserved );
    Fixture.clearPreserved();
    tree.setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP, Boolean.TRUE );
    Fixture.preserveWidgets();
    adapter = WidgetUtil.getAdapter( tree );
    preserved
      = ( Boolean )adapter.getPreserved( TreeLCA.PROP_ENABLE_CELL_TOOLTIP );
    assertEquals( Boolean.TRUE, preserved );
    Fixture.clearPreserved();
  }

  public void testSelectionEvent() {
    final StringBuffer log = new StringBuffer();

    String expected = "w.setHasScrollBarsSelectionListener( true );";
    assertTrue( markup.indexOf( expected ) != -1 );
  }
  
  public void testWriteEnableCellToolTip() throws IOException {
    Tree tree = new Tree( shell, SWT.NONE );
    createTreeItems( tree, 5 );
    Fixture.fakeNewRequest();
    tree.setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP, Boolean.TRUE );
    TreeLCA treeLCA = new TreeLCA();
    treeLCA.renderChanges( tree );
    String markup = Fixture.getAllMarkup();
    String expected = "w.setEnableCellToolTip( true )";
    assertTrue( markup.indexOf( expected ) != -1 );
  }

  public void testGetCellToolTipText() {
    Tree tree = new Tree( shell, SWT.NONE );
    createTreeItems( tree, 5 );
    Object adapter = tree.getAdapter( ITreeAdapter.class );
    final ITreeAdapter treeAdapter = ( ITreeAdapter )adapter;
    treeAdapter.setCellToolTipProvider( new ICellToolTipProvider() {
      public void getToolTipText( final Item item,
                                  final int columnIndex )
      {
        StringBuffer buffer = new StringBuffer();
        buffer.append( "[" );
        buffer.append( WidgetUtil.getId( item ) );
        buffer.append( "," );
        buffer.append( columnIndex );
        buffer.append( "]" );
        treeAdapter.setToolTipText( buffer.toString() );
      }
    } );
    Fixture.fakeNewRequest();
    Fixture.executeLifeCycleFromServerThread();
    String markup = Fixture.getAllMarkup();
    String expected = "w.setCellToolTipText(";
    assertTrue( markup.indexOf( expected ) == -1 );
    String itemId = WidgetUtil.getId( tree.getItem( 2 ) );
    processCellToolTipRequest( tree, itemId, 0 );
    markup = Fixture.getAllMarkup();
    expected = "w.setCellToolTipText( \"[" + itemId + ",0]\" );";
    assertTrue( markup.indexOf( expected ) != -1 );
  }
  
  public void testGetCellToolTipTextForSubitems() {
    Tree tree = new Tree( shell, SWT.NONE );
    createTreeItems( tree, 5 );
    Object adapter = tree.getAdapter( ITreeAdapter.class );
    final ITreeAdapter treeAdapter = ( ITreeAdapter )adapter;
    treeAdapter.setCellToolTipProvider( new ICellToolTipProvider() {
      public void getToolTipText( final Item item,
                                  final int columnIndex )
      {
        StringBuffer buffer = new StringBuffer();
        buffer.append( "[" );
        buffer.append( WidgetUtil.getId( item ) );
        buffer.append( "," );
        buffer.append( columnIndex );
        buffer.append( "]" );
        treeAdapter.setToolTipText( buffer.toString() );
      }
    } );
    Fixture.fakeNewRequest();
    Fixture.executeLifeCycleFromServerThread();
    String markup = Fixture.getAllMarkup();
    String expected = "w.setCellToolTipText(";
    assertTrue( markup.indexOf( expected ) == -1 );
    String itemId = WidgetUtil.getId( tree.getItem( 2 ).getItem( 1 ) );
    processCellToolTipRequest( tree, itemId, 0 );
    markup = Fixture.getAllMarkup();
    expected = "w.setCellToolTipText( \"[" + itemId + ",0]\" );";
    assertTrue( markup.indexOf( expected ) != -1 );
  }

  public void testCellTooltipRequestForMissingCells() {
    Tree tree = new Tree( shell, SWT.NONE );
    createTreeItems( tree, 3 );
    final StringBuffer log = new StringBuffer();
    final ITreeAdapter treeAdapter
      = ( ITreeAdapter )tree.getAdapter( ITreeAdapter.class );
    treeAdapter.setCellToolTipProvider( new ICellToolTipProvider() {

      public void getToolTipText( final Item item, final int columnIndex ) {
        StringBuffer buffer = new StringBuffer();
        buffer.append( "[" );
        buffer.append( WidgetUtil.getId( item ) );
        buffer.append( "," );
        buffer.append( columnIndex );
        buffer.append( "]" );
        log.append( buffer.toString() );
      }
    } );
    String itemId = WidgetUtil.getId( tree.getItem( 0 ) );
    processCellToolTipRequest( tree, itemId, 0 );
    String expected = "[" + itemId + ",0]";
    assertEquals( expected, log.toString() );
    log.setLength( 0 );
    itemId = WidgetUtil.getId( tree.getItem( 2 ) );
    processCellToolTipRequest( tree, itemId, 0 );
    expected = "[" + itemId + ",0]";
    assertEquals( expected, log.toString() );
    log.setLength( 0 );
    processCellToolTipRequest( tree, "xyz", 0 );
    assertEquals( "", log.toString() );
    processCellToolTipRequest( tree, itemId, 1 );
    assertEquals( "", log.toString() );
    createTreeColumns( tree, 2 );
    processCellToolTipRequest( tree, itemId, 1 );
    expected = "[" + itemId + ",1]";
    assertEquals( expected, log.toString() );
    log.setLength( 0 );
    processCellToolTipRequest( tree, itemId, 2 );
    assertEquals( "", log.toString() );
  }
  
  private static void createTreeColumns( final Tree tree, final int count ) {
    for( int i = 0; i < count; i++ ) {
      new TreeColumn( tree, SWT.NONE );
    }
  }

  private static void createTreeItems( final Tree tree, final int count ) {
    for( int i = 0; i < count; i++ ) {
      TreeItem item = new TreeItem( tree, SWT.NONE );      
      for( int j = 0; j < count; j++ ) {
        new TreeItem( item, SWT.NONE );
      }
      item.setExpanded( true );
    }
  }

  private static void processCellToolTipRequest( final Tree tree,
                                                 final String itemId,
                                                 final int column )
  {
    Fixture.fakeNewRequest();
    String displayId = DisplayUtil.getId( tree.getDisplay() );
    Fixture.fakeRequestParam( RequestParams.UIROOT, displayId );
    String treeId = WidgetUtil.getId( tree );
    Fixture.fakeRequestParam( JSConst.EVENT_CELL_TOOLTIP_REQUESTED, treeId );
    String cellString = itemId + "," + column;
    Fixture.fakeRequestParam( JSConst.EVENT_CELL_TOOLTIP_DETAILS, cellString );
    Fixture.executeLifeCycleFromServerThread();
  }

  // TODO [tb] : Test for fake redraw calls checkAllData


Return to bug 334675

Lines 1-5 Link Here

(-)src/org/eclipse/swt/internal/widgets/tablekit/TableLCA_Test.java (-21 / +68 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 275-280 Link Here
275	Fixture.clearPreserved();	275	Fixture.clearPreserved();
276	}	276	}
277		277
		278	public void testPreserveEnableCellToolTip() {
		279	Table table = new Table( shell, SWT.BORDER );
		280	Fixture.markInitialized( display );
		281	Fixture.preserveWidgets();
		282	IWidgetAdapter adapter = WidgetUtil.getAdapter( table );
		283	Boolean preserved
		284	= ( Boolean )adapter.getPreserved( TableLCA.PROP_ENABLE_CELL_TOOLTIP );
		285	assertEquals( Boolean.FALSE, preserved );
		286	Fixture.clearPreserved();
		287	table.setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP, Boolean.TRUE );
		288	Fixture.preserveWidgets();
		289	adapter = WidgetUtil.getAdapter( table );
		290	preserved
		291	= ( Boolean )adapter.getPreserved( TableLCA.PROP_ENABLE_CELL_TOOLTIP );
		292	assertEquals( Boolean.TRUE, preserved );
		293	Fixture.clearPreserved();
		294	}
		295
278	public void testSetDataEvent() {	296	public void testSetDataEvent() {
279	final StringBuffer log = new StringBuffer();	297	final StringBuffer log = new StringBuffer();
280	final Table table = new Table( shell, SWT.VIRTUAL );	298	final Table table = new Table( shell, SWT.VIRTUAL );
Lines 816-832 Link Here
816	assertEquals( 0, table.getTopIndex() );	834	assertEquals( 0, table.getTopIndex() );
817	}	835	}
818		836
		837	public void testWriteEnableCellToolTip() throws IOException {
		838	Table table = new Table( shell, SWT.NONE );
		839	createTableItems( table, 5 );
		840	Fixture.fakeNewRequest();
		841	table.setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP, Boolean.TRUE );
		842	TableLCA tableLCA = new TableLCA();
		843	tableLCA.renderChanges( table );
		844	String markup = Fixture.getAllMarkup();
		845	String expected = "w.setEnableCellToolTip( true )";
		846	assertTrue( markup.indexOf( expected ) != -1 );
		847	}
		848
819	public void testGetCellToolTipText() {	849	public void testGetCellToolTipText() {
820	Table table = new Table( shell, SWT.NONE );	850	Table table = new Table( shell, SWT.NONE );
821	createTableItems( table, 5 );	851	createTableItems( table, 5 );
822	Object adapter = table.getAdapter( ITableAdapter.class );	852	Object adapter = table.getAdapter( ITableAdapter.class );
823	final ITableAdapter tableAdapter = ( ITableAdapter )adapter;	853	final ITableAdapter tableAdapter = ( ITableAdapter )adapter;
824	tableAdapter.setCellToolTipProvider( new ICellToolTipProvider() {	854	tableAdapter.setCellToolTipProvider( new ICellToolTipProvider() {
825	public void getToolTipText( final int itemIndex,	855	public void getToolTipText( final Item item,
826	final int columnIndex )	856	final int columnIndex )
827	{	857	{
828	String text = "[" + itemIndex + "," + columnIndex + "]";	858	StringBuffer buffer = new StringBuffer();
829	tableAdapter.setToolTipText( text );	859	buffer.append( "[" );
		860	buffer.append( WidgetUtil.getId( item ) );
		861	buffer.append( "," );
		862	buffer.append( columnIndex );
		863	buffer.append( "]" );
		864	tableAdapter.setToolTipText( buffer.toString() );
830	}	865	}
831	} );	866	} );
832	Fixture.fakeNewRequest();	867	Fixture.fakeNewRequest();
Lines 834-842 Link Here
834	String markup = Fixture.getAllMarkup();	869	String markup = Fixture.getAllMarkup();
835	String expected = "w.setCellToolTipText(";	870	String expected = "w.setCellToolTipText(";
836	assertTrue( markup.indexOf( expected ) == -1 );	871	assertTrue( markup.indexOf( expected ) == -1 );
837	processCellToolTipRequest( table, 2, 0 );	872	String itemId = WidgetUtil.getId( table.getItem( 2 ) );
		873	processCellToolTipRequest( table, itemId, 0 );
838	markup = Fixture.getAllMarkup();	874	markup = Fixture.getAllMarkup();
839	expected = "w.setCellToolTipText( \"[2,0]\" );";	875	expected = "w.setCellToolTipText( \"[" + itemId + ",0]\" );";
840	assertTrue( markup.indexOf( expected ) != -1 );	876	assertTrue( markup.indexOf( expected ) != -1 );
841	}	877	}
842		878
Lines 848-872 Link Here
848	= ( ITableAdapter )table.getAdapter( ITableAdapter.class );	884	= ( ITableAdapter )table.getAdapter( ITableAdapter.class );
849	tableAdapter.setCellToolTipProvider( new ICellToolTipProvider() {	885	tableAdapter.setCellToolTipProvider( new ICellToolTipProvider() {
850		886
851	public void getToolTipText( final int itemIndex, final int columnIndex ) {	887	public void getToolTipText( final Item item, final int columnIndex ) {
852	log.append( "[" + itemIndex + "," + columnIndex + "]" );	888	StringBuffer buffer = new StringBuffer();
		889	buffer.append( "[" );
		890	buffer.append( WidgetUtil.getId( item ) );
		891	buffer.append( "," );
		892	buffer.append( columnIndex );
		893	buffer.append( "]" );
		894	log.append( buffer.toString() );
853	}	895	}
854	} );	896	} );
855	processCellToolTipRequest( table, 0, 0 );	897	String itemId = WidgetUtil.getId( table.getItem( 0 ) );
856	assertEquals( "[0,0]", log.toString() );	898	processCellToolTipRequest( table, itemId, 0 );
		899	String expected = "[" + itemId + ",0]";
		900	assertEquals( expected, log.toString() );
857	log.setLength( 0 );	901	log.setLength( 0 );
858	processCellToolTipRequest( table, 2, 0 );	902	itemId = WidgetUtil.getId( table.getItem( 2 ) );
859	assertEquals( "[2,0]", log.toString() );	903	processCellToolTipRequest( table, itemId, 0 );
		904	expected = "[" + itemId + ",0]";
		905	assertEquals( expected, log.toString() );
860	log.setLength( 0 );	906	log.setLength( 0 );
861	processCellToolTipRequest( table, 3, 0 );	907	processCellToolTipRequest( table, "xyz", 0 );
862	assertEquals( "", log.toString() );	908	assertEquals( "", log.toString() );
863	processCellToolTipRequest( table, 2, 1 );	909	processCellToolTipRequest( table, itemId, 1 );
864	assertEquals( "", log.toString() );	910	assertEquals( "", log.toString() );
865	createTableColumns( table, 2 );	911	createTableColumns( table, 2 );
866	processCellToolTipRequest( table, 2, 1 );	912	processCellToolTipRequest( table, itemId, 1 );
867	assertEquals( "[2,1]", log.toString() );	913	expected = "[" + itemId + ",1]";
		914	assertEquals( expected, log.toString() );
868	log.setLength( 0 );	915	log.setLength( 0 );
869	processCellToolTipRequest( table, 2, 2 );	916	processCellToolTipRequest( table, itemId, 2 );
870	assertEquals( "", log.toString() );	917	assertEquals( "", log.toString() );
871	}	918	}
872		919
Lines 921-936 Link Here
921	}	968	}
922		969
923	private static void processCellToolTipRequest( final Table table,	970	private static void processCellToolTipRequest( final Table table,
924	final int item,	971	final String itemId,
925	final int column )	972	final int column )
926	{	973	{
927	Fixture.fakeNewRequest();	974	Fixture.fakeNewRequest();
928	String displayId = DisplayUtil.getId( table.getDisplay() );	975	String displayId = DisplayUtil.getId( table.getDisplay() );
929	Fixture.fakeRequestParam( RequestParams.UIROOT, displayId );	976	Fixture.fakeRequestParam( RequestParams.UIROOT, displayId );
930	String tableId = WidgetUtil.getId( table );	977	String tableId = WidgetUtil.getId( table );
931	Fixture.fakeRequestParam( TableLCA.EVENT_CELL_TOOLTIP_REQUESTED, tableId );	978	Fixture.fakeRequestParam( JSConst.EVENT_CELL_TOOLTIP_REQUESTED, tableId );
932	String cellString = item + "," + column;	979	String cellString = itemId + "," + column;
933	Fixture.fakeRequestParam( TableLCA.EVENT_CELL_TOOLTIP_DETAILS, cellString );	980	Fixture.fakeRequestParam( JSConst.EVENT_CELL_TOOLTIP_DETAILS, cellString );
934	Fixture.executeLifeCycleFromServerThread();	981	Fixture.executeLifeCycleFromServerThread();
935	}	982	}
936		983

Lines 1-5 Link Here

(-)src/org/eclipse/jface/viewers/CellToolTipProvider.java (-19 / +31 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009, 2010 EclipseSource and others. All rights reserved.	2	* Copyright (c) 2009, 2011 EclipseSource and others. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,	4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html	5	* and is available at http://www.eclipse.org/legal/epl-v10.html
Lines 9-51 Link Here
9	******************************************************************************/	9	******************************************************************************/
10	package org.eclipse.jface.viewers;	10	package org.eclipse.jface.viewers;
11		11
		12	import org.eclipse.swt.internal.widgets.ICellToolTipAdapter;
12	import org.eclipse.swt.internal.widgets.ITableAdapter;	13	import org.eclipse.swt.internal.widgets.ITableAdapter;
13	import org.eclipse.swt.internal.widgets.ICellToolTipProvider;	14	import org.eclipse.swt.internal.widgets.ICellToolTipProvider;
		15	import org.eclipse.swt.internal.widgets.ITreeAdapter;
		16	import org.eclipse.swt.widgets.Item;
14	import org.eclipse.swt.widgets.Table;	17	import org.eclipse.swt.widgets.Table;
		18	import org.eclipse.swt.widgets.Tree;
15		19
16	/**	20	/**
17	* Support for table tool-tips in RAP	21	* Support for table/tree tool-tips in RAP
18	*/	22	*/
19	final class CellToolTipProvider implements ICellToolTipProvider {	23	final class CellToolTipProvider implements ICellToolTipProvider {
20	private TableViewer viewer;	24	private ColumnViewer viewer;
21		25
22	CellToolTipProvider( final TableViewer viewer ) {	26	CellToolTipProvider( final ColumnViewer viewer ) {
23	this.viewer = viewer;	27	this.viewer = viewer;
24	}	28	}
25		29
26	static void attach( final TableViewer tableViewer,	30	static void attach( final ColumnViewer viewer,
27	final IBaseLabelProvider labelProvider )	31	final CellLabelProvider labelProvider )
28	{	32	{
29	Table table = tableViewer.getTable();	33	ICellToolTipAdapter adapter = getAdapter( viewer );
30	Object adapter = table.getAdapter( ITableAdapter.class );	34	if( labelProvider != null ) {
31	ITableAdapter tableAdapter = ( ITableAdapter )adapter;	35	CellToolTipProvider provider = new CellToolTipProvider( viewer );
32	if( labelProvider instanceof CellLabelProvider ) {	36	adapter.setCellToolTipProvider( provider );
33	CellToolTipProvider provider = new CellToolTipProvider( tableViewer );
34	tableAdapter.setCellToolTipProvider( provider );
35	} else {	37	} else {
36	tableAdapter.setCellToolTipProvider( null );	38	adapter.setCellToolTipProvider( null );
37	}	39	}
38	}	40	}
39		41
40	public void getToolTipText( final int itemIndex, final int columnIndex ) {	42	private static ICellToolTipAdapter getAdapter( final ColumnViewer viewer ) {
41	Table table = viewer.getTable();	43	ICellToolTipAdapter result = null;
42	Object element = table.getItem( itemIndex ).getData();	44	if( viewer instanceof TableViewer ) {
		45	Table table = ( ( TableViewer )viewer ).getTable();
		46	result = ( ICellToolTipAdapter )table.getAdapter( ITableAdapter.class );
		47	} else if( viewer instanceof TreeViewer ) {
		48	Tree tree = ( ( TreeViewer )viewer ).getTree();
		49	result = ( ICellToolTipAdapter )tree.getAdapter( ITreeAdapter.class );
		50	}
		51	return result;
		52	}
		53
		54	public void getToolTipText( final Item item, final int columnIndex ) {
		55	Object element = item.getData();
43	ViewerColumn column = viewer.getViewerColumn( columnIndex );	56	ViewerColumn column = viewer.getViewerColumn( columnIndex );
44	CellLabelProvider labelProvider = column.getLabelProvider();	57	CellLabelProvider labelProvider = column.getLabelProvider();
45	String text = labelProvider.getToolTipText( element );	58	String text = labelProvider.getToolTipText( element );
46	Object adapter = table.getAdapter( ITableAdapter.class );	59	ICellToolTipAdapter adapter = getAdapter( viewer );
47	ITableAdapter tableAdapter = ( ITableAdapter )adapter;	60	adapter.setToolTipText( text );
48	tableAdapter.setToolTipText( text );
49	}	61	}
50		62
51	}	63	}

Lines 22-28 Link Here

(-)src/org/eclipse/jface/viewers/ColumnViewerToolTipSupport.java (-8 / +7 lines)
22	//import org.eclipse.swt.graphics.Point;	22	//import org.eclipse.swt.graphics.Point;
23	//import org.eclipse.swt.widgets.Composite;	23	//import org.eclipse.swt.widgets.Composite;
24	//import org.eclipse.swt.widgets.Event;	24	//import org.eclipse.swt.widgets.Event;
25	import org.eclipse.swt.widgets.Table;	25	import org.eclipse.swt.internal.widgets.ICellToolTipProvider;
26		26
27	/**	27	/**
28	* The ColumnViewerTooltipSupport is the class that provides tool tips for	28	* The ColumnViewerTooltipSupport is the class that provides tool tips for
Lines 31-37 Link Here
31	* @since 1.3	31	* @since 1.3
32	*	32	*
33	*/	33	*/
34	// RAP [rh] RAP provides tooltip support only for the table widget	34	// RAP [rh] RAP provides tooltip support for the table and tree widgets
35	// In addition RAP cannot reuse the DefaultToolTip and ToolTip as these	35	// In addition RAP cannot reuse the DefaultToolTip and ToolTip as these
36	// classes make heavy use of mouse events	36	// classes make heavy use of mouse events
37	public class ColumnViewerToolTipSupport	37	public class ColumnViewerToolTipSupport
Lines 77-88 Link Here
77	* @param viewer	77	* @param viewer
78	* the viewer the support is attached to	78	* the viewer the support is attached to
79	*/	79	*/
80	// public static void enableFor(ColumnViewer viewer) {	80	public static void enableFor(ColumnViewer viewer) {
81	// new ColumnViewerToolTipSupport(viewer, ToolTip.NO_RECREATE, false);	81	// new ColumnViewerToolTipSupport(viewer, ToolTip.NO_RECREATE, false);
82	// }	82	viewer.getControl().setData( ICellToolTipProvider.ENABLE_CELL_TOOLTIP,
83	public static void enableFor(AbstractTableViewer viewer) {	83	Boolean.TRUE );
84	viewer.getControl().setData( Table.ENABLE_CELL_TOOLTIP, Boolean.TRUE );	84	}
85	}
86		85
87	// RAP [rh] ToolTip style not supported	86	// RAP [rh] ToolTip style not supported
88	// /**	87	// /**

Added Link Here

(-)src/org/eclipse/swt/internal/widgets/ICellToolTipAdapter.java (+20 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 EclipseSource and others. All rights reserved.
3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* EclipseSource - initial API and implementation
9	******************************************************************************/
10	package org.eclipse.swt.internal.widgets;
11
12	public interface ICellToolTipAdapter {
13
14	ICellToolTipProvider getCellToolTipProvider();
15	void setCellToolTipProvider( ICellToolTipProvider provider );
16
17	String getToolTipText();
18	void setToolTipText( String toolTipText );
19
20	}

Lines 1-5 Link Here

(-)src/org/eclipse/swt/widgets/Table.java (-10 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 243-257 Link Here
243	public static final String ALWAYS_HIDE_SELECTION	243	public static final String ALWAYS_HIDE_SELECTION
244	= Table.class.getName() + "#alwaysHideSelection";	244	= Table.class.getName() + "#alwaysHideSelection";
245		245
246	/**
247	* <strong>IMPORTANT:</strong> This field is <em>not</em> part of the SWT
248	* public API. It is marked public only so that it can be shared
249	* within the packages provided by SWT. It should never be accessed from
250	* application code.
251	*/
252	public static final String ENABLE_CELL_TOOLTIP
253	= Table.class.getName() + "#enableCellToolTip";
254
255	private static final int GRID_WIDTH = 1;	246	private static final int GRID_WIDTH = 1;
256		247
257	private static final int[] EMPTY_SELECTION = new int[ 0 ];	248	private static final int[] EMPTY_SELECTION = new int[ 0 ];

Lines 1-5 Link Here

(-)js/org/eclipse/swt/widgets/Table.js (-22 / +36 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2010 Innoopract Informationssysteme GmbH.	2	* Copyright (c) 2007, 2011 Innoopract Informationssysteme GmbH.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 160-171 Link Here
160	this.add( this._clientArea );	160	this.add( this._clientArea );
161	// Cell tooltip	161	// Cell tooltip
162	this._cellToolTip = null;	162	this._cellToolTip = null;
163	if( qx.lang.String.contains( style, "enableCellToolTip" ) ) {
164	this._cellToolTip = new org.eclipse.swt.widgets.TableCellToolTip();
165	this._cellToolTip.setTableId( id );
166	this._clientArea.addEventListener( "mousemove", this._onClientAreaMouseMove, this );
167	this._clientArea.setToolTip( this._cellToolTip );
168	}
169	// Disable scrolling (see bug 279460)	163	// Disable scrolling (see bug 279460)
170	qx.ui.core.Widget.disableScrolling( this );	164	qx.ui.core.Widget.disableScrolling( this );
171	// Fix for bug Bug 297202	165	// Fix for bug Bug 297202
Lines 228-234 Link Here
228	this._clientArea = null;	222	this._clientArea = null;
229	}	223	}
230	if( this._cellToolTip ) {	224	if( this._cellToolTip ) {
231	this._cellToolTip.dispose();	225	this._cellToolTip.destroy();
232	this._cellToolTip = null;	226	this._cellToolTip = null;
233	}	227	}
234	if( this._columnArea ) {	228	if( this._columnArea ) {
Lines 1730-1755 Link Here
1730	////////////////////////	1724	////////////////////////
1731	// Cell tooltip handling	1725	// Cell tooltip handling
1732		1726
		1727	setEnableCellToolTip : function( value ) {
		1728	if( value ) {
		1729	var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
		1730	var id = widgetManager.findIdByWidget( this );
		1731	this._cellToolTip = new org.eclipse.swt.widgets.TableCellToolTip( id );
		1732	this._clientArea.addEventListener( "mousemove",
		1733	this._onClientAreaMouseMove,
		1734	this );
		1735	this._clientArea.setToolTip( this._cellToolTip );
		1736	} else {
		1737	this._clientArea.removeEventListener( "mousemove",
		1738	this._onClientAreaMouseMove,
		1739	this );
		1740	this._clientArea.setToolTip( null );
		1741	this._cellToolTip.destroy();
		1742	this._cellToolTip = null;
		1743	}
		1744	},
		1745
1733	_onClientAreaMouseMove : function( evt ) {	1746	_onClientAreaMouseMove : function( evt ) {
1734	if( this._cellToolTip != null ) {	1747	if( this._cellToolTip != null ) {
1735	var pageX = evt.getPageX();	1748	var pageX = evt.getPageX();
1736	var pageY = evt.getPageY();	1749	var pageY = evt.getPageY();
1737	var row = this._getRowAtPoint( pageX, pageY );	1750	var row = this._getRowAtPoint( pageX, pageY );
1738	var rowIndex = this._rows.indexOf( row );	1751	var itemIndex = row.getItemIndex();
1739	var itemIndex = this._getItemIndexFromRowIndex( rowIndex );	1752	if( itemIndex != -1 ) {
1740	var columnIndex = -1;	1753	var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
1741	var columns = this.getColumns();	1754	var itemId = widgetManager.findIdByWidget( this._items[ itemIndex ] );
1742	for( var i = 0; columnIndex == -1 && i < columns.length; i++ ) {	1755	var columnIndex = -1;
1743	var element = this._clientArea.getElement();	1756	var columns = this.getColumns();
1744	var pageLeft = qx.bom.element.Location.getLeft( element )	1757	var element = this._clientArea.getElement();
1745	+ this._itemLeft[ i ];	1758	var leftOffset = qx.bom.element.Location.getLeft( element );
1746	if( pageX >= pageLeft	1759	for( var i = 0; columnIndex == -1 && i < columns.length; i++ ) {
1747	&& pageX < pageLeft + this._itemWidth[ i ] )	1760	var pageLeft = leftOffset + this._itemLeft[ i ];
1748	{	1761	if( pageX >= pageLeft && pageX < pageLeft + this._itemWidth[ i ] ) {
1749	columnIndex = i;	1762	columnIndex = i;
1750	}	1763	}
		1764	}
		1765	this._cellToolTip.setCell( itemId, columnIndex );
1751	}	1766	}
1752	this._cellToolTip.setCell( itemIndex, columnIndex );
1753	}	1767	}
1754	},	1768	},
1755		1769

Lines 1-5 Link Here

(-)js/org/eclipse/swt/widgets/TableCellToolTip.js (-15 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 EclipseSource and others. All rights reserved.	2	* Copyright (c) 2009, 2011 EclipseSource and others. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,	4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html	5	* and is available at http://www.eclipse.org/legal/epl-v10.html
Lines 12-21 Link Here
12	extend : qx.ui.popup.ToolTip,	12	extend : qx.ui.popup.ToolTip,
13	include : org.eclipse.rwt.FadeAnimationMixin,	13	include : org.eclipse.rwt.FadeAnimationMixin,
14		14
15	construct : function() {	15	construct : function( controlId ) {
16	this.base( arguments );	16	this.base( arguments );
17	this._tableId = -1;	17	this._controlId = controlId;
18	this._itemIndex = -1;	18	this._itemId = null;
19	this._columnIndex = -1;	19	this._columnIndex = -1;
20	},	20	},
21		21
Lines 37-53 Link Here
37	}	37	}
38	},	38	},
39		39
40	setTableId : function( tableId ) {	40	setCell : function( itemId, columnIndex ) {
41	this._tableId = tableId;	41	if( this._itemId != itemId \|\| this._columnIndex != columnIndex ) {
42	},	42	this._itemId = itemId;
43
44	setCell : function( itemIndex, columnIndex ) {
45	if( this._itemIndex != itemIndex \|\| this._columnIndex != columnIndex ) {
46	this._itemIndex = itemIndex;
47	this._columnIndex = columnIndex;	43	this._columnIndex = columnIndex;
48	this.hide();	44	this.hide();
49	if( !this._showTimer.getEnabled()	45	if( !this._showTimer.getEnabled()
50	&& itemIndex != -1	46	&& itemId != null
51	&& columnIndex != -1 )	47	&& columnIndex != -1 )
52	{	48	{
53	this._showTimer.start();	49	this._showTimer.start();
Lines 56-66 Link Here
56	},	52	},
57		53
58	_requestCellToolTipText : function() {	54	_requestCellToolTipText : function() {
59	if( this._itemIndex != -1 && this._columnIndex != -1 ) {	55	if( this._itemId != null && this._columnIndex != -1 ) {
60	var req = org.eclipse.swt.Request.getInstance();	56	var req = org.eclipse.swt.Request.getInstance();
61	req.addEvent( "org.eclipse.swt.events.cellToolTipTextRequested",	57	req.addEvent( "org.eclipse.swt.events.cellToolTipTextRequested",
62	this._tableId );	58	this._controlId );
63	var cell = this._itemIndex + "," + this._columnIndex;	59	var cell = this._itemId + "," + this._columnIndex;
64	req.addParameter( "org.eclipse.swt.events.cellToolTipTextRequested.cell",	60	req.addParameter( "org.eclipse.swt.events.cellToolTipTextRequested.cell",
65	cell );	61	cell );
66	req.send();	62	req.send();

Lines 1-5 Link Here

(-)js/org/eclipse/rwt/test/tests/TableTest.js (-2 / +31 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2010 EclipseSource and others. All rights reserved.	2	* Copyright (c) 2010, 2011 EclipseSource and others. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,	4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html	5	* and is available at http://www.eclipse.org/legal/epl-v10.html
Lines 114-121 Link Here
114	table.destroy();	114	table.destroy();
115	},	115	},
116		116
		117	testEnableCellToolTip : function() {
		118	var table = this._createDefaultTable();
		119	assertNull( table._cellToolTip );
		120	assertNull( table._clientArea.getToolTip() );
		121	table.setEnableCellToolTip( true );
		122	assertNotNull( table._cellToolTip );
		123	assertNotNull( table._clientArea.getToolTip() );
		124	table.setEnableCellToolTip( false );
		125	assertNull( table._cellToolTip );
		126	assertNull( table._clientArea.getToolTip() );
		127	table.destroy();
		128	},
		129
		130	testRequestCellToolTipText : function() {
		131	var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
		132	var table = this._createDefaultTable();
		133	var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
		134	widgetManager.add( table, "w3", true );
		135	table.setEnableCellToolTip( true );
		136	testUtil.prepareTimerUse();
		137	testUtil.initRequestLog();
		138	table._cellToolTip.setCell( "w45", 5 );
		139	testUtil.forceInterval( table._cellToolTip._showTimer );
		140	var msg = testUtil.getMessage();
		141	var param1 = "org.eclipse.swt.events.cellToolTipTextRequested=w3";
		142	var param2 = "org.eclipse.swt.events.cellToolTipTextRequested.cell=w45%2C5";
		143	assertTrue( msg.indexOf( param1 ) != -1 );
		144	assertTrue( msg.indexOf( param2 ) != -1 );
		145	table.destroy();
		146	},
117		147
118
119	/////////	148	/////////
120	// Helper	149	// Helper
121		150

Lines 1-5 Link Here

(-)js/org/eclipse/rwt/test/tests/TreeTest.js (-1 / +31 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2010 EclipseSource and others. All rights reserved.	2	* Copyright (c) 2010, 2011 EclipseSource and others. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,	4	* terms of the Eclipse Public License v1.0 which accompanies this distribution,
5	* and is available at http://www.eclipse.org/legal/epl-v10.html	5	* and is available at http://www.eclipse.org/legal/epl-v10.html
Lines 3167-3172 Link Here
3167	tree.destroy();	3167	tree.destroy();
3168	},	3168	},
3169		3169
		3170	testEnableCellToolTip : function() {
		3171	var tree = this._createDefaultTree();
		3172	assertNull( tree._cellToolTip );
		3173	assertNull( tree._clientArea.getToolTip() );
		3174	tree.setEnableCellToolTip( true );
		3175	assertNotNull( tree._cellToolTip );
		3176	assertNotNull( tree._clientArea.getToolTip() );
		3177	tree.setEnableCellToolTip( false );
		3178	assertNull( tree._cellToolTip );
		3179	assertNull( tree._clientArea.getToolTip() );
		3180	tree.destroy();
		3181	},
		3182
		3183	testRequestCellToolTipText : function() {
		3184	var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
		3185	var tree = this._createDefaultTree();
		3186	var widgetManager = org.eclipse.swt.WidgetManager.getInstance();
		3187	widgetManager.add( tree, "w3", true );
		3188	tree.setEnableCellToolTip( true );
		3189	testUtil.prepareTimerUse();
		3190	testUtil.initRequestLog();
		3191	tree._cellToolTip.setCell( "w45", 5 );
		3192	testUtil.forceInterval( tree._cellToolTip._showTimer );
		3193	var msg = testUtil.getMessage();
		3194	var param1 = "org.eclipse.swt.events.cellToolTipTextRequested=w3";
		3195	var param2 = "org.eclipse.swt.events.cellToolTipTextRequested.cell=w45%2C5";
		3196	assertTrue( msg.indexOf( param1 ) != -1 );
		3197	assertTrue( msg.indexOf( param2 ) != -1 );
		3198	tree.destroy();
		3199	},
3170		3200
3171	/////////	3201	/////////
3172	// helper	3202	// helper