infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-03 23:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8025109: Better encapsulation for AnnotatedType

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Werner Dietl 2013-10-20 12:01:43 -07:00 committed by Jonathan Gibbons
parent 027b935c1b
commit 84cadf2e45
3 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
View File

@ -100,7 +100,7 @@ public abstract class Symbol extends AnnoConstruct implements Element {
/** The attributes of this symbol are contained in this
* SymbolMetadata. The SymbolMetadata instance is NOT immutable.
*/
protected SymbolMetadata annotations;
protected SymbolMetadata metadata;
/** An accessor method for the attributes of this symbol.
@ -108,9 +108,9 @@ public abstract class Symbol extends AnnoConstruct implements Element {
* method to make sure that the class symbol is loaded.
*/
public List<Attribute.Compound> getRawAttributes() {
return (annotations == null)
return (metadata == null)
? List.<Attribute.Compound>nil()
: annotations.getDeclarationAttributes();
: metadata.getDeclarationAttributes();
}
/** An accessor method for the type attributes of this symbol.
@ -118,9 +118,9 @@ public abstract class Symbol extends AnnoConstruct implements Element {
* method to make sure that the class symbol is loaded.
*/
public List<Attribute.TypeCompound> getRawTypeAttributes() {
return (annotations == null)
return (metadata == null)
? List.<Attribute.TypeCompound>nil()
: annotations.getTypeAttributes();
: metadata.getTypeAttributes();
}
/** Fetch a particular annotation from a symbol. */
@ -132,106 +132,106 @@ public abstract class Symbol extends AnnoConstruct implements Element {
}
public boolean annotationsPendingCompletion() {
return annotations == null ? false : annotations.pendingCompletion();
return metadata == null ? false : metadata.pendingCompletion();
}
public void appendAttributes(List<Attribute.Compound> l) {
if (l.nonEmpty()) {
initedAnnos().append(l);
initedMetadata().append(l);
}
}
public void appendClassInitTypeAttributes(List<Attribute.TypeCompound> l) {
if (l.nonEmpty()) {
initedAnnos().appendClassInitTypeAttributes(l);
initedMetadata().appendClassInitTypeAttributes(l);
}
}
public void appendInitTypeAttributes(List<Attribute.TypeCompound> l) {
if (l.nonEmpty()) {
initedAnnos().appendInitTypeAttributes(l);
initedMetadata().appendInitTypeAttributes(l);
}
}
public void appendTypeAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.TypeCompound> ctx) {
initedAnnos().appendTypeAttributesWithCompletion(ctx);
initedMetadata().appendTypeAttributesWithCompletion(ctx);
}
public void appendUniqueTypeAttributes(List<Attribute.TypeCompound> l) {
if (l.nonEmpty()) {
initedAnnos().appendUniqueTypes(l);
initedMetadata().appendUniqueTypes(l);
}
}
public List<Attribute.TypeCompound> getClassInitTypeAttributes() {
return (annotations == null)
return (metadata == null)
? List.<Attribute.TypeCompound>nil()
: annotations.getClassInitTypeAttributes();
: metadata.getClassInitTypeAttributes();
}
public List<Attribute.TypeCompound> getInitTypeAttributes() {
return (annotations == null)
return (metadata == null)
? List.<Attribute.TypeCompound>nil()
: annotations.getInitTypeAttributes();
: metadata.getInitTypeAttributes();
}
public List<Attribute.Compound> getDeclarationAttributes() {
return (annotations == null)
return (metadata == null)
? List.<Attribute.Compound>nil()
: annotations.getDeclarationAttributes();
: metadata.getDeclarationAttributes();
}
public boolean hasAnnotations() {
return (annotations != null && !annotations.isEmpty());
return (metadata != null && !metadata.isEmpty());
}
public boolean hasTypeAnnotations() {
return (annotations != null && !annotations.isTypesEmpty());
return (metadata != null && !metadata.isTypesEmpty());
}
public void prependAttributes(List<Attribute.Compound> l) {
if (l.nonEmpty()) {
initedAnnos().prepend(l);
initedMetadata().prepend(l);
}
}
public void resetAnnotations() {
initedAnnos().reset();
initedMetadata().reset();
}
public void setAttributes(Symbol other) {
if (annotations != null || other.annotations != null) {
initedAnnos().setAttributes(other.annotations);
if (metadata != null || other.metadata != null) {
initedMetadata().setAttributes(other.metadata);
}
}
public void setDeclarationAttributes(List<Attribute.Compound> a) {
if (annotations != null || a.nonEmpty()) {
initedAnnos().setDeclarationAttributes(a);
if (metadata != null || a.nonEmpty()) {
initedMetadata().setDeclarationAttributes(a);
}
}
public void setDeclarationAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.Compound> ctx) {
initedAnnos().setDeclarationAttributesWithCompletion(ctx);
initedMetadata().setDeclarationAttributesWithCompletion(ctx);
}
public void setTypeAttributes(List<Attribute.TypeCompound> a) {
if (annotations != null || a.nonEmpty()) {
if (annotations == null)
annotations = new SymbolMetadata(this);
annotations.setTypeAttributes(a);
if (metadata != null || a.nonEmpty()) {
if (metadata == null)
metadata = new SymbolMetadata(this);
metadata.setTypeAttributes(a);
}
}
private SymbolMetadata initedAnnos() {
if (annotations == null)
annotations = new SymbolMetadata(this);
return annotations;
private SymbolMetadata initedMetadata() {
if (metadata == null)
metadata = new SymbolMetadata(this);
return metadata;
}
/** This method is intended for debugging only. */
public SymbolMetadata getAnnotations() {
return annotations;
public SymbolMetadata getMetadata() {
return metadata;
}
// </editor-fold>
@ -862,10 +862,10 @@ public abstract class Symbol extends AnnoConstruct implements Element {
}
private void mergeAttributes() {
if (annotations == null &&
package_info.annotations != null) {
annotations = new SymbolMetadata(this);
annotations.setAttributes(package_info.annotations);
if (metadata == null &&
package_info.metadata != null) {
metadata = new SymbolMetadata(this);
metadata.setAttributes(package_info.metadata);
}
}

4
langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
View File

@ -404,11 +404,11 @@ public class TypeAnnotations {
depth = depth.append(TypePathEntry.ARRAY);
while (arType.elemtype.hasTag(TypeTag.ARRAY)) {
if (arType.elemtype.isAnnotated()) {
Type.AnnotatedType aelemtype = (Type.AnnotatedType) arType.elemtype;
Type aelemtype = arType.elemtype;
arType = (Type.ArrayType) aelemtype.unannotatedType();
ArrayType prevToMod = tomodify;
tomodify = new Type.ArrayType(null, arType.tsym);
prevToMod.elemtype = (Type.AnnotatedType) tomodify.annotatedType(arType.elemtype.getAnnotationMirrors());
prevToMod.elemtype = tomodify.annotatedType(arType.elemtype.getAnnotationMirrors());
} else {
arType = (Type.ArrayType) arType.elemtype;
tomodify.elemtype = new Type.ArrayType(null, arType.tsym);

2
langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -4062,8 +4062,6 @@ public class Attr extends JCTree.Visitor {
* Apply the annotations to the particular type.
*/
public void annotateType(final JCTree tree, final List<JCAnnotation> annotations) {
// Callers ensure this.
// Assert.check(annotations != null && annotations.nonEmpty());
annotate.typeAnnotation(new Annotate.Worker() {
@Override
public String toString() {