Thu, 10 Oct 2013 20:12:08 -0400
8008762: Type annotation on inner class in anonymous class show up as regular type annotations
8015257: type annotation with TYPE_USE and FIELD attributed differently if repeated.
8013409: test failures for type annotations
Summary: Fixes to address some problems in type annotations
Reviewed-by: jfranck, jjg
jjg@1521 | 1 | /* |
darcy@1534 | 2 | * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. |
jjg@1521 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
jjg@1521 | 4 | * |
jjg@1521 | 5 | * This code is free software; you can redistribute it and/or modify it |
jjg@1521 | 6 | * under the terms of the GNU General Public License version 2 only, as |
jjg@1521 | 7 | * published by the Free Software Foundation. |
jjg@1521 | 8 | * |
jjg@1521 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
jjg@1521 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
jjg@1521 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
jjg@1521 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
jjg@1521 | 13 | * accompanied this code). |
jjg@1521 | 14 | * |
jjg@1521 | 15 | * You should have received a copy of the GNU General Public License version |
jjg@1521 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
jjg@1521 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
jjg@1521 | 18 | * |
jjg@1521 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
jjg@1521 | 20 | * or visit www.oracle.com if you need additional information or have any |
jjg@1521 | 21 | * questions. |
jjg@1521 | 22 | */ |
jjg@1521 | 23 | |
jjg@1521 | 24 | import static com.sun.tools.classfile.TypeAnnotation.TargetType.*; |
jjg@1521 | 25 | |
jjg@1521 | 26 | /* |
jjg@1521 | 27 | * @test |
jjg@1521 | 28 | * @summary Test population of reference info for repeating type annotations |
jjg@1521 | 29 | * @compile -g Driver.java ReferenceInfoUtil.java RepeatingTypeAnnotations.java |
jjg@1521 | 30 | * @run main Driver RepeatingTypeAnnotations |
jjg@1521 | 31 | * @author Werner Dietl |
jjg@1521 | 32 | */ |
jjg@1521 | 33 | public class RepeatingTypeAnnotations { |
jjg@1521 | 34 | // Field types |
jjg@1521 | 35 | @TADescription(annotation = "RTAs", type = FIELD) |
jjg@1521 | 36 | public String fieldAsPrimitive() { |
jjg@1521 | 37 | return "@RTA @RTA int test;"; |
jjg@1521 | 38 | } |
jjg@1521 | 39 | |
jjg@1521 | 40 | // Method returns |
jjg@1521 | 41 | @TADescription(annotation = "RTAs", type = METHOD_RETURN) |
jjg@1521 | 42 | public String methodReturn1() { |
jjg@1521 | 43 | return "@RTA @RTA int test() { return 0; }"; |
jjg@1521 | 44 | } |
jjg@1521 | 45 | |
jjg@1521 | 46 | @TADescription(annotation = "RTAs", type = METHOD_RETURN) |
jjg@1521 | 47 | public String methodReturn2() { |
jjg@1521 | 48 | return "@RTAs({@RTA, @RTA}) int test() { return 0; }"; |
jjg@1521 | 49 | } |
jjg@1521 | 50 | |
jjg@1521 | 51 | // Method parameters |
jjg@1521 | 52 | @TADescriptions({ |
jjg@1521 | 53 | @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 54 | paramIndex = 0), |
jjg@1521 | 55 | @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 56 | paramIndex = 0, |
jjg@1521 | 57 | genericLocation = { 3, 0 }) |
jjg@1521 | 58 | }) |
jjg@1521 | 59 | public String methodParam1() { |
jjg@1521 | 60 | return "void m(@RTA @RTA List<@RTB @RTB String> p) {}"; |
jjg@1521 | 61 | } |
jjg@1521 | 62 | |
jjg@1521 | 63 | @TADescriptions({ |
jjg@1521 | 64 | @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 65 | paramIndex = 0), |
jjg@1521 | 66 | @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 67 | paramIndex = 0, |
jjg@1521 | 68 | genericLocation = { 3, 0 }) |
jjg@1521 | 69 | }) |
jjg@1521 | 70 | public String methodParam2() { |
jjg@1521 | 71 | return "void m(@RTAs({@RTA, @RTA}) List<@RTBs({@RTB, @RTB}) String> p) {}"; |
jjg@1521 | 72 | } |
jjg@1521 | 73 | |
jjg@1521 | 74 | // TODO: test that all other locations work with repeated type annotations. |
jjg@1521 | 75 | } |