--- old/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java	2010-04-29 22:39:10.000000000 -0700
+++ new/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java	2010-04-29 22:39:09.000000000 -0700
@@ -30,7 +30,6 @@
 import javax.lang.model.SourceVersion;
 import static javax.lang.model.SourceVersion.*;
 
-
 /**
  * A simple visitor of types with default behavior appropriate for the
  * {@link SourceVersion#RELEASE_6 RELEASE_6} source version.
@@ -70,23 +69,18 @@
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @author Peter von der Ahé
+ *
+ * @see SimpleTypeVisitor7
  * @since 1.6
  */
 @SupportedSourceVersion(RELEASE_6)
-public class SimpleTypeVisitor6<R, P> extends AbstractTypeVisitor6<R, P> {
-    /**
-     * Default value to be returned; {@link #defaultAction
-     * defaultAction} returns this value unless the method is
-     * overridden.
-     */
-    protected final R DEFAULT_VALUE;
-
+public class SimpleTypeVisitor6<R, P> extends SharedSimpleTypeVisitor<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the
      * default value.
      */
     protected SimpleTypeVisitor6(){
-        DEFAULT_VALUE = null;
+        super();
     }
 
     /**
@@ -96,114 +90,6 @@
      * @param defaultValue the value to assign to {@link #DEFAULT_VALUE}
      */
     protected SimpleTypeVisitor6(R defaultValue){
-        DEFAULT_VALUE = defaultValue;
-    }
-
-    /**
-     * The default action for visit methods.  The implementation in
-     * this class just returns {@link #DEFAULT_VALUE}; subclasses will
-     * commonly override this method.
-     */
-    protected R defaultAction(TypeMirror e, P p) {
-        return DEFAULT_VALUE;
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitPrimitive(PrimitiveType t, P p) {
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitNull(NullType t, P p){
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitArray(ArrayType t, P p){
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitDeclared(DeclaredType t, P p){
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitError(ErrorType t, P p){
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitTypeVariable(TypeVariable t, P p){
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitWildcard(WildcardType t, P p){
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitExecutable(ExecutableType t, P p) {
-        return defaultAction(t, p);
-    }
-
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param t {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     */
-    public R visitNoType(NoType t, P p){
-        return defaultAction(t, p);
+        super(defaultValue);
     }
 }