Attachment 54777 Details for Bug 158611 – Fix (using JavaCore.PLUGIN_ID as marker)

[patch] Fix (using JavaCore.PLUGIN_ID as marker)

org.eclipse.jdt.core_02.txt (text/plain), 8.63 KB, created by Maxime Daniel

on 2006-11-30 09:21:00 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2006-11-30 09:21:00 EST

Size: 8.63 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.376
>diff -u -r1.376 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	24 Nov 2006 01:32:03 -0000	1.376
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	30 Nov 2006 14:16:04 -0000
>@@ -799,12 +799,13 @@
> 				new String[] { 
> 					IMarker.MESSAGE, 
> 					IMarker.SEVERITY, 
>-					IMarker.LOCATION, 
>+					IMarker.LOCATION,
> 					IJavaModelMarker.CYCLE_DETECTED,
> 					IJavaModelMarker.CLASSPATH_FILE_FORMAT,
> 					IJavaModelMarker.ID,
> 					IJavaModelMarker.ARGUMENTS ,
> 					IJavaModelMarker.CATEGORY_ID,
>+					IMarker.GENERATED_BY,
> 				},
> 				new Object[] {
> 					status.getMessage(),
>@@ -814,7 +815,8 @@
> 					isClasspathFileFormatProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
> 					new Integer(status.getCode()),
> 					Util.getProblemArgumentsForMarker(arguments) ,
>-					new Integer(CategorizedProblem.CAT_BUILDPATH)
>+					new Integer(CategorizedProblem.CAT_BUILDPATH),
>+					JavaCore.PLUGIN_ID,
> 				}
> 			);
> 		} catch (CoreException e) {
>Index: model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java,v
>retrieving revision 1.13
>diff -u -r1.13 RequestorWrapper.java
>--- model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java	29 Mar 2006 03:09:16 -0000	1.13
>+++ model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java	30 Nov 2006 14:16:06 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jdt.core.IJavaModelMarker;
>+import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.compiler.CategorizedProblem;
> import org.eclipse.jdt.core.eval.ICodeSnippetRequestor;
> import org.eclipse.jdt.internal.compiler.ClassFile;
>@@ -60,6 +61,7 @@
> 		//marker.setAttribute(IMarker.LOCATION, "#" + problem.getSourceLineNumber());
> 		marker.setAttribute(IMarker.MESSAGE, problem.getMessage());
> 		marker.setAttribute(IMarker.SEVERITY, (problem.isWarning() ? IMarker.SEVERITY_WARNING : IMarker.SEVERITY_ERROR));
>+		marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 		this.requestor.acceptProblem(marker, new String(fragmentSource), fragmentKind);
> 	} catch (CoreException e) {
> 		e.printStackTrace();
>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.123
>diff -u -r1.123 JavaBuilder.java
>--- model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java	13 Jun 2006 13:00:44 -0000	1.123
>+++ model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java	30 Nov 2006 14:16:06 -0000
>@@ -203,12 +203,14 @@
> 		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);
>+		marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 	} 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);
>+		marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 	} catch (MissingClassFileException e) {
> 		// do not log this exception since its thrown to handle aborted compiles because of missing class files
> 		if (DEBUG)
>@@ -217,6 +219,7 @@
> 		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);
>+		marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 	} catch (MissingSourceFileException e) {
> 		// do not log this exception since its thrown to handle aborted compiles because of missing source files
> 		if (DEBUG)
>@@ -225,6 +228,7 @@
> 		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
> 		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_missingSourceFile, e.missingSourceFile)); 
> 		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
>+		marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 	} finally {
> 		if (!ok)
> 			// If the build failed, clear the previously built state, forcing a full build next time.
>@@ -286,6 +290,7 @@
> 		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(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);		
> 	} finally {
> 		notifier.done();
> 		cleanup();
>@@ -606,6 +611,7 @@
> 		marker.setAttribute(IMarker.MESSAGE, Messages.build_abortDueToClasspathProblems); 
> 		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
> 		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
>+		marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 		return false;
> 	}
> 
>@@ -644,6 +650,7 @@
> 					: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName())); 
> 			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
> 			marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
>+			marker.setAttribute(IMarker.GENERATED_BY, JavaCore.PLUGIN_ID);
> 			return false;
> 		}
> 	}
>Index: model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java,v
>retrieving revision 1.99
>diff -u -r1.99 AbstractImageBuilder.java
>--- model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java	13 Sep 2006 18:41:05 -0000	1.99
>+++ model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java	30 Nov 2006 14:16:04 -0000
>@@ -62,6 +62,7 @@
> 	IMarker.LINE_NUMBER, 
> 	IJavaModelMarker.ARGUMENTS,
> 	IJavaModelMarker.CATEGORY_ID,	
>+	IMarker.GENERATED_BY,
> };
> public final static String[] JAVA_TASK_MARKER_ATTRIBUTE_NAMES = {
> 	IMarker.MESSAGE, 
>@@ -71,6 +72,7 @@
> 	IMarker.CHAR_END, 
> 	IMarker.LINE_NUMBER, 
> 	IMarker.USER_EDITABLE,
>+	IMarker.GENERATED_BY,
> };
> public final static Integer S_ERROR = new Integer(IMarker.SEVERITY_ERROR);
> public final static Integer S_WARNING = new Integer(IMarker.SEVERITY_WARNING);
>@@ -318,8 +320,8 @@
> 		int start = range == null ? 0 : range.getOffset();
> 		int end = range == null ? 1 : start + range.getLength();
> 		marker.setAttributes(
>-			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.CHAR_START, IMarker.CHAR_END},
>-			new Object[] {message, new Integer(severity), new Integer(start), new Integer(end)});
>+			new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.CHAR_START, IMarker.CHAR_END, IMarker.GENERATED_BY},
>+			new Object[] {message, new Integer(severity), new Integer(start), new Integer(end), JavaCore.PLUGIN_ID});
> 	} catch (CoreException e) {
> 		throw internalException(e);
> 	}
>@@ -576,6 +578,7 @@
> 					new Integer(problem.getSourceLineNumber()), // line
> 					Util.getProblemArgumentsForMarker(problem.getArguments()), // arguments
> 					new Integer(problem.getCategoryID()), // category ID
>+					JavaCore.PLUGIN_ID
> 				}
> 			);
> 			// optional extra attributes
>@@ -614,6 +617,7 @@
> 					new Integer(task.getSourceEnd() + 1),
> 					new Integer(task.getSourceLineNumber()),
> 					Boolean.FALSE,
>+					JavaCore.PLUGIN_ID,
> 				});
> 			String[] extraAttributeNames = task.getExtraMarkerAttributeNames();
> 			int extraLength = extraAttributeNames == null ? 0 : extraAttributeNames.length;

Actions: View | Diff

Attachments on bug 158611: 54777 | 54877 | 55194