Skip to content

Commit 172900d

Browse files
committedSep 27, 2021
8274255: Update javac messages to use "enum class" rather than "enum type"
Reviewed-by: vromero
1 parent b0983df commit 172900d

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed
 

‎src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties

+22-22
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ compiler.err.annotation.not.valid.for.type=\
131131
annotation not valid for an element of type {0}
132132

133133
compiler.err.annotation.type.not.applicable=\
134-
annotation type not applicable to this kind of declaration
134+
annotation interface not applicable to this kind of declaration
135135

136136
# 0: type
137137
compiler.err.annotation.type.not.applicable.to.type=\
@@ -362,7 +362,7 @@ compiler.err.cant.extend.intf.annotation=\
362362
''extends'' not allowed for @interfaces
363363

364364
compiler.err.annotation.decl.not.allowed.here=\
365-
annotation type declaration not allowed here
365+
annotation interface declaration not allowed here
366366

367367
# 0: symbol
368368
compiler.err.cant.inherit.from.final=\
@@ -416,7 +416,7 @@ compiler.err.concrete.inheritance.conflict=\
416416
methods {0} from {1} and {2} from {3} are inherited with the same signature
417417

418418
compiler.err.default.allowed.in.intf.annotation.member=\
419-
default value only allowed in an annotation type declaration
419+
default value only allowed in an annotation interface declaration
420420

421421
# 0: symbol
422422
compiler.err.doesnt.exist=\
@@ -432,7 +432,7 @@ compiler.err.duplicate.annotation.member.value=\
432432

433433
# 0: type
434434
compiler.err.duplicate.annotation.missing.container=\
435-
{0} is not a repeatable annotation type
435+
{0} is not a repeatable annotation interface
436436

437437
# 0: symbol
438438
compiler.err.invalid.repeatable.annotation=\
@@ -452,27 +452,27 @@ compiler.err.invalid.repeatable.annotation.invalid.value=\
452452

453453
# 0: symbol or type, 1: type, 2: type
454454
compiler.err.invalid.repeatable.annotation.value.return=\
455-
containing annotation type ({0}) must declare an element named ''value'' of type {2}
455+
containing annotation interface ({0}) must declare an element named ''value'' of type {2}
456456

457457
# 0: symbol or type, 1: symbol
458458
compiler.err.invalid.repeatable.annotation.elem.nondefault=\
459-
containing annotation type ({0}) does not have a default value for element {1}
459+
containing annotation interface ({0}) does not have a default value for element {1}
460460

461461
# 0: symbol, 1: string, 2: symbol, 3: string
462462
compiler.err.invalid.repeatable.annotation.retention=\
463-
retention of containing annotation type ({0}) is shorter than the retention of repeatable annotation type ({2})
463+
retention of containing annotation interface ({0}) is shorter than the retention of repeatable annotation interface ({2})
464464

465465
# 0: symbol, 1: symbol
466466
compiler.err.invalid.repeatable.annotation.not.documented=\
467-
repeatable annotation type ({1}) is @Documented while containing annotation type ({0}) is not
467+
repeatable annotation interface ({1}) is @Documented while containing annotation interface ({0}) is not
468468

469469
# 0: symbol, 1: symbol
470470
compiler.err.invalid.repeatable.annotation.not.inherited=\
471-
repeatable annotation type ({1}) is @Inherited while containing annotation type ({0}) is not
471+
repeatable annotation interface ({1}) is @Inherited while containing annotation interface ({0}) is not
472472

473473
# 0: symbol, 1: symbol
474474
compiler.err.invalid.repeatable.annotation.incompatible.target=\
475-
containing annotation type ({0}) is applicable to more targets than repeatable annotation type ({1})
475+
containing annotation interface ({0}) is applicable to more targets than repeatable annotation interface ({1})
476476

477477
# 0: symbol
478478
compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\
@@ -533,7 +533,7 @@ compiler.err.enum.annotation.must.be.enum.constant=\
533533
an enum annotation value must be an enum constant
534534

535535
compiler.err.enum.cant.be.instantiated=\
536-
enum types may not be instantiated
536+
enum classes may not be instantiated
537537

