Attachment 37913 Details for Bug 125823 – Better patch

[patch] Better patch

patch_125823.txt (text/plain), 4.27 KB, created by Olivier Thomann

on 2006-04-06 13:00:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-04-06 13:00:36 EDT

Size: 4.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.368
>diff -u -r1.368 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	6 Apr 2006 01:47:51 -0000	1.368
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	6 Apr 2006 16:45:28 -0000
>@@ -58,6 +58,7 @@
> import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.WorkingCopyOwner;
>+import org.eclipse.jdt.core.compiler.CategorizedProblem;
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.core.eval.IEvaluationContext;
> import org.eclipse.jdt.internal.compiler.util.ObjectVector;
>@@ -768,6 +769,7 @@
> 					IJavaModelMarker.CLASSPATH_FILE_FORMAT,
> 					IJavaModelMarker.ID,
> 					IJavaModelMarker.ARGUMENTS ,
>+					IJavaModelMarker.CATEGORY_ID,
> 				},
> 				new Object[] {
> 					status.getMessage(),
>@@ -777,6 +779,7 @@
> 					isClasspathFileFormatProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
> 					new Integer(status.getCode()),
> 					Util.getProblemArgumentsForMarker(arguments) ,
>+					new Integer(CategorizedProblem.CAT_BUILDPATH)
> 				}
> 			);
> 		} catch (CoreException e) {
>Index: model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java,v
>retrieving revision 1.121
>diff -u -r1.121 JavaBuilder.java
>--- model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java	3 Apr 2006 14:40:13 -0000	1.121
>+++ model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java	6 Apr 2006 16:45:28 -0000
>@@ -202,11 +202,13 @@
> 		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
> 		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage())); 
> 		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>+		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
> 	} catch (ImageBuilderInternalException e) {
> 		Util.log(e.getThrowable(), "JavaBuilder handling ImageBuilderInternalException while building: " + currentProject.getName()); //$NON-NLS-1$
> 		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
> 		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage())); 
> 		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>+		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
> 	} catch (MissingClassFileException e) {
> 		// do not log this exception since its thrown to handle aborted compiles because of missing class files
> 		if (DEBUG)
>@@ -214,6 +216,7 @@
> 		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
> 		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_incompleteClassPath, e.missingClassFile)); 
> 		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>+		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
> 	} catch (MissingSourceFileException e) {
> 		// do not log this exception since its thrown to handle aborted compiles because of missing source files
> 		if (DEBUG)
>@@ -605,6 +608,7 @@
> 		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
> 		marker.setAttribute(IMarker.MESSAGE, Messages.build_abortDueToClasspathProblems); 
> 		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>+		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
> 		return false;
> 	}
> 
>@@ -642,6 +646,7 @@
> 					? Messages.bind(Messages.build_prereqProjectHasClasspathProblems, p.getName()) 
> 					: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName())); 
> 			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>+			marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
> 			return false;
> 		}
> 	}

Actions: View | Diff

Attachments on bug 125823: 37905 | 37913 | 37914