hg: type-annotations/type-annotations/langtools: 5 new changesets

[jonathan.gibbons at oracle.com]

Changeset: 1f8c28134ffc
Author:    jjg
Date:      2013-03-18 08:46 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/1f8c28134ffc

8005220: RFE to write javap tests for repeating annotations.
Reviewed-by: jjg
Contributed-by: peter.jensen at oracle.com

+ test/tools/javap/output/RepeatingTypeAnnotations.java
+ test/tools/javap/output/Tester.java

Changeset: 40adaf938847
Author:    jjg
Date:      2013-03-18 14:40 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/40adaf938847

8008425: Remove interim new javax.lang.model API for type-annotations
Reviewed-by: darcy

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/model/JavacTypes.java
! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/TypeMaker.java
! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
- src/share/classes/javax/lang/model/type/AnnotatedType.java
! src/share/classes/javax/lang/model/type/ExecutableType.java
! src/share/classes/javax/lang/model/type/TypeKind.java
! src/share/classes/javax/lang/model/type/TypeVisitor.java
! src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
! src/share/classes/javax/lang/model/util/Types.java

Changeset: 97f6839673d6
Author:    jjg
Date:      2013-03-18 18:33 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/97f6839673d6

8007803: Implement javax.lang.model API for Type Annotations
Reviewed-by: darcy

! src/share/classes/com/sun/tools/javac/code/Printer.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
+ src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java
! src/share/classes/com/sun/tools/javac/model/JavacElements.java
! src/share/classes/com/sun/tools/javac/model/JavacTypes.java
+ src/share/classes/javax/lang/model/AnnotatedConstruct.java
! src/share/classes/javax/lang/model/element/Element.java
! src/share/classes/javax/lang/model/element/ExecutableElement.java
! src/share/classes/javax/lang/model/type/ExecutableType.java
! src/share/classes/javax/lang/model/type/TypeMirror.java
! src/share/classes/javax/lang/model/util/Types.java

Changeset: 6281d357caf2
Author:    jjg
Date:      2013-03-18 19:16 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/6281d357caf2

Merge

! src/share/classes/com/sun/tools/javac/code/Printer.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
! src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java
! src/share/classes/com/sun/tools/javac/model/JavacElements.java
! src/share/classes/com/sun/tools/javac/model/JavacTypes.java
! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/TypeMaker.java
! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
! src/share/classes/javax/lang/model/AnnotatedConstruct.java
! src/share/classes/javax/lang/model/element/ExecutableElement.java
! src/share/classes/javax/lang/model/type/ExecutableType.java
! src/share/classes/javax/lang/model/type/TypeKind.java
! src/share/classes/javax/lang/model/type/TypeVisitor.java
! src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
! src/share/classes/javax/lang/model/util/Types.java

Changeset: 8d0997a404a6
Author:    jjg
Date:      2013-03-18 19:28 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/8d0997a404a6

Fix merge errors

! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/javax/lang/model/element/ExecutableElement.java