src/share/classes/com/sun/tools/javac/comp/Check.java

@@ -985,11 +985,11 @@
      *
      *  If the enum does have specialized enum contants, it is
      *  <i>not</i> final.
      */
     private long implicitEnumFinalFlag(JCTree tree) {
-        if (tree.getTag() != JCTree.CLASSDEF) return 0;
+        if (tree.getTag() != JCTree.Tag.CLASSDEF) return 0;
         class SpecialTreeVisitor extends JCTree.Visitor {
             boolean specialized;
             SpecialTreeVisitor() {
                 this.specialized = false;
             };

@@ -1097,11 +1097,11 @@
 
                 // Check that this type is either fully parameterized, or
                 // not parameterized at all.
                 if (tree.type.getEnclosingType().isRaw())
                     log.error(tree.pos(), "improperly.formed.type.inner.raw.param");
-                if (tree.clazz.getTag() == JCTree.SELECT)
+                if (tree.clazz.getTag() == JCTree.Tag.SELECT)
                     visitSelectInternal((JCFieldAccess)tree.clazz);
             }
         }
 
         @Override

@@ -2411,11 +2411,11 @@
             if (e.sym.kind == MTH)
                 members.add((MethodSymbol) e.sym);
 
         // count them off as they're annotated
         for (JCTree arg : a.args) {
-            if (arg.getTag() != JCTree.ASSIGN) continue; // recovery
+            if (arg.getTag() != JCTree.Tag.ASSIGN) continue; // recovery
             JCAssign assign = (JCAssign) arg;
             Symbol m = TreeInfo.symbol(assign.lhs);
             if (m == null || m.type.isErroneous()) continue;
             if (!members.remove(m))
                 log.error(assign.lhs.pos(), "duplicate.annotation.member.value",

@@ -2440,16 +2440,16 @@
         // repeated values in its value member
         if (a.annotationType.type.tsym != syms.annotationTargetType.tsym ||
             a.args.tail == null)
             return;
 
-        if (a.args.head.getTag() != JCTree.ASSIGN) return; // error recovery
+        if (a.args.head.getTag() != JCTree.Tag.ASSIGN) return; // error recovery
         JCAssign assign = (JCAssign) a.args.head;
         Symbol m = TreeInfo.symbol(assign.lhs);
         if (m.name != names.value) return;
         JCTree rhs = assign.rhs;
-        if (rhs.getTag() != JCTree.NEWARRAY) return;
+        if (rhs.getTag() != JCTree.Tag.NEWARRAY) return;
         JCNewArray na = (JCNewArray) rhs;
         Set<Symbol> targets = new HashSet<Symbol>();
         for (JCTree elem : na.elems) {
             if (!targets.add(TreeInfo.symbol(elem))) {
                 log.error(elem.pos(), "repeated.annotation.target");

@@ -2504,11 +2504,11 @@
         if ((tree.sym.flags_field & ANNOTATION) == 0) return;
         Assert.check((tree.sym.flags_field & LOCKED) == 0);
         try {
             tree.sym.flags_field |= LOCKED;
             for (JCTree def : tree.defs) {
-                if (def.getTag() != JCTree.METHODDEF) continue;
+                if (def.getTag() != JCTree.Tag.METHODDEF) continue;
                 JCMethodDecl meth = (JCMethodDecl)def;
                 checkAnnotationResType(meth.pos(), meth.restype.type);
             }
         } finally {
             tree.sym.flags_field &= ~LOCKED;

@@ -2612,11 +2612,11 @@
      * @param left       type of left hand side
      * @param right      type of right hand side
      */
     int checkOperator(DiagnosticPosition pos,
                        OperatorSymbol operator,
-                       int tag,
+                       JCTree.Tag tag,
                        Type left,
                        Type right) {
         if (operator.opcode == ByteCodes.error) {
             log.error(pos,
                       "operator.cant.be.applied.1",

@@ -2648,11 +2648,12 @@
 
     /**
      * Check for empty statements after if
      */
     void checkEmptyIf(JCIf tree) {
-        if (tree.thenpart.getTag() == JCTree.SKIP && tree.elsepart == null && lint.isEnabled(LintCategory.EMPTY))
+        if (tree.thenpart.getTag() == JCTree.Tag.SKIP && tree.elsepart == null && 
+                lint.isEnabled(LintCategory.EMPTY))
             log.warning(LintCategory.EMPTY, tree.thenpart.pos(), "empty.if");
     }
 
     /** Check that symbol is unique in given scope.
      *  @param pos           Position for error reporting.

@@ -2752,11 +2753,11 @@
             log.error(tree.pos(), "import.requires.canonical",
                       TreeInfo.symbol(tree));
     }
         // where
         private boolean isCanonical(JCTree tree) {
-            while (tree.getTag() == JCTree.SELECT) {
+            while (tree.getTag() == JCTree.Tag.SELECT) {
                 JCFieldAccess s = (JCFieldAccess) tree;
                 if (s.sym.owner != TreeInfo.symbol(s.selected))
                     return false;
                 tree = s.selected;
             }