1.1 --- a/src/share/classes/com/sun/tools/javac/code/Annotations.java Mon Jan 14 19:52:36 2013 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Annotations.java Mon Jan 14 13:50:01 2013 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -126,12 +126,12 @@
1.11 //
1.12 // We need to do this in two passes because when creating
1.13 // a container for a repeating annotation we must
1.14 - // guarantee that the @ContainedBy on the
1.15 + // guarantee that the @Repeatable on the
1.16 // contained annotation is fully annotated
1.17 //
1.18 // The way we force this order is to do all repeating
1.19 // annotations in a pass after all non-repeating are
1.20 - // finished. This will work because @ContainedBy
1.21 + // finished. This will work because @Repeatable
1.22 // is non-repeating and therefore will be annotated in the
1.23 // fist pass.
1.24
1.25 @@ -261,7 +261,7 @@
1.26 // its contained annotation.
1.27 ListBuffer<Attribute.Compound> manualContainer = ctx.annotated.get(validRepeated.type.tsym);
1.28 if (manualContainer != null) {
1.29 - log.error(ctx.pos.get(manualContainer.first()), "invalid.containedby.annotation.repeated.and.container.present",
1.30 + log.error(ctx.pos.get(manualContainer.first()), "invalid.repeatable.annotation.repeated.and.container.present",
1.31 manualContainer.first().type.tsym);
1.32 }
1.33 }
