Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Tue, 09 Nov 2010 22:54:48 -0800
changeset 7083 f6bd6c4fcf54
parent 7070 4fd2b103e010 (diff)
parent 7082 b36c199d8de8 (current diff)
child 7084 ea14efe08312
Merge
langtools/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/source/tree/DisjointTypeTree.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/T6985181.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/TypeAnnotationsNotSupported.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/treeannotests/AnnoTreeTests.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/6967002/T6967002.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/6967002/T6967002.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/InnerClass.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/MultipleTargets.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/TypeParameterTarget.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/TypeUseTarget.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/attribution/Scopes.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/classfile/DeadCode.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/IndexArray.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/IndexArray.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/LintCast.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/LintCast.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/OldArray.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/Scopes.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/Scopes.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/StaticFields.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/StaticFields.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/VoidGenericMethod.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/ClassExtends.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/ClassLiterals.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/ClassParameters.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/ConstructorTypeArgs.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/Expressions.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/Fields.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/LocalVariables.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/MethodReturnType.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/MethodTypeArgs.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/MethodTypeParameters.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/Parameters.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/Receivers.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/Throws.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/TypeCasts.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/TypeParameters.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/typeAnnotations/newlocations/Wildcards.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/ArrayClassLiterals.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/ArrayClassLiterals2.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/ClassLiterals.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/NewArray.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/Presence.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/PresenceInner.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/T6855990.java file | annotate | diff | comparison | revisions
langtools/test/tools/javap/typeAnnotations/Visibility.java file | annotate | diff | comparison | revisions 
--- a/langtools/.hgtags	Tue Nov 02 19:41:59 2010 -0700
+++ b/langtools/.hgtags	Tue Nov 09 22:54:48 2010 -0800
@@ -91,3 +91,4 @@
 e4e7408cdc5b3d91d39161e1e94aad576ecc2dcd jdk7-b114
 01e8ac5fbefd35d2d9a0996213cf2390fd164e57 jdk7-b115
 857bfcea3f30cb5f4ae96f46a53ae1c772f9b0e5 jdk7-b116
+2129a046f117547fc8a5cb3397a767e6d528f5b6 jdk7-b117
jdk-sandbox