Attachment #57889 for bug #171684

Lines 14-21 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/messages.properties (-2 / +2 lines)
14	#Format: compiler.name = word1 word2 word3	14	#Format: compiler.name = word1 word2 word3
15	compiler.name = Eclipse Java Compiler	15	compiler.name = Eclipse Java Compiler
16	#Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]	16	#Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]
17	compiler.version = 0.733, 3.3.0 milestone-5	17	compiler.version = 0.734, 3.3.0 milestone-5
18	compiler.copyright = Copyright IBM Corp 2000, 2006. All rights reserved.	18	compiler.copyright = Copyright IBM Corp 2000, 2007. All rights reserved.
19		19
20	### progress	20	### progress
21	progress.compiling = Compiling	21	progress.compiling = Compiling

Lines 806-812 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaProject.java (-2 / +2 lines)
806	IJavaModelMarker.ID,	806	IJavaModelMarker.ID,
807	IJavaModelMarker.ARGUMENTS ,	807	IJavaModelMarker.ARGUMENTS ,
808	IJavaModelMarker.CATEGORY_ID,	808	IJavaModelMarker.CATEGORY_ID,
809	IMarker.GENERATED_BY,	809	IMarker.SOURCE_ID,
810	},	810	},
811	new Object[] {	811	new Object[] {
812	status.getMessage(),	812	status.getMessage(),
Lines 817-823 Link Here
817	new Integer(status.getCode()),	817	new Integer(status.getCode()),
818	Util.getProblemArgumentsForMarker(arguments) ,	818	Util.getProblemArgumentsForMarker(arguments) ,
819	new Integer(CategorizedProblem.CAT_BUILDPATH),	819	new Integer(CategorizedProblem.CAT_BUILDPATH),
820	JavaBuilder.GENERATED_BY,	820	JavaBuilder.SOURCE_ID,
821	}	821	}
822	);	822	);
823	} catch (CoreException e) {	823	} catch (CoreException e) {




  </tr>
</table>

<a name="v_734"></a>
<hr><h1>
Eclipse Platform Build Notes<br>
Java Development Tooling Core</h1>
Eclipse SDK 3.3M5 - ??? February 2007
<br>Project org.eclipse.jdt.core v_734
(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_734">cvs</a>).
<h2>What's new in this drop</h2>

<h3>Problem Reports Fixed</h3>
<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=171684">171684</a>
Replace references to IMarker.GENERATED_BY with IMarker.SOURCE_ID

<a name="v_733"></a>
<hr><h1>
Eclipse Platform Build Notes<br>

Lines 61-67 Link Here

(-)model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java (-1 / +1 lines)
61	//marker.setAttribute(IMarker.LOCATION, "#" + problem.getSourceLineNumber());	61	//marker.setAttribute(IMarker.LOCATION, "#" + problem.getSourceLineNumber());
62	marker.setAttribute(IMarker.MESSAGE, problem.getMessage());	62	marker.setAttribute(IMarker.MESSAGE, problem.getMessage());
63	marker.setAttribute(IMarker.SEVERITY, (problem.isWarning() ? IMarker.SEVERITY_WARNING : IMarker.SEVERITY_ERROR));	63	marker.setAttribute(IMarker.SEVERITY, (problem.isWarning() ? IMarker.SEVERITY_WARNING : IMarker.SEVERITY_ERROR));
64	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	64	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.SOURCE_ID);
65	this.requestor.acceptProblem(marker, new String(fragmentSource), fragmentKind);	65	this.requestor.acceptProblem(marker, new String(fragmentSource), fragmentKind);
66	} catch (CoreException e) {	66	} catch (CoreException e) {
67	e.printStackTrace();	67	e.printStackTrace();




BuildNotifier notifier;
char[][] extraResourceFileFilters;
String[] extraResourceFolderFilters;
public static final String SOURCE_ID = "JDT"; //$NON-NLS-1$

public static boolean DEBUG = false;


		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.SOURCE_ID, JavaBuilder.SOURCE_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.SOURCE_ID, JavaBuilder.SOURCE_ID);
	} catch (MissingSourceFileException e) {
		// do not log this exception since its thrown to handle aborted compiles because of missing source files
		if (DEBUG)

		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.SOURCE_ID, JavaBuilder.SOURCE_ID);
	} finally {
		if (!ok)
			// If the build failed, clear the previously built state, forcing a full build next time.

		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.SOURCE_ID, JavaBuilder.SOURCE_ID);
	} finally {
		notifier.done();
		cleanup();

		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.SOURCE_ID, JavaBuilder.SOURCE_ID);
		return false;
	}


					: 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.SOURCE_ID, JavaBuilder.SOURCE_ID);
			return false;
		}
	}




	IMarker.CHAR_END, 
	IMarker.LINE_NUMBER, 
	IMarker.USER_EDITABLE,
	IMarker.SOURCE_ID,
};
public final static Integer S_ERROR = new Integer(IMarker.SEVERITY_ERROR);
public final static Integer S_WARNING = new Integer(IMarker.SEVERITY_WARNING);

		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, IMarker.SOURCE_ID},
			new Object[] {message, new Integer(severity), new Integer(start), new Integer(end), JavaBuilder.SOURCE_ID});
	} catch (CoreException e) {
		throw internalException(e);
	}

			marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_incompleteClassPath, missingClassfileName)); 
			marker.setAttribute(IMarker.SEVERITY, isInvalidClasspathError ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING);
			marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
			marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
			// even if we're not keeping more markers, still fall through rest of the problem reporting, so that offending
			// IsClassPathCorrect problem gets recorded since it may help locate the offending reference
		}

			);
			// GENERATED_BY attribute for JDT problems
			if (!managedProblem) {
				marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
			}
			// optional extra attributes
			String[] extraAttributeNames = problem.getExtraMarkerAttributeNames();

					new Integer(task.getSourceEnd() + 1),
					new Integer(task.getSourceLineNumber()),
					Boolean.FALSE,
					JavaBuilder.SOURCE_ID
				});
			String[] extraAttributeNames = task.getExtraMarkerAttributeNames();
			int extraLength = extraAttributeNames == null ? 0 : extraAttributeNames.length;




	private String message;
	private IPath resourcePath;
	private int start = -1, end = -1, categoryId = -1;
	private String sourceId;
	
	public Problem(String location, String message, IPath resourcePath, int start, int end, int categoryId){
		this.location = location;

		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.sourceId = marker.getAttribute(IMarker.SOURCE_ID, "missing");
	}
	public int getCategoryId() {
		return categoryId;
	}
	
