1.1 --- a/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Tue Oct 23 13:58:56 2012 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Oct 25 11:09:36 2012 -0700
1.3 @@ -39,7 +39,7 @@
1.4 import com.sun.tools.javac.code.Type.*;
1.5 import com.sun.tools.javac.code.Types;
1.6
1.7 -import static com.sun.tools.javac.code.TypeTags.*;
1.8 +import static com.sun.tools.javac.code.TypeTag.*;
1.9 import static com.sun.tools.javac.code.Flags.*;
1.10 import static com.sun.tools.javac.util.LayoutCharacters.*;
1.11 import static com.sun.tools.javac.util.RichDiagnosticFormatter.RichConfiguration.*;
1.12 @@ -295,7 +295,7 @@
1.13 conflicts.contains(s))) {
1.14 List<Name> l = List.nil();
1.15 Symbol s2 = s;
1.16 - while (s2.type.getEnclosingType().tag == CLASS
1.17 + while (s2.type.getEnclosingType().hasTag(CLASS)
1.18 && s2.owner.kind == Kinds.TYP) {
1.19 l = l.prepend(s2.getSimpleName());
1.20 s2 = s2.owner;
1.21 @@ -414,7 +414,7 @@
1.22 ? ownerName
1.23 : s.name.toString();
1.24 if (s.type != null) {
1.25 - if (s.type.tag == FORALL) {
1.26 + if (s.type.hasTag(FORALL)) {
1.27 ms = "<" + visitTypes(s.type.getTypeArguments(), locale) + ">" + ms;
1.28 }
1.29 ms += "(" + printMethodArgs(
1.30 @@ -532,8 +532,8 @@
1.31 nameSimplifier.addUsage(t.tsym);
1.32
1.33 boolean boundErroneous = bounds.head == null ||
1.34 - bounds.head.tag == NONE ||
1.35 - bounds.head.tag == ERROR;
1.36 + bounds.head.hasTag(NONE) ||
1.37 + bounds.head.hasTag(ERROR);
1.38
1.39 if ((t.tsym.flags() & SYNTHETIC) == 0) {
1.40 //this is a true typevar
