1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed Apr 02 11:20:52 2008 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed Apr 02 11:38:16 2008 +0100
1.3 @@ -2199,7 +2199,7 @@
1.4 (env.tree.getTag() != JCTree.ASSIGN ||
1.5 TreeInfo.skipParens(((JCAssign) env.tree).lhs) != tree)) {
1.6
1.7 - if (!onlyWarning || isNonStaticEnumField(v)) {
1.8 + if (!onlyWarning || isStaticEnumField(v)) {
1.9 log.error(tree.pos(), "illegal.forward.ref");
1.10 } else if (useBeforeDeclarationWarning) {
1.11 log.warning(tree.pos(), "forward.ref", v);
1.12 @@ -2233,7 +2233,7 @@
1.13 // initializer expressions of an enum constant e to refer
1.14 // to itself or to an enum constant of the same type that
1.15 // is declared to the right of e."
1.16 - if (isNonStaticEnumField(v)) {
1.17 + if (isStaticEnumField(v)) {
1.18 ClassSymbol enclClass = env.info.scope.owner.enclClass();
1.19
1.20 if (enclClass == null || enclClass.owner == null)
1.21 @@ -2254,8 +2254,14 @@
1.22 }
1.23 }
1.24
1.25 - private boolean isNonStaticEnumField(VarSymbol v) {
1.26 - return Flags.isEnum(v.owner) && Flags.isStatic(v) && !Flags.isConstant(v);
1.27 + /** Is the given symbol a static, non-constant field of an Enum?
1.28 + * Note: enum literals should not be regarded as such
1.29 + */
1.30 + private boolean isStaticEnumField(VarSymbol v) {
1.31 + return Flags.isEnum(v.owner) &&
1.32 + Flags.isStatic(v) &&
1.33 + !Flags.isConstant(v) &&
1.34 + v.name != names._class;
1.35 }
1.36
1.37 /** Can the given symbol be the owner of code which forms part
