Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Fri Sep 12 23:32:51 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Tue Sep 16 18:35:18 2008 -0700
     1.3 @@ -146,14 +146,14 @@
     1.4       * the default package; otherwise, the owner symbol is returned
     1.5       */
     1.6      public Symbol location() {
     1.7 -        if (owner.name == null || (owner.name.len == 0 && owner.kind != PCK)) {
     1.8 +        if (owner.name == null || (owner.name.isEmpty() && owner.kind != PCK)) {
     1.9              return null;
    1.10          }
    1.11          return owner;
    1.12      }
    1.13  
    1.14      public Symbol location(Type site, Types types) {
    1.15 -        if (owner.name == null || owner.name.len == 0) {
    1.16 +        if (owner.name == null || owner.name.isEmpty()) {
    1.17              return location();
    1.18          }
    1.19          if (owner.type.tag == CLASS) {
    1.20 @@ -177,7 +177,7 @@
    1.21       */
    1.22      public Type externalType(Types types) {
    1.23          Type t = erasure(types);
    1.24 -        if (name == name.table.init && owner.hasOuterInstance()) {
    1.25 +        if (name == name.table.names.init && owner.hasOuterInstance()) {
    1.26              Type outerThisType = types.erasure(owner.type.getEnclosingType());
    1.27              return new MethodType(t.getParameterTypes().prepend(outerThisType),
    1.28                                    t.getReturnType(),
    1.29 @@ -212,7 +212,7 @@
    1.30      /** Is this symbol a constructor?
    1.31       */
    1.32      public boolean isConstructor() {
    1.33 -        return name == name.table.init;
    1.34 +        return name == name.table.names.init;
    1.35      }
    1.36  
    1.37      /** The fully qualified name of this symbol.
    1.38 @@ -501,7 +501,7 @@
    1.39                   || (owner.kind == TYP && owner.type.tag == TYPEVAR)
    1.40                   )) return name;
    1.41              Name prefix = owner.getQualifiedName();
    1.42 -            if (prefix == null || prefix == prefix.table.empty)
    1.43 +            if (prefix == null || prefix == prefix.table.names.empty)
    1.44                  return name;
    1.45              else return prefix.append('.', name);
    1.46          }
    1.47 @@ -516,7 +516,7 @@
    1.48                  ) return name;
    1.49              char sep = owner.kind == TYP ? '$' : '.';
    1.50              Name prefix = owner.flatName();
    1.51 -            if (prefix == null || prefix == prefix.table.empty)
    1.52 +            if (prefix == null || prefix == prefix.table.names.empty)
    1.53                  return name;
    1.54              else return prefix.append(sep, name);
    1.55          }
    1.56 @@ -737,7 +737,7 @@
    1.57          }
    1.58  
    1.59          public String className() {
    1.60 -            if (name.len == 0)
    1.61 +            if (name.isEmpty())
    1.62                  return
    1.63                      Log.getLocalizedString("anonymous.class", flatname);
    1.64              else
    1.65 @@ -1011,7 +1011,7 @@
    1.66              if ((flags() & BLOCK) != 0) {
    1.67                  return owner.name.toString();
    1.68              } else {
    1.69 -                String s = (name == name.table.init)
    1.70 +                String s = (name == name.table.names.init)
    1.71                      ? owner.name.toString()
    1.72                      : name.toString();
    1.73                  if (type != null) {
    1.74 @@ -1208,9 +1208,9 @@
    1.75          }
    1.76  
    1.77          public ElementKind getKind() {
    1.78 -            if (name == name.table.init)
    1.79 +            if (name == name.table.names.init)
    1.80                  return ElementKind.CONSTRUCTOR;
    1.81 -            else if (name == name.table.clinit)
    1.82 +            else if (name == name.table.names.clinit)
    1.83                  return ElementKind.STATIC_INIT;
    1.84              else
    1.85                  return ElementKind.METHOD;