diff -c -r old/compiler.properties new/compiler.properties
*** old/compiler.properties Wed Feb 26 13:30:59 2003
--- new/compiler.properties Thu Jul 17 16:29:01 2003
***************
*** 1,5 ****
  #
! # @(#)compiler.properties 1.42 03/01/23
  #
  # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
  #
--- 1,5 ----
  #
! # @(#)compiler.properties 1.44 03/07/17
  #
  # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
  #
***************
*** 38,44 ****
  compiler.err.cant.access= cannot access {0}; {1}
  compiler.err.cant.apply.symbol=! {0} in {1} cannot be applied to ({2})
  compiler.err.cant.assign.val.to.final.var= cannot assign a value to final variable {0}
  compiler.err.cant.deref=--- 38,46 ----
  compiler.err.cant.access= cannot access {0}; {1}
  compiler.err.cant.apply.symbol=! {0} in {1} cannot be applied to {2}({3})
! compiler.err.cant.apply.symbol.1=! {0} in {1} cannot be applied to {2}({3}); {4}
  compiler.err.cant.assign.val.to.final.var= cannot assign a value to final variable {0}
  compiler.err.cant.deref=***************
*** 95,104 ****
--- 97,111 ----
  compiler.err.fp.number.too.small= floating point number too small
  
+ compiler.err.generic.array.creation=+ generic array creation
+
  compiler.err.icls.cant.have.static.decl= inner classes cannot have static declarations
  compiler.err.illegal.char= illegal character: \\{0}
+ compiler.err.illegal.char.for.encoding=+ unmappable character for encoding {0}
  compiler.err.illegal.combination.of.modifiers= illegal combination of modifiers: {0} and {1}
  compiler.err.illegal.esc.char=***************
*** 245,251 ****
  compiler.err.type.doesnt.take.params= type {0} does not take parameters
  compiler.err.type.var.cant.be.deref=! type variables cannot be dereferenced
  compiler.err.type.var.more.than.once= type variable {0} occurs more than once in result type of {1}; cannot be left uninstantiated
  compiler.err.type.var.more.than.once.in.result=--- 252,260 ----
  compiler.err.type.doesnt.take.params= type {0} does not take parameters
  compiler.err.type.var.cant.be.deref=! cannot select from a type variable
! compiler.err.type.var.may.not.be.followed.by.other.bounds=! a type variable may not be followed by other bounds
  compiler.err.type.var.more.than.once= type variable {0} occurs more than once in result type of {1}; cannot be left uninstantiated
  compiler.err.type.var.more.than.once.in.result=***************
*** 267,272 ****
--- 276,283 ----
      undefined label: {0}
  compiler.err.undetermined.type= type parameters of {0} cannot be determined
+ compiler.err.undetermined.type.1=+ type parameters of {0} cannot be determined; {1}
  compiler.err.unreachable.stmt= unreachable statement
  compiler.err.initializer.must.be.able.to.complete.normally=***************
*** 310,315 ****
--- 321,329 ----
  compiler.err.cant.read.file= cannot read: {0}
  
+ compiler.err.enum.as.identifier=+ as of release 1.5, 'enum' is a keyword, and may not be used as an identifier
+
  #####
  
  # Fatal Errors
***************
*** 347,355 ****
      Recompile with -deprecation for details.
  
  compiler.note.unchecked.filename=! {0} uses unchecked operations.
  compiler.note.unchecked.plural=! Some input files use unchecked operations.
  # The following string will always appear after one of the above deprecation
  # messages.
  compiler.note.unchecked.recompile=--- 361,369 ----
      Recompile with -deprecation for details.
  
  compiler.note.unchecked.filename=! {0} uses unchecked or unsafe operations.
  compiler.note.unchecked.plural=! Some input files use unchecked or unsafe operations.
  # The following string will always appear after one of the above deprecation
  # messages.
  compiler.note.unchecked.recompile=***************
*** 414,428 ****
  compiler.warn.assert.as.identifier= as of release 1.4, 'assert' is a keyword, and may not be used as an identifier
  
! compiler.warn.has.been.deprecated=! {0} in {1} has been deprecated
  
  compiler.warn.finally.cannot.complete= finally clause cannot complete normally
  
  compiler.warn.illegal.nonascii.digit= illegal non-ASCII digit
  
  compiler.warn.possible.fall-through.into.case= possible fall-through into case
  
--- 428,458 ----
  compiler.warn.assert.as.identifier= as of release 1.4, 'assert' is a keyword, and may not be used as an identifier
  
! compiler.warn.constant.SVUID=! serialVersionUID must be constant in class {0}
  
+ compiler.warn.enum.as.identifier=+ as of release 1.5, 'enum' is a keyword, and may not be used as an identifier
+
  compiler.warn.finally.cannot.complete= finally clause cannot complete normally
  
