View | Details | Raw Unified | Return to bug 125823 | Differences between
and this patch

Collapse All | Expand All

(-)model/org/eclipse/jdt/internal/core/JavaProject.java (+3 lines)
Lines 58-63 Link Here
58
import org.eclipse.jdt.core.JavaCore;
58
import org.eclipse.jdt.core.JavaCore;
59
import org.eclipse.jdt.core.JavaModelException;
59
import org.eclipse.jdt.core.JavaModelException;
60
import org.eclipse.jdt.core.WorkingCopyOwner;
60
import org.eclipse.jdt.core.WorkingCopyOwner;
61
import org.eclipse.jdt.core.compiler.CategorizedProblem;
61
import org.eclipse.jdt.core.compiler.CharOperation;
62
import org.eclipse.jdt.core.compiler.CharOperation;
62
import org.eclipse.jdt.core.eval.IEvaluationContext;
63
import org.eclipse.jdt.core.eval.IEvaluationContext;
63
import org.eclipse.jdt.internal.compiler.util.ObjectVector;
64
import org.eclipse.jdt.internal.compiler.util.ObjectVector;
Lines 768-773 Link Here
768
					IJavaModelMarker.CLASSPATH_FILE_FORMAT,
769
					IJavaModelMarker.CLASSPATH_FILE_FORMAT,
769
					IJavaModelMarker.ID,
770
					IJavaModelMarker.ID,
770
					IJavaModelMarker.ARGUMENTS ,
771
					IJavaModelMarker.ARGUMENTS ,
772
					IJavaModelMarker.CATEGORY_ID,
771
				},
773
				},
772
				new Object[] {
774
				new Object[] {
773
					status.getMessage(),
775
					status.getMessage(),
Lines 777-782 Link Here
777
					isClasspathFileFormatProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
779
					isClasspathFileFormatProblem ? "true" : "false",//$NON-NLS-1$ //$NON-NLS-2$
778
					new Integer(status.getCode()),
780
					new Integer(status.getCode()),
779
					Util.getProblemArgumentsForMarker(arguments) ,
781
					Util.getProblemArgumentsForMarker(arguments) ,
782
					new Integer(CategorizedProblem.CAT_BUILDPATH)
780
				}
783
				}
781
			);
784
			);
782
		} catch (CoreException e) {
785
		} catch (CoreException e) {
(-)model/org/eclipse/jdt/internal/core/builder/JavaBuilder.java (+5 lines)
Lines 202-212 Link Here
202
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
202
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
203
		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage())); 
203
		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage())); 
204
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
204
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
205
		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
205
	} catch (ImageBuilderInternalException e) {
206
	} catch (ImageBuilderInternalException e) {
206
		Util.log(e.getThrowable(), "JavaBuilder handling ImageBuilderInternalException while building: " + currentProject.getName()); //$NON-NLS-1$
207
		Util.log(e.getThrowable(), "JavaBuilder handling ImageBuilderInternalException while building: " + currentProject.getName()); //$NON-NLS-1$
207
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
208
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
208
		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage())); 
209
		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_inconsistentProject, e.getLocalizedMessage())); 
209
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
210
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
211
		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
210
	} catch (MissingClassFileException e) {
212
	} catch (MissingClassFileException e) {
211
		// do not log this exception since its thrown to handle aborted compiles because of missing class files
213
		// do not log this exception since its thrown to handle aborted compiles because of missing class files
212
		if (DEBUG)
214
		if (DEBUG)
Lines 214-219 Link Here
214
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
216
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
215
		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_incompleteClassPath, e.missingClassFile)); 
217
		marker.setAttribute(IMarker.MESSAGE, Messages.bind(Messages.build_incompleteClassPath, e.missingClassFile)); 
216
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
218
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
219
		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
217
	} catch (MissingSourceFileException e) {
220
	} catch (MissingSourceFileException e) {
218
		// do not log this exception since its thrown to handle aborted compiles because of missing source files
221
		// do not log this exception since its thrown to handle aborted compiles because of missing source files
219
		if (DEBUG)
222
		if (DEBUG)
Lines 605-610 Link Here
605
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
608
		IMarker marker = currentProject.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
606
		marker.setAttribute(IMarker.MESSAGE, Messages.build_abortDueToClasspathProblems); 
609
		marker.setAttribute(IMarker.MESSAGE, Messages.build_abortDueToClasspathProblems); 
607
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
610
		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
611
		marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
608
		return false;
612
		return false;
609
	}
613
	}
610
614
Lines 642-647 Link Here
642
					? Messages.bind(Messages.build_prereqProjectHasClasspathProblems, p.getName()) 
646
					? Messages.bind(Messages.build_prereqProjectHasClasspathProblems, p.getName()) 
643
					: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName())); 
647
					: Messages.bind(Messages.build_prereqProjectMustBeRebuilt, p.getName())); 
644
			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
648
			marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
649
			marker.setAttribute(IJavaModelMarker.CATEGORY_ID, CategorizedProblem.CAT_BUILDPATH);
645
			return false;
650
			return false;
646
		}
651
		}
647
	}
652
	}

Return to bug 125823