Attachment 175613 Details for Bug 321398 – Cleaned up version - only go to the LocalManager

[patch] Cleaned up version - only go to the LocalManager

bug321398a.patch (text/plain), 2.07 KB, created by Carl Anderson

on 2010-07-30 16:18:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2010-07-30 16:18:05 EDT

Size: 2.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.common.modulecore
>Index: modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java,v
>retrieving revision 1.57
>diff -u -r1.57 ModuleStructuralModel.java
>--- modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java	6 May 2010 18:24:53 -0000	1.57
>+++ modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java	30 Jul 2010 20:14:31 -0000
>@@ -19,10 +19,10 @@
> import java.util.List;
> import java.util.Map;
> 
>+import org.eclipse.core.internal.resources.Workspace;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IWorkspace;
>-import org.eclipse.core.resources.IWorkspaceRoot;
> import org.eclipse.core.resources.IWorkspaceRunnable;
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
>@@ -284,15 +284,15 @@
> 			if (!compFile.isSynchronized(IResource.DEPTH_ONE)) {
> 				File iofile = compFile.getFullPath().toFile();
> 				if (iofile.exists() || compFile.exists()) {
>-					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
> 					try {
>-						// OK wait to get workspace root before refreshing
>-						Job.getJobManager().beginRule(root, null);
>-						compFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>+						Workspace workspace = (Workspace)compFile.getWorkspace();
>+						if (workspace.getElementTree().isImmutable())
>+						{
>+							workspace.newWorkingTree();
>+						}
>+						((org.eclipse.core.internal.resources.Resource)compFile).getLocalManager().refresh(compFile.getProject(), IResource.DEPTH_INFINITE, true, null);
> 					} catch (CoreException ce) {
> 						// ignore
>-					} finally {
>-						Job.getJobManager().endRule(root);
> 					}
> 				}
> 			}

Actions: View | Diff

Attachments on bug 321398: 175608 | 175613