jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties

equal deleted inserted replaced

-:af0b915df7cc
+:b35973e2d42e
 compiler.err.already.defined.in.clinit=\
 {0} {1} is already defined in {2} of {3} {4}
 # 0: string
 compiler.err.already.defined.single.import=\
-{0} is already defined in a single-type import
+a type with the same simple name is already defined by the single-type-import of {0}
 # 0: string
 compiler.err.already.defined.static.single.import=\
-{0} is already defined in a static single-type import
+a type with the same simple name is already defined by the static single-type-import of {0}
 compiler.err.already.defined.this.unit=\
 {0} is already defined in this compilation unit
 # 0: type, 1: list of name
 compiler.err.annotation.missing.default.value=\
-annotation {0} is missing value for the attribute {1}
+annotation @{0} is missing a default value for the element ''{1}''
 # 0: type, 1: list of name
 compiler.err.annotation.missing.default.value.1=\
-annotation {0} is missing values for attributes {1}
+annotation @{0} is missing default values for elements {1}
 # 0: type
 compiler.err.annotation.not.valid.for.type=\
-annotation not valid for a value of type {0}
+annotation not valid for an element of type {0}
 compiler.err.annotation.type.not.applicable=\
 annotation type not applicable to this kind of declaration
 compiler.err.annotation.value.must.be.annotation=\
 # 0: type
 compiler.err.array.req.but.found=\
 array required, but {0} found
 compiler.err.attribute.value.must.be.constant=\
-attribute value must be constant
+element value must be a constant expression
 # 0: statement type
 compiler.err.bad.initializer=\
 bad initializer for {0}
 # 0: symbol
 compiler.err.cyclic.inheritance=\
 cyclic inheritance involving {0}
+# 0: symbol
 compiler.err.cyclic.annotation.element=\
-cyclic annotation element type
+type of element {0} is cyclic
 # 0: unused
 compiler.err.call.to.super.not.allowed.in.enum.ctor=\
 call to super not allowed in enum constructor
 # 0: type
 compiler.err.no.superclass=\
-{0} has no superclass
+{0} has no superclass.
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
 compiler.err.concrete.inheritance.conflict=\
 methods {0} from {1} and {2} from {3} are inherited with the same signature
 compiler.err.default.allowed.in.intf.annotation.member=\
-default value only allowed in an @interface member
+default value only allowed in an annotation type declaration
 # 0: symbol
 compiler.err.doesnt.exist=\
 package {0} does not exist
-compiler.err.duplicate.annotation=\
-duplicate annotation
 # 0: type
 compiler.err.duplicate.annotation.invalid.repeated=\
-annotation {0} cannot be repeated\nIt does not define a valid containing annotation.
+annotation {0} is not a valid repeatable annotation
 # 0: name, 1: type
 compiler.err.duplicate.annotation.member.value=\
-duplicate annotation member value {0} in {1}
+duplicate element ''{0}'' in annotation @{1}.
-# 0: type, 1: type
+# 0: name, 1: unused
 compiler.err.duplicate.annotation.missing.container=\
-duplicate annotation: the declaration of {0} does not have a valid {1} annotation
+{0} is not a repeatable annotation type
-# 0: type
+# 0: type, 1: unused
 compiler.err.invalid.repeatable.annotation=\
-duplicate annotation: {0} is annotated with an invalid Repeatable annotation
+duplicate annotation: {0} is annotated with an invalid @Repeatable annotation
 # 0: symbol or type
 compiler.err.invalid.repeatable.annotation.no.value=\
-duplicate annotation: {0} is not a valid Repeatable, no value element method declared
+{0} is not a valid @Repeatable, no value element method declared
 # 0: type, 1: number
 compiler.err.invalid.repeatable.annotation.multiple.values=\
-duplicate annotation: {0} is not a valid Repeatable, {1} value element methods declared
+{0} is not a valid @Repeatable, {1} element methods named ''value'' declared
 # 0: type
 compiler.err.invalid.repeatable.annotation.invalid.value=\