/**
 * Return the IMarker.SOURCE_ID 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.SOURCE_ID attribute. 
 * @return the IMarker.SOURCE_ID attribute of the underlying marker if any
 */
public String getSourceId() {
	return this.sourceId;
}
	/**
	 * Gets the location.




	fullBuild();
	Problem[] prob1 = env.getProblemsFor(classTest1);
	expectingSpecificProblemFor(classTest1, new Problem("p1", "Test2 cannot be resolved to a type", classTest1, 39, 44, 40));
	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611

	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(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611

	fullBuild();
	Problem[] prob1 = env.getProblemsFor(classTest1);
	expectingSpecificProblemFor(classTest1, new Problem("p1", "The field Test1.i is not visible", classTest1, 109, 110, 50));
	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611

	fullBuild();
	Problem[] prob1 = env.getProblemsFor(classTest1);
	expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO : marker only", classTest1, 38, 55, -1));
	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611

	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(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}
}




	Problem[] problems = env.getProblemsFor(projectPath, "org.eclipse.jdt.core.tests.compile.problem");
	assertNotNull("null problems array", problems);
	assertEquals("unexpected problems count", 1, problems.length);
	assertEquals("unexpected generated by attribute", "missing", problems[0].getSourceId());
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
// Checking the GENERATED_BY attribute

					context.recordNewProblems(new CategorizedProblem[] {
							new ParticipantProblem("Participant problem", context.getFile().getFullPath().toString()) {
								public String[] getExtraMarkerAttributeNames() {
									return new String[] {IMarker.SOURCE_ID};
								}
								public Object[] getExtraMarkerAttributeValues() {
									return new String[] {specificGeneratedBy};

	Problem[] problems = env.getProblemsFor(projectPath, "org.eclipse.jdt.core.tests.compile.problem");
	assertNotNull("null problems array", problems);
	assertEquals("unexpected problems count", 1, problems.length);
	assertEquals("unexpected generated by attribute", specificGeneratedBy, problems[0].getSourceId());
}
}

Return to bug 171684

Lines 35-41 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java (-7 / +7 lines)
35	BuildNotifier notifier;	35	BuildNotifier notifier;
36	char[][] extraResourceFileFilters;	36	char[][] extraResourceFileFilters;
37	String[] extraResourceFolderFilters;	37	String[] extraResourceFolderFilters;
38	public static final String GENERATED_BY = "JDT"; //$NON-NLS-1$	38	public static final String SOURCE_ID = "JDT"; //$NON-NLS-1$
39		39
40	public static boolean DEBUG = false;	40	public static boolean DEBUG = false;
41		41
Lines 204-217 Link Here
204	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()));	204	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()));
205	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);	205	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
206	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);	206	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
207	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	207	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
208	} catch (ImageBuilderInternalException e) {	208	} catch (ImageBuilderInternalException e) {
209	Util.log(e.getThrowable(), "JavaBuilder handling ImageBuilderInternalException while building: " + currentProject.getName()); //$NON-NLS-1$	209	Util.log(e.getThrowable(), "JavaBuilder handling ImageBuilderInternalException while building: " + currentProject.getName()); //$NON-NLS-1$
210	IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);	210	IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
211	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()));	211	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()));
212	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);	212	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
213	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);	213	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
214	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	214	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
215	} catch (MissingSourceFileException e) {	215	} catch (MissingSourceFileException e) {
216	// do not log this exception since its thrown to handle aborted compiles because of missing source files	216	// do not log this exception since its thrown to handle aborted compiles because of missing source files
217	if (DEBUG)	217	if (DEBUG)
Lines 220-226 Link Here
220	IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);	220	IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
221	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_missingSourceFile, e.missingSourceFile));	221	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_missingSourceFile, e.missingSourceFile));
222	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);	222	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
223	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	223	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
224	} finally {	224	} finally {
225	if (!ok)	225	if (!ok)
226	// If the build failed, clear the previously built state, forcing a full build next time.	226	// If the build failed, clear the previously built state, forcing a full build next time.
Lines 282-288 Link Here
282	IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);	282	IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
283	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()));	283	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage()));
284	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);	284	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
285	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	285	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
286	} finally {	286	} finally {
287	notifier.done();	287	notifier.done();
288	cleanup();	288	cleanup();
Lines 611-617 Link Here
611	marker.setAttribute(IMarker.MESSAGE, Messages.build_abortDueToClasspathProblems);	611	marker.setAttribute(IMarker.MESSAGE, Messages.build_abortDueToClasspathProblems);
612	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);	612	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
613	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);	613	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
614	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	614	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
615	return false;	615	return false;
616	}	616	}
617		617
Lines 650-656 Link Here
650	: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName()));	650	: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName()));
651	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);	651	marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
652	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);	652	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
653	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	653	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
654	return false;	654	return false;
655	}	655	}
656	}	656	}

Lines 72-78 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java (-6 / +6 lines)
72	IMarker.CHAR_END,	72	IMarker.CHAR_END,
73	IMarker.LINE_NUMBER,	73	IMarker.LINE_NUMBER,
74	IMarker.USER_EDITABLE,	74	IMarker.USER_EDITABLE,
75	IMarker.GENERATED_BY,	75	IMarker.SOURCE_ID,
76	};	76	};
77	public final static Integer S_ERROR = new Integer(IMarker.SEVERITY_ERROR);	77	public final static Integer S_ERROR = new Integer(IMarker.SEVERITY_ERROR);
78	public final static Integer S_WARNING = new Integer(IMarker.SEVERITY_WARNING);	78	public final static Integer S_WARNING = new Integer(IMarker.SEVERITY_WARNING);
Lines 372-379 Link Here
372	int start = range == null ? 0 : range.getOffset();	372	int start = range == null ? 0 : range.getOffset();
373	int end = range == null ? 1 : start + range.getLength();	373	int end = range == null ? 1 : start + range.getLength();
374	marker.setAttributes(	374	marker.setAttributes(
375	new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.CHAR_START, IMarker.CHAR_END, IMarker.GENERATED_BY},	375	new String[] {IMarker.MESSAGE, IMarker.SEVERITY, IMarker.CHAR_START, IMarker.CHAR_END, IMarker.SOURCE_ID},
376	new Object[] {message, new Integer(severity), new Integer(start), new Integer(end), JavaBuilder.GENERATED_BY});	376	new Object[] {message, new Integer(severity), new Integer(start), new Integer(end), JavaBuilder.SOURCE_ID});
377	} catch (CoreException e) {	377	} catch (CoreException e) {
378	throw internalException(e);	378	throw internalException(e);
379	}	379	}
Lines 628-634 Link Here
628	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_incompleteClassPath, missingClassfileName));	628	marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_incompleteClassPath, missingClassfileName));
629	marker.setAttribute(IMarker.SEVERITY, isInvalidClasspathError ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING);	629	marker.setAttribute(IMarker.SEVERITY, isInvalidClasspathError ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING);
630	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);	630	marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
631	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	631	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
632	// even if we're not keeping more markers, still fall through rest of the problem reporting, so that offending	632	// even if we're not keeping more markers, still fall through rest of the problem reporting, so that offending
633	// IsClassPathCorrect problem gets recorded since it may help locate the offending reference	633	// IsClassPathCorrect problem gets recorded since it may help locate the offending reference
634	}	634	}
Lines 655-661 Link Here
655	);	655	);
656	// GENERATED_BY attribute for JDT problems	656	// GENERATED_BY attribute for JDT problems
657	if (!managedProblem) {	657	if (!managedProblem) {
658	marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);	658	marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
659	}	659	}
660	// optional extra attributes	660	// optional extra attributes
661	String[] extraAttributeNames = problem.getExtraMarkerAttributeNames();	661	String[] extraAttributeNames = problem.getExtraMarkerAttributeNames();
Lines 693-699 Link Here
693	new Integer(task.getSourceEnd() + 1),	693	new Integer(task.getSourceEnd() + 1),
694	new Integer(task.getSourceLineNumber()),	694	new Integer(task.getSourceLineNumber()),
695	Boolean.FALSE,	695	Boolean.FALSE,
696	JavaBuilder.GENERATED_BY	696	JavaBuilder.SOURCE_ID
697	});	697	});
698	String[] extraAttributeNames = task.getExtraMarkerAttributeNames();	698	String[] extraAttributeNames = task.getExtraMarkerAttributeNames();
699	int extraLength = extraAttributeNames == null ? 0 : extraAttributeNames.length;	699	int extraLength = extraAttributeNames == null ? 0 : extraAttributeNames.length;

Lines 113-119 Link Here

(-)src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java (-5 / +5 lines)
113	fullBuild();	113	fullBuild();
114	Problem[] prob1 = env.getProblemsFor(classTest1);	114	Problem[] prob1 = env.getProblemsFor(classTest1);
115	expectingSpecificProblemFor(classTest1, new Problem("p1", "Test2 cannot be resolved to a type", classTest1, 39, 44, 40));	115	expectingSpecificProblemFor(classTest1, new Problem("p1", "Test2 cannot be resolved to a type", classTest1, 39, 44, 40));
116	assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());	116	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
117	}	117	}
118		118
119	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611	119	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
Lines 130-136 Link Here
130	fullBuild();	130	fullBuild();
131	Problem[] prob1 = env.getProblemsFor(classTest1);	131	Problem[] prob1 = env.getProblemsFor(classTest1);
132	expectingSpecificProblemFor(classTest1, new Problem("p1", "Syntax error on token \"extends\", Type expected after this token", classTest1, 31, 38, 20));	132	expectingSpecificProblemFor(classTest1, new Problem("p1", "Syntax error on token \"extends\", Type expected after this token", classTest1, 31, 38, 20));
133	assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());	133	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
134	}	134	}
135		135
136	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611	136	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
Lines 153-159 Link Here
153	fullBuild();	153	fullBuild();
154	Problem[] prob1 = env.getProblemsFor(classTest1);	154	Problem[] prob1 = env.getProblemsFor(classTest1);
155	expectingSpecificProblemFor(classTest1, new Problem("p1", "The field Test1.i is not visible", classTest1, 109, 110, 50));	155	expectingSpecificProblemFor(classTest1, new Problem("p1", "The field Test1.i is not visible", classTest1, 109, 110, 50));
156	assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());	156	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
157	}	157	}
158		158
159	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611	159	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
Lines 172-178 Link Here
172	fullBuild();	172	fullBuild();
173	Problem[] prob1 = env.getProblemsFor(classTest1);	173	Problem[] prob1 = env.getProblemsFor(classTest1);
174	expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO : marker only", classTest1, 38, 55, -1));	174	expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO : marker only", classTest1, 38, 55, -1));
175	assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());	175	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
176	}	176	}
177		177
178	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611	178	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
Lines 189-194 Link Here
189	Problem[] prob1 = env.getProblemsFor(classTest1);	189	Problem[] prob1 = env.getProblemsFor(classTest1);
190	expectingSpecificProblemFor(classTest1,	190	expectingSpecificProblemFor(classTest1,
191	new Problem("p1", "The type java.lang.Object cannot be resolved. It is indirectly referenced from required .class files", classTest1, 0, 1, 10));	191	new Problem("p1", "The type java.lang.Object cannot be resolved. It is indirectly referenced from required .class files", classTest1, 0, 1, 10));
192	assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());	192	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
193	}	193	}
194	}	194	}

Lines 43-48 Link Here

(-)buildnotes_jdt-core.html (+13 lines)
43	</tr>	43	</tr>
44	</table>	44	</table>
45		45
		46	<a name="v_734"></a>
		47	<hr><h1>
		48	Eclipse Platform Build Notes<br>
		49	Java Development Tooling Core</h1>
		50	Eclipse SDK 3.3M5 - ??? February 2007
		51	<br>Project org.eclipse.jdt.core v_734
		52	(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_734">cvs</a>).
		53	<h2>What's new in this drop</h2>
		54
		55	<h3>Problem Reports Fixed</h3>
		56	<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=171684">171684</a>
		57	Replace references to IMarker.GENERATED_BY with IMarker.SOURCE_ID
		58
46	<a name="v_733"></a>	59	<a name="v_733"></a>
47	<hr><h1>	60	<hr><h1>
48	Eclipse Platform Build Notes<br>	61	Eclipse Platform Build Notes<br>

Lines 19-25 Link Here

(-)src/org/eclipse/jdt/core/tests/builder/Problem.java (-7 / +7 lines)
19	private String message;	19	private String message;
20	private IPath resourcePath;	20	private IPath resourcePath;
21	private int start = -1, end = -1, categoryId = -1;	21	private int start = -1, end = -1, categoryId = -1;
22	private String generatedBy;	22	private String sourceId;
23		23
24	public Problem(String location, String message, IPath resourcePath, int start, int end, int categoryId){	24	public Problem(String location, String message, IPath resourcePath, int start, int end, int categoryId){
25	this.location = location;	25	this.location = location;
Lines 42-62 Link Here
42	this.start = marker.getAttribute(IMarker.CHAR_START, -1);	42	this.start = marker.getAttribute(IMarker.CHAR_START, -1);
43	this.end = marker.getAttribute(IMarker.CHAR_END, -1);	43	this.end = marker.getAttribute(IMarker.CHAR_END, -1);
44	this.categoryId = marker.getAttribute(IJavaModelMarker.CATEGORY_ID, -1);	44	this.categoryId = marker.getAttribute(IJavaModelMarker.CATEGORY_ID, -1);
45	this.generatedBy = marker.getAttribute(IMarker.GENERATED_BY, "missing");	45	this.sourceId = marker.getAttribute(IMarker.SOURCE_ID, "missing");
46	}	46	}
47	public int getCategoryId() {	47	public int getCategoryId() {
48	return categoryId;	48	return categoryId;
49	}	49	}
50		50
51	/**	51	/**
52	* Return the IMarker.GENERATED_BY attribute of the underlying marker if any.	52	* Return the IMarker.SOURCE_ID attribute of the underlying marker if any.
53	* Value null denotes a problem created from explicit structural attributes	53	* Value null denotes a problem created from explicit structural attributes
54	* (instead of using a source marker). Value "missing" denotes that the marker	54	* (instead of using a source marker). Value "missing" denotes that the marker
55	* used to initialize the problem had no IMarker.GENERATED_BY attribute.	55	* used to initialize the problem had no IMarker.SOURCE_ID attribute.
56	* @return the IMarker.GENERATED_BY attribute of the underlying marker if any	56	* @return the IMarker.SOURCE_ID attribute of the underlying marker if any
57	*/	57	*/
58	public String getGeneratedBy() {	58	public String getSourceId() {
59	return this.generatedBy;	59	return this.sourceId;
60	}	60	}
61	/**	61	/**
62	* Gets the location.	62	* Gets the location.

Lines 448-454 Link Here

(-)src/org/eclipse/jdt/core/tests/builder/ParticipantBuildTests.java (-3 / +3 lines)
448	Problem[] problems = env.getProblemsFor(projectPath, "org.eclipse.jdt.core.tests.compile.problem");	448	Problem[] problems = env.getProblemsFor(projectPath, "org.eclipse.jdt.core.tests.compile.problem");
449	assertNotNull("null problems array", problems);	449	assertNotNull("null problems array", problems);
450	assertEquals("unexpected problems count", 1, problems.length);	450	assertEquals("unexpected problems count", 1, problems.length);
451	assertEquals("unexpected generated by attribute", "missing", problems[0].getGeneratedBy());	451	assertEquals("unexpected generated by attribute", "missing", problems[0].getSourceId());
452	}	452	}
453	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611	453	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
454	// Checking the GENERATED_BY attribute	454	// Checking the GENERATED_BY attribute
Lines 472-478 Link Here
472	context.recordNewProblems(new CategorizedProblem[] {	472	context.recordNewProblems(new CategorizedProblem[] {
473	new ParticipantProblem("Participant problem", context.getFile().getFullPath().toString()) {	473	new ParticipantProblem("Participant problem", context.getFile().getFullPath().toString()) {
474	public String[] getExtraMarkerAttributeNames() {	474	public String[] getExtraMarkerAttributeNames() {
475	return new String[] {IMarker.GENERATED_BY};	475	return new String[] {IMarker.SOURCE_ID};
476	}	476	}
477	public Object[] getExtraMarkerAttributeValues() {	477	public Object[] getExtraMarkerAttributeValues() {
478	return new String[] {specificGeneratedBy};	478	return new String[] {specificGeneratedBy};
Lines 486-491 Link Here
486	Problem[] problems = env.getProblemsFor(projectPath, "org.eclipse.jdt.core.tests.compile.problem");	486	Problem[] problems = env.getProblemsFor(projectPath, "org.eclipse.jdt.core.tests.compile.problem");
487	assertNotNull("null problems array", problems);	487	assertNotNull("null problems array", problems);
488	assertEquals("unexpected problems count", 1, problems.length);	488	assertEquals("unexpected problems count", 1, problems.length);
489	assertEquals("unexpected generated by attribute", specificGeneratedBy, problems[0].getGeneratedBy());	489	assertEquals("unexpected generated by attribute", specificGeneratedBy, problems[0].getSourceId());
490	}	490	}
491	}	491	}