1.1 --- a/src/share/classes/com/sun/tools/javac/code/Annotations.java Wed Dec 12 20:26:56 2012 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Annotations.java Mon Dec 03 11:16:32 2012 +0100
1.3 @@ -74,12 +74,12 @@
1.4 */
1.5 private List<Attribute.Compound> attributes = NOT_STARTED;
1.6 /*
1.7 - * The Symbol this Annotatios belong to
1.8 + * The Symbol this Annotations belong to
1.9 */
1.10 - private final Symbol s;
1.11 + private final Symbol sym;
1.12
1.13 - public Annotations(Symbol s) {
1.14 - this.s = s;
1.15 + public Annotations(Symbol sym) {
1.16 + this.sym = sym;
1.17 }
1.18
1.19 public List<Attribute.Compound> getAttributes() {
1.20 @@ -102,7 +102,7 @@
1.21 }
1.22
1.23 public void setAttributesWithCompletion(final Annotate.AnnotateRepeatedContext ctx) {
1.24 - Assert.check(pendingCompletion() || (!isStarted() && s.kind == PCK));
1.25 + Assert.check(pendingCompletion() || (!isStarted() && sym.kind == PCK));
1.26
1.27 Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated = ctx.annotated;
1.28 boolean atLeastOneRepeated = false;
1.29 @@ -111,7 +111,7 @@
1.30 if (lb.size() == 1) {
1.31 buf = buf.prepend(lb.first());
1.32 } else { // repeated
1.33 - buf = buf.prepend(new Placeholder(lb.toList(), s));
1.34 + buf = buf.prepend(new Placeholder(lb.toList(), sym));
1.35 atLeastOneRepeated = true;
1.36 }
1.37 }
1.38 @@ -141,7 +141,7 @@
1.39
1.40 @Override
1.41 public String toString() {
1.42 - return "repeated annotation pass of: " + s + " in: " + s.owner;
1.43 + return "repeated annotation pass of: " + sym + " in: " + sym.owner;
1.44 }
1.45
1.46 @Override
1.47 @@ -253,7 +253,7 @@
1.48
1.49 // Process repeated annotations
1.50 Attribute.Compound validRepeated =
1.51 - ctx.processRepeatedAnnotations(placeholder.getPlaceholderFor());
1.52 + ctx.processRepeatedAnnotations(placeholder.getPlaceholderFor(), sym);
1.53
1.54 if (validRepeated != null) {
1.55 // Check that the container isn't manually
