1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Feb 07 18:09:46 2011 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Feb 07 18:10:13 2011 +0000
1.3 @@ -521,10 +521,20 @@
1.4 compiler.err.name.clash.same.erasure=\
1.5 name clash: {0} and {1} have the same erasure
1.6
1.7 -# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.8 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol, 4: unused, 5: unused
1.9 compiler.err.name.clash.same.erasure.no.override=\
1.10 name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither overrides the other
1.11
1.12 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol, 4: symbol, 5: symbol
1.13 +compiler.err.name.clash.same.erasure.no.override.1=\
1.14 + name clash: {0} in {1} overrides a method whose erasure is the same as another method, yet neither overrides the other\n\
1.15 + first method: {2} in {3}\n\
1.16 + second method: {4} in {5}
1.17 +
1.18 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.19 +compiler.err.name.clash.same.erasure.no.hide=\
1.20 + name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither hides the other
1.21 +
1.22 compiler.err.name.reserved.for.internal.use=\
1.23 {0} is reserved for internal use
1.24
