Attachment 183260 Details for Bug 329335 – Patch

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

[patch] Patch

patch 342.txt (text/plain), 2.49 KB, created by Oleg Besedin

on 2010-11-16 14:27:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Besedin

Created: 2010-11-16 14:27:18 EST

Size: 2.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/META-INF/MANIFEST.MF,v
>retrieving revision 1.40.2.2
>diff -u -r1.40.2.2 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Jan 2009 18:47:50 -0000	1.40.2.2
>+++ META-INF/MANIFEST.MF	16 Nov 2010 19:26:19 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %Plugin.name
> Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
>-Bundle-Version: 3.4.2.qualifier
>+Bundle-Version: 3.4.3.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
> Bundle-ActivationPolicy: lazy
>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.4
>diff -u -r1.4 ContentTypeDecorator.java
>--- src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java	28 May 2008 14:43:34 -0000	1.4
>+++ src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java	16 Nov 2010 19:26:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2008 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;
>@@ -39,10 +40,13 @@
> 		IFile file = (IFile) element;
> 		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 329335: 183260