--- /dev/null	2009-07-06 20:02:10.000000000 -0700
+++ new/src/share/classes/javax/lang/model/util/SharedElementScanner.java	2010-04-29 22:39:17.000000000 -0700
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.lang.model.util;
+
+import javax.lang.model.element.*;
+import javax.annotation.processing.SupportedSourceVersion;
+import static javax.lang.model.element.ElementKind.*;
+import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
+
+
+/**
+ * Shared package private superclass to avoid code bloat.
+ *
+ * @param <R> the return type of this visitor's methods.  Use {@link
+ *            Void} for visitors that do not need to return results.
+ * @param <P> the type of the additional parameter to this visitor's
+ *            methods.  Use {@code Void} for visitors that do not need an
+ *            additional parameter.
+ *
+ * @since 1.7
+ */
+class SharedElementScanner<R, P> extends AbstractElementVisitor6<R, P> {
+    /**
+     * The specified default value.
+     */
+    protected final R DEFAULT_VALUE;
+
+    /**
+     * Constructor for concrete subclasses; uses {@code null} for the
+     * default value.
+     */
+    protected SharedElementScanner(){
+        DEFAULT_VALUE = null;
+    }
+
+    /**
+     * Constructor for concrete subclasses; uses the argument for the
+     * default value.
+     */
+    protected SharedElementScanner(R defaultValue){
+        DEFAULT_VALUE = defaultValue;
+    }
+
+    /**
+     * Iterates over the given elements and calls {@link
+     * #scan(Element, Object) scan(Element, P)} on each one.  Returns
+     * the result of the last call to {@code scan} or {@code
+     * DEFAULT_VALUE} for an empty iterable.
+     *
+     * @param iterable the elements to scan
+     * @param  p additional parameter
+     * @return the scan of the last element or {@code DEFAULT_VALUE} if no elements
+     */
+    public final R scan(Iterable<? extends Element> iterable, P p) {
+        R result = DEFAULT_VALUE;
+        for(Element e : iterable)
+            result = scan(e, p);
+        return result;
+    }
+
+    /**
+     * Processes an element by calling {@code e.accept(this, p)};
+     * this method may be overridden by subclasses.
+     * @return the result of visiting {@code e}.
+     */
+    public R scan(Element e, P p) {
+        return e.accept(this, p);
+    }
+
+    /**
+     * Convenience method equivalent to {@code v.scan(e, null)}.
+     * @return the result of scanning {@code e}.
+     */
+    public final R scan(Element e) {
+        return scan(e, null);
+    }
+
+    /**
+     * {@inheritDoc} This implementation scans the enclosed elements.
+     *
+     * @param e  the element to visit
+     * @param p  a visitor-specified parameter
+     * @return the result of scanning
+     */
+    public R visitPackage(PackageElement e, P p) {
+        return scan(e.getEnclosedElements(), p);
+    }
+
+    /**
+     * {@inheritDoc} This implementation scans the enclosed elements.
+     *
+     * @param e  the element to visit
+     * @param p  a visitor-specified parameter
+     * @return the result of scanning
+     */
+    public R visitType(TypeElement e, P p) {
+        return scan(e.getEnclosedElements(), p);
+    }
+
+    /**
+     * {@inheritDoc} This implementation scans the enclosed elements.
+     *
+     * @param e  the element to visit
+     * @param p  a visitor-specified parameter
+     * @return the result of scanning
+     */
+    public R visitVariable(VariableElement e, P p) {
+        return scan(e.getEnclosedElements(), p);
+    }
+
+    /**
+     * {@inheritDoc} This implementation scans the parameters.
+     *
+     * @param e  the element to visit
+     * @param p  a visitor-specified parameter
+     * @return the result of scanning
+     */
+    public R visitExecutable(ExecutableElement e, P p) {
+        return scan(e.getParameters(), p);
+    }
+
+    /**
+     * {@inheritDoc} This implementation scans the enclosed elements.
+     *
+     * @param e  the element to visit
+     * @param p  a visitor-specified parameter
+     * @return the result of scanning
+     */
+    public R visitTypeParameter(TypeParameterElement e, P p) {
+        return scan(e.getEnclosedElements(), p);
+    }
+}