# HG changeset patch
# User alanb
# Date 1251044446 -3600
# Node ID e86b5b8235fbb52a9b0e610a3c1a0b2b35169677
# Parent  399359a027de94c9b257248edac07d84fa5cbd86# Parent  28237c1f0c41255b9cce41c91a3a850513e6656a
Merge

diff -r 399359a027de -r e86b5b8235fb jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java
--- a/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java	Sun Aug 23 12:53:45 2009 +0100
+++ b/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java	Sun Aug 23 17:20:46 2009 +0100
@@ -28,8 +28,12 @@
 /**
  * Thrown when an application tries to access an enum constant by name
  * and the enum type contains no constant with the specified name.
+ * This exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since   1.5
  */
 public class EnumConstantNotPresentException extends RuntimeException {
diff -r 399359a027de -r e86b5b8235fb jdk/src/share/classes/java/lang/TypeNotPresentException.java
--- a/jdk/src/share/classes/java/lang/TypeNotPresentException.java	Sun Aug 23 12:53:45 2009 +0100
+++ b/jdk/src/share/classes/java/lang/TypeNotPresentException.java	Sun Aug 23 17:20:46 2009 +0100
@@ -35,8 +35,12 @@
  * <p>Note that this exception may be used when undefined type variables
  * are accessed as well as when types (e.g., classes, interfaces or
  * annotation types) are loaded.
+ * In particular, this exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since 1.5
  */
 public class TypeNotPresentException extends RuntimeException {
diff -r 399359a027de -r e86b5b8235fb jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java
--- a/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java	Sun Aug 23 12:53:45 2009 +0100
+++ b/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java	Sun Aug 23 17:20:46 2009 +0100
@@ -28,8 +28,12 @@
 /**
  * Thrown when the annotation parser attempts to read an annotation
  * from a class file and determines that the annotation is malformed.
+ * This error can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since   1.5
  */
 public class AnnotationFormatError extends Error {
diff -r 399359a027de -r e86b5b8235fb jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
--- a/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java	Sun Aug 23 12:53:45 2009 +0100
+++ b/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java	Sun Aug 23 17:20:46 2009 +0100
@@ -30,8 +30,12 @@
  * Thrown to indicate that a program has attempted to access an element of
  * an annotation whose type has changed after the annotation was compiled
  * (or serialized).
+ * This exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since 1.5
  */
 public class AnnotationTypeMismatchException extends RuntimeException {
diff -r 399359a027de -r e86b5b8235fb jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
--- a/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java	Sun Aug 23 12:53:45 2009 +0100
+++ b/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java	Sun Aug 23 17:20:46 2009 +0100
@@ -30,8 +30,12 @@
  * an annotation type that was added to the annotation type definition after
  * the annotation was compiled (or serialized).  This exception will not be
  * thrown if the new element has a default value.
+ * This exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since 1.5
  */
 public class IncompleteAnnotationException extends RuntimeException {
diff -r 399359a027de -r e86b5b8235fb jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
--- a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java	Sun Aug 23 12:53:45 2009 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java	Sun Aug 23 17:20:46 2009 +0100
@@ -50,6 +50,11 @@
  * java.lang.annotation.AnnotationTypeMismatchException} or an
  * {@link java.lang.annotation.IncompleteAnnotationException}.
  *
+ * @see java.lang.EnumConstantNotPresentException
+ * @see java.lang.TypeNotPresentException
+ * @see java.lang.annotation.AnnotationFormatError
+ * @see java.lang.annotation.AnnotationTypeMismatchException
+ * @see java.lang.annotation.IncompleteAnnotationException
  * @since 1.5
  * @author Josh Bloch
  */