### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v retrieving revision 1.257 diff -u -r1.257 Main.java --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 21 Jun 2006 17:04:31 -0000 1.257 +++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 24 Jun 2006 09:24:58 -0000 @@ -535,7 +535,7 @@ if (localErrorCount == 0) { this.printlnErr("----------"); //$NON-NLS-1$ } - this.printlnErr(problem.isError() ? + this.printErr(problem.isError() ? Main.bind( "requestor.error", //$NON-NLS-1$ Integer.toString(globalErrorCount), @@ -546,7 +546,7 @@ new String(problem.getOriginatingFileName()))); try { final String errorReportSource = ((DefaultProblem) problem).errorReportSource(unitSource); - if (errorReportSource.length() != 0) this.printlnErr(errorReportSource); + this.printlnErr(errorReportSource); this.printlnErr(problem.getMessage()); } catch (Exception e) { this.printlnErr(Main.bind( #P org.eclipse.jdt.core.tests.compiler Index: src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java,v retrieving revision 1.64 diff -u -r1.64 BatchCompilerTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java 16 Jun 2006 15:22:09 -0000 1.64 +++ src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java 24 Jun 2006 09:25:01 -0000 @@ -716,8 +716,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 11)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 11)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -768,20 +767,17 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 5)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 5)\n" + " Warn warn;\n" + " ^^^^\n" + "Discouraged access: The type Warn is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + "----------\n" + - "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 6)\n" + + "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 6)\n" + " KO ko;\n" + " ^^\n" + "Access restriction: The type KO is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + "----------\n" + - "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 7)\n" + + "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 7)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1066,8 +1062,7 @@ + " -log \"" + logFileName + "\" -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 3)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 3)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1229,8 +1224,7 @@ + " -log \"" + logFileName + "\" -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 3)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 3)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1240,8 +1234,7 @@ String logContents = Util.fileContent(logFileName); String expectedLogContents = "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---" + File.separator + "X.java\n" + - " (at line 3)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---" + File.separator + "X.java (at line 3)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1278,8 +1271,7 @@ + " -log \"" + logFileName + "\" -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 3)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 3)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1289,8 +1281,7 @@ String logContents = Util.fileContent(logFileName); String expectedLogContents = "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---" + File.separator + "X.java\n" + - " (at line 3)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---" + File.separator + "X.java (at line 3)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1485,20 +1476,17 @@ + " -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 5)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 5)\n" + " Warn warn;\n" + " ^^^^\n" + "Discouraged access: The type Warn is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + "----------\n" + - "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 6)\n" + + "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 6)\n" + " KO ko;\n" + " ^^\n" + "Access restriction: The type KO is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + "----------\n" + - "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 7)\n" + + "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 7)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -1626,8 +1614,7 @@ + " -d \"" + OUTPUT_DIR + "\" ", "", "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 3)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 3)\n" + " sun.net.spi.nameservice.dns.DNSNameService dummy;\n" + " ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + "sun.net.spi.nameservice.dns cannot be resolved to a type\n" + @@ -1753,20 +1740,17 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 5)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 5)\n" + " Warn warn;\n" + " ^^^^\n" + "Discouraged access: The type Warn is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---/p1\n" + "----------\n" + - "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 6)\n" + + "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 6)\n" + " KO ko;\n" + " ^^\n" + "Access restriction: The type KO is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + "----------\n" + - "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 7)\n" + + "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 7)\n" + " Zork z;\n" + " ^^^^\n" + "Zork cannot be resolved to a type\n" + @@ -2005,32 +1989,27 @@ + " -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 25)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 25)\n" + " m1.put(p1, l1);\n" + " ^^\n" + "Type safety: The expression of type Y needs unchecked conversion to conform to Y,? extends X.XY>\n" + "----------\n" + - "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 27)\n" + + "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 27)\n" + " return l1;\n" + " ^^\n" + "Type safety: The expression of type Y needs unchecked conversion to conform to Y\n" + "----------\n" + - "3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 33)\n" + + "3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 33)\n" + " m2.put((XX) p1, p2);\n" + " ^^^^^^^^^^^^^^\n" + "Type safety: The cast from TT to X.XX is actually checking against the erased type X.XX\n" + "----------\n" + - "4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 58)\n" + + "4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 58)\n" + " final XX l1 = (XX) i.getKey();\n" + " ^^\n" + "The local variable l1 is never read\n" + "----------\n" + - "5. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 58)\n" + + "5. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 58)\n" + " final XX l1 = (XX) i.getKey();\n" + " ^^^^^^^^^^^^^^^^^^^^^^\n" + "Type safety: The cast from X.XX to X.XX is actually checking against the erased type X.XX\n" + @@ -2175,32 +2154,27 @@ + " -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 25)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 25)\n" + " m1.put(p1, l1);\n" + " ^^\n" + "Type safety: The expression of type Y needs unchecked conversion to conform to Y,? extends X.XY>\n" + "----------\n" + - "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 27)\n" + + "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 27)\n" + " return l1;\n" + " ^^\n" + "Type safety: The expression of type Y needs unchecked conversion to conform to Y\n" + "----------\n" + - "3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 33)\n" + + "3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 33)\n" + " m2.put((XX) p1, p2);\n" + " ^^^^^^^^^^^^^^\n" + "Type safety: The cast from TT to X.XX is actually checking against the erased type X.XX\n" + "----------\n" + - "4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 58)\n" + + "4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 58)\n" + " final XX l1 = (XX) i.getKey();\n" + " ^^\n" + "The local variable l1 is never read\n" + "----------\n" + - "5. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java\n" + - " (at line 58)\n" + + "5. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/p/Z.java (at line 58)\n" + " final XX l1 = (XX) i.getKey();\n" + " ^^^^^^^^^^^^^^^^^^^^^^\n" + "Type safety: The cast from X.XX to X.XX is actually checking against the erased type X.XX\n" + @@ -2324,8 +2298,7 @@ + " -d \"" + OUTPUT_DIR + File.separator + "bin2/\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java\n" + - " (at line 2)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java (at line 2)\n" + " public class Y extends p.X {\n" + " ^^^\n" + "Discouraged access: The type X is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---/bin1\n" + @@ -2354,14 +2327,12 @@ + " -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 3)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 3)\n" + " i = 0; // warning\n" + " ^\n" + "The parameter i should not be assigned\n" + "----------\n" + - "2. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 4)\n" + + "2. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 4)\n" + " j = 0; // error\n" + " ^\n" + "The final local variable j cannot be assigned. It must be blank and not using a compound assignment\n" + @@ -2405,26 +2376,22 @@ + " -d \"" + OUTPUT_DIR + File.separator + "bin2/\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java\n" + - " (at line 3)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java (at line 3)\n" + " X x1;\n" + " ^\n" + "Discouraged access: The type X is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---/bin1\n" + "----------\n" + - "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java\n" + - " (at line 4)\n" + + "2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java (at line 4)\n" + " X x2 = new X();\n" + " ^\n" + "Discouraged access: The type X is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---/bin1\n" + "----------\n" + - "3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java\n" + - " (at line 4)\n" + + "3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java (at line 4)\n" + " X x2 = new X();\n" + " ^^^^^^^^^^^^^^^\n" + "Discouraged access: The constructor X() is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---/bin1\n" + "----------\n" + - "4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java\n" + - " (at line 4)\n" + + "4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/src2/Y.java (at line 4)\n" + " X x2 = new X();\n" + " ^\n" + "Discouraged access: The type X is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---/bin1\n" + @@ -2472,8 +2439,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java\n" + - " (at line 4)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java (at line 4)\n" + " p.Z z;\n" + " ^^^\n" + "Access restriction: The type Z is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + @@ -2522,8 +2488,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java\n" + - " (at line 4)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java (at line 4)\n" + " p.Z z;\n" + " ^^^\n" + "Access restriction: The type Z is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + @@ -2572,8 +2537,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java\n" + - " (at line 3)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java (at line 3)\n" + " p.X x;\n" + " ^^^\n" + "Discouraged access: The type X is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + @@ -2644,8 +2608,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 4)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 4)\n" + " o.toString();\n" + " ^\n" + "The variable o can only be null; it was either set to null or checked for null when last used\n" + @@ -2783,8 +2746,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java\n" + - " (at line 4)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/Y.java (at line 4)\n" + " p.X x;\n" + " ^^^\n" + "Discouraged access: The type X is not accessible due to restriction on classpath entry ---OUTPUT_DIR_PLACEHOLDER---\n" + @@ -2874,8 +2836,7 @@ + " -proceedOnError -referenceInfo -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 7)\n" + + "1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 7)\n" + " case 1:\n" + " ^^^^^^\n" + "Switch case may be entered by falling through previous case\n" + @@ -2922,35 +2883,30 @@ + " -d \"" + OUTPUT_DIR + "\"", "", "----------\n" + - "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java\n" + - " (at line 5)\n" + + "1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 5)\n" + " return new Bar(5);\n" + " ^^^^^^^^^^\n" + "The constructor Bar(int) is undefined\n" + "----------\n" + "----------\n" + - "2. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java\n" + - " (at line 2)\n" + + "2. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java (at line 2)\n" + " { \n" + " ^\n" + "Syntax error, insert \"}\" to complete ClassBody\n" + "----------\n" + - "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java\n" + - " (at line 3)\n" + + "3. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java (at line 3)\n" + " Bar(int class) \n" + " ^^^^^\n" + "Syntax error on token \"class\", invalid VariableDeclaratorId\n" + "----------\n" + - "4. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java\n" + - " (at line 3)\n" + + "4. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java (at line 3)\n" + " Bar(int class) \n" + " { \n" + " } \n" + " ^^^^^^^^^^^^^^^^\n" + "Syntax error on tokens, delete these tokens\n" + "----------\n" + - "5. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java\n" + - " (at line 6)\n" + + "5. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/Bar.java (at line 6)\n" + " }\n" + " ^\n" + "Syntax error on token \"}\", delete this token\n" +