--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Tue Jun 04 13:21:41 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Tue Jun 04 14:17:50 2013 -0700
@@ -271,8 +271,8 @@
}
}
- sym.annotations.reset();
- sym.annotations.setDeclarationAttributes(declAnnos.toList());
+ sym.resetAnnotations();
+ sym.setDeclarationAttributes(declAnnos.toList());
if (typeAnnos.isEmpty()) {
return;
@@ -284,7 +284,7 @@
// When type is null, put the type annotations to the symbol.
// This is used for constructor return annotations, for which
// no appropriate type exists.
- sym.annotations.appendUniqueTypes(typeAnnotations);
+ sym.appendUniqueTypeAttributes(typeAnnotations);
return;
}
@@ -318,7 +318,7 @@
sym.type = type;
}
- sym.annotations.appendUniqueTypes(typeAnnotations);
+ sym.appendUniqueTypeAttributes(typeAnnotations);
if (sym.getKind() == ElementKind.PARAMETER ||
sym.getKind() == ElementKind.LOCAL_VARIABLE ||
@@ -326,7 +326,7 @@
sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
// Make sure all type annotations from the symbol are also
// on the owner.
- sym.owner.annotations.appendUniqueTypes(sym.getRawTypeAttributes());
+ sym.owner.appendUniqueTypeAttributes(sym.getRawTypeAttributes());
}
}
@@ -855,7 +855,7 @@
Assert.error("Found unexpected type annotation for variable: " + v + " with kind: " + v.getKind());
}
if (v.getKind() != ElementKind.FIELD) {
- v.owner.annotations.appendUniqueTypes(v.getRawTypeAttributes());
+ v.owner.appendUniqueTypeAttributes(v.getRawTypeAttributes());
}
return;