1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jul 24 11:12:41 2008 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jul 24 19:06:57 2008 +0100
1.3 @@ -81,9 +81,14 @@
1.4 compiler.err.call.must.be.first.stmt.in.ctor=\
1.5 call to {0} must be first statement in constructor
1.6 compiler.err.cant.apply.symbol=\
1.7 - {0} in {1} cannot be applied to {2}({3})
1.8 -compiler.err.cant.apply.symbol.1=\
1.9 - {0} in {1} cannot be applied to {2}({3}); {4}
1.10 + {0} {1} in {4} {5} cannot be applied to given types\n\
1.11 + required: {2}\n\
1.12 + found: {3}
1.13 + compiler.err.cant.apply.symbol.1=\
1.14 + {0} {1} in {4} {5} cannot be applied to given types;\n\
1.15 + required: {2}\n\
1.16 + found: {3}\n\
1.17 + reason: {6}
1.18 compiler.err.cant.assign.val.to.final.var=\
1.19 cannot assign a value to final variable {0}
1.20 compiler.err.cant.deref=\
1.21 @@ -940,7 +945,7 @@
1.22 compiler.misc.type.req.exact=\
1.23 class or interface without bounds
1.24 compiler.misc.type.parameter=\
1.25 - type parameter {0}
1.26 + type parameter {0}
1.27
1.28 #####
1.29
1.30 @@ -980,16 +985,39 @@
1.31 required: {0}\n\
1.32 found : {1}
1.33
1.34 -## The first argument ({0}) is a "kindname".
1.35 +## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
1.36 +## The second argument {1} is the non-resolved symbol
1.37 +## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
1.38 +## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
1.39 compiler.err.cant.resolve=\
1.40 -cannot find symbol\n\
1.41 -symbol: {0} {3}{1}{2}
1.42 + cannot find symbol\n\
1.43 + symbol: {0} {1}
1.44
1.45 -## The first argument ({0}) and fifth argument ({4}) are "kindname"s.
1.46 +compiler.err.cant.resolve.args=\
1.47 + cannot find symbol\n\
1.48 + symbol: {0} {1}({3})
1.49 +
1.50 +compiler.err.cant.resolve.args.params=\
1.51 + cannot find symbol\n\
1.52 + symbol: {0} <{2}>{1}({3})
1.53 +
1.54 +## arguments from {0} to {3} have the same meaning as above
1.55 +## The fifth argument {4} is the location "kindname" (e.g. 'constructor', 'field', etc.)
1.56 +## The sixth argument {5} is the location type
1.57 compiler.err.cant.resolve.location=\
1.58 -cannot find symbol\n\
1.59 -symbol : {0} {3}{1}{2}\n\
1.60 -location: {4} {5}
1.61 + cannot find symbol\n\
1.62 + symbol : {0} {1}\n\
1.63 + location: {4} {5}
1.64 +
1.65 +compiler.err.cant.resolve.location.args=\
1.66 + cannot find symbol\n\
1.67 + symbol : {0} {1}({3})\n\
1.68 + location: {4} {5}
1.69 +
1.70 +compiler.err.cant.resolve.location.args.params=\
1.71 + cannot find symbol\n\
1.72 + symbol : {0} <{2}>{1}({3})\n\
1.73 + location: {4} {5}
1.74
1.75 ## The following are all possible string for "kindname".
1.76 ## They should be called whatever the JLS calls them after it been translated
1.77 @@ -1008,55 +1036,16 @@
1.78 type variable
1.79 compiler.misc.kindname.type.variable.bound=\
1.80 bound of type variable
1.81 -compiler.misc.kindname=\
1.82 - identifier({0})
1.83 compiler.misc.kindname.variable=\
1.84 variable
1.85 compiler.misc.kindname.value=\
1.86 value
1.87 compiler.misc.kindname.method=\
1.88 method
1.89 -compiler.misc.kindname.variable.method=\
1.90 - variable, method
1.91 -compiler.misc.kindname.value.method=\
1.92 - value, method
1.93 compiler.misc.kindname.class=\
1.94 class
1.95 -compiler.misc.kindname.variable.class=\
1.96 - variable, class
1.97 -compiler.misc.kindname.value.class=\
1.98 - value, class
1.99 -compiler.misc.kindname.method.class=\
1.100 - method, class
1.101 -compiler.misc.kindname.variable.method.class=\
1.102 - variable, method, class
1.103 -compiler.misc.kindname.value.method.class=\
1.104 - value, method, class
1.105 compiler.misc.kindname.package=\
1.106 package
1.107 -compiler.misc.kindname.variable.package=\
1.108 - variable, package
1.109 -compiler.misc.kindname.value.package=\
1.110 - value, package
1.111 -compiler.misc.kindname.method.package=\
1.112 - method, package
1.113 -compiler.misc.kindname.variable.method.package=\
1.114 - variable, method, package
1.115 -compiler.misc.kindname.value.method.package=\
1.116 - value, method, package
1.117 -compiler.misc.kindname.class.package=\
1.118 - class, package
1.119 -compiler.misc.kindname.variable.class.package=\
1.120 - variable, class, package
1.121 -compiler.misc.kindname.value.class.package=\
1.122 - value, class, package
1.123 -compiler.misc.kindname.method.class.package=\
1.124 - method, class, package
1.125 -compiler.misc.kindname.variable.method.class.package=\
1.126 - variable, method, class, package
1.127 -compiler.misc.kindname.value.method.class.package=\
1.128 - value, method, class, package
1.129 -
1.130 #####
1.131
1.132 compiler.err.override.static=\
