Attachment 54877 Details for Bug 158611 – Fix + test cases - still using JavaCore.PLUGIN_ID

[patch] Fix + test cases - still using JavaCore.PLUGIN_ID

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

on 2006-12-01 04:30:26 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2006-12-01 04:30:26 EST

Size: 15.62 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	1 Dec 2006 09:08:48 -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	1 Dec 2006 09:08:48 -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	1 Dec 2006 09:08:48 -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	1 Dec 2006 09:08:48 -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;
>#P org.eclipse.jdt.core.tests.builder
>Index: src/org/eclipse/jdt/core/tests/builder/Problem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/Problem.java,v
>retrieving revision 1.12
>diff -u -r1.12 Problem.java
>--- src/org/eclipse/jdt/core/tests/builder/Problem.java	29 Mar 2006 03:16:23 -0000	1.12
>+++ src/org/eclipse/jdt/core/tests/builder/Problem.java	1 Dec 2006 09:08:52 -0000
>@@ -19,6 +19,7 @@
> 	private String message;
> 	private IPath resourcePath;
> 	private int start = -1, end = -1, categoryId = -1;
>+	private String generatedBy;
> 	
> 	public Problem(String location, String message, IPath resourcePath, int start, int end, int categoryId){
> 		this.location = location;
>@@ -41,11 +42,22 @@
> 		this.start = marker.getAttribute(IMarker.CHAR_START, -1);
> 		this.end = marker.getAttribute(IMarker.CHAR_END, -1);
> 		this.categoryId = marker.getAttribute(IJavaModelMarker.CATEGORY_ID, -1);
>+		this.generatedBy = marker.getAttribute(IMarker.GENERATED_BY, "missing");
> 	}
> 	public int getCategoryId() {
> 		return categoryId;
> 	}
> 	
>+/**
>+ * Return the IMarker.GENERATED_BY attribute of the underlying marker if any.
>+ * Value null denotes a problem created from explicit structural attributes
>+ * (instead of using a source marker). Value "missing" denotes that the marker
>+ * used to initialize the problem had no IMarker.GENERATED_BY attribute. 
>+ * @return the IMarker.GENERATED_BY attribute of the underlying marker if any
>+ */
>+public String getGeneratedBy() {
>+	return this.generatedBy;
>+}
> 	/**
> 	 * Gets the location.
> 	 * @return Returns a String
>Index: src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java,v
>retrieving revision 1.17
>diff -u -r1.17 ErrorsTests.java
>--- src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java	29 Mar 2006 03:16:23 -0000	1.17
>+++ src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java	1 Dec 2006 09:08:52 -0000
>@@ -12,6 +12,7 @@
> 
> import junit.framework.*;
> import org.eclipse.core.runtime.IPath;
>+import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.compiler.CategorizedProblem;
> import org.eclipse.jdt.core.tests.util.Util;
>@@ -98,4 +99,79 @@
> 		expectingNoProblems();
> 	}
> 
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
>+// Checking the GENERATED_BY attribute
>+public void test0100() throws JavaModelException {
>+	IPath projectPath = env.addProject("Project");
>+	env.addExternalJars(projectPath, Util.getJavaClassLibs());	
>+	env.removePackageFragmentRoot(projectPath, "");
>+	IPath root = env.addPackageFragmentRoot(projectPath, "src");
>+	IPath classTest1 = env.addClass(root, "p1", "Test1",
>+		"package p1;\n" +
>+		"public class Test1 extends Test2 {}"
>+	);
>+	fullBuild();
>+	Problem[] prob1 = env.getProblemsFor(classTest1);
>+	expectingSpecificProblemFor(classTest1, new Problem("p1", "Test2 cannot be resolved to a type", classTest1, 39, 44, 40));
>+	assertEquals(prob1[0].getGeneratedBy(), JavaCore.PLUGIN_ID);
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
>+// Checking the GENERATED_BY attribute
>+public void test0101() throws JavaModelException {
>+	IPath projectPath = env.addProject("Project");
>+	env.addExternalJars(projectPath, Util.getJavaClassLibs());	
>+	env.removePackageFragmentRoot(projectPath, "");
>+	IPath root = env.addPackageFragmentRoot(projectPath, "src");
>+	IPath classTest1 = env.addClass(root, "p1", "Test1",
>+		"package p1;\n" +
>+		"public class Test1 extends {}"
>+	);
>+	fullBuild();
>+	Problem[] prob1 = env.getProblemsFor(classTest1);
>+	expectingSpecificProblemFor(classTest1, new Problem("p1", "Syntax error on token \"extends\", Type expected after this token", classTest1, 31, 38, 20));
>+	assertEquals(prob1[0].getGeneratedBy(), JavaCore.PLUGIN_ID);
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
>+// Checking the GENERATED_BY attribute
>+public void test0102() throws JavaModelException {
>+	IPath projectPath = env.addProject("Project");
>+	env.addExternalJars(projectPath, Util.getJavaClassLibs());	
>+	env.removePackageFragmentRoot(projectPath, "");
>+	IPath root = env.addPackageFragmentRoot(projectPath, "src");
>+	IPath classTest1 = env.addClass(root, "p1", "Test1",
>+		"package p1;\n" +
>+		"public class Test1 {\n" +
>+		"  private static int i;\n" +
>+		"  int j = i;\n" +
>+		"}\n" +
>+		"class Test2 {\n" +
>+		"  static int i = Test1.i;\n" +
>+		"}\n"
>+	);
>+	fullBuild();
>+	Problem[] prob1 = env.getProblemsFor(classTest1);
>+	expectingSpecificProblemFor(classTest1, new Problem("p1", "The field Test1.i is not visible", classTest1, 109, 110, 50));
>+	assertEquals(prob1[0].getGeneratedBy(), JavaCore.PLUGIN_ID);
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
>+// Checking the GENERATED_BY attribute
>+public void test0103() throws JavaModelException {
>+	IPath projectPath = env.addProject("Project");
>+	env.addExternalJars(projectPath, Util.getJavaClassLibs());	
>+	env.removePackageFragmentRoot(projectPath, "");
>+	IPath root = env.addPackageFragmentRoot(projectPath, "src");
>+	IPath classTest1 = env.addClass(root, "p1", "Test1",
>+		"package p1;\n" +
>+		"public class Test1 {\n" +
>+		"  // TODO: marker only\n" +
>+		"}\n"
>+	);
>+	fullBuild();
>+	Problem[] prob1 = env.getProblemsFor(classTest1);
>+	expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO : marker only", classTest1, 38, 55, -1));
>+	assertEquals(prob1[0].getGeneratedBy(), JavaCore.PLUGIN_ID);
>+}
> }
>Index: src/org/eclipse/jdt/core/tests/builder/BuildpathTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/BuildpathTests.java,v
>retrieving revision 1.30
>diff -u -r1.30 BuildpathTests.java
>--- src/org/eclipse/jdt/core/tests/builder/BuildpathTests.java	12 Oct 2006 18:16:30 -0000	1.30
>+++ src/org/eclipse/jdt/core/tests/builder/BuildpathTests.java	1 Dec 2006 09:08:52 -0000
>@@ -592,4 +592,21 @@
> 	incrementalBuild();
> 	expectingNoProblems();
> }
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
>+// Checking the GENERATED_BY attribute
>+public void test0101() throws JavaModelException {
>+	IPath projectPath = env.addProject("Project");
>+	env.removePackageFragmentRoot(projectPath, "");
>+	IPath root = env.addPackageFragmentRoot(projectPath, "src");
>+	IPath classTest1 = env.addClass(root, "p1", "Test1",
>+		"package p1;\n" +
>+		"public class Test1 {}"
>+	);
>+	fullBuild();
>+	Problem[] prob1 = env.getProblemsFor(classTest1);
>+	expectingSpecificProblemFor(classTest1, 
>+		new Problem("p1", "The type java.lang.Object cannot be resolved. It is indirectly referenced from required .class files", classTest1, 0, 1, 10));
>+	assertEquals(prob1[0].getGeneratedBy(), JavaCore.PLUGIN_ID);
>+}
> }

Actions: View | Diff

Attachments on bug 158611: 54777 | 54877 | 55194