Attachment #66332 for bug #173944

View | Details | Raw Unified | Return to bug 173944
Collapse All | Expand All

Lines 587-593 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java (-1 / +1 lines)
587	}	587	}
588		588
589	this.binaryLocationsPerProject = new SimpleLookupTable(3);	589	this.binaryLocationsPerProject = new SimpleLookupTable(3);
590	this.nameEnvironment = new NameEnvironment(workspaceRoot, javaProject, binaryLocationsPerProject);	590	this.nameEnvironment = new NameEnvironment(workspaceRoot, javaProject, binaryLocationsPerProject, notifier);
591		591
592	if (forBuild) {	592	if (forBuild) {
593	String filterSequence = javaProject.getOption(JavaCore.CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, true);	593	String filterSequence = javaProject.getOption(JavaCore.CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, true);




boolean isIncrementalBuild;
ClasspathMultiDirectory[] sourceLocations;
ClasspathLocation[] binaryLocations;
BuildNotifier notifier;

SimpleSet initialTypeNames; // assumed that each name is of the form "a/b/ClassName"
SimpleLookupTable additionalUnits;

NameEnvironment(IWorkspaceRoot root, JavaProject javaProject, SimpleLookupTable binaryLocationsPerProject, BuildNotifier notifier) throws CoreException {
	this.isIncrementalBuild = false;
	this.notifier = notifier;
	computeClasspathLocations(root, javaProject, binaryLocationsPerProject);
	setNames(null, null);
}

}

private NameEnvironmentAnswer findClass(String qualifiedTypeName, char[] typeName) {
	if (this.notifier != null)
		this.notifier.checkCancelWithinCompiler();

	if (this.initialTypeNames != null && this.initialTypeNames.includes(qualifiedTypeName)) {
		if (isIncrementalBuild)
			// catch the case that a type inside a source file has been renamed but other class files are looking for it

Return to bug 173944

Lines 30-41 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/NameEnvironment.java (-2 / +7 lines)
30	boolean isIncrementalBuild;	30	boolean isIncrementalBuild;
31	ClasspathMultiDirectory[] sourceLocations;	31	ClasspathMultiDirectory[] sourceLocations;
32	ClasspathLocation[] binaryLocations;	32	ClasspathLocation[] binaryLocations;
33		33	BuildNotifier notifier;
		34
34	SimpleSet initialTypeNames; // assumed that each name is of the form "a/b/ClassName"	35	SimpleSet initialTypeNames; // assumed that each name is of the form "a/b/ClassName"
35	SimpleLookupTable additionalUnits;	36	SimpleLookupTable additionalUnits;
36		37
37	NameEnvironment(IWorkspaceRoot root, JavaProject javaProject, SimpleLookupTable binaryLocationsPerProject) throws CoreException {	38	NameEnvironment(IWorkspaceRoot root, JavaProject javaProject, SimpleLookupTable binaryLocationsPerProject, BuildNotifier notifier) throws CoreException {
38	this.isIncrementalBuild = false;	39	this.isIncrementalBuild = false;
		40	this.notifier = notifier;
39	computeClasspathLocations(root, javaProject, binaryLocationsPerProject);	41	computeClasspathLocations(root, javaProject, binaryLocationsPerProject);
40	setNames(null, null);	42	setNames(null, null);
41	}	43	}
Lines 259-264 Link Here
259	}	261	}
260		262
261	private NameEnvironmentAnswer findClass(String qualifiedTypeName, char[] typeName) {	263	private NameEnvironmentAnswer findClass(String qualifiedTypeName, char[] typeName) {
		264	if (this.notifier != null)
		265	this.notifier.checkCancelWithinCompiler();
		266
262	if (this.initialTypeNames != null && this.initialTypeNames.includes(qualifiedTypeName)) {	267	if (this.initialTypeNames != null && this.initialTypeNames.includes(qualifiedTypeName)) {
263	if (isIncrementalBuild)	268	if (isIncrementalBuild)
264	// catch the case that a type inside a source file has been renamed but other class files are looking for it	269	// catch the case that a type inside a source file has been renamed but other class files are looking for it