Attachment #180240 for bug #322789

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




			}
		}

		Path classpath = new Path(this.project);

		/*
		 * Eclipse compiler doesn't support -extdirs.
		 * It is emulated using the classpath. We add extdirs entries after the

			cmd.createArgument().setPath(this.extdirs);
		}

		Path classpath = new Path(this.project);
		/*
		 * The java runtime is already handled, so we simply want to retrieve the
		 * ant runtime and the compile classpath.
		 */
		classpath.append(getCompileClasspath());
		/*
		 * Set the classpath for the Eclipse compiler.
		 */
		cmd.createArgument().setValue("-classpath"); //$NON-NLS-1$
		createClasspathArgument(cmd, classpath);

		// For -sourcepath, use the "sourcepath" value if present.
		// Otherwise default to the "srcdir" value.

		} else {
			sourcepath = this.src;
		}
		cmd.createArgument().setValue("-sourcepath"); //$NON-NLS-1$
		createClasspathArgument(cmd, sourcepath);
		 * Set the classpath for the Eclipse compiler.
		 */
		cmd.createArgument().setValue("-classpath"); //$NON-NLS-1$
		createClasspathArgument(cmd, classpath);

		final String javaVersion = JavaEnvUtils.getJavaVersion();
		String memoryParameterPrefix = javaVersion.equals(JavaEnvUtils.JAVA_1_1) ? "-J-" : "-J-X";//$NON-NLS-1$//$NON-NLS-2$




			fileName = CharOperation.subarray(fileName, 0, lastIndexOf);
		}
		CharOperation.replace(fileName, '\\', '/');
		boolean globalPathMatches = false;
		// the most nested path should be the selected one
		for (int j = 0, max = this.classpaths.length; j < max; j++) {
			char[] matchCandidate = this.classpaths[j].normalizedPath();
			boolean currentPathMatch = false;
			if (this.classpaths[j] instanceof ClasspathDirectory
					&& CharOperation.prefixEquals(matchCandidate, fileName)) {
				currentPathMatch = true;
				if (matchingPathName == null) {
					matchingPathName = matchCandidate;
				} else {
					if (currentPathMatch) {
						// we have a second source folder that matches the path of the source file
						if (matchCandidate.length > matchingPathName.length) {
							// we want to preserve the shortest possible path
							matchingPathName = matchCandidate;
						}
					} else {
						// we want to preserve the shortest possible path
						if (!globalPathMatches && matchCandidate.length < matchingPathName.length) {
							matchingPathName = matchCandidate;
						}
					}
				}
				if (currentPathMatch) {
					globalPathMatches = true;
				}
			}
		}
		if (matchingPathName == null) {

Return to bug 322789

Lines 119-126 Link Here

(-)antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java (-8 / +8 lines)
119	}	119	}
120	}	120	}
121		121
122	Path classpath = new Path(this.project);
123
124	/*	122	/*
125	* Eclipse compiler doesn't support -extdirs.	123	* Eclipse compiler doesn't support -extdirs.
126	* It is emulated using the classpath. We add extdirs entries after the	124	* It is emulated using the classpath. We add extdirs entries after the
Lines 131-141 Link Here
131	cmd.createArgument().setPath(this.extdirs);	129	cmd.createArgument().setPath(this.extdirs);
132	}	130	}
133		131
		132	Path classpath = new Path(this.project);
134	/*	133	/*
135	* The java runtime is already handled, so we simply want to retrieve the	134	* The java runtime is already handled, so we simply want to retrieve the
136	* ant runtime and the compile classpath.	135	* ant runtime and the compile classpath.
137	*/	136	*/
138	classpath.append(getCompileClasspath());	137	classpath.append(getCompileClasspath());
		138	/*
		139	* Set the classpath for the Eclipse compiler.
		140	*/
		141	cmd.createArgument().setValue("-classpath"); //$NON-NLS-1$
		142	createClasspathArgument(cmd, classpath);
139		143
140	// For -sourcepath, use the "sourcepath" value if present.	144	// For -sourcepath, use the "sourcepath" value if present.
141	// Otherwise default to the "srcdir" value.	145	// Otherwise default to the "srcdir" value.
Lines 164-175 Link Here
164	} else {	168	} else {
165	sourcepath = this.src;	169	sourcepath = this.src;
166	}	170	}
167	classpath.append(sourcepath);	171	cmd.createArgument().setValue("-sourcepath"); //$NON-NLS-1$
168	/*	172	createClasspathArgument(cmd, sourcepath);
169	* Set the classpath for the Eclipse compiler.
170	*/
171	cmd.createArgument().setValue("-classpath"); //$NON-NLS-1$
172	createClasspathArgument(cmd, classpath);
173		173
174	final String javaVersion = JavaEnvUtils.getJavaVersion();	174	final String javaVersion = JavaEnvUtils.getJavaVersion();
175	String memoryParameterPrefix = javaVersion.equals(JavaEnvUtils.JAVA_1_1) ? "-J-" : "-J-X";//$NON-NLS-1$//$NON-NLS-2$	175	String memoryParameterPrefix = javaVersion.equals(JavaEnvUtils.JAVA_1_1) ? "-J-" : "-J-X";//$NON-NLS-1$//$NON-NLS-2$

Lines 201-213 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java (-5 / +25 lines)
201	fileName = CharOperation.subarray(fileName, 0, lastIndexOf);	201	fileName = CharOperation.subarray(fileName, 0, lastIndexOf);
202	}	202	}
203	CharOperation.replace(fileName, '\\', '/');	203	CharOperation.replace(fileName, '\\', '/');
		204	boolean globalPathMatches = false;
		205	// the most nested path should be the selected one
204	for (int j = 0, max = this.classpaths.length; j < max; j++) {	206	for (int j = 0, max = this.classpaths.length; j < max; j++) {
205	char[] matchCandidate = this.classpaths[j].normalizedPath();	207	char[] matchCandidate = this.classpaths[j].normalizedPath();
206	if (this.classpaths[j] instanceof ClasspathDirectory &&	208	boolean currentPathMatch = false;
207	CharOperation.prefixEquals(matchCandidate, fileName) &&	209	if (this.classpaths[j] instanceof ClasspathDirectory
208	(matchingPathName == null \|\|	210	&& CharOperation.prefixEquals(matchCandidate, fileName)) {
209	matchCandidate.length < matchingPathName.length)) {	211	currentPathMatch = true;
210	matchingPathName = matchCandidate;	212	if (matchingPathName == null) {
		213	matchingPathName = matchCandidate;
		214	} else {
		215	if (currentPathMatch) {
		216	// we have a second source folder that matches the path of the source file
		217	if (matchCandidate.length > matchingPathName.length) {
		218	// we want to preserve the shortest possible path
		219	matchingPathName = matchCandidate;
		220	}
		221	} else {
		222	// we want to preserve the shortest possible path
		223	if (!globalPathMatches && matchCandidate.length < matchingPathName.length) {
		224	matchingPathName = matchCandidate;
		225	}
		226	}
		227	}
		228	if (currentPathMatch) {
		229	globalPathMatches = true;
		230	}
211	}	231	}
212	}	232	}
213	if (matchingPathName == null) {	233	if (matchingPathName == null) {