Attachment 46263 Details for Bug 149193 – Patch that passes the test suites

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

[patch] Patch that passes the test suites

149193.txt (text/plain), 76.52 KB, created by Tod Creasey

on 2006-07-13 16:33:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2006-07-13 16:33:12 EDT

Size: 76.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/viewers/TableViewer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewer.java,v
>retrieving revision 1.56
>diff -u -r1.56 TableViewer.java
>--- src/org/eclipse/jface/viewers/TableViewer.java	15 Jun 2006 22:28:48 -0000	1.56
>+++ src/org/eclipse/jface/viewers/TableViewer.java	13 Jul 2006 20:35:57 -0000
>@@ -7,6 +7,7 @@
> *
> * Contributors:
> * IBM Corporation - initial API and implementation
>+ * Tom Schindl <tom.schindl@bestsolution.at> (bug 83200)
> *******************************************************************************/
> 
> package org.eclipse.jface.viewers;
>@@ -28,6 +29,7 @@
> import org.eclipse.swt.widgets.Item;
> import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Table;
>+import org.eclipse.swt.widgets.TableColumn;
> import org.eclipse.swt.widgets.TableItem;
> import org.eclipse.swt.widgets.Widget;
> 
>@@ -64,178 +66,101 @@
> * @see #internalRefresh(Object, boolean)
> */
> public class TableViewer extends StructuredViewer {
>-		
>-	private class VirtualManager{
>+
>+	private class VirtualManager {
> 
> 		/**
>-		 * The currently invisible elements as provided 
>-		 * by the content provider or by addition.
>-		 * This will not be populated by an ILazyStructuredContentProvider
>-		 * as an ILazyStructuredContentProvider is only queried
>-		 * on the virtual callback.
>+		 * The currently invisible elements as provided by the content provider
>+		 * or by addition. This will not be populated by an
>+		 * ILazyStructuredContentProvider as an ILazyStructuredContentProvider
>+		 * is only queried on the virtual callback.
> 		 */
> 		private Object[] cachedElements = new Object[0];
>+
> 		/**
> 		 * Create a new instance of the receiver.
>-		 *
>+		 * 
> 		 */
>-		public VirtualManager(){
>+		public VirtualManager() {
> 			addTableListener();
> 		}
> 
>-		
> 		/**
> 		 * Add the listener for SetData on the table
> 		 */
> 		private void addTableListener() {
>-			table.addListener(SWT.SetData,new Listener(){
>-				/* (non-Javadoc)
>+			table.addListener(SWT.SetData, new Listener() {
>+				/*
>+				 * (non-Javadoc)
>+				 * 
> 				 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
> 				 */
> 				public void handleEvent(Event event) {
> 					TableItem item = (TableItem) event.item;
> 					final int index = table.indexOf(item);
> 					Object element = resolveElement(index);
>-					if(element == null){
>-						//Didn't find it so make a request
>-						//Keep looking if it is not in the cache.
>+					if (element == null) {
>+						// Didn't find it so make a request
>+						// Keep looking if it is not in the cache.
> 						IContentProvider contentProvider = getContentProvider();
>-						//If we are building lazily then request lookup now
>-						if(contentProvider instanceof ILazyContentProvider){
>-							((ILazyContentProvider) contentProvider).
>-								updateElement(index);
>+						// If we are building lazily then request lookup now
>+						if (contentProvider instanceof ILazyContentProvider) {
>+							((ILazyContentProvider) contentProvider)
>+									.updateElement(index);
> 							return;
>-						}	
>+						}
> 					}
>-						
>-					
>-					associate(element,item);
>-					updateItem(item,element);
>+
>+					associate(element, item);
>+					updateItem(item, element);
> 				}
> 
> 			});
> 		}
>-		
>+
> 		/**
>-		 * Get the element at index.Resolve it lazily if this
>-		 * is available.
>+		 * Get the element at index.Resolve it lazily if this is available.
>+		 * 
> 		 * @param index
>-		 * @return Object or <code>null</code> if it could
>-		 * not be found
>+		 * @return Object or <code>null</code> if it could not be found
> 		 */
> 		protected Object resolveElement(int index) {
>-			
>+
> 			Object element = null;
>-			if(index < cachedElements.length) {
>-				element = cachedElements[index];
>+			if (index < cachedElements.length) {
>+				element = cachedElements[index];
> 			}
>-			
>+
> 			return element;
> 		}
> 
> 		/**
> 		 * A non visible item has been added.
>+		 * 
> 		 * @param element
> 		 * @param index
> 		 */
> 		public void notVisibleAdded(Object element, int index) {
>-			
>+
> 			int requiredCount = index + 1;
>-			
>-			if(requiredCount > getTable().getItemCount()){
>+
>+			if (requiredCount > getTable().getItemCount()) {
> 				getTable().setItemCount(requiredCount);
> 				Object[] newCache = new Object[requiredCount];
>-				System.arraycopy(cachedElements, 0, newCache, 0, cachedElements.length);
>+				System.arraycopy(cachedElements, 0, newCache, 0,
>+						cachedElements.length);
> 				cachedElements = newCache;
> 			}
>-			
>-			
>+
> 			cachedElements[index] = element;
>-			
>+
> 		}
>-		
>+
> 	}
>-	
>+
> 	private VirtualManager virtualManager;
>-	
>-	/**
>-	 * TableColorAndFontNoOp is an optimization for tables without
>-	 * color and font support.
>-	 * @see ITableColorProvider
>-	 * @see ITableFontProvider
>-	 */
>-	private class TableColorAndFontNoOp{
>-		
>-		/**
>-		 * Create a new instance of the receiver.
>-		 *
>-		 */
>-		TableColorAndFontNoOp(){
>-			
>-		}
>-		
>-		/**
>-		 * Set the fonts and colors for the tableItem if there is a color
>-		 * and font provider available.
>-		 * @param tableItem The item to update.
>-		 * @param element The element being represented
>-		 * @param column The column index
>-		 */
>-		public void setFontsAndColors(TableItem tableItem, Object element, int column){
>-		}	
>-		
>-	}
> 
> 	/**
>-	 * TableColorAndFontCollector is an helper class for color and font
>-	 * support for tables that support the ITableFontProvider and
>-	 * the ITableColorProvider.
>-	 * @see ITableColorProvider
>-	 * @see ITableFontProvider
>-	 */
>-	
>-	private class TableColorAndFontCollector extends TableColorAndFontNoOp{
>-		
>-		ITableFontProvider fontProvider = null;
>-		ITableColorProvider colorProvider = null;
>-		
>-		/**
>-		 * Create an instance of the receiver. Set the color and font
>-		 * providers if provider can be cast to the correct type.
>-		 * @param provider IBaseLabelProvider
>-		 */
>-		public TableColorAndFontCollector(IBaseLabelProvider provider){
>-			if(provider instanceof ITableFontProvider) {
>-				fontProvider = (ITableFontProvider) provider;
>-			}
>-			if(provider instanceof ITableColorProvider) {
>-				colorProvider = (ITableColorProvider) provider;
>-			}
>-		}
>-	
>-		
>-		/**
>-		 * Set the fonts and colors for the tableItem if there is a color
>-		 * and font provider available.
>-		 * @param tableItem The item to update.
>-		 * @param element The element being represented
>-		 * @param column The column index
>-		 */
>-		public void setFontsAndColors(TableItem tableItem, Object element, int column){
>-			if (colorProvider != null) {
>-				tableItem.setBackground(column, colorProvider.getBackground(element,
>-						column));
>-				tableItem.setForeground(column, colorProvider.getForeground(element,
>-						column));
>-			}
>-			if(fontProvider != null) {
>-				tableItem.setFont(column,fontProvider.getFont(element,column));
>-			}
>-		}	
>-		
>-	}
>-	
>-	/**
> 	 * Internal table viewer implementation.
> 	 */
> 	private TableEditorImpl tableViewerImpl;
>@@ -249,12 +174,8 @@
> 	 * This viewer's table editor.
> 	 */
> 	private TableEditor tableEditor;
>-	
>-	/**
>-	 * The color and font collector for the cells.
>-	 */
>-	private TableColorAndFontNoOp tableColorAndFont = new TableColorAndFontNoOp();
>-	
>+
>+
> 	/**
> 	 * Creates a table viewer on a newly-created table control under the given
> 	 * parent. The table control is created using the SWT style bits
>@@ -281,7 +202,7 @@
> 	 * SWT style bits
> 	 */
> 	public TableViewer(Composite parent, int style) {
>-		this(new Table(parent, style));			
>+		this(new Table(parent, style));
> 	}
> 
> 	/**
>@@ -299,19 +220,19 @@
> 		initTableViewerImpl();
> 		initializeVirtualManager(table.getStyle());
> 	}
>-	
>+
> 	/**
>-	 * Initialize the virtual manager to manage the virtual state
>-	 * if the table is VIRTUAL. If not use the default no-op
>-	 * version.
>+	 * Initialize the virtual manager to manage the virtual state if the table
>+	 * is VIRTUAL. If not use the default no-op version.
>+	 * 
> 	 * @param style
> 	 */
> 	private void initializeVirtualManager(int style) {
>-		if((style & SWT.VIRTUAL) == 0) {
>+		if ((style & SWT.VIRTUAL) == 0) {
> 			return;
> 		}
>-			
>-		virtualManager = new VirtualManager();	
>+
>+		virtualManager = new VirtualManager();
> 	}
> 
> 	/**
>@@ -330,7 +251,7 @@
> 	public void add(Object[] elements) {
> 		assertElementsNotNull(elements);
> 		Object[] filtered = filter(elements);
>-		
>+
> 		for (int i = 0; i < filtered.length; i++) {
> 			Object element = filtered[i];
> 			int index = indexForElement(element);
>@@ -340,17 +261,18 @@
> 
> 	/**
> 	 * Create a new TableItem at index if required.
>+	 * 
> 	 * @param element
> 	 * @param index
> 	 * 
> 	 * @since 3.1
> 	 */
> 	private void createItem(Object element, int index) {
>-		if(virtualManager == null) {
>+		if (virtualManager == null) {
> 			updateItem(new TableItem(getTable(), SWT.NONE, index), element);
>-		} else{
>-			virtualManager.notVisibleAdded(element,index);
>-			
>+		} else {
>+			virtualManager.notVisibleAdded(element, index);
>+
> 		}
> 	}
> 
>@@ -382,7 +304,8 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#doFindInputItem(java.lang.Object)
> 	 */
> 	protected Widget doFindInputItem(Object element) {
>@@ -393,11 +316,12 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#doFindItem(java.lang.Object)
> 	 */
> 	protected Widget doFindItem(Object element) {
>-		
>+
> 		TableItem[] children = table.getItems();
> 		for (int i = 0; i < children.length; i++) {
> 			TableItem item = children[i];
>@@ -411,8 +335,10 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget, java.lang.Object, boolean)
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.StructuredViewer#doUpdateItem(org.eclipse.swt.widgets.Widget,
>+	 * java.lang.Object, boolean)
> 	 */
> 	protected void doUpdateItem(Widget widget, Object element, boolean fullMap) {
> 		if (widget instanceof TableItem) {
>@@ -422,87 +348,74 @@
> 			if (fullMap) {
> 				associate(element, item);
> 			} else {
>- 	Object data = item.getData();
>- 	if (data != null) {
>- 		unmapElement(data, item);
>- 	}
>+				Object data = item.getData();
>+				if (data != null) {
>+					unmapElement(data, item);
>+				}
> 				item.setData(element);
> 				mapElement(element, item);
> 			}
> 
>-			IBaseLabelProvider prov = getLabelProvider();
>-			ITableLabelProvider tprov = null;		
>-			ILabelProvider lprov = null;
>-			IViewerLabelProvider vprov = null;
>-			
>-			if(prov instanceof ILabelProvider) {
>-				lprov = (ILabelProvider) prov;
>-			}
>-			
>-			if (prov instanceof IViewerLabelProvider) {
>-				vprov = (IViewerLabelProvider) prov;
>-			} 
>-
>-			if (prov instanceof ITableLabelProvider) {
>-				tprov = (ITableLabelProvider) prov;
>-			} 
>-			
> 			int columnCount = table.getColumnCount();
>-			TableItem ti = item;
>-			getColorAndFontCollector().setFontsAndColors(element);
>-			
>+			if(columnCount == 0)
>+				columnCount = 1;//If there are no columns do the first one 
>+
> 			// Also enter loop if no columns added. See 1G9WWGZ: JFUIF:WINNT -
> 			// TableViewer with 0 columns does not work
> 			for (int column = 0; column < columnCount || column == 0; column++) {
>-				// Similar code in TreeViewer.doUpdateItem()
>-				String text = "";//$NON-NLS-1$
>-				Image image = null;
>-				tableColorAndFont.setFontsAndColors(ti,element,column);
>-
>-				if (tprov == null) {
>-					if (column == 0) {
>-						ViewerLabel updateLabel = new ViewerLabel(item
>-								.getText(), item.getImage());
>-						
>-						if(vprov != null) {
>-							buildLabel(updateLabel,element,vprov);
>-						} else{
>-							if(lprov != null) {
>-								buildLabel(updateLabel,element,lprov);
>-							}
>-						}
>-						
>-//						As it is possible for user code to run the event 
>-			 //loop check here.
>-						if (item.isDisposed()) {
>-			 unmapElement(element, item);
>-			 return;
>-			 } 
>-						
>-						text = updateLabel.getText();
>-						image = updateLabel.getImage();
>-					}
>-				} else {
>-					text = tprov.getColumnText(element, column);
>-					image = tprov.getColumnImage(element, column);
>-				}
>+				ColumnViewerPart columnViewer = getColumnViewer(column);
>+				columnViewer.refresh(item, element);
> 
>-				//Avoid setting text to null
>-				if (text == null) {
>-					text = ""; //$NON-NLS-1$
>-				}
>-				ti.setText(column, text);
>-				if (ti.getImage(column) != image) {
>-					ti.setImage(column, image);
>+				// As it is possible for user code to run the event
>+				// loop check here.
>+				if (item.isDisposed()) {
>+					unmapElement(element, item);
>+					return;
> 				}
>+
> 			}
>-			
>-			
>-			getColorAndFontCollector().applyFontsAndColors(ti);
>+
> 		}
> 	}
> 
> 	/**
>+	 * Return the TableColumnViewer at columnIndex
>+	 * 
>+	 * @param columnIndex
>+	 * @return TableColumnViewer
>+	 */
>+	public ColumnViewerPart getColumnViewer(int columnIndex) {
>+
>+		Object viewer;
>+		Widget columnOwner;
>+		if (getTable().getColumnCount() == 0)// Hang it off the table if it
>+			// has no columns
>+			columnOwner = getTable();
>+		else
>+			columnOwner = getTable().getColumn(columnIndex);
>+		viewer = columnOwner.getData(ColumnViewerPart.COLUMN_VIEWER_KEY);
>+
>+		if (viewer == null) {
>+			viewer = new ColumnViewerPart(
>+					ViewerLabelProvider.createViewerLabelProvider(columnIndex,getLabelProvider()), columnIndex);
>+			columnOwner.setData(ColumnViewerPart.COLUMN_VIEWER_KEY, viewer);
>+		}
>+		return (ColumnViewerPart) viewer;
>+	}
>+
>+	/**
>+	 * Set the TableColumnViewerPart at columnIndex to be viewerPart.
>+	 * 
>+	 * @param viewerPart
>+	 * @param columnIndex
>+	 */
>+	public void setColumnPart(ColumnViewerPart viewerPart, int columnIndex) {
>+		TableColumn column = getTable().getColumn(columnIndex);
>+		column.setData(ColumnViewerPart.COLUMN_VIEWER_KEY, viewerPart);
>+	}
>+
>+
>+	/**
> 	 * Starts editing the given element.
> 	 * 
> 	 * @param element
>@@ -544,7 +457,8 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.Viewer#getControl()
> 	 */
> 	public Control getControl() {
>@@ -588,11 +502,12 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget()
> 	 */
> 	protected List getSelectionFromWidget() {
>-		if(virtualManager != null) {
>+		if (virtualManager != null) {
> 			return getVirtualSelection();
> 		}
> 		Widget[] items = table.getSelection();
>@@ -606,50 +521,49 @@
> 		}
> 		return list;
> 	}
>-	
>+
> 	/**
>-	 * Get the virtual selection. Avoid calling SWT whenever possible
>-	 * to prevent extra widget creation.
>+	 * Get the virtual selection. Avoid calling SWT whenever possible to prevent
>+	 * extra widget creation.
>+	 * 
> 	 * @return List of Object
> 	 */
> 
> 	private List getVirtualSelection() {
>-		
>+
> 		List result = new ArrayList();
>-		int[] selectionIndices = getTable().getSelectionIndices(); 
>-		if(getContentProvider() instanceof ILazyContentProvider){
>+		int[] selectionIndices = getTable().getSelectionIndices();
>+		if (getContentProvider() instanceof ILazyContentProvider) {
> 			ILazyContentProvider lazy = (ILazyContentProvider) getContentProvider();
> 			for (int i = 0; i < selectionIndices.length; i++) {
> 				int selectionIndex = selectionIndices[i];
>-				lazy.updateElement(selectionIndex);//Start the update
>+				lazy.updateElement(selectionIndex);// Start the update
> 				Object element = getTable().getItem(selectionIndex).getData();
>-				//Only add the element if it got updated.
>-				//If this is done deferred the selection will
>-				//be incomplete until selection is finished.
>+				// Only add the element if it got updated.
>+				// If this is done deferred the selection will
>+				// be incomplete until selection is finished.
> 				if (element != null) {
> 					result.add(element);
>-				}				
>+				}
> 			}
>-		}
>-		else{
>+		} else {
> 			for (int i = 0; i < selectionIndices.length; i++) {
> 				Object element = null;
>-				//See if it is cached
>+				// See if it is cached
> 				int selectionIndex = selectionIndices[i];
>-				if (selectionIndex < virtualManager.cachedElements.length){
>+				if (selectionIndex < virtualManager.cachedElements.length) {
> 					element = virtualManager.cachedElements[selectionIndex];
> 				}
>-				if (element == null){
>+				if (element == null) {
> 					// Not cached so try the item's data
> 					TableItem item = getTable().getItem(selectionIndex);
> 					element = item.getData();
> 				}
> 				if (element != null) {
> 					result.add(element);
>-				}				
>+				}
> 			}
>-			
>-			
>+
> 		}
> 		return result;
> 	}
>@@ -664,7 +578,8 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.ContentViewer#hookControl(org.eclipse.swt.widgets.Control)
> 	 */
> 	protected void hookControl(Control control) {
>@@ -757,8 +672,10 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object, java.lang.Object)
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.Viewer#inputChanged(java.lang.Object,
>+	 * java.lang.Object)
> 	 */
> 	protected void inputChanged(Object input, Object oldInput) {
> 		getControl().setRedraw(false);
>@@ -795,12 +712,13 @@
> 		if (position == -1) {
> 			position = table.getItemCount();
> 		}
>-		
>-		createItem(element,position);
>+
>+		createItem(element, position);
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object)
> 	 */
> 	protected void internalRefresh(Object element) {
>@@ -808,15 +726,17 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object, boolean)
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.StructuredViewer#internalRefresh(java.lang.Object,
>+	 * boolean)
> 	 */
> 	protected void internalRefresh(Object element, boolean updateLabels) {
> 		tableViewerImpl.applyEditorValue();
> 		if (element == null || equals(element, getRoot())) {
>-			if(virtualManager == null) {
>+			if (virtualManager == null) {
> 				internalRefreshAll(updateLabels);
>-			} else{
>+			} else {
> 				internalVirtualRefreshAll();
> 			}
> 		} else {
>@@ -833,17 +753,17 @@
> 	 * @since 3.1
> 	 */
> 	private void internalVirtualRefreshAll() {
>-		
>+
> 		Object root = getRoot();
> 		IContentProvider contentProvider = getContentProvider();
>-		
>-		//Invalidate for lazy
>-		if(!(contentProvider instanceof ILazyContentProvider) 
>+
>+		// Invalidate for lazy
>+		if (!(contentProvider instanceof ILazyContentProvider)
> 				&& (contentProvider instanceof IStructuredContentProvider)) {
>-			//Don't cache if the root is null but cache if it is not lazy.
>-			if(root != null){
>-				virtualManager.cachedElements = 
>-					((IStructuredContentProvider) getContentProvider()).getElements(root);
>+			// Don't cache if the root is null but cache if it is not lazy.
>+			if (root != null) {
>+				virtualManager.cachedElements = ((IStructuredContentProvider) getContentProvider())
>+						.getElements(root);
> 				getTable().setItemCount(virtualManager.cachedElements.length);
> 			}
> 		}
>@@ -851,8 +771,9 @@
> 	}
> 
> 	/**
>-	 * Refresh all of the elements of the table. update the
>-	 * labels if updatLabels is true;
>+	 * Refresh all of the elements of the table. update the labels if
>+	 * updatLabels is true;
>+	 * 
> 	 * @param updateLabels
> 	 * 
> 	 * @since 3.1
>@@ -871,10 +792,9 @@
> 		TableItem[] items = getTable().getItems();
> 		int min = Math.min(children.length, items.length);
> 		for (int i = 0; i < min; ++i) {
>-			
>-			
>+
> 			TableItem item = items[i];
>-				
>+
> 			// if the element is unchanged, update its label if appropriate
> 			if (equals(children[i], item.getData())) {
> 				if (updateLabels) {
>@@ -893,14 +813,16 @@
> 				// So, if the object associated with this item has changed,
> 				// just disassociate it for now, and update it below.
> 				item.setText(""); //$NON-NLS-1$
>-				item.setImage(new Image[Math.max(1,table.getColumnCount())]);//Clear all images
>+				item.setImage(new Image[Math.max(1, table.getColumnCount())]);// Clear
>+				// all
>+				// images
> 				disassociate(item);
> 			}
> 		}
> 		// dispose of all items beyond the end of the current elements
> 		if (min < items.length) {
> 			for (int i = items.length; --i >= min;) {
>-				
>+
> 				disassociate(items[i]);
> 			}
> 			table.remove(min, items.length - 1);
>@@ -912,7 +834,7 @@
> 		}
> 		// Update items which were removed above
> 		for (int i = 0; i < min; ++i) {
>-							
>+
> 			TableItem item = items[i];
> 			if (item.getData() == null) {
> 				updateItem(item, children[i]);
>@@ -920,11 +842,10 @@
> 		}
> 		// add any remaining elements
> 		for (int i = min; i < children.length; ++i) {
>-			createItem(children[i],i);
>+			createItem(children[i], i);
> 		}
> 	}
> 
>-
> 	/**
> 	 * Removes the given elements from this table viewer.
> 	 * 
>@@ -987,9 +908,9 @@
> 	 */
> 	public void remove(final Object[] elements) {
> 		assertElementsNotNull(elements);
>- if (elements.length == 0) {
>- 	return;
>- }
>+		if (elements.length == 0) {
>+			return;
>+		}
> 		preservingSelection(new Runnable() {
> 			public void run() {
> 				internalRemove(elements);
>@@ -1007,8 +928,8 @@
> 	 * the model. Note that there is another method for efficiently processing
> 	 * the simultaneous removal of multiple elements.
> 	 * 
>-	 * NOTE: removing an object from a virtual
>-	 * table will decrement the itemCount.
>+	 * NOTE: removing an object from a virtual table will
>+	 * decrement the itemCount.
> 	 * 
> 	 * @param element
> 	 * the element
>@@ -1018,7 +939,8 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#reveal(java.lang.Object)
> 	 */
> 	public void reveal(Object element) {
>@@ -1079,34 +1001,51 @@
> 	 * may also implement {@link IColorProvider} and/or {@link IFontProvider} to
> 	 * provide colors and/or fonts.
> 	 * 
>+	 * 
>+	 * If the label provider implements the mixin interface ITooltipProvider, it
>+	 * can provide custom tooltips.
>+	 * 
> 	 */
> 	public void setLabelProvider(IBaseLabelProvider labelProvider) {
> 		Assert.isTrue(labelProvider instanceof ITableLabelProvider
> 				|| labelProvider instanceof ILabelProvider);
>+		clearColumnParts();//Clear before refresh
> 		super.setLabelProvider(labelProvider);
>-		if(labelProvider instanceof ITableFontProvider || labelProvider instanceof ITableColorProvider) {
>-			tableColorAndFont = new TableColorAndFontCollector(labelProvider);
>-		} else {
>-			tableColorAndFont = new TableColorAndFontNoOp();
>-		}
>-				
> 	}
> 	
> 	/**
>+	 * Clear the viewer parts for the columns
>+	 */
>+	private void clearColumnParts() {
>+		TableColumn[] columns = getTable().getColumns();
>+		if(columns.length == 0)
>+			getTable().setData(ColumnViewerPart.COLUMN_VIEWER_KEY,null);
>+		else{
>+			for (int i = 0; i < columns.length; i++) {
>+				columns[i].setData(ColumnViewerPart.COLUMN_VIEWER_KEY,null);
>+				
>+			}
>+		}
>+		
>+	}
>+
>+	/**
> 	 * 
>-	 * Sets a new selection for this viewer and optionally makes it visible.
>-	 * The TableViewer implmentation of this method is ineffecient for the
>+	 * Sets a new selection for this viewer and optionally makes it visible. The
>+	 * TableViewer implmentation of this method is ineffecient for the
> 	 * ILazyContentProvider as lookup is done by indices rather than elements
>-	 * and may require population of the entire table in worse case. 
>+	 * and may require population of the entire table in worse case.
> 	 * 
> 	 * 
>-	 * Use Table#setSelection(int[] indices) and Table#showSelection() if
>-	 * you wish to set selection more effeciently when using a ILazyContentProvider.
>+	 * Use Table#setSelection(int[] indices) and Table#showSelection() if you
>+	 * wish to set selection more effeciently when using a ILazyContentProvider.
> 	 * 
> 	 * 
>-	 * @param selection the new selection
>- * @param reveal <code>true</code> if the selection is to be made
>- * visible, and <code>false</code> otherwise
>+	 * @param selection
>+	 * the new selection
>+	 * @param reveal
>+	 * <code>true</code> if the selection is to be made visible,
>+	 * and <code>false</code> otherwise
> 	 * @see Table#setSelection(int[])
> 	 * @see Table#showSelection()
> 	 */
>@@ -1115,21 +1054,23 @@
> 	}
> 
> 	/*
>-	 * (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean)
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List,
>+	 * boolean)
> 	 */
> 	protected void setSelectionToWidget(List list, boolean reveal) {
>-		
>+
> 		if (list == null) {
> 			table.deselectAll();
> 			return;
> 		}
>-		
>-		if(virtualManager != null){
>+
>+		if (virtualManager != null) {
> 			virtualSetSelectionToWidget(list, reveal);
> 			return;
> 		}
>-		
>+
> 		int size = list.size();
> 		TableItem[] items = new TableItem[size];
> 		int count = 0;
>@@ -1149,22 +1090,24 @@
> 		if (reveal) {
> 			table.showSelection();
> 		}
>-			
>+
> 	}
>-	
>-	
>+
> 	/**
> 	 * Set the selection on a virtual table
>-	 * @param list The elements to set
>-	 * @param reveal Whether or not reveal the first item.
>+	 * 
>+	 * @param list
>+	 * The elements to set
>+	 * @param reveal
>+	 * Whether or not reveal the first item.
> 	 */
> 	private void virtualSetSelectionToWidget(List list, boolean reveal) {
> 		int size = list.size();
> 		int[] indices = new int[list.size()];
>-		
>+
> 		TableItem firstItem = null;
> 		int count = 0;
>-		HashSet virtualElements = new HashSet(); 
>+		HashSet virtualElements = new HashSet();
> 		for (int i = 0; i < size; ++i) {
> 			Object o = list.get(i);
> 			Widget w = findItem(o);
>@@ -1178,37 +1121,38 @@
> 				virtualElements.add(o);
> 			}
> 		}
>-		
>-		if(getContentProvider() instanceof ILazyContentProvider){
>-			ILazyContentProvider provider = 
>-				(ILazyContentProvider) getContentProvider();
>-		
>-			//Now go through it again until all is done or we are no longer virtual
>-			//This may create all items so it is not a good
>-			//idea in general.
>-			//Use #setSelection (int [] indices,boolean reveal) instead
>-			for (int i = 0; virtualElements.size() > 0 && i < getTable().getItemCount(); i++) {
>+
>+		if (getContentProvider() instanceof ILazyContentProvider) {
>+			ILazyContentProvider provider = (ILazyContentProvider) getContentProvider();
>+
>+			// Now go through it again until all is done or we are no longer
>+			// virtual
>+			// This may create all items so it is not a good
>+			// idea in general.
>+			// Use #setSelection (int [] indices,boolean reveal) instead
>+			for (int i = 0; virtualElements.size() > 0
>+					&& i < getTable().getItemCount(); i++) {
> 				provider.updateElement(i);
> 				TableItem item = getTable().getItem(i);
>-				if(virtualElements.contains(item.getData())){
>-					indices[count++] = i;	
>+				if (virtualElements.contains(item.getData())) {
>+					indices[count++] = i;
> 					virtualElements.remove(item.getData());
> 					if (firstItem == null) {
> 						firstItem = item;
> 					}
> 				}
> 			}
>-		}
>-		else{
>-			
>-			if(count != list.size()){//As this is expensive skip it if all have been found
>-				//If it is not lazy we can use the cache
>+		} else {
>+
>+			if (count != list.size()) {// As this is expensive skip it if all
>+				// have been found
>+				// If it is not lazy we can use the cache
> 				for (int i = 0; i < virtualManager.cachedElements.length; i++) {
> 					Object element = virtualManager.cachedElements[i];
>-					if(virtualElements.contains(element)){
>+					if (virtualElements.contains(element)) {
> 						TableItem item = getTable().getItem(i);
>-						item.getText();//Be sure to fire the update
>-						indices[count++] = i;	
>+						item.getText();// Be sure to fire the update
>+						indices[count++] = i;
> 						virtualElements.remove(element);
> 						if (firstItem == null) {
> 							firstItem = item;
>@@ -1217,7 +1161,7 @@
> 				}
> 			}
> 		}
>-		
>+
> 		if (count < size) {
> 			System.arraycopy(indices, 0, indices = new int[count], 0, count);
> 		}
>@@ -1230,35 +1174,39 @@
> 
> 	/**
> 	 * Set the item count of the receiver.
>-	 * @param count the new table size.
>+	 * 
>+	 * @param count
>+	 * the new table size.
> 	 * 
> 	 * @since 3.1
> 	 */
>-	public void setItemCount(int count){
>+	public void setItemCount(int count) {
> 		getTable().setItemCount(count);
> 		getTable().redraw();
> 	}
>-	
>+
> 	/**
>-	 * Replace the entries starting at index with elements.
>-	 * This method assumes all of these values are correct
>-	 * and will not call the content provider to verify.
>-	 * Note that this method will create a TableItem
>-	 * for all of the elements provided.
>+	 * Replace the entries starting at index with elements. This method assumes
>+	 * all of these values are correct and will not call the content provider to
>+	 * verify. Note that this method will create a TableItem for all of
>+	 * the elements provided.
>+	 * 
> 	 * @param element
> 	 * @param index
> 	 * @see ILazyContentProvider
> 	 * 
> 	 * @since 3.1
> 	 */
>-	public void replace(Object element, int index){
>+	public void replace(Object element, int index) {
> 		TableItem item = getTable().getItem(index);
> 		refreshItem(item, element);
> 	}
> 
> 	/**
> 	 * Clear the table item at the specified index
>-	 * @param index the index of the table item to be cleared
>+	 * 
>+	 * @param index
>+	 * the index of the table item to be cleared
> 	 * 
> 	 * @since 3.1
> 	 */
>@@ -1269,26 +1217,28 @@
> 		}
> 		table.clear(index);
> 	}
>-	
>-	/* (non-Javadoc)
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#getRawChildren(java.lang.Object)
> 	 */
> 	protected Object[] getRawChildren(Object parent) {
> 
>-		Assert.isTrue(!(getContentProvider() instanceof ILazyContentProvider),"Cannot get raw children with an ILazyContentProvider");//$NON-NLS-1$
>+		Assert.isTrue(!(getContentProvider() instanceof ILazyContentProvider),
>+				"Cannot get raw children with an ILazyContentProvider");//$NON-NLS-1$
> 		return super.getRawChildren(parent);
>-	
>+
> 	}
>-	
>-	/* (non-Javadoc)
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
> 	 * @see org.eclipse.jface.viewers.StructuredViewer#assertContentProviderType(org.eclipse.jface.viewers.IContentProvider)
> 	 */
> 	protected void assertContentProviderType(IContentProvider provider) {
>-		Assert.isTrue(provider instanceof IStructuredContentProvider ||
>-				provider instanceof ILazyContentProvider);
>+		Assert.isTrue(provider instanceof IStructuredContentProvider
>+				|| provider instanceof ILazyContentProvider);
> 	}
>-	
>-	
>-	
>-}
> 
>+}
>Index: src/org/eclipse/jface/viewers/TreeViewer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewer.java,v
>retrieving revision 1.50
>diff -u -r1.50 TreeViewer.java
>--- src/org/eclipse/jface/viewers/TreeViewer.java	30 May 2006 20:15:06 -0000	1.50
>+++ src/org/eclipse/jface/viewers/TreeViewer.java	13 Jul 2006 20:35:57 -0000
>@@ -22,7 +22,6 @@
> import org.eclipse.swt.events.MouseAdapter;
> import org.eclipse.swt.events.MouseEvent;
> import org.eclipse.swt.events.TreeListener;
>-import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.graphics.Rectangle;
> import org.eclipse.swt.widgets.Composite;
>@@ -55,69 +54,6 @@
> public class TreeViewer extends AbstractTreeViewer {
> 
> 	/**
>-	 * TreeColorAndFontCollector is an helper class for color and font support
>-	 * for trees that support the ITableFontProvider and the
>-	 * ITableColorProvider.
>-	 * 
>-	 * @see ITableColorProvider
>-	 * @see ITableFontProvider
>-	 */
>-
>-	private class TreeColorAndFontCollector {
>-
>-		ITableFontProvider fontProvider = null;
>-
>-		ITableColorProvider colorProvider = null;
>-
>-		/**
>-		 * Create an instance of the receiver. Set the color and font providers
>-		 * if provider can be cast to the correct type.
>-		 * 
>-		 * @param provider
>-		 * IBaseLabelProvider
>-		 */
>-		public TreeColorAndFontCollector(IBaseLabelProvider provider) {
>-			if (provider instanceof ITableFontProvider) {
>-				fontProvider = (ITableFontProvider) provider;
>-			}
>-			if (provider instanceof ITableColorProvider) {
>-				colorProvider = (ITableColorProvider) provider;
>-			}
>-		}
>-
>-		/**
>-		 * Create an instance of the receiver with no color and font providers.
>-		 */
>-		public TreeColorAndFontCollector() {
>-		}
>-
>-		/**
>-		 * Set the fonts and colors for the treeItem if there is a color and
>-		 * font provider available.
>-		 * 
>-		 * @param treeItem
>-		 * The item to update.
>-		 * @param element
>-		 * The element being represented
>-		 * @param column
>-		 * The column index
>-		 */
>-		public void setFontsAndColors(TreeItem treeItem, Object element,
>-				int column) {
>-			if (colorProvider != null) {
>-				treeItem.setBackground(column, colorProvider.getBackground(
>-						element, column));
>-				treeItem.setForeground(column, colorProvider.getForeground(
>-						element, column));
>-			}
>-			if (fontProvider != null) {
>-				treeItem.setFont(column, fontProvider.getFont(element, column));
>-			}
>-		}
>-
>-	}
>-
>-	/**
> 	 * Internal tree viewer implementation.
> 	 */
> 	private TreeEditorImpl treeViewerImpl;
>@@ -133,11 +69,6 @@
> 	private TreeEditor treeEditor;
> 
> 	/**
>-	 * The color and font collector for the cells.
>-	 */
>-	private TreeColorAndFontCollector treeColorAndFont = new TreeColorAndFontCollector();
>-	
>-	/**
> 	 * Flag for whether the tree has been disposed of.
> 	 */
> 	private boolean treeIsDisposed = false;
>@@ -207,7 +138,7 @@
> 	 * (non-Javadoc) Method declared in AbstractTreeViewer.
> 	 */
> 	protected void doUpdateItem(final Item item, Object element) {
>-		if (!(item instanceof TreeItem)) {
>+ 		if (!(item instanceof TreeItem)) {
> 			return;
> 		}
> 		TreeItem treeItem = (TreeItem) item;
>@@ -216,116 +147,56 @@
> 			return;
> 		}
> 
>-		getColorAndFontCollector().setFontsAndColors(element);
>-
>-		IBaseLabelProvider prov = getLabelProvider();
>-		ITableLabelProvider tprov = null;
>-		ILabelProvider lprov = null;
>-		IViewerLabelProvider vprov = null;
>-		ITreePathLabelProvider pprov = null;
>-		
>-		if(prov instanceof ILabelProvider) {
>-			lprov = (ILabelProvider) prov;
>-		}
>-		
>-		if (prov instanceof IViewerLabelProvider) {
>-			vprov = (IViewerLabelProvider) prov;
>-		} 
>-		
>-		if (prov instanceof ITableLabelProvider) {
>-			tprov = (ITableLabelProvider) prov;
>-		}
>-		
>-		if (prov instanceof ITreePathLabelProvider) {
>-			pprov = (ITreePathLabelProvider) prov;
>-		}
>-		
>-		
>-		int columnCount = tree.getColumnCount();
>-		if (columnCount == 0) {// If no columns were created use the label
>-								// provider
>-
>-			ViewerLabel updateLabel = new ViewerLabel(treeItem.getText(),
>-					treeItem.getImage());
>-			if (pprov != null) {
>-				TreePath path = getTreePathFromItem(item);
>-				buildLabel(updateLabel,path,pprov);
>-			} else 
>-				if(vprov != null) {
>-					buildLabel(updateLabel,element,vprov);
>-				} else{
>-					if(lprov != null) {
>-						buildLabel(updateLabel,element,lprov);
>-					}
>-				}
>+		int columnCount = getTree().getColumnCount();
>+		if(columnCount == 0)//If no columns are created then fake one
>+			columnCount = 1;
>+
>+		for (int column = 0; column < columnCount; column++) {
>+			ColumnViewerPart columnViewer = getColumnViewer(column);
>+			columnViewer.refresh(treeItem, element);
> 
> 			// As it is possible for user code to run the event
> 			// loop check here.
>-			if (treeItem.isDisposed()) {
>-				unmapElement(element, treeItem);
>+			if (item.isDisposed()) {
>+				unmapElement(element, item);
> 				return;
> 			}
> 
>-			if (updateLabel.hasNewText()) {
>-				treeItem.setText(updateLabel.getText());
>-			}
>-			if (updateLabel.hasNewImage()) {
>-				treeItem.setImage(updateLabel.getImage());
>-			}
>-			
>-			if (!updateLabel.hasPendingDecorations())
>-				getColorAndFontCollector().applyFontsAndColors(treeItem);
>-
>-		} else {// Use the table based support
>-			for (int column = 0; column < columnCount; column++) {
>-				// Similar code in TableViewer.doUpdateItem()
>-				String text = "";//$NON-NLS-1$
>-				Image image = null;
>-				treeColorAndFont.setFontsAndColors(treeItem, element, column);
>-
>-				if (tprov == null) {
>-					if (column == 0) {
>-						ViewerLabel updateLabel = new ViewerLabel(treeItem
>-								.getText(), treeItem.getImage());
>-						if(vprov != null) {
>-							buildLabel(updateLabel,element,vprov);
>-						} else{
>-							if(lprov != null) {
>-								buildLabel(updateLabel,element,lprov);
>-							}
>-						}
>+		}
> 
>-						// As it is possible for user code to run the event
>-						// loop check here.
>-						if (treeItem.isDisposed()) {
>-							unmapElement(element, treeItem);
>-							return;
>-						}
>+	}
> 
>-						text = updateLabel.getText();
>-						image = updateLabel.getImage();
>-					}
>-				} else {
>-					text = tprov.getColumnText(element, column);
>-					image = tprov.getColumnImage(element, column);
>-				}
>+	/**
>+	 * Get the TreeColumnViewerPart at the columnIndex.
>+	 * 
>+	 * @param columnIndex
>+	 * @return ColumnViewerPart
>+	 */
>+	private ColumnViewerPart getColumnViewer(int columnIndex) {
> 
>-				// Avoid setting text to null
>-				if (text == null) {
>-					text = ""; //$NON-NLS-1$
>-				}
>-				treeItem.setText(column, text);
>-				if (treeItem.getImage(column) != image) {
>-					treeItem.setImage(column, image);
>-				}
>-			}
>-			getColorAndFontCollector().applyFontsAndColors(treeItem);
>+		Object viewer;
>+		Widget columnOwner;
>+		if (getTree().getColumnCount() == 0)// Hang it off the table if it
>+			// has no columns
>+			columnOwner = getTree();
>+		else
>+			columnOwner = getTree().getColumn(columnIndex);
>+		viewer = columnOwner.getData(ColumnViewerPart.COLUMN_VIEWER_KEY);
>+
>+		if (viewer == null) {
>+			viewer = new ColumnViewerPart(
>+					ViewerLabelProvider.createViewerLabelProvider(columnIndex,
>+							getLabelProvider()), columnIndex);
>+			columnOwner.setData(ColumnViewerPart.COLUMN_VIEWER_KEY, viewer);
> 		}
>+		return (ColumnViewerPart) viewer;
> 	}
>-	
>+
> 	/**
> 	 * Override to handle tree paths.
>-	 * @see org.eclipse.jface.viewers.StructuredViewer#buildLabel(org.eclipse.jface.viewers.ViewerLabel, java.lang.Object)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.StructuredViewer#buildLabel(org.eclipse.jface.viewers.ViewerLabel,
>+	 * java.lang.Object)
> 	 */
> 	protected void buildLabel(ViewerLabel updateLabel, Object elementOrPath) {
> 		Object element;
>@@ -463,7 +334,7 @@
> 	protected Item getParentItem(Item item) {
> 		return ((TreeItem) item).getParentItem();
> 	}
>-	
>+
> 	/*
> 	 * (non-Javadoc) Method declared in AbstractTreeViewer.
> 	 */
>@@ -494,12 +365,13 @@
> 			}
> 		});
> 		if ((treeControl.getStyle() & SWT.VIRTUAL) != 0) {
>-			treeControl.addDisposeListener(new DisposeListener(){
>+			treeControl.addDisposeListener(new DisposeListener() {
> 				public void widgetDisposed(DisposeEvent e) {
> 					treeIsDisposed = true;
> 					unmapAllElements();
>-				}});
>-			treeControl.addListener(SWT.SetData, new Listener(){
>+				}
>+			});
>+			treeControl.addListener(SWT.SetData, new Listener() {
> 
> 				public void handleEvent(Event event) {
> 					if (getContentProvider() instanceof ILazyTreeContentProvider) {
>@@ -645,7 +517,7 @@
> 	 */
> 	protected void setExpanded(Item node, boolean expand) {
> 		((TreeItem) node).setExpanded(expand);
>-		if(getContentProvider() instanceof ILazyTreeContentProvider) {
>+		if (getContentProvider() instanceof ILazyTreeContentProvider) {
> 			// force repaints to happen
> 			getControl().update();
> 		}
>@@ -661,7 +533,7 @@
> 	 * <code>ITableLabelProvider</code> may also implement
> 	 * {@link ITableColorProvider} and/or {@link ITableFontProvider} to provide
> 	 * colors and/or fonts. Note that the underlying {@link Tree} must be
>-	 * configured with {@link TreeColumn} objects in this case. 
>+	 * configured with {@link TreeColumn} objects in this case.
> 	 * 
> 	 * 
> 	 * If the label provider is an <code>ILabelProvider</code>, then it
>@@ -674,8 +546,25 @@
> 	public void setLabelProvider(IBaseLabelProvider labelProvider) {
> 		Assert.isTrue(labelProvider instanceof ITableLabelProvider
> 				|| labelProvider instanceof ILabelProvider);
>+		clearColumnParts();//Clear before refresh
> 		super.setLabelProvider(labelProvider);
>-		treeColorAndFont = new TreeColorAndFontCollector(labelProvider);
>+		
>+	}
>+
>+	/**
>+	 * Clear the viewer parts for the columns
>+	 */
>+	private void clearColumnParts() {
>+		TreeColumn[] columns = getTree().getColumns();
>+		if(columns.length == 0)
>+			getTree().setData(ColumnViewerPart.COLUMN_VIEWER_KEY,null);
>+		else{
>+			for (int i = 0; i < columns.length; i++) {
>+				columns[i].setData(ColumnViewerPart.COLUMN_VIEWER_KEY,null);
>+				
>+			}
>+		}
>+		
> 	}
> 
> 	/*
>@@ -705,7 +594,7 @@
> 	 * the array of items
> 	 * @return <code>true</code> if the refer to the same elements,
> 	 * <code>false</code> otherwise
>-	 * 
>+	 * 
> 	 * @since 3.1
> 	 */
> 	protected boolean isSameSelection(List items, Item[] current) {
>@@ -725,7 +614,8 @@
> 		// Go through the items of the current collection
> 		// If there is a mismatch return false
> 		for (int i = 0; i < current.length; i++) {
>-			if (current[i].getData() == null || !itemSet.containsKey(current[i].getData())) {
>+			if (current[i].getData() == null
>+					|| !itemSet.containsKey(current[i].getData())) {
> 				return false;
> 			}
> 		}
>@@ -740,9 +630,11 @@
> 		getTree().showItem((TreeItem) item);
> 	}
> 
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#getChild(org.eclipse.swt.widgets.Widget, int)
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#getChild(org.eclipse.swt.widgets.Widget,
>+	 * int)
> 	 */
> 	protected Item getChild(Widget widget, int index) {
> 		if (widget instanceof TreeItem) {
>@@ -753,38 +645,38 @@
> 		}
> 		return null;
> 	}
>-	
>+
> 	protected void assertContentProviderType(IContentProvider provider) {
>-		if(provider instanceof ILazyTreeContentProvider) {
>+		if (provider instanceof ILazyTreeContentProvider) {
> 			return;
> 		}
> 		super.assertContentProviderType(provider);
> 	}
>-	
>- protected Object[] getRawChildren(Object parent) {
>- 	if(getContentProvider() instanceof ILazyTreeContentProvider) {
>- 		return new Object[0];
>- 	}
>- 	return super.getRawChildren(parent);
>- }
>-
>- /**
>- * For a TreeViewer with a tree with the VIRTUAL style bit set, set the
>- * number of children of the given element. To set the number of children
>- * of the invisible root of the tree, the input object is passed as the
>- * element.
>- * 
>- * @param element
>- * @param count
>- * 
>+
>+	protected Object[] getRawChildren(Object parent) {
>+		if (getContentProvider() instanceof ILazyTreeContentProvider) {
>+			return new Object[0];
>+		}
>+		return super.getRawChildren(parent);
>+	}
>+
>+	/**
>+	 * For a TreeViewer with a tree with the VIRTUAL style bit set, set the
>+	 * number of children of the given element. To set the number of children of
>+	 * the invisible root of the tree, the input object is passed as the
>+	 * element.
>+	 * 
>+	 * @param element
>+	 * @param count
>+	 * 
> 	 * EXPERIMENTAL. This class or interface has been added as
>-	 * part of a work in progress. There is no guarantee that this API will remain
>-	 * unchanged during the 3.2 release cycle. Please do not use this API without
>-	 * consulting with the Platform/UI team.
>+	 * part of a work in progress. There is no guarantee that this API will
>+	 * remain unchanged during the 3.2 release cycle. Please do not use this API
>+	 * without consulting with the Platform/UI team.
> 	 * 
>- * 
>- * @since 3.2
>- */
>+	 * 
>+	 * @since 3.2
>+	 */
> 	public void setChildCount(Object element, int count) {
> 		Tree tree = (Tree) doFindInputItem(element);
> 		if (tree != null) {
>@@ -793,9 +685,9 @@
> 		}
> 		Widget[] items = findItems(element);
> 		for (int i = 0; i < items.length; i++) {
>-			TreeItem treeItem = (TreeItem)items[i];
>+			TreeItem treeItem = (TreeItem) items[i];
> 			treeItem.setItemCount(count);
>-		}		
>+		}
> 	}
> 
> 	/**
>@@ -807,23 +699,27 @@
> 	 * This method should be called by implementers of ILazyTreeContentProvider
> 	 * to populate this viewer.
> 	 * 
>-	 * @param parent the parent of the element that should be updated
>-	 * @param index the index in the parent's children
>-	 * @param element the new element
>+	 * 
>+	 * @param parent
>+	 * the parent of the element that should be updated
>+	 * @param index
>+	 * the index in the parent's children
>+	 * @param element
>+	 * the new element
> 	 * 
> 	 * @see #setChildCount(Object, int)
> 	 * @see ILazyTreeContentProvider
>- * 
>+	 * 
> 	 * EXPERIMENTAL. This class or interface has been added as
>-	 * part of a work in progress. There is no guarantee that this API will remain
>-	 * unchanged during the 3.2 release cycle. Please do not use this API without
>-	 * consulting with the Platform/UI team.
>+	 * part of a work in progress. There is no guarantee that this API will
>+	 * remain unchanged during the 3.2 release cycle. Please do not use this API
>+	 * without consulting with the Platform/UI team.
> 	 * 
>- * 
>+	 * 
> 	 * @since 3.2
> 	 */
> 	public void replace(Object parent, int index, Object element) {
>-		if(parent.equals(getInput())) {
>+		if (parent.equals(getInput())) {
> 			if (index < tree.getItemCount()) {
> 				updateItem(tree.getItem(index), element);
> 			}
>@@ -834,81 +730,82 @@
> 				if (index < parentItem.getItemCount()) {
> 					updateItem(parentItem.getItem(index), element);
> 				}
>-			}			
>+			}
>+		}
>+	}
>+
>+	public boolean isExpandable(Object element) {
>+		if (getContentProvider() instanceof ILazyTreeContentProvider) {
>+			TreeItem treeItem = (TreeItem) internalExpand(element, false);
>+			if (treeItem == null) {
>+				return false;
>+			}
>+			virtualMaterializeItem(treeItem);
>+			return treeItem.getItemCount() > 0;
> 		}
>+		return super.isExpandable(element);
> 	}
>-	
>- public boolean isExpandable(Object element) {
>- 	if (getContentProvider() instanceof ILazyTreeContentProvider) {
>- 		TreeItem treeItem = (TreeItem) internalExpand(element, false);
>- 		if (treeItem == null) {
>- 			return false;
>- 		}
>- 		virtualMaterializeItem(treeItem);
>- 		return treeItem.getItemCount() > 0;
>- 	}
>- 	return super.isExpandable(element);
>- }
>-
>- protected Object getParentElement(Object element) {
>- 	if(!(element instanceof TreePath) && (getContentProvider() instanceof ILazyTreeContentProvider)) {
>- 		ILazyTreeContentProvider lazyTreeContentProvider = (ILazyTreeContentProvider) getContentProvider();
>- 		return lazyTreeContentProvider.getParent(element);
>- 	}
>- return super.getParentElement(element);
>-	}
>- 
>- protected void createChildren(Widget widget) {
>- 	if (getContentProvider() instanceof ILazyTreeContentProvider) {
>- 		final Item[] tis = getChildren(widget);
>- 		if (tis != null && tis.length > 0) {
>- 			// children already there, touch them
>- 			for (int i = 0; i < tis.length; i++) {
>+
>+	protected Object getParentElement(Object element) {
>+		if (!(element instanceof TreePath)
>+				&& (getContentProvider() instanceof ILazyTreeContentProvider)) {
>+			ILazyTreeContentProvider lazyTreeContentProvider = (ILazyTreeContentProvider) getContentProvider();
>+			return lazyTreeContentProvider.getParent(element);
>+		}
>+		return super.getParentElement(element);
>+	}
>+
>+	protected void createChildren(Widget widget) {
>+		if (getContentProvider() instanceof ILazyTreeContentProvider) {
>+			final Item[] tis = getChildren(widget);
>+			if (tis != null && tis.length > 0) {
>+				// children already there, touch them
>+				for (int i = 0; i < tis.length; i++) {
> 					tis[i].getText();
> 				}
>- 			return;
>- 		}
>- 		ILazyTreeContentProvider lazyTreeContentProvider = (ILazyTreeContentProvider) getContentProvider();
>- 		Object element = widget.getData();
>- 		if (element == null && widget instanceof TreeItem) {
>- 			// parent has not been materialized
>- 			virtualMaterializeItem((TreeItem) widget);
>- 			// try getting the element now that updateElement was called
>- 			element = widget.getData();
>- 		}
>- 		TreeItem[] children;
>- 		if (widget instanceof Tree) {
>- 			children = ((Tree) widget).getItems();
>- 		} else {
>- 			children = ((TreeItem) widget).getItems();
>- 		}
>- 		if (element != null && children.length > 0) {
>- 			for (int i = 0; i < children.length; i++) {
>- 				lazyTreeContentProvider.updateElement(element, i);
>- 			}
>- 		}
>- 		return;
>- 	}
>- 	super.createChildren(widget);
>- }
>- 
>- protected void internalAdd(Widget widget, Object parentElement,
>- 		Object[] childElements) {
>- 	if (getContentProvider() instanceof ILazyTreeContentProvider) {
>- 		if (widget instanceof TreeItem) {
>- 			TreeItem ti = (TreeItem) widget;
>- 			int count = ti.getItemCount() + childElements.length;
>+				return;
>+			}
>+			ILazyTreeContentProvider lazyTreeContentProvider = (ILazyTreeContentProvider) getContentProvider();
>+			Object element = widget.getData();
>+			if (element == null && widget instanceof TreeItem) {
>+				// parent has not been materialized
>+				virtualMaterializeItem((TreeItem) widget);
>+				// try getting the element now that updateElement was called
>+				element = widget.getData();
>+			}
>+			TreeItem[] children;
>+			if (widget instanceof Tree) {
>+				children = ((Tree) widget).getItems();
>+			} else {
>+				children = ((TreeItem) widget).getItems();
>+			}
>+			if (element != null && children.length > 0) {
>+				for (int i = 0; i < children.length; i++) {
>+					lazyTreeContentProvider.updateElement(element, i);
>+				}
>+			}
>+			return;
>+		}
>+		super.createChildren(widget);
>+	}
>+
>+	protected void internalAdd(Widget widget, Object parentElement,
>+			Object[] childElements) {
>+		if (getContentProvider() instanceof ILazyTreeContentProvider) {
>+			if (widget instanceof TreeItem) {
>+				TreeItem ti = (TreeItem) widget;
>+				int count = ti.getItemCount() + childElements.length;
> 				ti.setItemCount(count);
>- 			ti.clearAll(false);
>- 		} else {
>- 			Tree t = (Tree) widget;
>- 			t.setItemCount(t.getItemCount() + childElements.length);
>- 			t.clearAll(false);
>- 		}
>- 		return;
>- 	}
>- 	super.internalAdd(widget, parentElement, childElements);
>- }
>+				ti.clearAll(false);
>+			} else {
>+				Tree t = (Tree) widget;
>+				t.setItemCount(t.getItemCount() + childElements.length);
>+				t.clearAll(false);
>+			}
>+			return;
>+		}
>+		super.internalAdd(widget, parentElement, childElements);
>+	}
> 
> 	private void virtualMaterializeItem(TreeItem treeItem) {
> 		if (treeItem.getData() != null) {
>@@ -934,47 +831,55 @@
> 			lazyTreeContentProvider.updateElement(parentElement, index);
> 		}
> 	}
>-	
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalRefreshStruct(org.eclipse.swt.widgets.Widget, java.lang.Object, boolean)
>-	 */
>-	protected void internalRefreshStruct(Widget widget, Object element, boolean updateLabels) {
>- 	if (getContentProvider() instanceof ILazyTreeContentProvider) {
>- 		// first phase: update child counts
>- 		virtualRefreshChildCounts(widget, element);
>- 		// second phase: update labels
>- 		if (updateLabels) {
>- 			if (widget instanceof Tree) {
>- 				((Tree)widget).clearAll(true);
>- 			} else if (widget instanceof TreeItem) {
>- 				((TreeItem)widget).clearAll(true);
>- 			}
>- 		}
>- 		return;
>- 	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalRefreshStruct(org.eclipse.swt.widgets.Widget,
>+	 * java.lang.Object, boolean)
>+	 */
>+	protected void internalRefreshStruct(Widget widget, Object element,
>+			boolean updateLabels) {
>+		if (getContentProvider() instanceof ILazyTreeContentProvider) {
>+			// first phase: update child counts
>+			virtualRefreshChildCounts(widget, element);
>+			// second phase: update labels
>+			if (updateLabels) {
>+				if (widget instanceof Tree) {
>+					((Tree) widget).clearAll(true);
>+				} else if (widget instanceof TreeItem) {
>+					((TreeItem) widget).clearAll(true);
>+				}
>+			}
>+			return;
>+		}
> 		super.internalRefreshStruct(widget, element, updateLabels);
> 	}
> 
> 	/**
>-	 * Traverses the visible (expanded) part of the tree and updates child counts.
>+	 * Traverses the visible (expanded) part of the tree and updates child
>+	 * counts.
>+	 * 
> 	 * @param widget
> 	 * @param element
> 	 * @param updateLabels
> 	 */
> 	private void virtualRefreshChildCounts(Widget widget, Object element) {
> 		ILazyTreeContentProvider lazyTreeContentProvider = (ILazyTreeContentProvider) getContentProvider();
>-		if (widget instanceof Tree || ((TreeItem)widget).getExpanded()) {
>+		if (widget instanceof Tree || ((TreeItem) widget).getExpanded()) {
> 			// widget shows children - it is safe to call getChildren
> 			if (element != null) {
>-				lazyTreeContentProvider.updateChildCount(element, getChildren(widget).length);
>+				lazyTreeContentProvider.updateChildCount(element,
>+						getChildren(widget).length);
> 			} else {
> 				if (widget instanceof Tree) {
>-					((Tree)widget).setItemCount(0);
>+					((Tree) widget).setItemCount(0);
> 				} else {
>-					((TreeItem)widget).setItemCount(0);
>+					((TreeItem) widget).setItemCount(0);
> 				}
> 			}
>-			// need to get children again because they might have been updated through a callback to setChildCount.
>+			// need to get children again because they might have been updated
>+			// through a callback to setChildCount.
> 			Item[] items = getChildren(widget);
> 			for (int i = 0; i < items.length; i++) {
> 				Item item = items[i];
>@@ -985,7 +890,7 @@
> 			}
> 		}
> 	}
>-	
>+
> 	/*
> 	 * To unmap elements correctly, we need to register a dispose listener with
> 	 * the item if the tree is virtual.
>@@ -994,7 +899,7 @@
> 		super.mapElement(element, item);
> 		// make sure to unmap elements if the tree is virtual
> 		if ((getTree().getStyle() & SWT.VIRTUAL) != 0) {
>-			item.addDisposeListener(new DisposeListener(){
>+			item.addDisposeListener(new DisposeListener() {
> 				public void widgetDisposed(DisposeEvent e) {
> 					if (!treeIsDisposed) {
> 						Object data = item.getData();
>@@ -1002,7 +907,8 @@
> 							unmapElement(data, item);
> 						}
> 					}
>-				}});
>+				}
>+			});
> 		}
> 	}
> }
>Index: src/org/eclipse/jface/viewers/DecoratingLabelProvider.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/DecoratingLabelProvider.java,v
>retrieving revision 1.20
>diff -u -r1.20 DecoratingLabelProvider.java
>--- src/org/eclipse/jface/viewers/DecoratingLabelProvider.java	19 Apr 2006 21:05:56 -0000	1.20
>+++ src/org/eclipse/jface/viewers/DecoratingLabelProvider.java	13 Jul 2006 20:35:57 -0000
>@@ -22,10 +22,8 @@
> * The decorator decorates the label text, image, font and colors provided by 
> * the nested label provider.
> */
>-public class DecoratingLabelProvider extends LabelProvider implements
>- ILabelProvider, IViewerLabelProvider, IColorProvider, IFontProvider, ITreePathLabelProvider {
>+public class DecoratingLabelProvider extends TreeViewerLabelProvider {
> 		
>- private ILabelProvider provider;
> 
> private ILabelDecorator decorator;
> 
>@@ -44,7 +42,7 @@
> public DecoratingLabelProvider(ILabelProvider provider,
> ILabelDecorator decorator) {
> Assert.isNotNull(provider);
>- this.provider = provider;
>+ setProviders(provider);
> this.decorator = decorator;
> }
> 
>@@ -56,7 +54,7 @@
> */
> public void addListener(ILabelProviderListener listener) {
> super.addListener(listener);
>- provider.addListener(listener);
>+ getLabelProvider().addListener(listener);
> if (decorator != null) {
> decorator.addListener(listener);
> }
>@@ -68,7 +66,7 @@
> * disposes both the nested label provider and the label decorator.
> */
> public void dispose() {
>- provider.dispose();
>+ getLabelProvider().dispose();
> if (decorator != null) {
> decorator.dispose();
> }
>@@ -82,7 +80,7 @@
> * <code>decorateImage</code> method.
> */
> public Image getImage(Object element) {
>- Image image = provider.getImage(element);
>+ Image image = getLabelProvider().getImage(element);
> if (decorator != null) {
> 	if (decorator instanceof LabelDecorator) {
> 				LabelDecorator ld2 = (LabelDecorator) decorator;
>@@ -110,15 +108,6 @@
> }
> 
> /**
>- * Returns the nested label provider.
>- *
>- * @return the nested label provider
>- */
>- public ILabelProvider getLabelProvider() {
>- return provider;
>- }
>-
>- /**
> * The <code>DecoratingLabelProvider</code> implementation of this 
> * <code>ILabelProvider</code> method returns the text label provided
> * by the nested label provider's <code>getText</code> method, 
>@@ -126,7 +115,7 @@
> * <code>decorateText</code> method.
> */
> public String getText(Object element) {
>- String text = provider.getText(element);
>+ String text = getLabelProvider().getText(element);
> if (decorator != null) {
> 	if (decorator instanceof LabelDecorator) {
> 				LabelDecorator ld2 = (LabelDecorator) decorator;
>@@ -151,7 +140,7 @@
> * decorator returns <code>true</code>.
> */
> public boolean isLabelProperty(Object element, String property) {
>- if (provider.isLabelProperty(element, property)) {
>+ if (getLabelProvider().isLabelProperty(element, property)) {
> 			return true;
> 		}
> if (decorator != null && decorator.isLabelProperty(element, property)) {
>@@ -168,7 +157,7 @@
> */
> public void removeListener(ILabelProviderListener listener) {
> super.removeListener(listener);
>- provider.removeListener(listener);
>+ getLabelProvider().removeListener(listener);
> if (decorator != null) {
> decorator.removeListener(listener);
> }
>@@ -260,36 +249,6 @@
> 		
> 	}
> 	
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
>-	 */
>-	public Color getBackground(Object element) {
>-		if(provider instanceof IColorProvider) {
>-			return ((IColorProvider) provider).getBackground(element);
>-		}
>-		return null;
>-	}
>-	
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
>-	 */
>-	public Font getFont(Object element) {
>-		if(provider instanceof IFontProvider) {
>-			return ((IFontProvider) provider).getFont(element);
>-		}
>-		return null;
>-	}
>-	
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
>-	 */
>-	public Color getForeground(Object element) {
>-		if(provider instanceof IColorProvider) {
>-			return ((IColorProvider) provider).getForeground(element);
>-		}
>-		return null;
>-	}
>-
> /**
> * Return the decoration context associated with this label provider.
> * It will be passed to the decorator if the decorator is an 
>@@ -314,8 +273,10 @@
> 		this.decorationContext = decorationContext;
> 	}
> 
>+	
>+
> 	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.ITreePathLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel, org.eclipse.jface.viewers.TreePath)
>+	 * @see org.eclipse.jface.viewers.TreeViewerLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel, org.eclipse.jface.viewers.TreePath)
> 	 */
> 	public void updateLabel(ViewerLabel settings, TreePath elementPath) {
> ILabelDecorator currentDecorator = getLabelDecorator();
>@@ -338,8 +299,8 @@
> settings.setHasPendingDecorations(!decorationReady);
> // update icon and label
> 
>- if (provider instanceof ITreePathLabelProvider) {
>-			ITreePathLabelProvider pprov = (ITreePathLabelProvider) provider;
>+ if (getTreePathProvider() == null) {
>+			ITreePathLabelProvider pprov = (ITreePathLabelProvider) getLabelProvider();
> 			if (decorationReady || oldText == null
> 	 || settings.getText().length() == 0) {
> 				pprov.updateLabel(settings, elementPath);
>Index: src/org/eclipse/jface/viewers/ColumnViewerPart.java
>===================================================================
>RCS file: src/org/eclipse/jface/viewers/ColumnViewerPart.java
>diff -N src/org/eclipse/jface/viewers/ColumnViewerPart.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jface/viewers/ColumnViewerPart.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,110 @@
>+/*******************************************************************************
>+ * Copyright (c) 2006 IBM Corporation 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:
>+ * IBM Corporation - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.jface.viewers;
>+
>+import org.eclipse.jface.util.Policy;
>+import org.eclipse.swt.widgets.TableItem;
>+import org.eclipse.swt.widgets.TreeItem;
>+
>+/**
>+ * The ColumnViewerPart is abstract implementation of the 
>+ * column parts.
>+ * @since 3.3
>+ *
>+ */
>+public class ColumnViewerPart {
>+
>+	private int index;
>+	private ViewerLabelProvider labelProvider;
>+	static String COLUMN_VIEWER_KEY = Policy.JFACE + ".columnViewer";//$NON-NLS-1$
>+	
>+	/**
>+	 * Create a new instance of the receiver at columnIndex.
>+	 * @param provider
>+	 * @param columnIndex
>+	 */
>+	public ColumnViewerPart(ViewerLabelProvider provider, int columnIndex) {
>+		index = columnIndex;
>+		labelProvider = provider;
>+	}
>+	
>+	/**
>+	 * Return the column index for the receiver
>+	 * @return int
>+	 */
>+	public int getIndex() {
>+		return index;
>+	}
>+	/**
>+	 * Return the label provider for the receiver.
>+	 * @return ViewerLabelProvider
>+	 */
>+	public ViewerLabelProvider getLabelProvider() {
>+		return labelProvider;
>+	}
>+	
>+	/**
>+	 * Refresh the TreeItem for element.
>+	 * @param item
>+	 * @param element
>+	 */
>+	public void refresh(TreeItem item, Object element) {
>+
>+		ViewerLabel label = new ViewerLabel(item.getText(getIndex()), item
>+				.getImage(getIndex()));
>+		getLabelProvider().updateLabel(label, element);
>+
>+		if (label.hasNewBackground())
>+			item.setBackground(getIndex(), label.getBackground());
>+
>+		if (label.hasNewForeground())
>+			item.setForeground(getIndex(), label.getForeground());
>+
>+		if (label.hasNewFont())
>+			item.setFont(getIndex(), label.getFont());
>+
>+		if (label.hasNewText())
>+			item.setText(getIndex(), label.getText());
>+
>+		if (label.hasNewImage())
>+			item.setImage(getIndex(), label.getImage());
>+
>+	}
>+	
>+	/**
>+	 * Refresh the TableItem for element.
>+	 * @param item
>+	 * @param element
>+	 */
>+	public void refresh(TableItem item, Object element) {
>+
>+		ViewerLabel label = new ViewerLabel(item.getText(getIndex()), item
>+				.getImage(getIndex()));
>+		getLabelProvider().updateLabel(label, element);
>+
>+		if (label.hasNewBackground())
>+			item.setBackground(getIndex(), label.getBackground());
>+
>+		if (label.hasNewForeground())
>+			item.setForeground(getIndex(), label.getForeground());
>+
>+		if (label.hasNewFont())
>+			item.setFont(getIndex(), label.getFont());
>+
>+		if (label.hasNewText())
>+			item.setText(getIndex(), label.getText());
>+
>+		if (label.hasNewImage())
>+			item.setImage(getIndex(), label.getImage());
>+
>+	}
>+}
>Index: src/org/eclipse/jface/viewers/ViewerLabelProvider.java
>===================================================================
>RCS file: src/org/eclipse/jface/viewers/ViewerLabelProvider.java
>diff -N src/org/eclipse/jface/viewers/ViewerLabelProvider.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jface/viewers/ViewerLabelProvider.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,220 @@
>+/*******************************************************************************
>+ * Copyright (c) 2006 IBM Corporation 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:
>+ * IBM Corporation - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.jface.viewers;
>+
>+import org.eclipse.swt.graphics.Color;
>+import org.eclipse.swt.graphics.Font;
>+
>+/**
>+ * @since 3.2
>+ * 
>+ */
>+public class ViewerLabelProvider extends LabelProvider implements
>+		ILabelProvider, IViewerLabelProvider, IColorProvider, IFontProvider {
>+
>+	private static IFontProvider defaultFontProvider = new IFontProvider() {
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
>+		 */
>+		public Font getFont(Object element) {
>+			return null;
>+		}
>+	};
>+
>+	private static IColorProvider defaultColorProvider = new IColorProvider() {
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
>+		 */
>+		public Color getBackground(Object element) {
>+			return null;
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
>+		 */
>+		public Color getForeground(Object element) {
>+			return null;
>+		}
>+	};
>+
>+	private static ILabelProvider defaultLabelProvider = new LabelProvider() {
>+
>+	};
>+
>+	private ILabelProvider labelProvider = defaultLabelProvider;
>+
>+	private IColorProvider colorProvider = defaultColorProvider;
>+
>+	private IFontProvider fontProvider = defaultFontProvider;
>+
>+	/**
>+	 * Create a new instance of the receiver.
>+	 */
>+	public ViewerLabelProvider() {
>+		super();
>+	}
>+
>+	/**
>+	 * Create a new instance of the receiver based on labelProvider.
>+	 * 
>+	 * @param labelProvider
>+	 */
>+	public ViewerLabelProvider(IBaseLabelProvider labelProvider) {
>+		super();
>+		setProviders(labelProvider);
>+	}
>+
>+	/**
>+	 * Create a ViewerLabelProvider for the column at index
>+	 * 
>+	 * @param columnIndex
>+	 * @param labelProvider The labelProvider to convert
>+	 * @return ViewerLabelProvider
>+	 */
>+	static ViewerLabelProvider createViewerLabelProvider(int columnIndex,
>+			IBaseLabelProvider labelProvider) {
>+
>+		if (labelProvider instanceof ITableLabelProvider
>+				|| labelProvider instanceof ITableColorProvider
>+				|| labelProvider instanceof ITableFontProvider)
>+			return new TableColumnViewerLabelProvider(labelProvider,
>+					columnIndex);
>+		return new ViewerLabelProvider(labelProvider);
>+
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.IViewerLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel,
>+	 * java.lang.Object)
>+	 */
>+	public void updateLabel(ViewerLabel label, Object element) {
>+		label.setText(labelProvider.getText(element));
>+		label.setImage(labelProvider.getImage(element));
>+
>+		if (colorProvider != null) {
>+			label.setBackground(colorProvider.getBackground(element));
>+			label.setForeground(colorProvider.getForeground(element));
>+		}
>+
>+		if (fontProvider != null) {
>+			label.setFont(fontProvider.getFont(element));
>+		}
>+
>+	}
>+
>+	/**
>+	 * Set the colorProvider to use for the receiver.
>+	 * 
>+	 * @param colorProvider
>+	 * The colorProvider to set.
>+	 */
>+	public void setColorProvider(IColorProvider colorProvider) {
>+		this.colorProvider = colorProvider;
>+	}
>+
>+	/**
>+	 * Set the fontProvider to fontProvider.
>+	 * 
>+	 * @param fontProvider
>+	 * The fontProvider to set.
>+	 */
>+	public void setFontProvider(IFontProvider fontProvider) {
>+		this.fontProvider = fontProvider;
>+	}
>+
>+	/**
>+	 * Set the labelProvider to be provider.
>+	 * 
>+	 * @param provider
>+	 * ILabelProvider provider to set.
>+	 */
>+	public void setLabelProvider(ILabelProvider provider) {
>+		this.labelProvider = provider;
>+	}
>+
>+	/**
>+	 * Set the any providers for the receiver that can be adapted from provider.
>+	 * 
>+	 * @param provider
>+	 */
>+	public void setProviders(Object provider) {
>+		if (provider instanceof ILabelProvider)
>+			labelProvider = (ILabelProvider) provider;
>+		if (provider instanceof IColorProvider)
>+			colorProvider = (IColorProvider) provider;
>+		if (provider instanceof IFontProvider)
>+			fontProvider = (IFontProvider) provider;
>+
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
>+	 */
>+	public Font getFont(Object element) {
>+		return fontProvider.getFont(element);
>+
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
>+	 */
>+	public Color getBackground(Object element) {
>+		return colorProvider.getBackground(element);
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
>+	 */
>+	public Color getForeground(Object element) {
>+		return colorProvider.getForeground(element);
>+	}
>+
>+	/**
>+	 * Get the IColorProvider for the receiver.
>+	 * 
>+	 * @return IColorProvider
>+	 */
>+	public IColorProvider getColorProvider() {
>+		return colorProvider;
>+	}
>+
>+	/**
>+	 * Get the IFontProvider for the receiver.
>+	 * 
>+	 * @return IFontProvider
>+	 */
>+	public IFontProvider getFontProvider() {
>+		return fontProvider;
>+	}
>+
>+	/**
>+	 * @return Returns the labelProvider.
>+	 */
>+	public ILabelProvider getLabelProvider() {
>+		return labelProvider;
>+	}
>+
>+}
>Index: src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java
>===================================================================
>RCS file: src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java
>diff -N src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jface/viewers/TableColumnViewerLabelProvider.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,128 @@
>+/*******************************************************************************
>+ * Copyright (c) 2006 IBM Corporation 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:
>+ * IBM Corporation - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.jface.viewers;
>+
>+import org.eclipse.swt.graphics.Color;
>+import org.eclipse.swt.graphics.Font;
>+import org.eclipse.swt.graphics.Image;
>+
>+/**
>+ * TableColumnViewerLabelProvider is the mapping from the table based providers
>+ * to the ViewerLabelProvider.
>+ * 
>+ * @since 3.3
>+ * @see ITableLabelProvider
>+ * @see ITableColorProvider
>+ * @see ITableFontProvider
>+ * 
>+ */
>+class TableColumnViewerLabelProvider extends ViewerLabelProvider {
>+
>+	/**
>+	 * Create a new instance of the receiver.
>+	 * 
>+	 * @param labelProvider
>+	 * instance of a table based label provider
>+	 * @param columnIndex the index into the table for this column 
>+	 * @see ITableLabelProvider
>+	 * @see ITableColorProvider
>+	 * @see ITableFontProvider
>+	 */
>+	public TableColumnViewerLabelProvider(IBaseLabelProvider labelProvider,
>+			int columnIndex) {
>+		super(labelProvider);
>+		
>+		if (labelProvider instanceof ITableLabelProvider)
>+			setLabelProvider(labelProviderFor(
>+					(ITableLabelProvider) labelProvider, columnIndex));
>+
>+		if (labelProvider instanceof ITableColorProvider)
>+			setColorProvider(colorProviderFor(
>+					(ITableColorProvider) labelProvider, columnIndex));
>+		
>+		if (labelProvider instanceof ITableFontProvider)
>+			setFontProvider(fontProviderFor(
>+					(ITableFontProvider) labelProvider, columnIndex));
>+	}
>+
>+	/**
>+	 * Return the IFontProvider based on provider at columnIndex.
>+	 * @param provider
>+	 * @param columnIndex
>+	 * @return IFontProvider
>+	 */
>+	private IFontProvider fontProviderFor(final ITableFontProvider provider,final int columnIndex) {
>+		return new IFontProvider(){
>+			/* (non-Javadoc)
>+			 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
>+			 */
>+			public Font getFont(Object element) {
>+				return provider.getFont(element, columnIndex);
>+			}
>+		};
>+	}
>+
>+	/**
>+	 * Return the ILabelProvider based on provider at columnIndex.
>+	 * @param provider
>+	 * @param columnIndex
>+	 * @return ILabelProvider
>+	 */
>+	private ILabelProvider labelProviderFor(final ITableLabelProvider provider, final int columnIndex) {
>+		return new LabelProvider(){
>+			/* (non-Javadoc)
>+			 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
>+			 */
>+			public String getText(Object element) {
>+				return provider.getColumnText(element,columnIndex);
>+			}
>+			
>+			/* (non-Javadoc)
>+			 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
>+			 */
>+			public Image getImage(Object element) {
>+				return provider.getColumnImage(element,columnIndex);
>+			}
>+		};
>+	}
>+
>+	/**
>+	 * Create an IColorProvider from the ITableColorProvider at columnIndex.
>+	 * 
>+	 * @param provider
>+	 * @param columnIndex
>+	 * @return IColorProvider
>+	 */
>+	private IColorProvider colorProviderFor(final ITableColorProvider provider,
>+			final int columnIndex) {
>+		return new IColorProvider() {
>+			/*
>+			 * (non-Javadoc)
>+			 * 
>+			 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
>+			 */
>+			public Color getBackground(Object element) {
>+				return provider.getBackground(element, columnIndex);
>+			}
>+
>+			/*
>+			 * (non-Javadoc)
>+			 * 
>+			 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
>+			 */
>+			public Color getForeground(Object element) {
>+				return provider.getForeground(element, columnIndex);
>+			}
>+		};
>+	}
>+
>+}
>Index: src/org/eclipse/jface/viewers/TreeViewerLabelProvider.java
>===================================================================
>RCS file: src/org/eclipse/jface/viewers/TreeViewerLabelProvider.java
>diff -N src/org/eclipse/jface/viewers/TreeViewerLabelProvider.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jface/viewers/TreeViewerLabelProvider.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,53 @@
>+/*******************************************************************************
>+ * Copyright (c) 2006 IBM Corporation 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:
>+ * IBM Corporation - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.jface.viewers;
>+
>+
>+/**
>+ * TreeViewerLabelProvider is the ViewerLabelProvider that handles
>+ * TreePaths.
>+ * @since 3.2
>+ *
>+ */
>+public class TreeViewerLabelProvider extends ViewerLabelProvider {
>+	 private ITreePathLabelProvider treePathProvider;
>+	
>+	
>+	
>+	/**
>+	 * Update the label for the element with TreePath.
>+	 * @param label
>+	 * @param elementPath
>+	 */
>+	public void updateLabel(ViewerLabel label, TreePath elementPath) {
>+		treePathProvider.updateLabel(label, elementPath);
>+
>+	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.viewers.ViewerLabelProvider#setProviders(java.lang.Object)
>+	 */
>+	public void setProviders(Object provider) {
>+		super.setProviders(provider);
>+		if(provider instanceof ITreePathLabelProvider)
>+			treePathProvider = (ITreePathLabelProvider) provider;
>+	}
>+
>+	/**
>+	 * Return the ITreePathLabelProvider for the receiver.
>+	 * @return Returns the treePathProvider.
>+	 */
>+	public ITreePathLabelProvider getTreePathProvider() {
>+		return treePathProvider;
>+	}
>+
>+}

Actions: View | Diff

Attachments on bug 149193: 46241 | 46254 | 46263 | 46677 | 46686 | 47008 | 47350 | 47453 | 47454 | 47472 | 47722 | 47944 | 48028 | 48089