1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Dec 13 14:08:01 2010 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Dec 13 15:11:00 2010 -0800
1.3 @@ -516,6 +516,15 @@
1.4 compiler.err.var.might.be.assigned.in.loop=\
1.5 variable {0} might be assigned in loop
1.6
1.7 +compiler.err.varargs.invalid.trustme.anno=\
1.8 + Invalid {0} annotation. {1}
1.9 +compiler.misc.varargs.trustme.on.reifiable.varargs=\
1.10 + Varargs element type {0} is reifiable.
1.11 +compiler.misc.varargs.trustme.on.non.varargs.meth=\
1.12 + Method {0} is not a varargs method.
1.13 +compiler.misc.varargs.trustme.on.virtual.varargs=\
1.14 + Instance method {0} is not final.
1.15 +
1.16 # In the following string, {1} will always be the detail message from
1.17 # java.io.IOException.
1.18 compiler.err.class.cant.write=\
1.19 @@ -600,20 +609,6 @@
1.20 compiler.note.unchecked.plural.additional=\
1.21 Some input files additionally use unchecked or unsafe operations.
1.22
1.23 -compiler.note.varargs.filename=\
1.24 - {0} declares unsafe vararg methods.
1.25 -compiler.note.varargs.plural=\
1.26 - Some input files declare unsafe vararg methods.
1.27 -# The following string may appear after one of the above unsafe varargs
1.28 -# messages.
1.29 -compiler.note.varargs.recompile=\
1.30 - Recompile with -Xlint:varargs for details.
1.31 -
1.32 -compiler.note.varargs.filename.additional=\
1.33 - {0} declares additional unsafe vararg methods.
1.34 -compiler.note.varargs.plural.additional=\
1.35 - Some input files additionally declares unsafe vararg methods.
1.36 -
1.37 compiler.note.sunapi.filename=\
1.38 {0} uses internal proprietary API that may be removed in a future release.
1.39 compiler.note.sunapi.plural=\
1.40 @@ -841,9 +836,12 @@
1.41 compiler.warn.unchecked.generic.array.creation=\
1.42 unchecked generic array creation for varargs parameter of type {0}
1.43
1.44 -compiler.warn.varargs.non.reifiable.type=\
1.45 +compiler.warn.unchecked.varargs.non.reifiable.type=\
1.46 Possible heap pollution from parameterized vararg type {0}
1.47
1.48 +compiler.warn.varargs.unsafe.use.varargs.param=\
1.49 + Varargs method could cause heap pollution from non-reifiable varargs parameter {0}
1.50 +
1.51 compiler.warn.missing.deprecated.annotation=\
1.52 deprecated item is not annotated with @Deprecated
1.53
1.54 @@ -876,6 +874,9 @@
1.55 explicit: {0}\n\
1.56 inferred: {1}
1.57
1.58 +compiler.warn.varargs.redundant.trustme.anno=\
1.59 + Redundant {0} annotation. {1}
1.60 +
1.61 #####
1.62
1.63 ## The following are tokens which are non-terminals in the language. They should
