View | Details | Raw Unified | Return to bug 321398 | Differences between
and this patch

Collapse All | Expand All

(-)modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java (-7 / +7 lines)
Lines 19-28 Link Here
19
import java.util.List;
19
import java.util.List;
20
import java.util.Map;
20
import java.util.Map;
21
21
22
import org.eclipse.core.internal.resources.Workspace;
22
import org.eclipse.core.resources.IFile;
23
import org.eclipse.core.resources.IFile;
23
import org.eclipse.core.resources.IResource;
24
import org.eclipse.core.resources.IResource;
24
import org.eclipse.core.resources.IWorkspace;
25
import org.eclipse.core.resources.IWorkspace;
25
import org.eclipse.core.resources.IWorkspaceRoot;
26
import org.eclipse.core.resources.IWorkspaceRunnable;
26
import org.eclipse.core.resources.IWorkspaceRunnable;
27
import org.eclipse.core.resources.ResourcesPlugin;
27
import org.eclipse.core.resources.ResourcesPlugin;
28
import org.eclipse.core.runtime.CoreException;
28
import org.eclipse.core.runtime.CoreException;
Lines 284-298 Link Here
284
			if (!compFile.isSynchronized(IResource.DEPTH_ONE)) {
284
			if (!compFile.isSynchronized(IResource.DEPTH_ONE)) {
285
				File iofile = compFile.getFullPath().toFile();
285
				File iofile = compFile.getFullPath().toFile();
286
				if (iofile.exists() || compFile.exists()) {
286
				if (iofile.exists() || compFile.exists()) {
287
					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
288
					try {
287
					try {
289
						// OK wait to get workspace root before refreshing
288
						Workspace workspace = (Workspace)compFile.getWorkspace();
290
						Job.getJobManager().beginRule(root, null);
289
						if (workspace.getElementTree().isImmutable())
291
						compFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
290
						{
291
							workspace.newWorkingTree();
292
						}
293
						((org.eclipse.core.internal.resources.Resource)compFile).getLocalManager().refresh(compFile.getProject(), IResource.DEPTH_INFINITE, true, null);
292
					} catch (CoreException ce) {
294
					} catch (CoreException ce) {
293
						// ignore
295
						// ignore
294
					} finally {
295
						Job.getJobManager().endRule(root);
296
					}
296
					}
297
				}
297
				}
298
			}
298
			}

Return to bug 321398