### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
retrieving revision 1.597
diff -u -r1.597 messages.properties
--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 23 Jan 2007 14:51:04 -0000 1.597
+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 31 Jan 2007 06:21:33 -0000
@@ -14,8 +14,8 @@
#Format: compiler.name = word1 word2 word3
compiler.name = Eclipse Java Compiler
#Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]
-compiler.version = 0.733, 3.3.0 milestone-5
-compiler.copyright = Copyright IBM Corp 2000, 2006. All rights reserved.
+compiler.version = 0.734, 3.3.0 milestone-5
+compiler.copyright = Copyright IBM Corp 2000, 2007. All rights reserved.
### progress
progress.compiling = Compiling
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.377
diff -u -r1.377 JavaProject.java
--- model/org/eclipse/jdt/internal/core/JavaProject.java 7 Dec 2006 07:28:06 -0000 1.377
+++ model/org/eclipse/jdt/internal/core/JavaProject.java 31 Jan 2007 06:21:34 -0000
@@ -806,7 +806,7 @@
IJavaModelMarker.ID,
IJavaModelMarker.ARGUMENTS ,
IJavaModelMarker.CATEGORY_ID,
- IMarker.GENERATED_BY,
+ IMarker.SOURCE_ID,
},
new Object[] {
status.getMessage(),
@@ -817,7 +817,7 @@
new Integer(status.getCode()),
Util.getProblemArgumentsForMarker(arguments) ,
new Integer(CategorizedProblem.CAT_BUILDPATH),
- JavaBuilder.GENERATED_BY,
+ JavaBuilder.SOURCE_ID,
}
);
} catch (CoreException e) {
Index: buildnotes_jdt-core.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v
retrieving revision 1.5657
diff -u -r1.5657 buildnotes_jdt-core.html
--- buildnotes_jdt-core.html 30 Jan 2007 11:31:08 -0000 1.5657
+++ buildnotes_jdt-core.html 31 Jan 2007 06:21:33 -0000
@@ -43,6 +43,19 @@
+
+
+Eclipse Platform Build Notes
+Java Development Tooling Core
+Eclipse SDK 3.3M5 - ??? February 2007
+
Project org.eclipse.jdt.core v_734
+(cvs).
+What's new in this drop
+
+Problem Reports Fixed
+171684
+Replace references to IMarker.GENERATED_BY with IMarker.SOURCE_ID
+
Eclipse Platform Build Notes
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.14
diff -u -r1.14 RequestorWrapper.java
--- model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java 7 Dec 2006 07:28:06 -0000 1.14
+++ model/org/eclipse/jdt/internal/core/eval/RequestorWrapper.java 31 Jan 2007 06:21:34 -0000
@@ -61,7 +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, JavaBuilder.GENERATED_BY);
+ marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.SOURCE_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.125
diff -u -r1.125 JavaBuilder.java
--- model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java 22 Dec 2006 16:02:08 -0000 1.125
+++ model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java 31 Jan 2007 06:21:34 -0000
@@ -35,7 +35,7 @@
BuildNotifier notifier;
char[][] extraResourceFileFilters;
String[] extraResourceFolderFilters;
-public static final String GENERATED_BY = "JDT"; //$NON-NLS-1$
+public static final String SOURCE_ID = "JDT"; //$NON-NLS-1$
public static boolean DEBUG = false;
@@ -204,14 +204,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, JavaBuilder.GENERATED_BY);
+ 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.GENERATED_BY, JavaBuilder.GENERATED_BY);
+ 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)
@@ -220,7 +220,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, JavaBuilder.GENERATED_BY);
+ 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.
@@ -282,7 +282,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, JavaBuilder.GENERATED_BY);
+ marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
} finally {
notifier.done();
cleanup();
@@ -611,7 +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, JavaBuilder.GENERATED_BY);
+ marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
return false;
}
@@ -650,7 +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, JavaBuilder.GENERATED_BY);
+ marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_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.103
diff -u -r1.103 AbstractImageBuilder.java
--- model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java 15 Jan 2007 18:34:52 -0000 1.103
+++ model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java 31 Jan 2007 06:21:34 -0000
@@ -72,7 +72,7 @@
IMarker.CHAR_END,
IMarker.LINE_NUMBER,
IMarker.USER_EDITABLE,
- IMarker.GENERATED_BY,
+ 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);
@@ -372,8 +372,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, IMarker.GENERATED_BY},
- new Object[] {message, new Integer(severity), new Integer(start), new Integer(end), JavaBuilder.GENERATED_BY});
+ 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);
}
@@ -628,7 +628,7 @@
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.GENERATED_BY, JavaBuilder.GENERATED_BY);
+ 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
}
@@ -655,7 +655,7 @@
);
// GENERATED_BY attribute for JDT problems
if (!managedProblem) {
- marker.setAttribute(IMarker.GENERATED_BY, JavaBuilder.GENERATED_BY);
+ marker.setAttribute(IMarker.SOURCE_ID, JavaBuilder.SOURCE_ID);
}
// optional extra attributes
String[] extraAttributeNames = problem.getExtraMarkerAttributeNames();
@@ -693,7 +693,7 @@
new Integer(task.getSourceEnd() + 1),
new Integer(task.getSourceLineNumber()),
Boolean.FALSE,
- JavaBuilder.GENERATED_BY
+ JavaBuilder.SOURCE_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.13
diff -u -r1.13 Problem.java
--- src/org/eclipse/jdt/core/tests/builder/Problem.java 7 Dec 2006 07:28:26 -0000 1.13
+++ src/org/eclipse/jdt/core/tests/builder/Problem.java 31 Jan 2007 06:21:36 -0000
@@ -19,7 +19,7 @@
private String message;
private IPath resourcePath;
private int start = -1, end = -1, categoryId = -1;
- private String generatedBy;
+ private String sourceId;
public Problem(String location, String message, IPath resourcePath, int start, int end, int categoryId){
this.location = location;
@@ -42,21 +42,21 @@
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");
+ this.sourceId = marker.getAttribute(IMarker.SOURCE_ID, "missing");
}
public int getCategoryId() {
return categoryId;
}
/**
- * Return the IMarker.GENERATED_BY attribute of the underlying marker if any.
+ * 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.GENERATED_BY attribute.
- * @return the IMarker.GENERATED_BY attribute of the underlying marker if any
+ * 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 getGeneratedBy() {
- return this.generatedBy;
+public String getSourceId() {
+ return this.sourceId;
}
/**
* Gets the location.
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.18
diff -u -r1.18 ErrorsTests.java
--- src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java 7 Dec 2006 07:28:26 -0000 1.18
+++ src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java 31 Jan 2007 06:21:36 -0000
@@ -113,7 +113,7 @@
fullBuild();
Problem[] prob1 = env.getProblemsFor(classTest1);
expectingSpecificProblemFor(classTest1, new Problem("p1", "Test2 cannot be resolved to a type", classTest1, 39, 44, 40));
- assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());
+ assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
@@ -130,7 +130,7 @@
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.GENERATED_BY, prob1[0].getGeneratedBy());
+ assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
@@ -153,7 +153,7 @@
fullBuild();
Problem[] prob1 = env.getProblemsFor(classTest1);
expectingSpecificProblemFor(classTest1, new Problem("p1", "The field Test1.i is not visible", classTest1, 109, 110, 50));
- assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());
+ assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
@@ -172,7 +172,7 @@
fullBuild();
Problem[] prob1 = env.getProblemsFor(classTest1);
expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO : marker only", classTest1, 38, 55, -1));
- assertEquals(JavaBuilder.GENERATED_BY, prob1[0].getGeneratedBy());
+ assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
@@ -189,6 +189,6 @@
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.GENERATED_BY, prob1[0].getGeneratedBy());
+ assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
}
}
Index: src/org/eclipse/jdt/core/tests/builder/ParticipantBuildTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ParticipantBuildTests.java,v
retrieving revision 1.16
diff -u -r1.16 ParticipantBuildTests.java
--- src/org/eclipse/jdt/core/tests/builder/ParticipantBuildTests.java 7 Dec 2006 07:28:26 -0000 1.16
+++ src/org/eclipse/jdt/core/tests/builder/ParticipantBuildTests.java 31 Jan 2007 06:21:36 -0000
@@ -448,7 +448,7 @@
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].getGeneratedBy());
+ assertEquals("unexpected generated by attribute", "missing", problems[0].getSourceId());
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=158611
// Checking the GENERATED_BY attribute
@@ -472,7 +472,7 @@
context.recordNewProblems(new CategorizedProblem[] {
new ParticipantProblem("Participant problem", context.getFile().getFullPath().toString()) {
public String[] getExtraMarkerAttributeNames() {
- return new String[] {IMarker.GENERATED_BY};
+ return new String[] {IMarker.SOURCE_ID};
}
public Object[] getExtraMarkerAttributeValues() {
return new String[] {specificGeneratedBy};
@@ -486,6 +486,6 @@
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].getGeneratedBy());
+ assertEquals("unexpected generated by attribute", specificGeneratedBy, problems[0].getSourceId());
}
}