jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/code/Symbol.java

-:475eb15dfdad
+:f91144b7da75
 /*
-* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 /** An accessor method for the attributes of this symbol.
 *  Attributes of class symbols should be accessed through the accessor
 *  method to make sure that the class symbol is loaded.
 */
 public List<Attribute.Compound> getRawAttributes() {
-return annotations.getAttributes();
+return annotations.getDeclarationAttributes();
+}
+/** An accessor method for the type attributes of this symbol.
+*  Attributes of class symbols should be accessed through the accessor
+*  method to make sure that the class symbol is loaded.
+*/
+public List<Attribute.TypeCompound> getRawTypeAttributes() {
+return annotations.getTypeAttributes();
 }
 /** Fetch a particular annotation from a symbol. */
 public Attribute.Compound attribute(Symbol anno) {
 for (Attribute.Compound a : getRawAttributes()) {
 /**
 * This is the implementation for {@code
 * javax.lang.model.element.Element.getAnnotationMirrors()}.
 */
-public final List<Attribute.Compound> getAnnotationMirrors() {
+public final List<? extends AnnotationMirror> getAnnotationMirrors() {
 return getRawAttributes();
+}
+/**
+* TODO: Should there be a {@code
+* javax.lang.model.element.Element.getTypeAnnotationMirrors()}.
+*/
+public final List<Attribute.TypeCompound> getTypeAnnotationMirrors() {
+return getRawTypeAttributes();
 }
 /**
 * @deprecated this method should never be used by javac internally.
 */
 @Deprecated
 public <A extends java.lang.annotation.Annotation> A getAnnotation(Class<A> annoType) {
 return JavacElements.getAnnotation(this, annoType);
+}
+// This method is part of the javax.lang.model API, do not use this in javac code.
+public <A extends java.lang.annotation.Annotation> A[] getAnnotations(Class<A> annoType) {
+return JavacElements.getAnnotations(this, annoType);
 }
 // TODO: getEnclosedElements should return a javac List, fix in FilteredMemberList
 public java.util.List<Symbol> getEnclosedElements() {
 return List.nil();
 public List<Attribute.Compound> getRawAttributes() {
 if (completer != null) complete();
 return super.getRawAttributes();
 }
+@Override
+public List<Attribute.TypeCompound> getRawTypeAttributes() {
+if (completer != null) complete();
+return super.getRawTypeAttributes();
+}
 public Type erasure(Types types) {
 if (erasure_field == null)
 erasure_field = new ClassType(types.erasure(type.getEnclosingType()),
 List.<Type>nil(), this);
 return erasure_field;
 // JLS 8.4.6.1
 switch ((int)(flags_field & Flags.AccessFlags)) {
 case Flags.PRIVATE:
 return false;
 case Flags.PUBLIC:
-return true;
+return !this.owner.isInterface() ||
+(flags_field & STATIC) == 0;
 case Flags.PROTECTED:
 return (origin.flags() & INTERFACE) == 0;
 case 0:
 // for package private: can only override in the same
 // package
 return
 this.packge() == origin.packge() &&
 (origin.flags() & INTERFACE) == 0;
 default:
 return false;
+}
+}
+@Override
+public boolean isInheritedIn(Symbol clazz, Types types) {
+switch ((int)(flags_field & Flags.AccessFlags)) {
+case PUBLIC:
+return !this.owner.isInterface() ||
+clazz == owner ||
+(flags_field & STATIC) == 0;
+default:
+return super.isInheritedIn(clazz, types);
 }
 }
 /** The implementation of this (abstract) symbol in class origin;
 *  null if none exists. Synthetic methods are not considered
 public Attribute getDefaultValue() {
 return defaultValue;
 }
 public List<VarSymbol> getParameters() {
 return params();
 }
 public boolean isVarArgs() {
 return (flags() & VARARGS) != 0;

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

comparison: src/share/classes/com/sun/tools/javac/code/Symbol.java

src/share/classes/com/sun/tools/javac/code/Symbol.java