WARNING: The {@code TypeVisitor} interface implemented * by this class may have methods added to it in the future to @@ -95,6 +96,20 @@ } /** + * Visits a {@code DisjunctiveType} element by calling {@code + * visitUnknown}. + + * @param t {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of {@code visitUnknown} + * + * @since 1.7 + */ + public R visitDisjunctive(DisjunctiveType t, P p) { + return visitUnknown(t, p); + } + + /** * {@inheritDoc} * *
The default implementation of this method in {@code diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java --- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011 Oracle and/or its affiliates. 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 @@ -29,7 +29,8 @@ /** * A skeletal visitor of types with default behavior appropriate for - * the version 7 language level. + * the {@link javax.lang.model.SourceVersion#RELEASE_7 RELEASE_7} + * source version. * *
WARNING: The {@code TypeVisitor} interface implemented * by this class may have methods added to it in the future to @@ -64,4 +65,13 @@ protected AbstractTypeVisitor7() { super(); } + + /** + * Visits a {@code DisjunctiveType} in a manner defined by a subclass. + * + * @param t {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of the visit as defined by a subclass + */ + public abstract R visitDisjunctive(DisjunctiveType t, P p); } diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/ElementKindVisitor6.java --- a/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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 @@ -199,7 +199,8 @@ * Visits a variable element, dispatching to the visit method for * the specific {@linkplain ElementKind kind} of variable, {@code * ENUM_CONSTANT}, {@code EXCEPTION_PARAMETER}, {@code FIELD}, - * {@code LOCAL_VARIABLE}, or {@code PARAMETER}. + * {@code LOCAL_VARIABLE}, {@code PARAMETER}, or {@code RESOURCE_VARIABLE}. + * * @param e {@inheritDoc} * @param p {@inheritDoc} * @return the result of the kind-specific visit method @@ -223,10 +224,12 @@ case PARAMETER: return visitVariableAsParameter(e, p); + case RESOURCE_VARIABLE: + return visitVariableAsResourceVariable(e, p); + default: throw new AssertionError("Bad kind " + k + " for VariableElement" + e); } - } /** @@ -290,6 +293,20 @@ } /** + * Visits a {@code RESOURCE_VARIABLE} variable element by calling + * {@code visitUnknown}. + * + * @param e the element to visit + * @param p a visitor-specified parameter + * @return the result of {@code visitUnknown} + * + * @since 1.7 + */ + public R visitVariableAsResourceVariable(VariableElement e, P p) { + return visitUnknown(e, p); + } + + /** * Visits an executable element, dispatching to the visit method * for the specific {@linkplain ElementKind kind} of executable, * {@code CONSTRUCTOR}, {@code INSTANCE_INIT}, {@code METHOD}, or diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/ElementKindVisitor7.java --- a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011 Oracle and/or its affiliates. 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 @@ -34,7 +34,7 @@ /** * A visitor of program elements based on their {@linkplain * ElementKind kind} with default behavior appropriate for the {@link - * SourceVersion#RELEASE_6 RELEASE_6} source version. For {@linkplain + * SourceVersion#RELEASE_7 RELEASE_7} source version. For {@linkplain * Element elements} XYZ that may have more than one * kind, the visitXYZ methods in this class delegate * to the visitXYZKind method corresponding to the @@ -94,4 +94,17 @@ protected ElementKindVisitor7(R defaultValue) { super(defaultValue); } + + /** + * Visits a {@code RESOURCE_VARIABLE} variable element by calling + * {@code defaultAction}. + * + * @param e {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of {@code defaultAction} + */ + @Override + public R visitVariableAsResourceVariable(VariableElement e, P p) { + return defaultAction(e, p); + } } diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/ElementScanner6.java --- a/src/share/classes/javax/lang/model/util/ElementScanner6.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/ElementScanner6.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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 @@ -152,8 +152,8 @@ /** * {@inheritDoc} This implementation scans the enclosed elements. * - * @param e the element to visit - * @param p a visitor-specified parameter + * @param e {@inheritDoc} + * @param p {@inheritDoc} * @return the result of scanning */ public R visitPackage(PackageElement e, P p) { @@ -163,8 +163,8 @@ /** * {@inheritDoc} This implementation scans the enclosed elements. * - * @param e the element to visit - * @param p a visitor-specified parameter + * @param e {@inheritDoc} + * @param p {@inheritDoc} * @return the result of scanning */ public R visitType(TypeElement e, P p) { @@ -172,21 +172,28 @@ } /** - * {@inheritDoc} This implementation scans the enclosed elements. + * {@inheritDoc} * - * @param e the element to visit - * @param p a visitor-specified parameter + * This implementation scans the enclosed elements, unless the + * element is a {@code RESOURCE_VARIABLE} in which case {@code + * visitUnknown} is called. + * + * @param e {@inheritDoc} + * @param p {@inheritDoc} * @return the result of scanning */ public R visitVariable(VariableElement e, P p) { - return scan(e.getEnclosedElements(), p); + if (e.getKind() != ElementKind.RESOURCE_VARIABLE) + return scan(e.getEnclosedElements(), p); + else + return visitUnknown(e, p); } /** * {@inheritDoc} This implementation scans the parameters. * - * @param e the element to visit - * @param p a visitor-specified parameter + * @param e {@inheritDoc} + * @param p {@inheritDoc} * @return the result of scanning */ public R visitExecutable(ExecutableElement e, P p) { @@ -196,8 +203,8 @@ /** * {@inheritDoc} This implementation scans the enclosed elements. * - * @param e the element to visit - * @param p a visitor-specified parameter + * @param e {@inheritDoc} + * @param p {@inheritDoc} * @return the result of scanning */ public R visitTypeParameter(TypeParameterElement e, P p) { diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/ElementScanner7.java --- a/src/share/classes/javax/lang/model/util/ElementScanner7.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/ElementScanner7.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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 @@ -105,4 +105,16 @@ protected ElementScanner7(R defaultValue){ super(defaultValue); } + + /** + * This implementation scans the enclosed elements. + * + * @param e {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of scanning + */ + @Override + public R visitVariable(VariableElement e, P p) { + return scan(e.getEnclosedElements(), p); + } } diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java --- a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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 @@ -36,8 +36,8 @@ /** * A simple visitor for annotation values with default behavior * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} - * source version. Visit methods call {@link - * #defaultAction} passing their arguments to {@code defaultAction}'s + * source version. Visit methods call {@link #defaultAction + * defaultAction} passing their arguments to {@code defaultAction}'s * corresponding parameters. * *
Methods in this class may be overridden subject to their diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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 @@ -38,8 +38,11 @@ * source version. * * Visit methods corresponding to {@code RELEASE_6} language - * constructs call {@link #defaultAction}, passing their arguments to - * {@code defaultAction}'s corresponding parameters. + * constructs call {@link #defaultAction defaultAction}, passing their + * arguments to {@code defaultAction}'s corresponding parameters. + * + * For constructs introduced in {@code RELEASE_7} and later, {@code + * visitUnknown} is called instead. * *
Methods in this class may be overridden subject to their * general contract. Note that annotating methods in concrete @@ -137,14 +140,21 @@ } /** - * {@inheritDoc} This implementation calls {@code defaultAction}. + * {@inheritDoc} + * + * This implementation calls {@code defaultAction}, unless the + * element is a {@code RESOURCE_VARIABLE} in which case {@code + * visitUnknown} is called. * * @param e {@inheritDoc} * @param p {@inheritDoc} - * @return the result of {@code defaultAction} + * @return the result of {@code defaultAction} or {@code visitUnknown} */ public R visitVariable(VariableElement e, P p) { - return defaultAction(e, p); + if (e.getKind() != ElementKind.RESOURCE_VARIABLE) + return defaultAction(e, p); + else + return visitUnknown(e, p); } /** diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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 @@ -36,9 +36,10 @@ * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} * source version. * - * Visit methods corresponding to {@code RELEASE_7} language - * constructs call {@link #defaultAction}, passing their arguments to - * {@code defaultAction}'s corresponding parameters. + * Visit methods corresponding to {@code RELEASE_7} and earlier + * language constructs call {@link #defaultAction defaultAction}, + * passing their arguments to {@code defaultAction}'s corresponding + * parameters. * *
Methods in this class may be overridden subject to their * general contract. Note that annotating methods in concrete @@ -89,4 +90,16 @@ protected SimpleElementVisitor7(R defaultValue){ super(defaultValue); } + + /** + * This implementation calls {@code defaultAction}. + * + * @param e {@inheritDoc} + * @param p {@inheritDoc} + * @return the result of {@code defaultAction} + */ + @Override + public R visitVariable(VariableElement e, P p) { + return defaultAction(e, p); + } } diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java --- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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 @@ -36,8 +36,11 @@ * {@link SourceVersion#RELEASE_6 RELEASE_6} source version. * * Visit methods corresponding to {@code RELEASE_6} language - * constructs call {@link #defaultAction}, passing their arguments to - * {@code defaultAction}'s corresponding parameters. + * constructs call {@link #defaultAction defaultAction}, passing their + * arguments to {@code defaultAction}'s corresponding parameters. + * + * For constructs introduced in {@code RELEASE_7} and later, {@code + * visitUnknown} is called instead. * *
Methods in this class may be overridden subject to their * general contract. Note that annotating methods in concrete diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java --- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java Mon Jan 31 19:06:32 2011 -0800 +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java Tue Feb 01 10:11:05 2011 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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 @@ -34,9 +34,10 @@ * A simple visitor of types with default behavior appropriate for the * {@link SourceVersion#RELEASE_7 RELEASE_7} source version. * - * Visit methods corresponding to {@code RELEASE_7} language - * constructs call {@link #defaultAction}, passing their arguments to - * {@code defaultAction}'s corresponding parameters. + * Visit methods corresponding to {@code RELEASE_7} and earlier + * language constructs call {@link #defaultAction defaultAction}, + * passing their arguments to {@code defaultAction}'s corresponding + * parameters. * *
Methods in this class may be overridden subject to their
* general contract. Note that annotating methods in concrete
@@ -88,4 +89,17 @@
protected SimpleTypeVisitor7(R defaultValue){
super(defaultValue);
}
+
+ /**
+ * This implementation visits a {@code DisjunctiveType} by calling
+ * {@code defaultAction}.
+ *
+ * @param t {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of {@code defaultAction}
+ */
+ @Override
+ public R visitDisjunctive(DisjunctiveType t, P p) {
+ return defaultAction(t, p);
+ }
}
diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
--- a/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Mon Jan 31 19:06:32 2011 -0800
+++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Tue Feb 01 10:11:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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
@@ -92,4 +92,17 @@
protected TypeKindVisitor7(R defaultValue) {
super(defaultValue);
}
+
+ /**
+ * This implementation visits a {@code DisjunctiveType} by calling
+ * {@code defaultAction}.
+ *
+ * @param t {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of {@code defaultAction}
+ */
+ @Override
+ public R visitDisjunctive(DisjunctiveType t, P p) {
+ return defaultAction(t, p);
+ }
}
diff -r 2ab47c4cd618 -r cad51b6eb7a6 src/share/classes/javax/lang/model/util/Types.java
--- a/src/share/classes/javax/lang/model/util/Types.java Mon Jan 31 19:06:32 2011 -0800
+++ b/src/share/classes/javax/lang/model/util/Types.java Tue Feb 01 10:11:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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
diff -r 2ab47c4cd618 -r cad51b6eb7a6 test/tools/javac/processing/model/element/TestResourceVariable.java
--- a/test/tools/javac/processing/model/element/TestResourceVariable.java Mon Jan 31 19:06:32 2011 -0800
+++ b/test/tools/javac/processing/model/element/TestResourceVariable.java Tue Feb 01 10:11:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 6911256 6964740 6967842
+ * @bug 6911256 6964740 6967842 6961571
* @summary Test that the resource variable kind is appropriately set
* @author Joseph D. Darcy
* @library ../../../lib
@@ -31,8 +31,6 @@
* @compile -processor TestResourceVariable -proc:only TestResourceVariable.java
*/
-// Bug should be filed for this misbehavior
-
import java.io.*;
import javax.annotation.processing.*;
import javax.lang.model.*;
@@ -82,6 +80,33 @@
try(TestResourceVariable trv1 = this; TestResourceVariable trv2 = trv1) {}
}
+ /**
+ * Verify that a resource variable modeled as an element behaves
+ * as expected under 6 and 7 specific visitors.
+ */
+ private static void testResourceVariable(Element element) {
+ ElementVisitor visitor6 = new ElementKindVisitor6