Thu, 31 Jan 2013 14:10:02 -0800
Merge
1.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Thu Jan 31 10:23:49 2013 -0800 1.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Thu Jan 31 14:10:02 2013 -0800 1.3 @@ -174,22 +174,20 @@ 1.4 1.5 String sourceBase = new String("@Retention("+retentn+")\n" + 1.6 "@Target({TYPE_USE,_OTHER_})\n" + 1.7 - "@ContainedBy( AC.class )\n" + 1.8 + "@Repeatable( AC.class )\n" + 1.9 "@interface A { }\n\n" + 1.10 1.11 "@Retention("+retentn+")\n" + 1.12 "@Target({TYPE_USE,_OTHER_})\n" + 1.13 - "@ContainerFor(A.class)\n" + 1.14 "@interface AC { A[] value(); }\n\n" + 1.15 1.16 "@Retention("+retentn+")\n" + 1.17 "@Target({TYPE_USE,_OTHER_})\n" + 1.18 - "@ContainedBy( BC.class )\n" + 1.19 + "@Repeatable( BC.class )\n" + 1.20 "@interface B { }\n\n" + 1.21 1.22 "@Retention("+retentn+")\n" + 1.23 "@Target({TYPE_USE,_OTHER_})\n" + 1.24 - "@ContainerFor(B.class)\n" + 1.25 "@interface BC { B[] value(); } \n\n" + 1.26 1.27 "@Retention("+retentn+")\n" + 1.28 @@ -198,12 +196,11 @@ 1.29 1.30 "@Retention("+retentn+")\n" + 1.31 "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + 1.32 - "@ContainedBy(DC.class)\n" + 1.33 + "@Repeatable(DC.class)\n" + 1.34 "@interface D { }\n\n" + 1.35 1.36 "@Retention("+retentn+")\n" + 1.37 "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + 1.38 - "@ContainerFor(D.class) \n" + 1.39 "@interface DC { D[] value(); }\n\n"); 1.40 1.41 // Test case sources with sample generated source.
2.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Thu Jan 31 10:23:49 2013 -0800 2.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Thu Jan 31 14:10:02 2013 -0800 2.3 @@ -171,32 +171,29 @@ 2.4 2.5 String sourceBase = new String("@Retention("+retentn+")\n" + 2.6 "@Target({TYPE_USE,_OTHER_})\n" + 2.7 - "@ContainedBy( AC.class )\n" + 2.8 + "@Repeatable( AC.class )\n" + 2.9 "@interface A { }\n\n" + 2.10 2.11 "@Retention("+retentn+")\n" + 2.12 "@Target({TYPE_USE,_OTHER_})\n" + 2.13 - "@ContainerFor(A.class)\n" + 2.14 "@interface AC { A[] value(); }\n\n" + 2.15 2.16 "@Retention("+retentn+")\n" + 2.17 "@Target({TYPE_USE,_OTHER_})\n" + 2.18 - "@ContainedBy( BC.class )\n" + 2.19 + "@Repeatable( BC.class )\n" + 2.20 "@interface B { }\n\n" + 2.21 2.22 "@Retention("+retentn+")\n" + 2.23 "@Target({TYPE_USE,_OTHER_})\n" + 2.24 - "@ContainerFor(B.class)\n" + 2.25 "@interface BC { B[] value(); } \n\n" + 2.26 2.27 "@Retention("+retentn+")\n" + 2.28 "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + 2.29 - "@ContainedBy(DC.class)\n" + 2.30 + "@Repeatable(DC.class)\n" + 2.31 "@interface D { }\n\n" + 2.32 2.33 "@Retention("+retentn+")\n" + 2.34 "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" + 2.35 - "@ContainerFor(D.class) \n" + 2.36 "@interface DC { D[] value(); }\n\n"); 2.37 2.38 // Test case sources with sample generated source
3.1 --- a/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Thu Jan 31 10:23:49 2013 -0800 3.2 +++ b/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Thu Jan 31 14:10:02 2013 -0800 3.3 @@ -120,7 +120,6 @@ 3.4 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) 3.5 @interface RTA { } 3.6 3.7 -@ContainerFor(RTA.class) 3.8 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) 3.9 @interface RTAs { 3.10 RTA[] value();
4.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Thu Jan 31 10:23:49 2013 -0800 4.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Thu Jan 31 14:10:02 2013 -0800 4.3 @@ -1,5 +1,5 @@ 4.4 /* 4.5 - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved. 4.6 + * Copyright (c) 2009, 2013 Oracle and/or its affiliates. All rights reserved. 4.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 * This code is free software; you can redistribute it and/or modify it 4.10 @@ -241,8 +241,8 @@ 4.11 sb.append("\n@Repeatable(RTAs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTA {}"); 4.12 sb.append("\n@Repeatable(RTBs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTB {}"); 4.13 4.14 - sb.append("\n@ContainerFor(RTA.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }"); 4.15 - sb.append("\n@ContainerFor(RTB.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }"); 4.16 + sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }"); 4.17 + sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }"); 4.18 4.19 sb.append("\n@Target(value={ElementType.TYPE,ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.CONSTRUCTOR,ElementType.LOCAL_VARIABLE})"); 4.20 sb.append("\n@interface Decl {}");