1.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Tue May 14 13:55:35 2013 -0700
1.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Tue May 14 15:04:06 2013 -0700
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 @@ -831,4 +831,48 @@
1.11 " }\n" +
1.12 "}}\n";
1.13 }
1.14 +
1.15 + @TADescriptions({
1.16 + @TADescription(annotation = "TA", type = CLASS_EXTENDS,
1.17 + genericLocation = {}, typeIndex = -1),
1.18 + @TADescription(annotation = "TB", type = CLASS_EXTENDS,
1.19 + genericLocation = {3, 0}, typeIndex = -1),
1.20 + @TADescription(annotation = "TC", type = CLASS_EXTENDS,
1.21 + genericLocation = {3, 1}, typeIndex = -1),
1.22 + @TADescription(annotation = "TD", type = CLASS_EXTENDS,
1.23 + genericLocation = {1, 0}, typeIndex = -1),
1.24 + @TADescription(annotation = "TE", type = CLASS_EXTENDS,
1.25 + genericLocation = {1, 0, 3, 0}, typeIndex = -1),
1.26 + @TADescription(annotation = "TF", type = CLASS_EXTENDS,
1.27 + genericLocation = {1, 0, 3, 1}, typeIndex = -1)
1.28 + })
1.29 + @TestClass("GOuter$GInner$Test")
1.30 + public String testExtends1() {
1.31 + return "class GOuter<A, B> {\n" +
1.32 + " class GInner<X, Y> {\n" +
1.33 + " class Test extends @TA GOuter<@TB String, @TC String>.@TD GInner<@TE String, @TF String> {}" +
1.34 + " }" +
1.35 + "}";
1.36 + }
1.37 +
1.38 + @TADescriptions({
1.39 + @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER,
1.40 + genericLocation = {}, paramIndex = 0),
1.41 + @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND,
1.42 + genericLocation = {}, paramIndex = 0, boundIndex = 0),
1.43 + @TADescription(annotation = "TC", type = FIELD,
1.44 + genericLocation = {}),
1.45 + @TADescription(annotation = "TD", type = FIELD,
1.46 + genericLocation = {3, 0})
1.47 + })
1.48 + @TestClass("Test$1Nested")
1.49 + public String testNestedInMethod1() {
1.50 + return "class Test {\n" +
1.51 + " void foobar() {\n" +
1.52 + " class Nested<@TA X extends @TB Object> {\n" +
1.53 + " @TC List<@TD Object> f;\n" +
1.54 + " }\n" +
1.55 + " }" +
1.56 + "}";
1.57 + }
1.58 }