-duplicate annotation: {0} is not a valid Repeatable: invalid value element
+{0} is not a valid @Repeatable: invalid value element
-# 0: symbol type, 1: type, 2: type
+# 0: symbol type, 1: unused, 2: type
 compiler.err.invalid.repeatable.annotation.value.return=\
-duplicate annotation: value element of containing annotation {0} should have type {2}, found {1}
+containing annotation type ({0}) must declare an element named ''value'' of type {2}
 # 0: symbol or type, 1: symbol
 compiler.err.invalid.repeatable.annotation.elem.nondefault=\
-containing annotation {0} does not have a default value for element {1}
+containing annotation type ({0}) does not have a default value for element {1}
-# 0: symbol, 1: type, 2: symbol, 3: type
+# 0: symbol, 1: unused, 2: symbol, 3: unused
 compiler.err.invalid.repeatable.annotation.retention=\
-containing annotation {0} has shorter retention ({1}) than the contained annotation {2} with retention {3}
+retention of containing annotation type ({0}) is shorter than the retention of repeatable annotation type ({2})
 # 0: symbol, 1: symbol
 compiler.err.invalid.repeatable.annotation.not.documented=\
-containing annotation type, {0}, is not @Documented while repeated annotation type, {1}, is
+repeatable annotation type ({1}) is @Documented while containing annotation type ({0}) is not
 # 0: symbol, 1: symbol
 compiler.err.invalid.repeatable.annotation.not.inherited=\
-containing annotation type, {0}, is not @Inherited while repeated annotation type, {1}, is
+repeatable annotation type ({1}) is @Inherited while containing annotation type ({0}) is not
 # 0: symbol, 1: symbol
 compiler.err.invalid.repeatable.annotation.incompatible.target=\
-target of container annotation {0} is not a subset of target of repeated annotation {1}
+containing annotation type ({0}) is applicable to more targets than repeatable annotation type ({1})
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\
 container {0} must not be present at the same time as the element it contains
 # 0: number
 compiler.err.int.number.too.large=\
 integer number too large: {0}
 compiler.err.intf.annotation.members.cant.have.params=\
-@interface members may not have parameters
+elements in annotation type declarations cannot declare formal parameters
+# 0: symbol
 compiler.err.intf.annotation.cant.have.type.params=\
-@interface may not have type parameters
+annotation type {0} cannot be generic
 compiler.err.intf.annotation.members.cant.have.type.params=\
-@interface members may not have type parameters
+elements in annotation type declarations cannot be generic methods
 # 0: symbol, 1: type
 compiler.err.intf.annotation.member.clash=\
-@interface member clashes with method ''{0}'' in {1}
+annotation type {1} declares an element with the same name as method {0}
 compiler.err.intf.expected.here=\
 interface expected here
+compiler.err.intf.or.array.expected.here=\
+interface or array type expected here
 compiler.err.intf.meth.cant.have.body=\
 interface abstract methods cannot have body
+# 0: symbol
 compiler.err.invalid.annotation.member.type=\
-invalid type for annotation member
+invalid type for element {0} of annotation type
 compiler.err.invalid.binary.number=\
 binary numbers must contain at least one binary digit
 compiler.err.invalid.hex.number=\
 compiler.err.type.annotations.not.supported.in.source=\
 type annotations are not supported in -source {0}\n\
 (use -source 8 or higher to enable type annotations)
 # 0: string
+compiler.err.repeatable.annotations.not.supported.in.source=\
+repeated annotations are not supported in -source {0}\n\
+(use -source 8 or higher to enable repeated annotations)
+# 0: string
 compiler.err.foreach.not.supported.in.source=\
-for-each loops are not supported in -source {0}\n\
+enhanced for loops are not supported in -source {0}\n\
 (use -source 5 or higher to enable for-each loops)
 # 0: string
 compiler.err.static.import.not.supported.in.source=\
 static import declarations are not supported in -source {0}\n\

changeset 21009	b35973e2d42e
parent 21006	534673718919
child 21041	99f5e5e97425