Attachment 22712 Details for Bug 97524 – Proposed fix

[patch] Proposed fix

v01.txt (text/plain), 2.17 KB, created by Frederic Fusier

on 2005-06-09 12:34:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2005-06-09 12:34:56 EDT

Size: 2.17 KB

patch

obsolete

>Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
>retrieving revision 1.282
>diff -u -r1.282 JavaModelManager.java
>--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	8 Jun 2005 14:50:41 -0000	1.282
>+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	9 Jun 2005 16:33:55 -0000
>@@ -1456,10 +1456,6 @@
> 		return this.temporaryCache.get() != null;
> 	}
> 	
>-	/*
>-	 * Initialize all container at the same time as the given container.
>-	 * Return the container for the given path and project.
>-	 */
> 	private IClasspathContainer initializeAllContainers(IJavaProject javaProjectToInit, IPath containerToInit) throws JavaModelException {
> 		if (CP_RESOLVE_VERBOSE) {
> 			Util.verbose(
>@@ -1467,7 +1463,7 @@
> 				"	project to init: " + javaProjectToInit.getElementName() + '\n' + //$NON-NLS-1$
> 				"	container path to init: " + containerToInit); //$NON-NLS-1$
> 		}
>-
>+	
> 		// collect all container paths
> 		HashMap allContainerPaths = new HashMap();
> 		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
>@@ -1489,6 +1485,10 @@
> 					paths.add(path);
> 				}
> 			}
>+			/* TODO (frederic) put back when JDT/UI dummy project will be thrown away...
>+			 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=97524
>+			 * and https://bugs.eclipse.org/bugs/show_bug.cgi?id=9xxxx
>+			 *
> 			if (javaProject.equals(javaProjectToInit)) {
> 				if (paths == null) {
> 					paths = new HashSet();
>@@ -1496,7 +1496,16 @@
> 				}
> 				paths.add(containerToInit);
> 			}
>+			*/
>+		}
>+		// TODO (frederic) remove following block when JDT/UI dummy project will be thrown away...
>+		HashSet containerPaths = (HashSet) allContainerPaths.get(javaProjectToInit);
>+		if (containerPaths == null) {
>+			containerPaths = new HashSet();
>+			allContainerPaths.put(javaProjectToInit, containerPaths);
> 		}
>+		containerPaths.add(containerToInit);
>+		// end block
> 		
> 		// mark all containers as being initialized
> 		this.containerInitializationInProgress.set(allContainerPaths);

Actions: View | Diff

Attachments on bug 97524: 22712 | 22719