Attachment 59535 Details for Bug 174355 – patch for M5a

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

[patch] patch for M5a

patch-174355.txt (text/plain), 3.13 KB, created by Boris Bokowski

on 2007-02-21 22:11:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Bokowski

Created: 2007-02-21 22:11:52 EST

Size: 3.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java,v
>retrieving revision 1.1
>diff -u -r1.1 WrappedViewerLabelProvider.java
>--- src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java	25 Sep 2006 13:35:58 -0000	1.1
>+++ src/org/eclipse/jface/viewers/WrappedViewerLabelProvider.java	22 Feb 2007 03:05:13 -0000
>@@ -11,9 +11,13 @@
> 
> package org.eclipse.jface.viewers;
> 
>+import java.util.LinkedList;
>+
>+import org.eclipse.core.runtime.Assert;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.widgets.TreeItem;
> 
> /**
>  * The WrappedViewerLabelProvider is a label provider that
>@@ -33,6 +37,10 @@
> 
> 	private IFontProvider fontProvider;
> 
>+	private IViewerLabelProvider viewerLabelProvider;
>+
>+	private ITreePathLabelProvider treePathLabelProvider;
>+	
> 	/**
> 	 * Create a new instance of the receiver based on labelProvider.
> 	 * 
>@@ -50,6 +58,12 @@
> 	 *            {@link Object}
> 	 */
> 	public void setProviders(Object provider) {
>+		if (provider instanceof ITreePathLabelProvider)
>+			treePathLabelProvider = ((ITreePathLabelProvider) provider);
>+
>+		if (provider instanceof IViewerLabelProvider)
>+			viewerLabelProvider = ((IViewerLabelProvider) provider);
>+		
> 		if (provider instanceof ILabelProvider)
> 			labelProvider = ((ILabelProvider) provider);
> 
>@@ -138,4 +152,49 @@
> 	IFontProvider getFontProvider() {
> 		return fontProvider;
> 	}
>+	
>+	public void update(ViewerCell cell) {
>+		if (viewerLabelProvider != null) {
>+			ViewerLabel label = new ViewerLabel(cell.getText(), cell.getImage());
>+			viewerLabelProvider.updateLabel(label, cell.getElement());
>+			applyViewerLabel(cell, label);
>+		} else if (treePathLabelProvider != null && cell.getItem() instanceof TreeItem) {
>+			ViewerLabel label = new ViewerLabel(cell.getText(), cell.getImage());
>+			TreePath treePath;
>+			{
>+				// inlined copy of AbstractTreeViewer.getTreePathFromItem
>+				TreeItem item = (TreeItem) cell.getItem();
>+				LinkedList segments = new LinkedList();
>+				while (item != null) {
>+					Object segment = item.getData();
>+					Assert.isNotNull(segment);
>+					segments.addFirst(segment);
>+					item = item.getParentItem();
>+				}
>+				treePath = new TreePath(segments.toArray());
>+			}
>+			treePathLabelProvider.updateLabel(label, treePath);
>+			applyViewerLabel(cell, label);
>+		} else {
>+			super.update(cell);
>+		}
>+	}
>+
>+	private void applyViewerLabel(ViewerCell cell, ViewerLabel label) {
>+		if (label.hasNewText()) {
>+			cell.setText(label.getText());
>+		}
>+		if (label.hasNewImage()) {
>+			cell.setImage(label.getImage());
>+		}
>+		if (label.hasNewBackground()) {
>+			cell.setBackground(label.getBackground());
>+		}
>+		if (label.hasNewForeground()) {
>+			cell.setBackground(label.getForeground());
>+		}
>+		if (label.hasNewFont()) {
>+			cell.setFont(label.getFont());
>+		}
>+	}
> }

Actions: View | Diff

Attachments on bug 174355: 59101 | 59103 | 59158 | 59165 | 59535 | 59551 | 59557 | 59578 | 60281