--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Jun 16 10:46:16 2009 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Jun 16 10:46:37 2009 +0100
@@ -84,7 +84,7 @@
{0} {1} in {4} {5} cannot be applied to given types\n\
required: {2}\n\
found: {3}
- compiler.err.cant.apply.symbol.1=\
+compiler.err.cant.apply.symbol.1=\
{0} {1} in {4} {5} cannot be applied to given types;\n\
required: {2}\n\
found: {3}\n\
@@ -469,6 +469,8 @@
type parameters of {0} cannot be determined
compiler.err.undetermined.type.1=\
type parameters of {0} cannot be determined; {1}
+compiler.err.invalid.inferred.types=\
+ invalid inferred types for {0}; {1}
compiler.err.unreachable.stmt=\
unreachable statement
compiler.err.initializer.must.be.able.to.complete.normally=\
@@ -995,7 +997,13 @@
compiler.misc.arg.length.mismatch=\
cannot instantiate from arguments because actual and formal argument lists differ in length
compiler.misc.inferred.do.not.conform.to.bounds=\
- inferred type argument(s) {0} do not conform to bounds of type variable(s) {1}
+ inferred type does not conform to declared bound(s)\n\
+ inferred: {0}\n\
+ bound(s): {1}
+compiler.misc.inferred.do.not.conform.to.params=\
+ actual arguments do not conforms to inferred formal arguments\n\
+ required: {0}\n\
+ found: {1}
#####