Attachment #154812 for bug #296998

Lines 25-30 Link Here

(-)src/org/eclipse/jdt/internal/compiler/tool/Options.java (+1 lines)
25	ZERO_ARGUMENT_OPTIONS = new HashSet<String>();	25	ZERO_ARGUMENT_OPTIONS = new HashSet<String>();
26	Options.ZERO_ARGUMENT_OPTIONS.add("-progress");//$NON-NLS-1$	26	Options.ZERO_ARGUMENT_OPTIONS.add("-progress");//$NON-NLS-1$
27	Options.ZERO_ARGUMENT_OPTIONS.add("-proceedOnError");//$NON-NLS-1$	27	Options.ZERO_ARGUMENT_OPTIONS.add("-proceedOnError");//$NON-NLS-1$
		28	Options.ZERO_ARGUMENT_OPTIONS.add("-proceedOnError:Fatal");//$NON-NLS-1$
28	Options.ZERO_ARGUMENT_OPTIONS.add("-time");//$NON-NLS-1$	29	Options.ZERO_ARGUMENT_OPTIONS.add("-time");//$NON-NLS-1$
29	Options.ZERO_ARGUMENT_OPTIONS.add("-v");//$NON-NLS-1$	30	Options.ZERO_ARGUMENT_OPTIONS.add("-v");//$NON-NLS-1$
30	Options.ZERO_ARGUMENT_OPTIONS.add("-version");//$NON-NLS-1$	31	Options.ZERO_ARGUMENT_OPTIONS.add("-version");//$NON-NLS-1$

Lines 109-114 Link Here

(-)src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java (+1 lines)
109	"-X",	109	"-X",
110	"-O",	110	"-O",
111	"-proceedOnError",	111	"-proceedOnError",
		112	"-proceedOnError:Fatal",
112	"-verbose",	113	"-verbose",
113	"-referenceInfo",	114	"-referenceInfo",
114	"-progress",	115	"-progress",




					this.showProgress = true;
					continue;
				}
				if (currentArg.startsWith("-proceedOnError")) { //$NON-NLS-1$
					mode = DEFAULT;
					int length = currentArg.length();
					if (length > 15) {
						if (currentArg.equals("-proceedOnError:Fatal")) { //$NON-NLS-1$
							this.options.put(CompilerOptions.OPTION_FatalOptionalError, CompilerOptions.ENABLED);
						} else {
							throw new IllegalArgumentException(
									this.bind("configure.invalidWarningConfiguration", currentArg)); //$NON-NLS-1$
						}
					} else {
						this.options.put(CompilerOptions.OPTION_FatalOptionalError, CompilerOptions.DISABLED);
					}
					this.proceedOnError = true;
					continue;
				}

Lines 215-222 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/messages.properties (-1 / +3 lines)
215	\ default)\n\	215	\ default)\n\
216	\ -log <file> log to a file. If the file extension is ''.xml'', then\n\	216	\ -log <file> log to a file. If the file extension is ''.xml'', then\n\
217	\ the log will be a xml file.\n\	217	\ the log will be a xml file.\n\
218	\ -proceedOnError do not stop at first error, dumping class files with\n\	218	\ -proceedOnError[:Fatal]\n\
		219	\ do not stop at first error, dumping class files with\n\
219	\ problem methods\n\	220	\ problem methods\n\
		221	\ With ":Fatal", all optional errors are treated as fatal\n\
220	\ -verbose enable verbose output\n\	222	\ -verbose enable verbose output\n\
221	\ -referenceInfo compute reference info\n\	223	\ -referenceInfo compute reference info\n\
222	\ -progress show progress (only in -log mode)\n\	224	\ -progress show progress (only in -log mode)\n\




	if (index > 0) {
		// the string already exists inside the constant pool
		// we reuse the same index
		ldcForIndex(index);
	} else {
		// the string is too big to be utf8-encoded in one pass.
		// we have to split it into different pieces.

		System.arraycopy(constantChars, 0, subChars, 0, i);
		System.arraycopy(utf8encoding, 0, utf8encoding = new byte[length], 0, length);
		index = this.constantPool.literalIndex(subChars, utf8encoding);
		ldcForIndex(index);
		// write the remaining part
		invokeStringConcatenationStringConstructor();
		while (i < constantLength) {

			System.arraycopy(constantChars, startIndex, subChars, 0, newCharLength);
			System.arraycopy(utf8encoding, 0, utf8encoding = new byte[length], 0, length);
			index = this.constantPool.literalIndex(subChars, utf8encoding);
			ldcForIndex(index);
			// now on the stack it should be a StringBuffer and a string.
			invokeStringConcatenationAppendForType(TypeIds.T_JavaLangString);
		}

	writeUnsignedShort(index);
}