+ compiler.warn.has.been.deprecated=+ {0} in {1} has been deprecated
+
+ compiler.warn.illegal.char.for.encoding=+ unmappable character for encoding {0}
  compiler.warn.illegal.nonascii.digit= illegal non-ASCII digit
+ compiler.warn.improper.SVUID=+ serialVersionUID must be declared static final in class {0}
  
+ compiler.warn.long.SVUID=+ serialVersionUID must be of type long in class {0}
+
+ compiler.warn.missing.SVUID=+ serializable class {0} has no definition of serialVersionUID
+
  compiler.warn.possible.fall-through.into.case= possible fall-through into case
  
***************
*** 434,443 ****
      unchecked call to {0} as a member of the raw type {1}
  compiler.warn.unchecked.cast.to.type= unchecked cast to type {0}
- compiler.warn.unchecked.generic.array.creation=- unchecked generic array creation
  compiler.warn.unchecked.meth.invocation.applied=! unchecked method invocation: {0} in {1} is applied to ({2})
  
  #####
  
--- 464,471 ----
      unchecked call to {0} as a member of the raw type {1}
  compiler.warn.unchecked.cast.to.type= unchecked cast to type {0}
  compiler.warn.unchecked.meth.invocation.applied=! unchecked method invocation: {0} in {1} is applied to {2}({3})
  
  #####
  
***************
*** 548,563 ****
  {0}\n found : {1}\n required: {2}
  
  ## The following are all possible strings for the first argument ({0}) of the
! ## above string.
  compiler.misc.incompatible.types= incompatible types
  compiler.misc.inconvertible.types= inconvertible types
  compiler.misc.possible.loss.of.precision= possible loss of precision
  
  #####
  
  compiler.err.type.found.req=--- 576,621 ----
  {0}\n found : {1}\n required: {2}
+ compiler.warn.prob.found.req=+ {0}\n+ found : {1}\n+ required: {2}
+ compiler.err.prob.found.req.1=+ {0} {3}\n+ found : {1}\n+ required: {2}
  
  ## The following are all possible strings for the first argument ({0}) of the
! ## above strings.
  compiler.misc.incompatible.types= incompatible types
+ compiler.misc.incompatible.types.1=+ incompatible types; {0}
  compiler.misc.inconvertible.types= inconvertible types
  compiler.misc.possible.loss.of.precision= possible loss of precision
  
+ # --- begin: VFORCE ---
+
+ compiler.misc.storecheck=+ assignment might cause later store checks to fail
+ compiler.misc.unchecked=+ assigned array cannot dynamically check its stores
+
+ compiler.misc.assignment.from.super-bound=+ assignment from super-bound type {0}
+ compiler.misc.assignment.to.extends-bound=+ assignment to extends-bound type {0}
+ compiler.err.star.expected=+ \'*\' expected
+ compiler.err.no.elem.type=+ \[\*\] cannot have a type
+ compiler.err.malformed.generic.array.type=+ arrays of generic types are not allowed
+
+ # --- end: VFORCE ---
+
  #####
  
  compiler.err.type.found.req=***************
*** 573,584 ****
      class or array
  compiler.misc.type.req.ref= reference
  
  #####
  
  ## The first argument ({0}) is a "kindname".
  compiler.err.abstract.cant.be.accessed.directly=! abstract {0} {1} cannot be accessed directly
  
  ## The first argument ({0}) is a "kindname".
  compiler.err.non-static.cant.be.ref=--- 631,665 ----
      class or array
  compiler.misc.type.req.ref= reference
+ compiler.misc.type.req.exact=+ class or interface without bounds
  
  #####
  
+ ## The following are all possible strings for the last argument of all those
+ ## diagnostics whose key ends in ".1"
+ compiler.misc.undetermined.type=+ undetermined type
+ ncompiler.misc.type.variable.has.undetermined.type=+ type variable {0} has undetermined type
+ compiler.misc.no.unique.maximal.instance.exists=+ no unique maximal instance exists for type variable {0} with upper bounds {1}
+ compiler.misc.no.unique.minimal.instance.exists=+ no unique minimal instance exists for type variable {0} with lower bounds {1}
+ compiler.misc.no.conforming.instance.exists=+ no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
+ compiler.misc.no.conforming.assignment.exists=+ no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
+ 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}
+
+ #####
+
  ## The first argument ({0}) is a "kindname".
  compiler.err.abstract.cant.be.accessed.directly=! abstract {0} {1} in {2} cannot be accessed directly
  
  ## The first argument ({0}) is a "kindname".
  compiler.err.non-static.cant.be.ref=***************
*** 593,628 ****
  
  ## The first argument ({0}) is a "kindname".
  compiler.err.cant.resolve=! cannot resolve symbol\n! symbol: {0} {1} {2}
  
  ## The first argument ({0}) and fifth argument ({4}) are "kindname"s.
  compiler.err.cant.resolve.location=! cannot resolve symbol\n! symbol : {0} {1} {2}\n! location: {3} {4}
  
  ## The following are all possible string for "kindname".
  ## They should be called whatever the JLS calls them after it been translated
  ## to the appropriate language.
