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

Collapse All | Expand All

(-)model/org/eclipse/jdt/internal/core/JavaModelManager.java (-5 / +14 lines)
Lines 1456-1465 Link Here
1456
		return this.temporaryCache.get() != null;
1456
		return this.temporaryCache.get() != null;
1457
	}
1457
	}
1458
	
1458
	
1459
	/*
1460
	 * Initialize all container at the same time as the given container.
1461
	 * Return the container for the given path and project.
1462
	 */
1463
	private IClasspathContainer initializeAllContainers(IJavaProject javaProjectToInit, IPath containerToInit) throws JavaModelException {
1459
	private IClasspathContainer initializeAllContainers(IJavaProject javaProjectToInit, IPath containerToInit) throws JavaModelException {
1464
		if (CP_RESOLVE_VERBOSE) {
1460
		if (CP_RESOLVE_VERBOSE) {
1465
			Util.verbose(
1461
			Util.verbose(
Lines 1467-1473 Link Here
1467
				"	project to init: " + javaProjectToInit.getElementName() + '\n' + //$NON-NLS-1$
1463
				"	project to init: " + javaProjectToInit.getElementName() + '\n' + //$NON-NLS-1$
1468
				"	container path to init: " + containerToInit); //$NON-NLS-1$
1464
				"	container path to init: " + containerToInit); //$NON-NLS-1$
1469
		}
1465
		}
1470
1466
	
1471
		// collect all container paths
1467
		// collect all container paths
1472
		HashMap allContainerPaths = new HashMap();
1468
		HashMap allContainerPaths = new HashMap();
1473
		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
1469
		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
Lines 1489-1494 Link Here
1489
					paths.add(path);
1485
					paths.add(path);
1490
				}
1486
				}
1491
			}
1487
			}
1488
			/* TODO (frederic) put back when JDT/UI dummy project will be thrown away...
1489
			 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=97524
1490
			 * and https://bugs.eclipse.org/bugs/show_bug.cgi?id=9xxxx
1491
			 *
1492
			if (javaProject.equals(javaProjectToInit)) {
1492
			if (javaProject.equals(javaProjectToInit)) {
1493
				if (paths == null) {
1493
				if (paths == null) {
1494
					paths = new HashSet();
1494
					paths = new HashSet();
Lines 1496-1502 Link Here
1496
				}
1496
				}
1497
				paths.add(containerToInit);
1497
				paths.add(containerToInit);
1498
			}
1498
			}
1499
			*/
1500
		}
1501
		// TODO (frederic) remove following block when JDT/UI dummy project will be thrown away...
1502
		HashSet containerPaths = (HashSet) allContainerPaths.get(javaProjectToInit);
1503
		if (containerPaths == null) {
1504
			containerPaths = new HashSet();
1505
			allContainerPaths.put(javaProjectToInit, containerPaths);
1499
		}
1506
		}
1507
		containerPaths.add(containerToInit);
1508
		// end block
1500
		
1509
		
1501
		// mark all containers as being initialized
1510
		// mark all containers as being initialized
1502
		this.containerInitializationInProgress.set(allContainerPaths);
1511
		this.containerInitializationInProgress.set(allContainerPaths);

Return to bug 97524