public void ldcForIndex(int index) {
	this.stackDepth++;
	if (this.stackDepth > this.stackMax) {
		this.stackMax = this.stackDepth;

Lines 1006-1013 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java (-2 / +2 lines)
1006	// suppress warning annotation	1006	// suppress warning annotation
1007	this.suppressWarnings = true;	1007	this.suppressWarnings = true;
1008		1008
1009	// treat optional error as fatal or just like warning?	1009	// treat optional error as non fatal
1010	this.treatOptionalErrorAsFatal = true;	1010	this.treatOptionalErrorAsFatal = false;
1011		1011
1012	// parser perform statements recovery	1012	// parser perform statements recovery
1013	this.performMethodsFullRecovery = true;	1013	this.performMethodsFullRecovery = true;

Lines 14247-14252 Link Here

(-)Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java (+7 lines)
14247	public void test382() {	14247	public void test382() {
14248	Map customOptions = getCompilerOptions();	14248	Map customOptions = getCompilerOptions();
14249	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);	14249	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);
		14250	customOptions.put(CompilerOptions.OPTION_ReportDeadCode, CompilerOptions.IGNORE);
14250	runNegativeTest(	14251	runNegativeTest(
14251	true,	14252	true,
14252	new String[] {	14253	new String[] {
Lines 14303-14308 Link Here
14303	public void test386() {	14304	public void test386() {
14304	Map customOptions = getCompilerOptions();	14305	Map customOptions = getCompilerOptions();
14305	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);	14306	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);
		14307	customOptions.put(CompilerOptions.OPTION_ReportDeadCode, CompilerOptions.IGNORE);
		14308	customOptions.put(CompilerOptions.OPTION_ReportDeadCodeInTrivialIfStatement, CompilerOptions.IGNORE);
14306	runNegativeTest(	14309	runNegativeTest(
14307	true,	14310	true,
14308	new String[] {	14311	new String[] {
Lines 14528-14533 Link Here
14528	public void test392() {	14531	public void test392() {
14529	Map customOptions = getCompilerOptions();	14532	Map customOptions = getCompilerOptions();
14530	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);	14533	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);
		14534	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.IGNORE);
14531	runNegativeTest(	14535	runNegativeTest(
14532	true,	14536	true,
14533	new String[] {	14537	new String[] {
Lines 14582-14587 Link Here
14582	public void test394() {	14586	public void test394() {
14583	Map customOptions = getCompilerOptions();	14587	Map customOptions = getCompilerOptions();
14584	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);	14588	customOptions.put(CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, CompilerOptions.ERROR);
		14589	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
		14590	customOptions.put(CompilerOptions.OPTION_ReportPotentialNullReference, CompilerOptions.IGNORE);
14585	runNegativeTest(	14591	runNegativeTest(
14586	true,	14592	true,
14587	new String[] {	14593	new String[] {
Lines 14811-14816 Link Here
14811	public void test401() {	14817	public void test401() {
14812	Map customOptions = getCompilerOptions();	14818	Map customOptions = getCompilerOptions();
14813	customOptions.put(CompilerOptions.OPTION_ReportUnqualifiedFieldAccess, CompilerOptions.ERROR);	14819	customOptions.put(CompilerOptions.OPTION_ReportUnqualifiedFieldAccess, CompilerOptions.ERROR);
		14820	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.IGNORE);
14814	runNegativeTest(	14821	runNegativeTest(
14815	true,	14822	true,
14816	new String[] {	14823	new String[] {




			);

		fullBuild();
		expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/*

			);

		incrementalBuild();
		expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/*

			);

		fullBuild();
		expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$

		//----------------------------
		//           Step 2

			);

		fullBuild();
		expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/*

			);

		incrementalBuild();
		expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/*

			);

		fullBuild();
		expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$

		//----------------------------
		//           Step 2

Lines 1909-1914 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java (+2 lines)
1909	" if ((i = 3) != i) {\n" +	1909	" if ((i = 3) != i) {\n" +
1910	" System.out.println(\"The second warning is just.\");\n" +	1910	" System.out.println(\"The second warning is just.\");\n" +
1911	" }\n" +	1911	" }\n" +
		1912	" return false;\n" +
1912	" }\n" +	1913	" }\n" +
1913	"}"	1914	"}"
1914	},	1915	},
Lines 1939-1944 Link Here
1939	" if ((s = \"\") != s) {\n" +	1940	" if ((s = \"\") != s) {\n" +
1940	" System.out.println(\"The second warning is just.\");\n" +	1941	" System.out.println(\"The second warning is just.\");\n" +
1941	" }\n" +	1942	" }\n" +
		1943	" return false;\n" +
1942	" }\n" +	1944	" }\n" +
1943	"}"	1945	"}"
1944	},	1946	},

Lines 110-115 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/Deprecated15Test.java (+1 lines)
110	public void test002() {	110	public void test002() {
111	Map customOptions = new HashMap();	111	Map customOptions = new HashMap();
112	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);	112	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
		113	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
113	this.runNegativeTest(	114	this.runNegativeTest(
114	true,	115	true,
115	new String[] {	116	new String[] {




public void test015() {
	Map customOptions = new HashMap();
	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
	runNegativeTest(
		// test directory preparation
		true /* flush output directory */,

public void test016() {
	Map customOptions = new HashMap();
	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
	runNegativeTest(
		// test directory preparation
		true /* flush output directory */,

	Map customOptions = new HashMap();
	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
	customOptions.put(CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, CompilerOptions.ERROR);
	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
	this.runConformTest(
		new String[] {
			"a/N1.java",

Lines 531-536 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/ExternalizeStringLiteralsTest.java (+1 lines)
531	public void test016() {	531	public void test016() {
532	Map customOptions = getCompilerOptions();	532	Map customOptions = getCompilerOptions();
533	customOptions.put(CompilerOptions.OPTION_ReportNonExternalizedStringLiteral, CompilerOptions.ERROR);	533	customOptions.put(CompilerOptions.OPTION_ReportNonExternalizedStringLiteral, CompilerOptions.ERROR);
		534	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.IGNORE);
534	runNegativeTest(	535	runNegativeTest(
535	// test directory preparation	536	// test directory preparation
536	true /* flush output directory */,	537	true /* flush output directory */,

Lines 669-674 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/FlowAnalysisTest.java (+1 lines)
669	public void test022() {	669	public void test022() {
670	Map options = getCompilerOptions();	670	Map options = getCompilerOptions();
671	options.put(CompilerOptions.OPTION_ReportEmptyStatement, CompilerOptions.ERROR);	671	options.put(CompilerOptions.OPTION_ReportEmptyStatement, CompilerOptions.ERROR);
		672	options.put(CompilerOptions.OPTION_ReportDeadCode, CompilerOptions.IGNORE);
672	runNegativeTest(	673	runNegativeTest(
673	// test directory preparation	674	// test directory preparation
674	true /* flush output directory */,	675	true /* flush output directory */,

Lines 8084-8090 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java (-1 / +1 lines)
8084	"X.java",	8084	"X.java",
8085	"class X {\n" +	8085	"class X {\n" +
8086	" /** @see #o */\n" +	8086	" /** @see #o */\n" +
8087	" public Object foo(Object o) {}\n" +	8087	" public Object foo(Object o) { return null; }\n" +
8088	"}\n"	8088	"}\n"
8089	},	8089	},
8090	"----------\n" +	8090	"----------\n" +

Lines 1014-1020 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java (-2 / +2 lines)
1014	" * </ul>\n" +	1014	" * </ul>\n" +
1015	" */\n" +	1015	" */\n" +
1016	"public interface X extends Map {\n" +	1016	"public interface X extends Map {\n" +
1017	" int i;\n" +	1017	" int i = 0;\n" +
1018	"}\n",	1018	"}\n",
1019	},	1019	},
1020	"----------\n" +	1020	"----------\n" +
Lines 1086-1092 Link Here
1086	" * </ul>\n" +	1086	" * </ul>\n" +
1087	" */\n" +	1087	" */\n" +
1088	"public interface X extends Map {\n" +	1088	"public interface X extends Map {\n" +
1089	" Entry e;\n" +	1089	" Entry e = null;\n" +
1090	"}\n",	1090	"}\n",
1091	},	1091	},
1092	"----------\n" +	1092	"----------\n" +

Lines 71-76 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java (+1 lines)
71	options.put(CompilerOptions.OPTION_ReportSyntheticAccessEmulation, CompilerOptions.IGNORE);	71	options.put(CompilerOptions.OPTION_ReportSyntheticAccessEmulation, CompilerOptions.IGNORE);
72	options.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);	72	options.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
73	options.put(CompilerOptions.OPTION_ReportUnusedImport, CompilerOptions.ERROR);	73	options.put(CompilerOptions.OPTION_ReportUnusedImport, CompilerOptions.ERROR);
		74	options.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.IGNORE);
74	return options;	75	return options;
75	}	76	}
76	/* (non-Javadoc)	77	/* (non-Javadoc)




		String src =
			"package p;\n" +
			"public class Y extends X2 {\n" +
			"	int foobar() {\n" +
			"		int l1 = m1; // accesses X1.m1, should trigger an error\n" +
			"		char l2 = m2; // accesses X2.m2, OK\n" +
			"		return l1 + l2;\n" +
			"	}\n" +
			"}";
		this.problemRequestor = new ProblemRequestor(src);

			"	   }\n" +
			"	}\n" +
			"	class C3c extends C2 implements I2 {}\n" +
			"	String foobar() {\n" +
			"		C1 m1 =                 // error\n" +
			"		        new C1(0);      // error\n" +
			"		C2 m2 = new C2();\n" +
			"		return m1.toString() + m2.toString();\n" +
			"	}\n" +
			"}";
		this.problemRequestor = new ProblemRequestor(src);

		String src =
			"package p;\n" +
			"public class Y extends X2 {\n" +
			"	int foobar() {\n" +
			"		int l1 = m1; // accesses X1.m1, should trigger an error\n" +
			"		char l2 = m2; // accesses X2.m2, OK\n" +
			"		return l1 + l2;\n" +
			"	}\n" +
			"}";
		this.problemRequestor = new ProblemRequestor(src);

			"	   }\n" +
			"	}\n" +
			"	class C3c extends C2 implements I2 {}\n" +
			"	String foobar() {\n" +
			"		C1 m1 =                 // error\n" +
			"		        new C1(0);      // error\n" +
			"		C2 m2 = new C2();\n" +
			"		return m1.toString() + m2.toString();\n" +
			"	}\n" +
			"}";
		this.problemRequestor = new ProblemRequestor(src);

Return to bug 296998

Lines 2023-2030 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/Main.java (-1 / +12 lines)
2023	this.showProgress = true;	2023	this.showProgress = true;
2024	continue;	2024	continue;
2025	}	2025	}
2026	if (currentArg.equals("-proceedOnError")) { //$NON-NLS-1$	2026	if (currentArg.startsWith("-proceedOnError")) { //$NON-NLS-1$
2027	mode = DEFAULT;	2027	mode = DEFAULT;
		2028	int length = currentArg.length();
		2029	if (length > 15) {
		2030	if (currentArg.equals("-proceedOnError:Fatal")) { //$NON-NLS-1$
		2031	this.options.put(CompilerOptions.OPTION_FatalOptionalError, CompilerOptions.ENABLED);
		2032	} else {
		2033	throw new IllegalArgumentException(
		2034	this.bind("configure.invalidWarningConfiguration", currentArg)); //$NON-NLS-1$
		2035	}
		2036	} else {
		2037	this.options.put(CompilerOptions.OPTION_FatalOptionalError, CompilerOptions.DISABLED);
		2038	}
2028	this.proceedOnError = true;	2039	this.proceedOnError = true;
2029	continue;	2040	continue;
2030	}	2041	}

Lines 4904-4910 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java (-4 / +4 lines)
4904	if (index > 0) {	4904	if (index > 0) {
4905	// the string already exists inside the constant pool	4905	// the string already exists inside the constant pool
4906	// we reuse the same index	4906	// we reuse the same index
4907	ldcForIndex(index, constantChars);	4907	ldcForIndex(index);
4908	} else {	4908	} else {
4909	// the string is too big to be utf8-encoded in one pass.	4909	// the string is too big to be utf8-encoded in one pass.
4910	// we have to split it into different pieces.	4910	// we have to split it into different pieces.
Lines 4949-4955 Link Here
4949	System.arraycopy(constantChars, 0, subChars, 0, i);	4949	System.arraycopy(constantChars, 0, subChars, 0, i);
4950	System.arraycopy(utf8encoding, 0, utf8encoding = new byte[length], 0, length);	4950	System.arraycopy(utf8encoding, 0, utf8encoding = new byte[length], 0, length);
4951	index = this.constantPool.literalIndex(subChars, utf8encoding);	4951	index = this.constantPool.literalIndex(subChars, utf8encoding);
4952	ldcForIndex(index, subChars);	4952	ldcForIndex(index);
4953	// write the remaining part	4953	// write the remaining part
4954	invokeStringConcatenationStringConstructor();	4954	invokeStringConcatenationStringConstructor();
4955	while (i < constantLength) {	4955	while (i < constantLength) {
Lines 4986-4992 Link Here
4986	System.arraycopy(constantChars, startIndex, subChars, 0, newCharLength);	4986	System.arraycopy(constantChars, startIndex, subChars, 0, newCharLength);
4987	System.arraycopy(utf8encoding, 0, utf8encoding = new byte[length], 0, length);	4987	System.arraycopy(utf8encoding, 0, utf8encoding = new byte[length], 0, length);
4988	index = this.constantPool.literalIndex(subChars, utf8encoding);	4988	index = this.constantPool.literalIndex(subChars, utf8encoding);
4989	ldcForIndex(index, subChars);	4989	ldcForIndex(index);
4990	// now on the stack it should be a StringBuffer and a string.	4990	// now on the stack it should be a StringBuffer and a string.
4991	invokeStringConcatenationAppendForType(TypeIds.T_JavaLangString);	4991	invokeStringConcatenationAppendForType(TypeIds.T_JavaLangString);
4992	}	4992	}
Lines 5050-5056 Link Here
5050	writeUnsignedShort(index);	5050	writeUnsignedShort(index);
5051	}	5051	}
5052		5052
5053	public void ldcForIndex(int index, char[] constant) {	5053	public void ldcForIndex(int index) {
5054	this.stackDepth++;	5054	this.stackDepth++;
5055	if (this.stackDepth > this.stackMax) {	5055	if (this.stackDepth > this.stackMax) {
5056	this.stackMax = this.stackDepth;	5056	this.stackMax = this.stackDepth;

Lines 991-997 Link Here

(-)src/org/eclipse/jdt/core/tests/builder/MultiProjectTests.java (-6 / +6 lines)
991	);	991	);
992		992
993	fullBuild();	993	fullBuild();
994	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_TYPE, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$	994	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
995	}	995	}
996		996
997	/*	997	/*
Lines 1042-1048 Link Here
1042	);	1042	);
1043		1043
1044	incrementalBuild();	1044	incrementalBuild();
1045	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_TYPE, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$	1045	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
1046	}	1046	}
1047		1047
1048	/*	1048	/*
Lines 1086-1092 Link Here
1086	);	1086	);
1087		1087
1088	fullBuild();	1088	fullBuild();
1089	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_TYPE, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$	1089	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
1090		1090
1091	//----------------------------	1091	//----------------------------
1092	// Step 2	1092	// Step 2
Lines 1136-1142 Link Here
1136	);	1136	);
1137		1137
1138	fullBuild();	1138	fullBuild();
1139	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_TYPE, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$	1139	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
1140	}	1140	}
1141		1141
1142	/*	1142	/*
Lines 1187-1193 Link Here
1187	);	1187	);
1188		1188
1189	incrementalBuild();	1189	incrementalBuild();
1190	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_TYPE, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$	1190	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
1191	}	1191	}
1192		1192
1193	/*	1193	/*
Lines 1231-1237 Link Here
1231	);	1231	);
1232		1232
1233	fullBuild();	1233	fullBuild();
1234	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_TYPE, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$	1234	expectingSpecificProblemFor(project2Path, new Problem("", "Access restriction: The type B is not accessible due to restriction on required project Project1", d, 23, 35, CategorizedProblem.CAT_RESTRICTION, IMarker.SEVERITY_ERROR)); //$NON-NLS-1$ //$NON-NLS-2$
1235		1235
1236	//----------------------------	1236	//----------------------------
1237	// Step 2	1237	// Step 2

Lines 563-568 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/DeprecatedTest.java (+3 lines)
563	public void test015() {	563	public void test015() {
564	Map customOptions = new HashMap();	564	Map customOptions = new HashMap();
565	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);	565	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
		566	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
566	runNegativeTest(	567	runNegativeTest(
567	// test directory preparation	568	// test directory preparation
568	true /* flush output directory */,	569	true /* flush output directory */,
Lines 614-619 Link Here
614	public void test016() {	615	public void test016() {
615	Map customOptions = new HashMap();	616	Map customOptions = new HashMap();
616	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);	617	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
		618	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
617	runNegativeTest(	619	runNegativeTest(
618	// test directory preparation	620	// test directory preparation
619	true /* flush output directory */,	621	true /* flush output directory */,
Lines 699-704 Link Here
699	Map customOptions = new HashMap();	701	Map customOptions = new HashMap();
700	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);	702	customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
701	customOptions.put(CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, CompilerOptions.ERROR);	703	customOptions.put(CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, CompilerOptions.ERROR);
		704	customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
702	this.runConformTest(	705	this.runConformTest(
703	new String[] {	706	new String[] {
704	"a/N1.java",	707	"a/N1.java",

Lines 230-238 Link Here

(-)src/org/eclipse/jdt/core/tests/model/AccessRestrictionsTests.java (-4 / +8 lines)
230	String src =	230	String src =
231	"package p;\n" +	231	"package p;\n" +
232	"public class Y extends X2 {\n" +	232	"public class Y extends X2 {\n" +
233	" void foobar() {\n" +	233	" int foobar() {\n" +
234	" int l1 = m1; // accesses X1.m1, should trigger an error\n" +	234	" int l1 = m1; // accesses X1.m1, should trigger an error\n" +
235	" char l2 = m2; // accesses X2.m2, OK\n" +	235	" char l2 = m2; // accesses X2.m2, OK\n" +
		236	" return l1 + l2;\n" +
236	" }\n" +	237	" }\n" +
237	"}";	238	"}";
238	this.problemRequestor = new ProblemRequestor(src);	239	this.problemRequestor = new ProblemRequestor(src);
Lines 321-330 Link Here
321	" }\n" +	322	" }\n" +
322	" }\n" +	323	" }\n" +
323	" class C3c extends C2 implements I2 {}\n" +	324	" class C3c extends C2 implements I2 {}\n" +
324	" void foobar() {\n" +	325	" String foobar() {\n" +
325	" C1 m1 = // error\n" +	326	" C1 m1 = // error\n" +
326	" new C1(0); // error\n" +	327	" new C1(0); // error\n" +
327	" C2 m2 = new C2();\n" +	328	" C2 m2 = new C2();\n" +
		329	" return m1.toString() + m2.toString();\n" +
328	" }\n" +	330	" }\n" +
329	"}";	331	"}";
330	this.problemRequestor = new ProblemRequestor(src);	332	this.problemRequestor = new ProblemRequestor(src);
Lines 865-873 Link Here
865	String src =	867	String src =
866	"package p;\n" +	868	"package p;\n" +
867	"public class Y extends X2 {\n" +	869	"public class Y extends X2 {\n" +
868	" void foobar() {\n" +	870	" int foobar() {\n" +
869	" int l1 = m1; // accesses X1.m1, should trigger an error\n" +	871	" int l1 = m1; // accesses X1.m1, should trigger an error\n" +
870	" char l2 = m2; // accesses X2.m2, OK\n" +	872	" char l2 = m2; // accesses X2.m2, OK\n" +
		873	" return l1 + l2;\n" +
871	" }\n" +	874	" }\n" +
872	"}";	875	"}";
873	this.problemRequestor = new ProblemRequestor(src);	876	this.problemRequestor = new ProblemRequestor(src);
Lines 963-972 Link Here
963	" }\n" +	966	" }\n" +
964	" }\n" +	967	" }\n" +
965	" class C3c extends C2 implements I2 {}\n" +	968	" class C3c extends C2 implements I2 {}\n" +
966	" void foobar() {\n" +	969	" String foobar() {\n" +
967	" C1 m1 = // error\n" +	970	" C1 m1 = // error\n" +
968	" new C1(0); // error\n" +	971	" new C1(0); // error\n" +
969	" C2 m2 = new C2();\n" +	972	" C2 m2 = new C2();\n" +
		973	" return m1.toString() + m2.toString();\n" +
970	" }\n" +	974	" }\n" +
971	"}";	975	"}";
972	this.problemRequestor = new ProblemRequestor(src);	976	this.problemRequestor = new ProblemRequestor(src);

Lines 1584-1591 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java (-3 / +5 lines)
1584	" default)\n" +	1584	" default)\n" +
1585	" -log <file> log to a file. If the file extension is ''.xml'', then\n" +	1585	" -log <file> log to a file. If the file extension is ''.xml'', then\n" +
1586	" the log will be a xml file.\n" +	1586	" the log will be a xml file.\n" +
1587	" -proceedOnError do not stop at first error, dumping class files with\n" +	1587	" -proceedOnError[:Fatal]\n" +
1588	" problem methods\n" +	1588	" do not stop at first error, dumping class files with\n" +
		1589	" problem methods\n" +
		1590	" With \":Fatal\", all optional errors are treated as fatal\n" +
1589	" -verbose enable verbose output\n" +	1591	" -verbose enable verbose output\n" +
1590	" -referenceInfo compute reference info\n" +	1592	" -referenceInfo compute reference info\n" +
1591	" -progress show progress (only in -log mode)\n" +	1593	" -progress show progress (only in -log mode)\n" +
Lines 1796-1802 Link Here
1796	" <option key=\"org.eclipse.jdt.core.compiler.problem.emptyStatement\" value=\"ignore\"/>\n" +	1798	" <option key=\"org.eclipse.jdt.core.compiler.problem.emptyStatement\" value=\"ignore\"/>\n" +
1797	" <option key=\"org.eclipse.jdt.core.compiler.problem.enumIdentifier\" value=\"warning\"/>\n" +	1799	" <option key=\"org.eclipse.jdt.core.compiler.problem.enumIdentifier\" value=\"warning\"/>\n" +
1798	" <option key=\"org.eclipse.jdt.core.compiler.problem.fallthroughCase\" value=\"ignore\"/>\n" +	1800	" <option key=\"org.eclipse.jdt.core.compiler.problem.fallthroughCase\" value=\"ignore\"/>\n" +
1799	" <option key=\"org.eclipse.jdt.core.compiler.problem.fatalOptionalError\" value=\"enabled\"/>\n" +	1801	" <option key=\"org.eclipse.jdt.core.compiler.problem.fatalOptionalError\" value=\"disabled\"/>\n" +
1800	" <option key=\"org.eclipse.jdt.core.compiler.problem.fieldHiding\" value=\"ignore\"/>\n" +	1802	" <option key=\"org.eclipse.jdt.core.compiler.problem.fieldHiding\" value=\"ignore\"/>\n" +
1801	" <option key=\"org.eclipse.jdt.core.compiler.problem.finalParameterBound\" value=\"warning\"/>\n" +	1803	" <option key=\"org.eclipse.jdt.core.compiler.problem.finalParameterBound\" value=\"warning\"/>\n" +
1802	" <option key=\"org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally\" value=\"warning\"/>\n" +	1804	" <option key=\"org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally\" value=\"warning\"/>\n" +