1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Nov 08 17:06:08 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Nov 08 17:06:58 2011 -0800
1.3 @@ -792,7 +792,7 @@
1.4 compiler.err.cant.apply.diamond=\
1.5 cannot infer type arguments for {0}
1.6
1.7 -# 0: message segment, 1: message segment
1.8 +# 0: message segment or type, 1: message segment
1.9 compiler.err.cant.apply.diamond.1=\
1.10 cannot infer type arguments for {0};\n\
1.11 reason: {1}
1.12 @@ -854,7 +854,7 @@
1.13 compiler.misc.varargs.trustme.on.virtual.varargs=\
1.14 Instance method {0} is not final.
1.15
1.16 -# 0: type, 1: kind, 2: symbol
1.17 +# 0: type, 1: symbol kind, 2: symbol
1.18 compiler.misc.inaccessible.varargs.type=\
1.19 formal varargs element type {0} is not accessible from {1} {2}
1.20
1.21 @@ -1631,6 +1631,7 @@
1.22 compiler.misc.diamond.non.generic=\
1.23 cannot use ''<>'' with non-generic class {0}
1.24
1.25 +# 0: unused
1.26 compiler.misc.diamond.and.explicit.params=\
1.27 cannot use ''<>'' with explicit type parameters for constructor
1.28
1.29 @@ -1712,7 +1713,7 @@
1.30 ## The second argument {1} is the location name
1.31 ## The third argument {2} is the location type (only when {1} is a variable name)
1.32
1.33 -# 0: symbol kind, 1: symbol, 2: unused
1.34 +# 0: symbol kind, 1: type or symbol, 2: unused
1.35 compiler.misc.location=\
1.36 {0} {1}
1.37
1.38 @@ -1847,6 +1848,7 @@
1.39 compiler.misc.varargs.clash.with=\
1.40 {0} in {1} overrides {2} in {3}
1.41
1.42 +# 0: unused
1.43 compiler.misc.diamond.and.anon.class=\
1.44 cannot use ''<>'' with anonymous inner classes
1.45
