1.1 --- a/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java Mon Jan 14 19:52:36 2013 +0100
1.2 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.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 @@ -34,15 +34,13 @@
1.11 public class Helper {
1.12
1.13 enum ContentVars {
1.14 - IMPORTCONTAINERSTMTS("\nimport java.lang.annotation.ContainedBy;\n" +
1.15 - "\nimport java.lang.annotation.ContainerFor;\n"),
1.16 + IMPORTCONTAINERSTMTS("\nimport java.lang.annotation.Repeatable;\n"),
1.17 IMPORTDEPRECATED("import java.lang.Deprecated;\n"),
1.18 IMPORTDOCUMENTED("import java.lang.annotation.Documented;\n"),
1.19 IMPORTINHERITED("import java.lang.annotation.Inherited;\n"),
1.20 IMPORTRETENTION("import java.lang.annotation.Retention;\n" +
1.21 "\nimport java.lang.annotation.RetentionPolicy;\n"),
1.22 - CONTAINEDBY("\n@ContainedBy(FooContainer.class)\n"),
1.23 - CONTAINERFOR("@ContainerFor(Foo.class)\n"),
1.24 + REPEATABLE("\n@Repeatable(FooContainer.class)\n"),
1.25 CONTAINER("@interface FooContainer {\n" +" Foo[] value();\n}\n"),
1.26 BASE("@interface Foo {}\n"),
1.27 REPEATABLEANNO("\n@Foo() @Foo()"),
