Attachment 5960 Details for Bug 39887 – Fix also exception raised while getting output location

[patch] Fix also exception raised while getting output location

39887-jdt-v2.txt (text/plain), 3.45 KB, created by Frederic Fusier

on 2003-09-03 11:56:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2003-09-03 11:56:53 EDT

Size: 3.45 KB

patch

obsolete

>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.261
>diff -u -r1.261 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	2 Sep 2003 16:34:42 -0000	1.261
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	3 Sep 2003 15:43:28 -0000
>@@ -1366,13 +1366,21 @@
> 	 * @see IJavaProject
> 	 */
> 	public IPath getOutputLocation() throws JavaModelException {
>+		// Do not create marker but log problems while getting output location
>+		return this.getOutputLocation(false, true);
>+	}
>+	
>+	/**
>+	 * @see IJavaProject
>+	 */
>+	public IPath getOutputLocation(boolean createMarkers, boolean logProblems) throws JavaModelException {
> 
> 		JavaModelManager.PerProjectInfo perProjectInfo = getPerProjectInfo();
> 		IPath outputLocation = perProjectInfo.outputLocation;
> 		if (outputLocation != null) return outputLocation;
> 
> 		// force to read classpath - will position output location as well
>-		this.getRawClasspath();
>+		this.getRawClasspath(createMarkers, logProblems);
> 		outputLocation = perProjectInfo.outputLocation;
> 		if (outputLocation == null) {
> 			return defaultOutputLocation();
>@@ -1579,8 +1587,8 @@
> 	 * @see IJavaProject
> 	 */
> 	public IClasspathEntry[] getRawClasspath() throws JavaModelException {
>-
>-		return getRawClasspath(false/*don't create markers*/, true/*log problems*/);
>+		// Do not create marker but log problems while getting raw classpath
>+		return getRawClasspath(false, true);
> 	}
> 	/**
> 	 * Internal variant allowing to parameterize problem creation/logging
>Index: search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java,v
>retrieving revision 1.56
>diff -u -r1.56 IndexAllProject.java
>--- search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java	2 Sep 2003 17:06:12 -0000	1.56
>+++ search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java	3 Sep 2003 15:43:28 -0000
>@@ -74,7 +74,8 @@
> 			final long indexLastModified = max == 0 ? 0L : index.getIndexFile().lastModified();
> 
> 			JavaProject javaProject = (JavaProject)JavaCore.create(this.project);
>-			IClasspathEntry[] entries = javaProject.getRawClasspath(false/*don't create markers*/, false/*log problems*/);
>+			// Do not create marker nor log problems while getting raw classpath (see bug 41859)
>+			IClasspathEntry[] entries = javaProject.getRawClasspath(false, false);
> 			IWorkspaceRoot root = this.project.getWorkspace().getRoot();
> 			for (int i = 0, length = entries.length; i < length; i++) {
> 				if (this.isCancelled) return false;
>@@ -87,7 +88,8 @@
> 						// collect output locations if source is project (see http://bugs.eclipse.org/bugs/show_bug.cgi?id=32041)
> 						final HashSet outputs = new HashSet();
> 						if (sourceFolder.getType() == IResource.PROJECT) {
>-							outputs.add(javaProject.getOutputLocation());
>+							// Do not create marker nor log problems while getting output location (see bug 41859)
>+							outputs.add(javaProject.getOutputLocation(false, false));
> 							for (int j = 0; j < length; j++) {
> 								IPath output = entries[j].getOutputLocation();
> 								if (output != null) {

Actions: View | Diff

Attachments on bug 39887: 5960