538538
compiler.err.enum.label.must.be.unqualified.enum=\
539539
an enum switch case label must be the unqualified name of an enumeration constant
@@ -542,7 +542,7 @@ compiler.err.enum.no.subclassing=\
542542
classes cannot directly extend java.lang.Enum
543543

544544
compiler.err.enum.types.not.extensible=\
545-
enum types are not extensible
545+
enum classes are not extensible
546546

547547
compiler.err.enum.no.finalize=\
548548
enums cannot have finalize methods
@@ -701,18 +701,18 @@ compiler.err.int.number.too.large=\
701701
integer number too large
702702

703703
compiler.err.intf.annotation.members.cant.have.params=\
704-
elements in annotation type declarations cannot declare formal parameters
704+
elements in annotation interface declarations cannot declare formal parameters
705705

706706
# 0: symbol
707707
compiler.err.intf.annotation.cant.have.type.params=\
708-
annotation type {0} cannot be generic
708+
annotation interface {0} cannot be generic
709709

710710
compiler.err.intf.annotation.members.cant.have.type.params=\
711-
elements in annotation type declarations cannot be generic methods
711+
elements in annotation interface declarations cannot be generic methods
712712

713713
# 0: symbol, 1: type
714714
compiler.err.intf.annotation.member.clash=\
715-
annotation type {1} declares an element with the same name as method {0}
715+
annotation interface {1} declares an element with the same name as method {0}
716716

717717
compiler.err.intf.expected.here=\
718718
interface expected here
@@ -721,7 +721,7 @@ compiler.err.intf.meth.cant.have.body=\
721721
interface abstract methods cannot have body
722722

723723
compiler.err.invalid.annotation.member.type=\
724-
invalid type for annotation type element
724+
invalid type for annotation interface element
725725

726726
compiler.err.invalid.binary.number=\
727727
binary numbers must contain at least one binary digit
@@ -759,7 +759,7 @@ compiler.err.local.var.accessed.from.icls.needs.final=\
759759
local variable {0} is accessed from within inner class; needs to be declared final
760760

761761
compiler.err.local.enum=\
762-
enum types must not be local
762+
enum classes must not be local
763763

764764
compiler.err.cannot.create.array.with.type.arguments=\
765765
cannot create array with type arguments
@@ -926,7 +926,7 @@ compiler.err.no.match.entry=\
926926

927927
# 0: type
928928
compiler.err.not.annotation.type=\
929-
{0} is not an annotation type
929+
{0} is not an annotation interface
930930

931931
# 0: symbol, 1: symbol, 2: message segment
932932
compiler.err.not.def.access.package.cant.access=\
@@ -1987,7 +1987,7 @@ compiler.warn.proc.file.create.last.round=\
19871987

19881988
# 0: string, 1: string
19891989
compiler.warn.proc.malformed.supported.string=\
1990-
Malformed string ''{0}'' for a supported annotation type returned by processor ''{1}''
1990+
Malformed string ''{0}'' for a supported annotation interface returned by processor ''{1}''
19911991

19921992
# 0: set of string
19931993
compiler.warn.proc.annotations.without.processors=\
@@ -2003,11 +2003,11 @@ compiler.warn.proc.duplicate.option.name=\
20032003

20042004
# 0: string, 1: string
20052005
compiler.warn.proc.duplicate.supported.annotation=\
2006-
Duplicate supported annotation type ''{0}'' returned by annotation processor ''{1}''
2006+
Duplicate supported annotation interface ''{0}'' returned by annotation processor ''{1}''
20072007

20082008
# 0: string
20092009
compiler.warn.proc.redundant.types.with.wildcard=\
2010-
Annotation processor ''{0}'' redundantly supports both ''*'' and other annotation types
2010+
Annotation processor ''{0}'' redundantly supports both ''*'' and other annotation interfaces
20112011

20122012
compiler.warn.proc.proc-only.requested.no.procs=\
20132013
Annotation processing without compilation requested but no processors were found.

0 commit comments

Comments
 (0)
Please sign in to comment.