Implement AbstractAnnotationValueVisitor6.

2014-05-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/lang/model/util/AbstractAnnotationValueVisitor6.java:
	New abstract class.
	(AbstractAnnotationValueVisitor6()): Implemented.
	(visit(AnnotationValue)): Likewise.
	(visit(AnnotationValue, P)): Likewise.
	(visitUnknown(AnnotationValue, P)): Likewise.
	* javax/lang/model/util/AbstractElementVisitor6.java:
	(visitUnknown(Element,P)): Add missing Override annotation.

Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>

3 files changed, 140 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b317a7be1..25f5b34c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-05-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* javax/lang/model/util/AbstractAnnotationValueVisitor6.java:
+	New abstract class.
+	(AbstractAnnotationValueVisitor6()): Implemented.
+	(visit(AnnotationValue)): Likewise.
+	(visit(AnnotationValue, P)): Likewise.
+	(visitUnknown(AnnotationValue, P)): Likewise.
+	* javax/lang/model/util/AbstractElementVisitor6.java:
+	(visitUnknown(Element,P)): Add missing Override annotation.
+
 2014-10-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS: Updated.
diff --git a/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
new file mode 100644
index 000000000..8f0800f5f
--- /dev/null
+++ b/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
@@ -0,0 +1,128 @@
+/* AbstractAnnotationValueVisitor6.java -- A visitor of annotation values for 1.6.
+   Copyright (C) 2014  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.lang.model.util;
+
+import javax.annotation.processing.SupportedSourceVersion;
+
+import javax.lang.model.SourceVersion;
+
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.AnnotationValueVisitor;
+import javax.lang.model.element.UnknownAnnotationValueException;
+
+/**
+ * <p>A skeletal implementation of {@link AnnotationValueVisitor} for the
+ * 1.6 version of the Java programming language
+ * ({@link SourceVersion#RELEASE_6}).  Implementors can extend this
+ * class and need provide only implementations of the
+ * {@code visitXYZ} methods appropriate to 1.6.</p>
+ * <p>As the interface this class implements may be extended in future,
+ * in order to support later language versions, methods beginning with
+ * the phrase {@code "visit"} should be avoided in subclasses.  This
+ * class itself will be extended to direct these new methods to the
+ * {@link #visitUnknown(AnnotationValue,P) method and a new class will be
+ * added to provide implementations for the new language version.
+ * At this time, all or some of this class may be deprecated.</p>
+ *
+ * @param <R> the return type of the visitor's methods.  {@code Void}
+ *            can be used where there is no return value.
+ * @param <P> the type of the additional parameter supplied to the visitor's
+ *            methods.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.6
+ */
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+public abstract class AbstractAnnotationValueVisitor6<R,P> implements AnnotationValueVisitor<R,P>
+{
+
+  /**
+   * Constructs a new {@code AbstractAnnotationValueVisitor6}.
+   */
+  protected AbstractAnnotationValueVisitor6() {}
+
+  /**
+   * Visits an annotation value by passing itself to the annotation
+   * value's {@code accept} method, with {@code null} for the additional
+   * parameter i.e. {@code{v.visit(annotationValue)} is equivalent to 
+   * {@code{element.accept(annotationValue, null)}.
+   *
+   * @param annotationValue the annotation value to visit.
+   * @return the return value specific to the annotation value.
+   */
+  @Override
+  public final R visit(AnnotationValue annotationValue)
+  {
+    return annotationValue.accept(this, null);
+  }
+
+  /**
+   * Visits an annotation value by passing itself to the annotation
+   * value's {@code accept} method, with the specified value as the additional
+   * parameter i.e. {@code{v.visit(annotationValue, parameter)} is equivalent to 
+   * {@code{annotationValue.accept(v, parameter)}.
+   *
+   * @param annotationValue the annotation value to visit.
+   * @param parameter the value to use as the additional parameter.
+   * @return the return value specific to the annotation value.
+   */
+  @Override
+  public final R visit(AnnotationValue annotationValue, P parameter)
+  {
+    return annotationValue.accept(this, parameter);
+  }
+
+  /**
+   * Visits an unknown annotation value.  This method is called if
+   * this visitor is used in a version of the language later
+   * than 1.6, where new elements have been added.  This
+   * implementation always throws a {@link UnknownAnnotationValueException}
+   * but this is not required of subclasses.
+   *
+   * @param annotationValue the annotation value to visit.
+   * @param parameter the additional parameter, specific to the visitor.
+   * @return the return value specific to the visitor.
+   * @throws UnknownAnnotationValueException by default.
+   */
+  @Override
+  public R visitUnknown(AnnotationValue annotationValue, P parameter)
+  {
+    throw new UnknownAnnotationValueException(annotationValue, parameter);
+  }
+
+}
diff --git a/javax/lang/model/util/AbstractElementVisitor6.java b/javax/lang/model/util/AbstractElementVisitor6.java
index 84463ff18..3fdb6b683 100644
--- a/javax/lang/model/util/AbstractElementVisitor6.java
+++ b/javax/lang/model/util/AbstractElementVisitor6.java
@@ -119,6 +119,7 @@ public abstract class AbstractElementVisitor6<R,P> implements ElementVisitor<R,P
    * @return the return value specific to the visitor.
    * @throws UnknownElementException by default.
    */
+  @Override
   public R visitUnknown(Element element, P parameter)
   {
     throw new UnknownElementException(element, parameter);