1.1 --- a/test/tools/javac/CyclicInheritance.out Tue Jul 08 18:06:19 2008 -0700
1.2 +++ b/test/tools/javac/CyclicInheritance.out Thu Jul 10 11:25:23 2008 -0700
1.3 @@ -1,25 +1,9 @@
1.4 -CyclicInheritance.java:15: cyclic inheritance involving C1
1.5 -class C1 extends C1 {} // ERROR - Cyclic inheritance
1.6 -^
1.7 -CyclicInheritance.java:17: cyclic inheritance involving C11
1.8 -class C11 extends C12 {} // ERROR - Cyclic inheritance
1.9 -^
1.10 -CyclicInheritance.java:20: cyclic inheritance involving I1
1.11 -interface I1 extends I1 {} // ERROR - Cyclic inheritance
1.12 -^
1.13 -CyclicInheritance.java:22: cyclic inheritance involving I11
1.14 -interface I11 extends I12 {} // ERROR - Cyclic inheritance
1.15 -^
1.16 -CyclicInheritance.java:27: cyclic inheritance involving C211
1.17 -class C211 implements C211.I { // ERROR - may change pending resoluation of 4087020
1.18 -^
1.19 -CyclicInheritance.java:31: cyclic inheritance involving C212
1.20 -class C212 extends C212.C { // ERROR - Cyclic inheritance, subclass cannot enclose superclass
1.21 -^
1.22 -CyclicInheritance.java:36: C221.I has private access in C221
1.23 -class C221 implements C221.I { // ERROR - Cannot access C21 (private)
1.24 - ^
1.25 -CyclicInheritance.java:40: C222.C has private access in C222
1.26 -class C222 extends C222.C { // ERROR - Cannot access C22 (private)
1.27 - ^
1.28 +CyclicInheritance.java:15:1: compiler.err.cyclic.inheritance: C1
1.29 +CyclicInheritance.java:17:1: compiler.err.cyclic.inheritance: C11
1.30 +CyclicInheritance.java:20:1: compiler.err.cyclic.inheritance: I1
1.31 +CyclicInheritance.java:22:1: compiler.err.cyclic.inheritance: I11
1.32 +CyclicInheritance.java:27:1: compiler.err.cyclic.inheritance: C211
1.33 +CyclicInheritance.java:31:1: compiler.err.cyclic.inheritance: C212
1.34 +CyclicInheritance.java:36:27: compiler.err.report.access: C221.I, private, C221
1.35 +CyclicInheritance.java:40:24: compiler.err.report.access: C222.C, private, C222
1.36 8 errors
