Attachment 60281 Details for Bug 174355 – Revised patch

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

[patch] Revised patch

patch.txt (text/plain), 6.79 KB, created by Thomas Schindl

on 2007-03-05 15:09:25 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Schindl

Created: 2007-03-05 15:09:25 EST

Size: 6.79 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/viewers/TableViewerRow.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerRow.java,v
>retrieving revision 1.4
>diff -u -r1.4 TableViewerRow.java
>--- src/org/eclipse/jface/viewers/TableViewerRow.java	20 Jan 2007 05:11:39 -0000	1.4
>+++ src/org/eclipse/jface/viewers/TableViewerRow.java	5 Mar 2007 20:02:10 -0000
>@@ -9,6 +9,7 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Tom Shindl <tom.schindl@bestsolution.at> - initial API and implementation
>+ *     											- Fix for bug 174355
>  ******************************************************************************/
> 
> package org.eclipse.jface.viewers;
>@@ -181,4 +182,8 @@
> 		return null;
> 	}
> 
>+	public TreePath getTreePath() {
>+		return new TreePath(new Object[] {item.getData()});
>+	}
>+
> }
>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	5 Mar 2007 20:02:10 -0000
>@@ -11,6 +11,7 @@
> 
> package org.eclipse.jface.viewers;
> 
>+import org.eclipse.core.runtime.Assert;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Image;
>@@ -33,6 +34,10 @@
> 
> 	private IFontProvider fontProvider;
> 
>+	private IViewerLabelProvider viewerLabelProvider;
>+
>+	private ITreePathLabelProvider treePathLabelProvider;
>+	
> 	/**
> 	 * Create a new instance of the receiver based on labelProvider.
> 	 * 
>@@ -50,6 +55,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 +149,40 @@
> 	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) {
>+			ViewerLabel label = new ViewerLabel(cell.getText(), cell.getImage());
>+			TreePath treePath = cell.getViewerRow().getTreePath();
>+			
>+			Assert.isNotNull(treePath);
>+			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.setForeground(label.getForeground());
>+		}
>+		if (label.hasNewFont()) {
>+			cell.setFont(label.getFont());
>+		}
>+	}
> }
>Index: src/org/eclipse/jface/viewers/TreeViewerRow.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerRow.java,v
>retrieving revision 1.4
>diff -u -r1.4 TreeViewerRow.java
>--- src/org/eclipse/jface/viewers/TreeViewerRow.java	20 Jan 2007 05:11:39 -0000	1.4
>+++ src/org/eclipse/jface/viewers/TreeViewerRow.java	5 Mar 2007 20:02:10 -0000
>@@ -8,10 +8,14 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
>+ *     											 - Fix for bug 174355
>  ******************************************************************************/
> 
> 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;
>@@ -293,6 +297,17 @@
> 		
> 		return rv;
> 	}
>-	
>-	
>-}
>+
>+	public TreePath getTreePath() {
>+		TreeItem tItem = item;
>+		LinkedList segments = new LinkedList();
>+		while (tItem != null) {
>+			Object segment = tItem.getData();
>+			Assert.isNotNull(segment);
>+			segments.addFirst(segment);
>+			tItem = tItem.getParentItem();
>+		}
>+		
>+		return new TreePath(segments.toArray());
>+	}
>+}
>\ No newline at end of file
>Index: src/org/eclipse/jface/viewers/ViewerRow.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerRow.java,v
>retrieving revision 1.8
>diff -u -r1.8 ViewerRow.java
>--- src/org/eclipse/jface/viewers/ViewerRow.java	20 Jan 2007 05:11:39 -0000	1.8
>+++ src/org/eclipse/jface/viewers/ViewerRow.java	5 Mar 2007 20:02:10 -0000
>@@ -9,6 +9,7 @@
>  *     IBM Corporation - initial API and implementation
>  *     Tom Shindl <tom.schindl@bestsolution.at> - initial API and implementation
>  *                                                fix for bug 166346, bug 167325s
>+ *                                              - Fix for bug 174355
>  ******************************************************************************/
> 
> package org.eclipse.jface.viewers;
>@@ -40,12 +41,14 @@
> 
> 	/**
> 	 * Constant denoting the row above the current one (value is 1).
>+	 * 
> 	 * @see #getNeighbor(int, boolean)
> 	 */
> 	public static final int ABOVE = 1;
> 
> 	/**
> 	 * Constant denoting the row below the current one (value is 2).
>+	 * 
> 	 * @see #getNeighbor(int, boolean)
> 	 */
> 	public static final int BELOW = 2;
>@@ -224,10 +227,9 @@
> 	public abstract Control getControl();
> 
> 	/**
>-	 * Returns a neighboring row, or <code>null</code> if no
>-	 * neighbor exists in the given direction. If <code>sameLevel</code> is
>-	 * <code>true</code>, only sibling rows (under the same parent) will be
>-	 * considered.
>+	 * Returns a neighboring row, or <code>null</code> if no neighbor exists
>+	 * in the given direction. If <code>sameLevel</code> is <code>true</code>,
>+	 * only sibling rows (under the same parent) will be considered.
> 	 * 
> 	 * @param direction
> 	 *            the direction {@link #BELOW} or {@link #ABOVE}
>@@ -238,4 +240,9 @@
> 	 */
> 	public abstract ViewerRow getNeighbor(int direction, boolean sameLevel);
> 
>+	/**
>+	 * The tree path used to identify an element by the unique path
>+	 * @return the path
>+	 */
>+	public abstract TreePath getTreePath();
> }

Actions: View | Diff

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