1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sat Sep 18 09:54:51 2010 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sat Sep 18 09:56:23 2010 -0700
1.3 @@ -93,6 +93,8 @@
1.4 required: {2}\n\
1.5 found: {3}\n\
1.6 reason: {6}
1.7 +compiler.err.cant.apply.symbols=\
1.8 + no suitable {0} found for {1}({2})
1.9 compiler.err.cant.assign.val.to.final.var=\
1.10 cannot assign a value to final variable {0}
1.11 compiler.err.cant.deref=\
1.12 @@ -1075,11 +1077,11 @@
1.13 no unique maximal instance exists for type variable {0} with upper bounds {1}
1.14 compiler.misc.no.unique.minimal.instance.exists=\
1.15 no unique minimal instance exists for type variable {0} with lower bounds {1}
1.16 -compiler.misc.no.conforming.instance.exists=\
1.17 +compiler.misc.infer.no.conforming.instance.exists=\
1.18 no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
1.19 -compiler.misc.no.conforming.assignment.exists=\
1.20 +compiler.misc.infer.no.conforming.assignment.exists=\
1.21 no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
1.22 -compiler.misc.arg.length.mismatch=\
1.23 +compiler.misc.infer.arg.length.mismatch=\
1.24 cannot instantiate from arguments because actual and formal argument lists differ in length
1.25 compiler.misc.inferred.do.not.conform.to.bounds=\
1.26 inferred type does not conform to declared bound(s)\n\
1.27 @@ -1095,6 +1097,16 @@
1.28 type argument {0} inferred for {1} is not allowed in this context
1.29 compiler.misc.diamond.invalid.args=\
1.30 type arguments {0} inferred for {1} are not allowed in this context
1.31 +
1.32 +compiler.misc.explicit.param.do.not.conform.to.bounds=\
1.33 + explicit type argument {0} does not conform to declared bound(s) {1}
1.34 +
1.35 +compiler.misc.arg.length.mismatch=\
1.36 + actual and formal argument lists differ in length
1.37 +compiler.misc.no.conforming.assignment.exists=\
1.38 + actual argument {0} cannot be converted to {1} by method invocation conversion
1.39 +compiler.misc.varargs.argument.mismatch=\
1.40 + argument type {0} does not conform to vararg element type {1}
1.41 #####
1.42
1.43 ## The first argument ({0}) is a "kindname".
1.44 @@ -1232,6 +1244,10 @@
1.45 compiler.misc.non.denotable.type=\
1.46 Non-denotable type {0} not allowed here
1.47
1.48 +compiler.misc.inapplicable.method=\
1.49 + {0} {1}.{2} is not applicable\n\
1.50 + ({3})
1.51 +
1.52 ########################################
1.53 # Diagnostics for language feature changes
1.54 ########################################
