1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Apr 14 12:23:29 2010 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Apr 14 12:31:55 2010 +0100
1.3 @@ -479,6 +479,11 @@
1.4 type parameters of {0} cannot be determined; {1}
1.5 compiler.err.invalid.inferred.types=\
1.6 invalid inferred types for {0}; {1}
1.7 +compiler.err.cant.apply.diamond=\
1.8 + cannot infer type arguments for {0}
1.9 +compiler.err.cant.apply.diamond.1=\
1.10 + cannot infer type arguments for {0};\n\
1.11 + reason: {1}
1.12 compiler.err.unreachable.stmt=\
1.13 unreachable statement
1.14 compiler.err.initializer.must.be.able.to.complete.normally=\
1.15 @@ -1030,7 +1035,12 @@
1.16 actual arguments do not conform to inferred formal arguments\n\
1.17 required: {0}\n\
1.18 found: {1}
1.19 -
1.20 +compiler.misc.diamond=\
1.21 + {0}<>
1.22 +compiler.misc.diamond.invalid.arg=\
1.23 + type argument {0} inferred for {1} is not allowed in this context
1.24 +compiler.misc.diamond.invalid.args=\
1.25 + type arguments {0} inferred for {1} are not allowed in this context
1.26 #####
1.27
1.28 ## The first argument ({0}) is a "kindname".
1.29 @@ -1163,6 +1173,8 @@
1.30 {0} in {1} implements {2} in {3}
1.31 compiler.misc.varargs.clash.with=\
1.32 {0} in {1} overrides {2} in {3}
1.33 +compiler.misc.non.denotable.type=\
1.34 + Non-denotable type {0} not allowed here
1.35
1.36 ########################################
1.37 # Diagnostics for language feature changes
