Merge branch 'master' of git.sv.gnu.org:/srv/git/classpath into gtk3gtk3

Conflicts:
	ChangeLog

1 files changed, 5 insertions, 2 deletions

diff --git a/javax/lang/model/element/UnknownAnnotationValueException.java b/javax/lang/model/element/UnknownAnnotationValueException.java
index dd9056b5a..1a51363c3 100644
--- a/javax/lang/model/element/UnknownAnnotationValueException.java
+++ b/javax/lang/model/element/UnknownAnnotationValueException.java
@@ -1,5 +1,5 @@
 /* UnknownAnnotationValueException.java -- Thrown by an unknown annotation value.
-   Copyright (C) 2012  Free Software Foundation, Inc.
+   Copyright (C) 2012, 2013  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.lang.model.element;
 
+import javax.lang.model.UnknownEntityException;
+
 /**
  * Thrown when an unknown annotation value is encountered,
  * usually by a {@link AnnotationValueVisitor}.
@@ -46,7 +48,7 @@ package javax.lang.model.element;
  * @see AnnotationValueVisitor#visitUnknown(AnnotationValue,P)
  */
 public class UnknownAnnotationValueException
-  extends RuntimeException
+  extends UnknownEntityException
 {
 
   private static final long serialVersionUID = 269L;
@@ -74,6 +76,7 @@ public class UnknownAnnotationValueException
   public UnknownAnnotationValueException(AnnotationValue annValue,
 					 Object param)
   {
+    super("The annotation value " + annValue + " is not recognised.");
     this.annValue = annValue;
     this.param = param;
   }