Attachment 182305 Details for Bug 329333 – Patch v.0.1

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

[patch] Patch v.0.1

patch3_6.txt (text/plain), 1.84 KB, created by Szymon Ptaszkiewicz

on 2010-11-03 12:03:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2010-11-03 12:03:05 EDT

Size: 1.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java,v
>retrieving revision 1.5
>diff -u -r1.5 ContentTypeDecorator.java
>--- src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java	20 Jan 2009 21:15:51 -0000	1.5
>+++ src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java	3 Nov 2010 15:09:39 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2009 IBM Corporation and others.
>+ * Copyright (c) 2005, 2010 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
>@@ -14,6 +14,7 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.content.IContentDescription;
> import org.eclipse.core.runtime.content.IContentType;
>+import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.IDecoration;
> import org.eclipse.jface.viewers.ILabelProviderListener;
>@@ -42,10 +43,13 @@
> 		ImageDescriptor image = null;
> 		IContentDescription contentDescription = null;
> 		try {
>+			Job.getJobManager().beginRule(file, null);
> 			contentDescription = file.getContentDescription();
> 		} catch (CoreException e) {
> 			// We already have some kind of icon for this file so it's OK to not
> 			// find a better icon.
>+		} finally {
>+			Job.getJobManager().endRule(file);
> 		}
> 		if (contentDescription != null) {
> 			IContentType contentType = contentDescription.getContentType();

Actions: View | Diff

Attachments on bug 329333: 182305