- compiler.misc.kindname.class=- class
  compiler.misc.kindname.constructor= constructor
- compiler.misc.kindname.default=- identifier({0})
  compiler.misc.kindname.interface= interface
- compiler.misc.kindname.method=- method
- compiler.misc.kindname.package=- package
  compiler.misc.kindname.type.variable= bound of type variable
! compiler.misc.kindname.value=! value
  compiler.misc.kindname.variable= variable
  
  #####
  
--- 674,747 ----
  
  ## The first argument ({0}) is a "kindname".
  compiler.err.cant.resolve=! cannot find symbol\n! symbol: {0} {3}{1}{2}
  
  ## The first argument ({0}) and fifth argument ({4}) are "kindname"s.
  compiler.err.cant.resolve.location=! cannot find symbol\n! symbol : {0} {3}{1}{2}\n! location: {4} {5}
  
  ## The following are all possible string for "kindname".
  ## They should be called whatever the JLS calls them after it been translated
  ## to the appropriate language.
  compiler.misc.kindname.constructor=+ static member
+ compiler.misc.kindname.constructor= constructor
  compiler.misc.kindname.interface= interface
  compiler.misc.kindname.type.variable= bound of type variable
! compiler.misc.kindname=! identifier({0})
  compiler.misc.kindname.variable= variable
+ compiler.misc.kindname.value=+ value
+ compiler.misc.kindname.method=+ method
+ compiler.misc.kindname.variable.method=+ variable, method
+ compiler.misc.kindname.value.method=+ value, method
+ compiler.misc.kindname.class=+ class
+ compiler.misc.kindname.variable.class=+ variable, class
+ compiler.misc.kindname.value.class=+ value, class
+ compiler.misc.kindname.method.class=+ method, class
+ compiler.misc.kindname.variable.method.class=+ variable, method, class
+ compiler.misc.kindname.value.method.class=+ value, method, class
+ compiler.misc.kindname.package=+ package
+ compiler.misc.kindname.variable.package=+ variable, package
+ compiler.misc.kindname.value.package=+ value, package
+ compiler.misc.kindname.method.package=+ method, package
+ compiler.misc.kindname.variable.method.package=+ variable, method, package
+ compiler.misc.kindname.value.method.package=+ value, method, package
+ compiler.misc.kindname.class.package=+ class, package
+ compiler.misc.kindname.variable.class.package=+ variable, class, package
+ compiler.misc.kindname.value.class.package=+ value, class, package
+ compiler.misc.kindname.method.class.package=+ method, class, package
+ compiler.misc.kindname.variable.method.class.package=+ variable, method, class, package
+ compiler.misc.kindname.value.method.class.package=+ value, method, class, package
  
  #####
  
***************
*** 633,642 ****
  
  # In the following string {1} is a space separated list of Java Keywords, as
  # they would have been declared in the source code
- compiler.err.override.weaker.access=- {0}; attempting to assign weaker access privileges; was {1}
  compiler.err.override.meth.doesnt.throw= {0}; overridden method does not throw {1}
  
  compiler.misc.override.incompatible.ret= {0}; attempting to use incompatible return type
--- 752,765 ----
  
  # In the following string {1} is a space separated list of Java Keywords, as
  # they would have been declared in the source code
  compiler.err.override.meth.doesnt.throw= {0}; overridden method does not throw {1}
+ compiler.err.override.varargs.missing=+ {0}; overridden method has no ''...''
+ compiler.err.override.varargs.extra=+ {0}; overriding method is missing ''...''
+ compiler.err.override.weaker.access=+ {0}; attempting to assign weaker access privileges; was {1}
  
  compiler.misc.override.incompatible.ret= {0}; attempting to use incompatible return type
diff -c -r old/javac.properties new/javac.properties
*** old/javac.properties Wed Feb 26 13:30:59 2003
--- new/javac.properties Thu May 22 20:58:26 2003
***************
*** 1,5 ****
  #
! # @(#)javac.properties 1.25 03/01/23
  #
  # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
  #
--- 1,5 ----
  #
! # @(#)javac.properties 1.26 03/05/22
  #
  # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
  #
***************
*** 76,82 ****
  javac.opt.switchcheck= Warn about fall-through in switches
  javac.opt.warnunchecked=! Output source locations where unchecked operations are used
  javac.opt.version= Version information
  javac.opt.arg.pathname=--- 76,82 ----
  javac.opt.switchcheck= Warn about fall-through in switches
  javac.opt.warnunchecked=! Output source locations where unchecked or unsafe operations are used
  javac.opt.version= Version information
  javac.opt.arg.pathname=The following diagnostic changes have been made between 1.4.2 and 1.5 for javac: