Attachment #155261 for bug #291559

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/PreferenceInitializer.java (-1 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 64-69 Link Here
64	prefs.putInt(CompilerFlags.P_NOT_EXTERNALIZED, CompilerFlags.IGNORE);	64	prefs.putInt(CompilerFlags.P_NOT_EXTERNALIZED, CompilerFlags.IGNORE);
65	prefs.putInt(CompilerFlags.P_BUILD, CompilerFlags.WARNING);	65	prefs.putInt(CompilerFlags.P_BUILD, CompilerFlags.WARNING);
66	prefs.putInt(CompilerFlags.P_BUILD_MISSING_OUTPUT, CompilerFlags.IGNORE);	66	prefs.putInt(CompilerFlags.P_BUILD_MISSING_OUTPUT, CompilerFlags.IGNORE);
		67	prefs.putInt(CompilerFlags.P_BUILD_SOURCE_LIBRARY, CompilerFlags.WARNING);
		68	prefs.putInt(CompilerFlags.P_BUILD_OUTPUT_LIBRARY, CompilerFlags.WARNING);
		69	prefs.putInt(CompilerFlags.P_BUILD_SRC_INCLUDES, CompilerFlags.WARNING);
		70	prefs.putInt(CompilerFlags.P_BUILD_BIN_INCLUDES, CompilerFlags.WARNING);
		71	prefs.putInt(CompilerFlags.P_BUILD_JAVA_COMPLIANCE, CompilerFlags.WARNING);
		72
67	prefs.putInt(CompilerFlags.P_INCOMPATIBLE_ENV, CompilerFlags.WARNING);	73	prefs.putInt(CompilerFlags.P_INCOMPATIBLE_ENV, CompilerFlags.WARNING);
68	prefs.putInt(CompilerFlags.P_MISSING_EXPORT_PKGS, CompilerFlags.IGNORE);	74	prefs.putInt(CompilerFlags.P_MISSING_EXPORT_PKGS, CompilerFlags.IGNORE);
69		75

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java (-32 / +40 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 104-120 Link Here
104		104
105	protected ArrayList fProblemList = new ArrayList();	105	protected ArrayList fProblemList = new ArrayList();
106	protected int fBuildSeverity;	106	protected int fBuildSeverity;
107	private int fClasspathSeverity;	107	protected int fClasspathSeverity;
		108	protected int fJavaComplSeverity;
		109	protected int fSrcInclSeverity;
		110	protected int fBinInclSeverity;
		111	protected int fMissingOutputLibSeverity;
		112	protected int fSrcLibSeverity;
		113	protected int fOututLibSeverity;
108		114
109	public BuildErrorReporter(IFile buildFile) {	115	public BuildErrorReporter(IFile buildFile) {
110	super(buildFile);	116	super(buildFile);
		117	fBuildSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD);
		118	fClasspathSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_UNRESOLVED_IMPORTS);
		119	fMissingOutputLibSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_MISSING_OUTPUT);
		120	fSrcLibSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_SOURCE_LIBRARY);
		121	fOututLibSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_OUTPUT_LIBRARY);
		122	fJavaComplSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_JAVA_COMPLIANCE);
		123	fSrcInclSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_SRC_INCLUDES);
		124	fBinInclSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD_BIN_INCLUDES);
111	}	125	}
112		126
113	public void validate(IProgressMonitor monitor) {	127	public void validate(IProgressMonitor monitor) {
114	fBuildSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_BUILD);	128	/*if (fBuildSeverity == CompilerFlags.IGNORE && fClasspathSeverity == CompilerFlags.IGNORE)
115	fClasspathSeverity = CompilerFlags.getFlag(fFile.getProject(), CompilerFlags.P_UNRESOLVED_IMPORTS);	129	return;*/
116	if (fBuildSeverity == CompilerFlags.IGNORE && fClasspathSeverity == CompilerFlags.IGNORE)
117	return;
118	WorkspaceBuildModel wbm = new WorkspaceBuildModel(fFile);	130	WorkspaceBuildModel wbm = new WorkspaceBuildModel(fFile);
119	wbm.load();	131	wbm.load();
120	if (!wbm.isLoaded())	132	if (!wbm.isLoaded())
Lines 192-207 Link Here
192	validateDependencyManagement(bundleList);	204	validateDependencyManagement(bundleList);
193	}	205	}
194		206
195	// rest of validation relies on build flag
196	if (fBuildSeverity == CompilerFlags.IGNORE)
197	return;
198
199	if (jarsExtra != null)	207	if (jarsExtra != null)
200	validateJarsExtraClasspath(jarsExtra);	208	validateJarsExtraClasspath(jarsExtra);
201	validateIncludes(binIncludes, sourceEntryKeys);	209	validateIncludes(binIncludes, sourceEntryKeys, fBinInclSeverity);
202	validateIncludes(binExcludes, sourceEntryKeys);	210	validateIncludes(binExcludes, sourceEntryKeys, fBinInclSeverity);
203	validateIncludes(srcIncludes, sourceEntryKeys);	211	validateIncludes(srcIncludes, sourceEntryKeys, fSrcInclSeverity);
204	validateIncludes(srcExcludes, sourceEntryKeys);	212	validateIncludes(srcExcludes, sourceEntryKeys, fSrcInclSeverity);
205	validateSourceFoldersInSrcIncludes(srcIncludes);	213	validateSourceFoldersInSrcIncludes(srcIncludes);
206		214
207	try {	215	try {
Lines 210-216 Link Here
210	IClasspathEntry[] cpes = jp.getRawClasspath();	218	IClasspathEntry[] cpes = jp.getRawClasspath();
211	validateMissingLibraries(sourceEntryKeys, cpes);	219	validateMissingLibraries(sourceEntryKeys, cpes);
212	validateSourceEntries(sourceEntries, cpes);	220	validateSourceEntries(sourceEntries, cpes);
213	SourceEntryErrorReporter srcEntryErrReporter = new SourceEntryErrorReporter(fFile, fBuildSeverity);	221	SourceEntryErrorReporter srcEntryErrReporter = new SourceEntryErrorReporter(fFile);
214	srcEntryErrReporter.initialize(sourceEntries, outputEntries, cpes, fProject);	222	srcEntryErrReporter.initialize(sourceEntries, outputEntries, cpes, fProject);
215	srcEntryErrReporter.validate();	223	srcEntryErrReporter.validate();
216	ArrayList problems = srcEntryErrReporter.getProblemList();	224	ArrayList problems = srcEntryErrReporter.getProblemList();
Lines 292-321 Link Here
292	if (projectJavaCompatibility != null) {	300	if (projectJavaCompatibility != null) {
293	if (jreCompilationProfileEntry == null) {	301	if (jreCompilationProfileEntry == null) {
294	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel);	302	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel);
295	prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_EE);	303	prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_ADDDITION, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
296	} else {	304	} else {
297	if (!projectJavaCompatibility.equalsIgnoreCase(jreCompilationProfileEntry.getTokens()[0])) {	305	if (!projectJavaCompatibility.equalsIgnoreCase(jreCompilationProfileEntry.getTokens()[0])) {
298	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel);	306	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JRE_COMPILATION_PROFILE, PDECoreMessages.BuildErrorReporter_CompilercomplianceLevel);
299	prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_REPLACE, PDEMarkerFactory.CAT_EE);	307	prepareError(PROPERTY_JRE_COMPILATION_PROFILE, projectJavaCompatibility, message, PDEMarkerFactory.B_REPLACE, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
300	}	308	}
301	}	309	}
302	} else {	310	} else {
303	if (javacSourceEntry == null) {	311	if (javacSourceEntry == null) {
304	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JAVAC_SOURCE, PDECoreMessages.BuildErrorReporter_SourceCompatibility);	312	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JAVAC_SOURCE, PDECoreMessages.BuildErrorReporter_SourceCompatibility);
305	prepareError(PROPERTY_JAVAC_SOURCE, projectSourceCompatibility, message, PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_EE);	313	prepareError(PROPERTY_JAVAC_SOURCE, projectSourceCompatibility, message, PDEMarkerFactory.B_ADDDITION, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
306	} else {	314	} else {
307	if (!projectSourceCompatibility.equalsIgnoreCase(javacSourceEntry.getTokens()[0])) {	315	if (!projectSourceCompatibility.equalsIgnoreCase(javacSourceEntry.getTokens()[0])) {
308	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JAVAC_SOURCE, PDECoreMessages.BuildErrorReporter_SourceCompatibility);	316	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JAVAC_SOURCE, PDECoreMessages.BuildErrorReporter_SourceCompatibility);
309	prepareError(PROPERTY_JAVAC_SOURCE, projectSourceCompatibility, message, PDEMarkerFactory.B_REPLACE, PDEMarkerFactory.CAT_EE);	317	prepareError(PROPERTY_JAVAC_SOURCE, projectSourceCompatibility, message, PDEMarkerFactory.B_REPLACE, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
310	}	318	}
311	}	319	}
312	if (javacTargetEntry == null) {	320	if (javacTargetEntry == null) {
313	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JAVAC_TARGET, PDECoreMessages.BuildErrorReporter_GeneratedClassFilesCompatibility);	321	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JAVAC_TARGET, PDECoreMessages.BuildErrorReporter_GeneratedClassFilesCompatibility);
314	prepareError(PROPERTY_JAVAC_TARGET, projectClassCompatibility, message, PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_EE);	322	prepareError(PROPERTY_JAVAC_TARGET, projectClassCompatibility, message, PDEMarkerFactory.B_ADDDITION, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
315	} else {	323	} else {
316	if (!projectClassCompatibility.equalsIgnoreCase(javacTargetEntry.getTokens()[0])) {	324	if (!projectClassCompatibility.equalsIgnoreCase(javacTargetEntry.getTokens()[0])) {
317	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JAVAC_TARGET, PDECoreMessages.BuildErrorReporter_GeneratedClassFilesCompatibility);	325	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JAVAC_TARGET, PDECoreMessages.BuildErrorReporter_GeneratedClassFilesCompatibility);
318	prepareError(PROPERTY_JAVAC_TARGET, projectClassCompatibility, message, PDEMarkerFactory.B_REPLACE, PDEMarkerFactory.CAT_EE);	326	prepareError(PROPERTY_JAVAC_TARGET, projectClassCompatibility, message, PDEMarkerFactory.B_REPLACE, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
319	}	327	}
320	}	328	}
321	}	329	}
Lines 341-347 Link Here
341	if (javacWarningsEntry == null) {	349	if (javacWarningsEntry == null) {
342	if (warningToken.length() > 0) {	350	if (warningToken.length() > 0) {
343	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JAVAC_WARNINGS_PREFIX, PDECoreMessages.BuildErrorReporter_DisallowIdentifiers);	351	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceMissingEntry, PROPERTY_JAVAC_WARNINGS_PREFIX, PDECoreMessages.BuildErrorReporter_DisallowIdentifiers);
344	prepareError(JAVAC_WARNINGS_ENTRY, warningToken, message, PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_EE);	352	prepareError(JAVAC_WARNINGS_ENTRY, warningToken, message, PDEMarkerFactory.B_ADDDITION, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
345	}	353	}
346	} else {	354	} else {
347	if (javacWarningsEntry.contains(ASSERT_IDENTIFIER) \|\| javacWarningsEntry.contains('+' + ASSERT_IDENTIFIER) \|\| javacWarningsEntry.contains('-' + ASSERT_IDENTIFIER)) {	355	if (javacWarningsEntry.contains(ASSERT_IDENTIFIER) \|\| javacWarningsEntry.contains('+' + ASSERT_IDENTIFIER) \|\| javacWarningsEntry.contains('-' + ASSERT_IDENTIFIER)) {
Lines 355-361 Link Here
355	warningToken = join(assertToken, enumToken);	363	warningToken = join(assertToken, enumToken);
356	if (warningToken.length() > 0) {	364	if (warningToken.length() > 0) {
357	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JAVAC_WARNINGS_PREFIX, PDECoreMessages.BuildErrorReporter_DisallowIdentifiers);	365	message = NLS.bind(PDECoreMessages.BuildErrorReporter_ProjectSpecificJavaComplianceDifferentToken, PROPERTY_JAVAC_WARNINGS_PREFIX, PDECoreMessages.BuildErrorReporter_DisallowIdentifiers);
358	prepareError(JAVAC_WARNINGS_ENTRY, warningToken, message, PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_EE);	366	prepareError(JAVAC_WARNINGS_ENTRY, warningToken, message, PDEMarkerFactory.B_ADDDITION, fJavaComplSeverity, PDEMarkerFactory.CAT_EE);
359	}	367	}
360	}	368	}
361	}	369	}
Lines 486-492 Link Here
486	}	494	}
487		495
488	if (!exists) {	496	if (!exists) {
489	prepareError(PROPERTY_BIN_INCLUDES, key, NLS.bind(PDECoreMessages.BuildErrorReporter_binIncludesMissing, key), PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_FATAL);	497	prepareError(PROPERTY_BIN_INCLUDES, key, NLS.bind(PDECoreMessages.BuildErrorReporter_binIncludesMissing, key), PDEMarkerFactory.B_ADDDITION, fBinInclSeverity, PDEMarkerFactory.CAT_FATAL);
490	}	498	}
491	}	499	}
492		500
Lines 550-556 Link Here
550	found = true;	558	found = true;
551	}	559	}
552	if (!found)	560	if (!found)
553	prepareError(PROPERTY_BIN_INCLUDES, key, NLS.bind(PDECoreMessages.BuildErrorReporter_binIncludesMissing, key), PDEMarkerFactory.B_ADDDITION, PDEMarkerFactory.CAT_FATAL);	561	prepareError(PROPERTY_BIN_INCLUDES, key, NLS.bind(PDECoreMessages.BuildErrorReporter_binIncludesMissing, key), PDEMarkerFactory.B_ADDDITION, fBinInclSeverity, PDEMarkerFactory.CAT_FATAL);
554	}	562	}
555	}	563	}
556		564
Lines 565-571 Link Here
565	for (int i = 0; i < cpes.length; i++) {	573	for (int i = 0; i < cpes.length; i++) {
566	if (cpes[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {	574	if (cpes[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
567	if (!sourceEntryKeys.contains(DEF_SOURCE_ENTRY))	575	if (!sourceEntryKeys.contains(DEF_SOURCE_ENTRY))
568	prepareError(DEF_SOURCE_ENTRY, null, PDECoreMessages.BuildErrorReporter_sourceMissing, PDEMarkerFactory.NO_RESOLUTION, PDEMarkerFactory.CAT_OTHER);	576	prepareError(DEF_SOURCE_ENTRY, null, PDECoreMessages.BuildErrorReporter_sourceMissing, PDEMarkerFactory.NO_RESOLUTION, fSrcInclSeverity, PDEMarkerFactory.CAT_OTHER);
569	break;	577	break;
570	}	578	}
571	}	579	}
Lines 579-585 Link Here
579	for (int j = 0; j < cpes.length; j++) {	587	for (int j = 0; j < cpes.length; j++) {
580	if (cpes[j].getEntryKind() == IClasspathEntry.CPE_SOURCE) {	588	if (cpes[j].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
581	if (!sourceEntryKeys.contains(DEF_SOURCE_ENTRY))	589	if (!sourceEntryKeys.contains(DEF_SOURCE_ENTRY))
582	prepareError(DEF_SOURCE_ENTRY, null, PDECoreMessages.BuildErrorReporter_sourceMissing, PDEMarkerFactory.NO_RESOLUTION, PDEMarkerFactory.CAT_OTHER);	590	prepareError(DEF_SOURCE_ENTRY, null, PDECoreMessages.BuildErrorReporter_sourceMissing, PDEMarkerFactory.NO_RESOLUTION, fSrcInclSeverity, PDEMarkerFactory.CAT_OTHER);
583	break;	591	break;
584	}	592	}
585	}	593	}
Lines 650-658 Link Here
650	return;	658	return;
651	if (sourceEntries.size() == 1) {	659	if (sourceEntries.size() == 1) {
652	String name = ((IBuildEntry) sourceEntries.get(0)).getName();	660	String name = ((IBuildEntry) sourceEntries.get(0)).getName();
653	prepareError(name, null, NLS.bind(PDECoreMessages.BuildErrorReporter_classpathEntryMissing1, unlistedEntries, name), PDEMarkerFactory.B_SOURCE_ADDITION, PDEMarkerFactory.CAT_OTHER);	661	prepareError(name, null, NLS.bind(PDECoreMessages.BuildErrorReporter_classpathEntryMissing1, unlistedEntries, name), PDEMarkerFactory.B_SOURCE_ADDITION, fSrcLibSeverity, PDEMarkerFactory.CAT_OTHER);
654	} else	662	} else
655	prepareError(DEF_SOURCE_ENTRY, null, NLS.bind(PDECoreMessages.BuildErrorReporter_classpathEntryMissing, unlistedEntries), PDEMarkerFactory.B_SOURCE_ADDITION, PDEMarkerFactory.CAT_OTHER);	663	prepareError(DEF_SOURCE_ENTRY, null, NLS.bind(PDECoreMessages.BuildErrorReporter_classpathEntryMissing, unlistedEntries), PDEMarkerFactory.B_SOURCE_ADDITION, fSrcLibSeverity, PDEMarkerFactory.CAT_OTHER);
656		664
657	}	665	}
658		666
Lines 689-701 Link Here
689	}	697	}
690		698
691	if (errorMessage != null) {	699	if (errorMessage != null) {
692	prepareError(includes.getName(), tokens[i], errorMessage, PDEMarkerFactory.B_REMOVAL, PDEMarkerFactory.CAT_OTHER);	700	prepareError(includes.getName(), tokens[i], errorMessage, PDEMarkerFactory.B_REMOVAL, fSrcInclSeverity, PDEMarkerFactory.CAT_OTHER);
693	}	701	}
694	}	702	}
695		703
696	}	704	}
697		705
698	private void validateIncludes(IBuildEntry includes, ArrayList sourceIncludes) {	706	private void validateIncludes(IBuildEntry includes, ArrayList sourceIncludes, int severity) {
699	if (includes == null)	707	if (includes == null)
700	return;	708	return;
701	String[] tokens = includes.getTokens();	709	String[] tokens = includes.getTokens();
Lines 730-736 Link Here
730	}	738	}
731		739
732	if (message != null)	740	if (message != null)
733	prepareError(includes.getName(), token, message, fixId, PDEMarkerFactory.CAT_OTHER);	741	prepareError(includes.getName(), token, message, fixId, severity, PDEMarkerFactory.CAT_OTHER);
734	}	742	}
735	}	743	}
736		744

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/builders/CompilerFlags.java (-1 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 55-60 Link Here
55	public static final String P_NOT_EXTERNALIZED = "compilers.p.not-externalized-att"; //$NON-NLS-1$	55	public static final String P_NOT_EXTERNALIZED = "compilers.p.not-externalized-att"; //$NON-NLS-1$
56	public static final String P_BUILD = "compilers.p.build"; //$NON-NLS-1$	56	public static final String P_BUILD = "compilers.p.build"; //$NON-NLS-1$
57	public static final String P_BUILD_MISSING_OUTPUT = "compilers.p.build.missing.output"; //$NON-NLS-1$	57	public static final String P_BUILD_MISSING_OUTPUT = "compilers.p.build.missing.output"; //$NON-NLS-1$
		58	public static final String P_BUILD_SOURCE_LIBRARY = "compilers.p.build.source.library"; //$NON-NLS-1$
		59	public static final String P_BUILD_OUTPUT_LIBRARY = "compilers.p.build.output.library"; //$NON-NLS-1$
		60	public static final String P_BUILD_SRC_INCLUDES = "compilers.p.build.src.includes"; //$NON-NLS-1$
		61	public static final String P_BUILD_BIN_INCLUDES = "compilers.p.build.bin.includes"; //$NON-NLS-1$
		62	public static final String P_BUILD_JAVA_COMPLIANCE = "compilers.p.build.java.compliance"; //$NON-NLS-1$
58	public static final String P_INCOMPATIBLE_ENV = "compilers.incompatible-environment"; //$NON-NLS-1$	63	public static final String P_INCOMPATIBLE_ENV = "compilers.incompatible-environment"; //$NON-NLS-1$
59	public static final String P_MISSING_EXPORT_PKGS = "compilers.p.missing-packages"; //$NON-NLS-1$	64	public static final String P_MISSING_EXPORT_PKGS = "compilers.p.missing-packages"; //$NON-NLS-1$
60	public static final String P_DEPRECATED = "compilers.p.deprecated"; //$NON-NLS-1$	65	public static final String P_DEPRECATED = "compilers.p.deprecated"; //$NON-NLS-1$




/*******************************************************************************
 * Copyright (c) 2009, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


public class SourceEntryErrorReporter extends BuildErrorReporter {

	public SourceEntryErrorReporter(IFile file) {
		super(file);
		fBuildSeverity = buildSeverity;
	}

	class ProjectFolder {


	}

	private HashMap fSourceFolderMap = new HashMap(4);
	private HashMap fOutputFolderMap = new HashMap(4);

	public void initialize(ArrayList sourceEntries, ArrayList outputEntries, IClasspathEntry[] cpes, IProject project) {


							message = NLS.bind(PDECoreMessages.BuildErrorReporter_missingFolder, outputPath.toString());
						else
							message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_InvalidOutputFolder, outputPath.toString());
						prepareError(PROPERTY_OUTPUT_PREFIX + libName, outputFolder.getToken(), message, PDEMarkerFactory.B_REMOVAL, fOututLibSeverity, PDEMarkerFactory.CAT_OTHER);
					}
				}
			} else {

								for (int k = 0; k < srcFolder.getLibs().size(); k++) {
									String libName = (String) srcFolder.getLibs().get(k);
									String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_DifferentTargetLibrary, erringSrcFolders);
									prepareError(PROPERTY_SOURCE_PREFIX + libName, srcFolder.getToken(), message, PDEMarkerFactory.NO_RESOLUTION, fSrcLibSeverity, PDEMarkerFactory.CAT_OTHER);
								}
							}
					}
				}
				for (int i = 0; i < outputFolderLibs.size(); i++) {
					String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_ExtraOutputFolder, outputFolder.getPath().toString(), PROPERTY_SOURCE_PREFIX + outputFolderLibs.get(i));
					prepareError(PROPERTY_OUTPUT_PREFIX + outputFolderLibs.get(i), outputFolder.getToken(), message, PDEMarkerFactory.B_REMOVAL, fOututLibSeverity, PDEMarkerFactory.CAT_OTHER);
				}

				if (outputFolder.getDupeLibName() != null) {
					String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_DupeOutputFolder, outputPath.toString(), PROPERTY_OUTPUT_PREFIX + outputFolder.getDupeLibName());
					prepareError(PROPERTY_OUTPUT_PREFIX + outputFolder.getDupeLibName(), outputFolder.getToken(), message, PDEMarkerFactory.NO_RESOLUTION, fOututLibSeverity, PDEMarkerFactory.CAT_OTHER);
				}
			}
		}

					String libName = (String) sourceFolder.getLibs().get(0);
					//error - missing output folder
					String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_MissingOutputEntry, sourcePath.toString(), PROPERTY_OUTPUT_PREFIX + libName);
					prepareError(PROPERTY_OUTPUT_PREFIX + libName, outputFolder.getToken(), message, PDEMarkerFactory.B_ADDDITION, fMissingOutputLibSeverity, PDEMarkerFactory.CAT_OTHER);
				}

				if (sourceFolder.getDupeLibName() != null) {
					String message = NLS.bind(PDECoreMessages.SourceEntryErrorReporter_DupeSourceFolder, sourcePath.toString(), PROPERTY_SOURCE_PREFIX + sourceFolder.getDupeLibName());
					prepareError(PROPERTY_SOURCE_PREFIX + sourceFolder.getDupeLibName(), sourceFolder.getToken(), message, PDEMarkerFactory.NO_RESOLUTION, fSrcLibSeverity, PDEMarkerFactory.CAT_OTHER);
				}
			}
		}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEUIMessages.java (-1 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 71-76 Link Here
71	public static String OrganizeManifestsProcessor_rootMessage;	71	public static String OrganizeManifestsProcessor_rootMessage;
72		72
73	public static String PDECompilersConfigurationBlock_0;	73	public static String PDECompilersConfigurationBlock_0;
		74	public static String PDECompilersConfigurationBlock_1;
		75	public static String PDECompilersConfigurationBlock_2;
		76	public static String PDECompilersConfigurationBlock_3;
		77	public static String PDECompilersConfigurationBlock_4;
		78	public static String PDECompilersConfigurationBlock_5;
74		79
75	public static String PDECompilersConfigurationBlock_general;	80	public static String PDECompilersConfigurationBlock_general;
76	public static String PDECompilersConfigurationBlock_versioning;	81	public static String PDECompilersConfigurationBlock_versioning;
Lines 79-84 Link Here
79	public static String PDECompilersConfigurationBlock_settings_changed;	84	public static String PDECompilersConfigurationBlock_settings_changed;
80	public static String PDECompilersConfigurationBlock_settings_changed_all;	85	public static String PDECompilersConfigurationBlock_settings_changed_all;
81	public static String PDECompilersConfigurationBlock_usage;	86	public static String PDECompilersConfigurationBlock_usage;
		87	public static String PDECompilersConfigurationBlock_build;
82		88
83	public static String PDEWizardNewFileCreationPage_errorMsgStartsWithDot;	89	public static String PDEWizardNewFileCreationPage_errorMsgStartsWithDot;
84		90

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/preferences/PDECompilersConfigurationBlock.java (-5 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2009 IBM Corporation and others.	2	* Copyright (c) 2008, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-18 Link Here
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.pde.internal.ui.preferences;	12	package org.eclipse.pde.internal.ui.preferences;
13		13
14	import org.eclipse.pde.internal.ui.PDEUIMessages;
15
16	import com.ibm.icu.text.MessageFormat;	14	import com.ibm.icu.text.MessageFormat;
17	import java.util.*;	15	import java.util.*;
18	import java.util.List;	16	import java.util.List;
Lines 203-208 Link Here
203	private static final Key KEY_P_NO_REQUIRED_ATT = getPDEPrefKey(CompilerFlags.P_NO_REQUIRED_ATT);	201	private static final Key KEY_P_NO_REQUIRED_ATT = getPDEPrefKey(CompilerFlags.P_NO_REQUIRED_ATT);
204	private static final Key KEY_P_BUILD = getPDEPrefKey(CompilerFlags.P_BUILD);	202	private static final Key KEY_P_BUILD = getPDEPrefKey(CompilerFlags.P_BUILD);
205	private static final Key KEY_P_BUILD_MISSING_OUTPUT = getPDEPrefKey(CompilerFlags.P_BUILD_MISSING_OUTPUT);	203	private static final Key KEY_P_BUILD_MISSING_OUTPUT = getPDEPrefKey(CompilerFlags.P_BUILD_MISSING_OUTPUT);
		204	private static final Key KEY_P_BUILD_SOURCE_LIBRARY = getPDEPrefKey(CompilerFlags.P_BUILD_SOURCE_LIBRARY);
		205	private static final Key KEY_P_BUILD_OUTPUT_LIBRARY = getPDEPrefKey(CompilerFlags.P_BUILD_OUTPUT_LIBRARY);
		206	private static final Key KEY_P_BUILD_SRC_INCLUDES = getPDEPrefKey(CompilerFlags.P_BUILD_SRC_INCLUDES);
		207	private static final Key KEY_P_BUILD_BIN_INCLUDES = getPDEPrefKey(CompilerFlags.P_BUILD_BIN_INCLUDES);
		208	private static final Key KEY_P_BUILD_JAVA_COMPLIANCE = getPDEPrefKey(CompilerFlags.P_BUILD_JAVA_COMPLIANCE);
206	private static final Key KEY_P_NOT_EXTERNALIZED = getPDEPrefKey(CompilerFlags.P_NOT_EXTERNALIZED);	209	private static final Key KEY_P_NOT_EXTERNALIZED = getPDEPrefKey(CompilerFlags.P_NOT_EXTERNALIZED);
207	private static final Key KEY_P_INCOMPATIBLE_ENV = getPDEPrefKey(CompilerFlags.P_INCOMPATIBLE_ENV);	210	private static final Key KEY_P_INCOMPATIBLE_ENV = getPDEPrefKey(CompilerFlags.P_INCOMPATIBLE_ENV);
208	private static final Key KEY_P_MISSING_EXPORT_PKGS = getPDEPrefKey(CompilerFlags.P_MISSING_EXPORT_PKGS);	211	private static final Key KEY_P_MISSING_EXPORT_PKGS = getPDEPrefKey(CompilerFlags.P_MISSING_EXPORT_PKGS);
Lines 220-226 Link Here
220		223
221	private static String[] SEVERITIES = {PDEUIMessages.PDECompilersConfigurationBlock_error, PDEUIMessages.PDECompilersConfigurationBlock_warning, PDEUIMessages.PDECompilersConfigurationBlock_ignore};	224	private static String[] SEVERITIES = {PDEUIMessages.PDECompilersConfigurationBlock_error, PDEUIMessages.PDECompilersConfigurationBlock_warning, PDEUIMessages.PDECompilersConfigurationBlock_ignore};
222		225
223	private static Key[] fgAllKeys = {KEY_F_UNRESOLVED_FEATURES, KEY_F_UNRESOLVED_PLUGINS, KEY_P_BUILD, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_INTERNAL, KEY_P_DEPRECATED, KEY_P_DISCOURAGED_CLASS, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS, KEY_P_NO_REQUIRED_ATT, KEY_P_NOT_EXTERNALIZED, KEY_P_UNKNOWN_ATTRIBUTE, KEY_P_UNKNOWN_CLASS, KEY_P_UNKNOWN_ELEMENT, KEY_P_UNKNOWN_IDENTIFIER, KEY_P_UNKNOWN_RESOURCE, KEY_P_UNRESOLVED_EX_POINTS, KEY_P_UNRESOLVED_IMPORTS, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG, KEY_P_VERSION_REQ_BUNDLE, KEY_S_CREATE_DOCS, KEY_S_DOC_FOLDER, KEY_S_OPEN_TAGS};	226	private static Key[] fgAllKeys = {KEY_F_UNRESOLVED_FEATURES, KEY_F_UNRESOLVED_PLUGINS, KEY_P_BUILD, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_BUILD_SOURCE_LIBRARY, KEY_P_BUILD_OUTPUT_LIBRARY, KEY_P_BUILD_SRC_INCLUDES, KEY_P_BUILD_BIN_INCLUDES, KEY_P_BUILD_JAVA_COMPLIANCE, KEY_P_INTERNAL, KEY_P_DEPRECATED, KEY_P_DISCOURAGED_CLASS, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS, KEY_P_NO_REQUIRED_ATT, KEY_P_NOT_EXTERNALIZED, KEY_P_UNKNOWN_ATTRIBUTE, KEY_P_UNKNOWN_CLASS, KEY_P_UNKNOWN_ELEMENT, KEY_P_UNKNOWN_IDENTIFIER, KEY_P_UNKNOWN_RESOURCE, KEY_P_UNRESOLVED_EX_POINTS, KEY_P_UNRESOLVED_IMPORTS, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG, KEY_P_VERSION_REQ_BUNDLE, KEY_S_CREATE_DOCS, KEY_S_DOC_FOLDER, KEY_S_OPEN_TAGS};
224		227
225	/**	228	/**
226	* Constant representing the {@link IDialogSettings} section for this block	229	* Constant representing the {@link IDialogSettings} section for this block
Lines 511-517 Link Here
511	scomp.setContent(sbody);	514	scomp.setContent(sbody);
512	// General	515	// General
513	Composite client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_general);	516	Composite client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_general);
514	initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_no_required_att, PDEUIMessages.CompilersConfigurationTab_buildPropertiesErrors, PDEUIMessages.PDECompilersConfigurationBlock_0, PDEUIMessages.CompilersConfigurationTab_incompatEnv, PDEUIMessages.compilers_p_exported_pkgs}, new Key[] {KEY_P_NO_REQUIRED_ATT, KEY_P_BUILD, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS}, CompilerFlags.PLUGIN_FLAGS);	517	initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_no_required_att, PDEUIMessages.CompilersConfigurationTab_incompatEnv, PDEUIMessages.compilers_p_exported_pkgs}, new Key[] {KEY_P_NO_REQUIRED_ATT, KEY_P_INCOMPATIBLE_ENV, KEY_P_MISSING_EXPORT_PKGS}, CompilerFlags.PLUGIN_FLAGS);
		518	//build.properties
		519	client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_build);
		520	initializeComboControls(client, new String[] {PDEUIMessages.CompilersConfigurationTab_buildPropertiesErrors, PDEUIMessages.PDECompilersConfigurationBlock_0, PDEUIMessages.PDECompilersConfigurationBlock_1, PDEUIMessages.PDECompilersConfigurationBlock_2, PDEUIMessages.PDECompilersConfigurationBlock_3, PDEUIMessages.PDECompilersConfigurationBlock_4, PDEUIMessages.PDECompilersConfigurationBlock_5}, new Key[] {KEY_P_BUILD, KEY_P_BUILD_MISSING_OUTPUT, KEY_P_BUILD_SOURCE_LIBRARY, KEY_P_BUILD_OUTPUT_LIBRARY, KEY_P_BUILD_SRC_INCLUDES, KEY_P_BUILD_BIN_INCLUDES, KEY_P_BUILD_JAVA_COMPLIANCE}, CompilerFlags.PLUGIN_FLAGS);
515	// Versioning	521	// Versioning
516	client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_versioning);	522	client = createExpansibleComposite(sbody, PDEUIMessages.PDECompilersConfigurationBlock_versioning);
517	initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_missing_require_bundle, PDEUIMessages.compilers_p_missing_exp_pkg, PDEUIMessages.compilers_p_missing_imp_pkg}, new Key[] {KEY_P_VERSION_REQ_BUNDLE, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG}, CompilerFlags.PLUGIN_FLAGS);	523	initializeComboControls(client, new String[] {PDEUIMessages.compilers_p_missing_require_bundle, PDEUIMessages.compilers_p_missing_exp_pkg, PDEUIMessages.compilers_p_missing_imp_pkg}, new Key[] {KEY_P_VERSION_REQ_BUNDLE, KEY_P_VERSION_EXP_PKG, KEY_P_VERSION_IMP_PKG}, CompilerFlags.PLUGIN_FLAGS);

Return to bug 291559

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (-5 / +11 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2009 IBM Corporation and others.	2	# Copyright (c) 2000, 2010 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 54-60 Link Here
54	ToggleLinkWithEditorAction_label = Lin&k with Editor	54	ToggleLinkWithEditorAction_label = Lin&k with Editor
55	ToggleLinkWithEditorAction_toolTip = Link with Editor	55	ToggleLinkWithEditorAction_toolTip = Link with Editor
56	ToggleLinkWithEditorAction_description = Link with active editorPDEMultiPageContentOutline.SortingAction.label = Sort	56	ToggleLinkWithEditorAction_description = Link with active editorPDEMultiPageContentOutline.SortingAction.label = Sort
57	PDECompilersConfigurationBlock_0=Missing &output.<library> entry:	57	PDECompilersConfigurationBlock_0=Missing output.<&library> entry:
		58	PDECompilersConfigurationBlock_1=Problems with &source.<library> entries:
		59	PDECompilersConfigurationBlock_2=Problems with output.<libr&ary> entries:
		60	PDECompilersConfigurationBlock_3=Proble&ms with binary build entry:
		61	PDECompilersConfigurationBlock_4=Problems with source buil&d entry:
		62	PDECompilersConfigurationBlock_5=Missing or incompatible &Java compliance properties:
58	PDECompilersConfigurationBlock_general=General	63	PDECompilersConfigurationBlock_general=General
59	PDECompilersConfigurationBlock_versioning=Versioning	64	PDECompilersConfigurationBlock_versioning=Versioning
60	PDECompilersConfigurationBlock_references=References	65	PDECompilersConfigurationBlock_references=References
Lines 62-67 Link Here
62	PDECompilersConfigurationBlock_settings_changed=Settings Changed	67	PDECompilersConfigurationBlock_settings_changed=Settings Changed
63	PDECompilersConfigurationBlock_settings_changed_all=Compiler settings have changed. A full build is required for the changes to take effect.\n\nDo a full build now?	68	PDECompilersConfigurationBlock_settings_changed_all=Compiler settings have changed. A full build is required for the changes to take effect.\n\nDo a full build now?
64	PDECompilersConfigurationBlock_usage=Usage	69	PDECompilersConfigurationBlock_usage=Usage
		70	PDECompilersConfigurationBlock_build=Build
65	PDEMultiPageContentOutline_SortingAction_label = Sort	71	PDEMultiPageContentOutline_SortingAction_label = Sort
66	PDEMultiPageContentOutline_SortingAction_tooltip = Sort	72	PDEMultiPageContentOutline_SortingAction_tooltip = Sort
67	PDEMultiPageContentOutline_SortingAction_description = Sorts elements in the outline	73	PDEMultiPageContentOutline_SortingAction_description = Sorts elements in the outline
Lines 1433-1441 Link Here
1433	compilers_p_unknown_resource= References to non-e&xistent resources:	1439	compilers_p_unknown_resource= References to non-e&xistent resources:
1434	compilers_p_unknown_identifier= References to non-exis&tent identifier attributes:	1440	compilers_p_unknown_identifier= References to non-exis&tent identifier attributes:
1435	compilers_p_no_required_att=Re&quired attributes not defined:	1441	compilers_p_no_required_att=Re&quired attributes not defined:
1436	compilers_p_not_externalized_att = Usage of n&on-externalized strings:	1442	compilers_p_not_externalized_att = Usage of non-externali&zed strings:
1437	compilers_p_deprecated = Usage of deprecated attributes and &elements:	1443	compilers_p_deprecated = Usage of deprecated attributes and &elements:
1438	compilers_p_internal = Usage of internal extension points:	1444	compilers_p_internal = Usage o&f internal extension points:
1439	compilers_p_exported_pkgs = Missing exported pac&kages:	1445	compilers_p_exported_pkgs = Missing exported pac&kages:
1440	compilers_p_missing_exp_pkg = Missing versions on exported packages:	1446	compilers_p_missing_exp_pkg = Missing versions on exported packages:
1441	compilers_p_missing_imp_pkg = Missing versions on imported packages:	1447	compilers_p_missing_imp_pkg = Missing versions on imported packages:
Lines 1450-1456 Link Here
1450		1456
1451	ContainerRenameParticipant_renameFolders=Rename folders referenced in plug-in manifest and build files	1457	ContainerRenameParticipant_renameFolders=Rename folders referenced in plug-in manifest and build files
1452	ContainerRenameParticipant_renameBundleId=Rename Bundle-SymbolicName	1458	ContainerRenameParticipant_renameBundleId=Rename Bundle-SymbolicName
1453	CompilersConfigurationTab_buildPropertiesErrors=Problems in &build.properties files:	1459	CompilersConfigurationTab_buildPropertiesErrors=General problems with &build.properties files:
1454	ControlValidationUtility_errorMsgNotOnClasspath=The specified class is not on the plug-in classpath	1460	ControlValidationUtility_errorMsgNotOnClasspath=The specified class is not on the plug-in classpath
1455	CompilersConfigurationBlock_building = Building Projects...	1461	CompilersConfigurationBlock_building = Building Projects...
1456	CompilersConfigurationTab_incompatEnv=Incompatible en&vironment:	1462	CompilersConfigurationTab_incompatEnv=Incompatible en&vironment: