Attachment 62557 Details for Bug 171099 – Patch to JDT/UI

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

[patch] Patch to JDT/UI

patch171099.txt (text/plain), 3.00 KB, created by Michael Valenta

on 2007-03-30 16:22:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Valenta

Created: 2007-03-30 16:22:02 EDT

Size: 3.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationLabelProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationLabelProvider.java,v
>retrieving revision 1.14
>diff -u -r1.14 JavaSynchronizationLabelProvider.java
>--- ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationLabelProvider.java	28 Mar 2007 11:01:57 -0000	1.14
>+++ ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationLabelProvider.java	30 Mar 2007 20:19:14 -0000
>@@ -10,13 +10,19 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.ui.model;
> 
>+import org.eclipse.core.resources.IFolder;
>+import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.ResourcesPlugin;
> 
>+import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Image;
> 
> import org.eclipse.jface.viewers.DecoratingLabelProvider;
> import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.ITreePathLabelProvider;
>+import org.eclipse.jface.viewers.TreePath;
>+import org.eclipse.jface.viewers.ViewerLabel;
> 
> import org.eclipse.team.core.diff.IDiff;
> import org.eclipse.team.core.diff.IDiffTree;
>@@ -36,7 +42,7 @@
>  * 
>  * @since 3.2
>  */
>-public final class JavaSynchronizationLabelProvider extends AbstractSynchronizationLabelProvider {
>+public final class JavaSynchronizationLabelProvider extends AbstractSynchronizationLabelProvider implements ITreePathLabelProvider{
> 
> 	/** The delegate label provider, or <code>null</code> */
> 	private ILabelProvider fLabelProvider= null;
>@@ -142,4 +148,31 @@
> 	protected boolean isIncludeOverlays() {
> 		return true;
> 	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.jface.viewers.ITreePathLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel, org.eclipse.jface.viewers.TreePath)
>+	 */
>+	public void updateLabel(ViewerLabel label, TreePath elementPath) {
>+		Object firstSegment = elementPath.getFirstSegment();
>+		if (firstSegment instanceof IProject && elementPath.getSegmentCount() == 2) {
>+			IProject project = (IProject) firstSegment;
>+			Object lastSegment = elementPath.getLastSegment();
>+			if (lastSegment instanceof IFolder) {
>+				IFolder folder = (IFolder) lastSegment;
>+				if (!folder.getParent().equals(project)) {
>+					// This means that a folder that is not a direct child of the project
>+					// is a child in the tree. Therefore, the resource content provider
>+					// must be active and in compress folder mode so we will leave
>+					// it to the resource provider to provide the proper label.
>+					// We need to do this because of bug 153912
>+					return;
>+				}
>+			}
>+		}
>+		label.setImage(getImage(elementPath));
>+		label.setText(getText(elementPath));
>+		Font f = getFont(elementPath);
>+		if (f != null)
>+			label.setFont(f);
>+	}
> }

Actions: View | Diff

Attachments on bug 171099: 62557