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

[wdietl at gmail.com]

Changeset: b6013b1c699e
Author:    wmdietl
Date:      2013-05-07 17:41 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/b6013b1c699e

Remove duplicate code from merge mistake.

! src/share/classes/com/sun/tools/javadoc/TypeMaker.java

Changeset: a98b02a745f6
Author:    wmdietl
Date:      2013-05-07 17:42 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/a98b02a745f6

Remove unused imports.

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
! src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
! src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
! src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
! src/share/classes/com/sun/tools/javadoc/Messager.java
! src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java

Changeset: f90d05a438f4
Author:    wmdietl
Date:      2013-05-07 17:43 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/f90d05a438f4

Expand test to also look for a documented TYPE_PARAMETER annotation.

! test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
! test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java

Changeset: bf7c5b3560b1
Author:    wmdietl
Date:      2013-05-09 01:01 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/bf7c5b3560b1

Automated merge with http://hg.openjdk.java.net/type-annotations/type-annotations/langtools


Changeset: 780014a234fa
Author:    jfranck
Date:      2013-05-08 14:10 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/780014a234fa

8013485: javac can't handle annotations with a <clinit> from a previous compilation unit
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/comp/Check.java
+ test/tools/javac/annotations/clinit/AnnoWithClinit1.java
+ test/tools/javac/annotations/clinit/AnnoWithClinitFail.java
+ test/tools/javac/annotations/clinit/AnnoWithClinitFail.out

Changeset: 3c0c13489ae2
Author:    wmdietl
Date:      2013-05-09 01:02 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/3c0c13489ae2

Automated merge with http://hg.openjdk.java.net/jdk8/tl/langtools

! src/share/classes/com/sun/tools/javac/comp/Check.java

Changeset: 345f3dc73dda
Author:    wmdietl
Date:      2013-05-09 01:33 +0200
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/345f3dc73dda

Move init and clinit type annotations from ClassSymbol to Annotations.

! src/share/classes/com/sun/tools/javac/code/Annotations.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java