diff --git a/src/share/classes/javax/lang/model/type/DisjunctiveType.java b/src/share/classes/javax/lang/model/type/DisjunctiveType.java new file mode 100644 index 0000000000000000000000000000000000000000..f75ea27f2ed84d8e08a0313d38044ad64ed04573 --- /dev/null +++ b/src/share/classes/javax/lang/model/type/DisjunctiveType.java @@ -0,0 +1,49 @@ +/* + * 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.lang.model.type; + +import java.util.List; + +/** + * Represents a disjunctive type. + * + * As of the {@link javax.lang.model.SourceVersion#RELEASE_7 + * RELEASE_7} source version, disjunctive types can appear as the type + * of a multi-catch exception parameter. + * + * @since 1.7 + */ +public interface DisjunctiveType extends TypeMirror { + + /** + * Return the alternatives comprising this disjunctive type. + * + * The alternatives are formally referred to as disjuncts. + * + * @return the alternatives comprising this disjunctive type. + */ + List getAlternatives(); +} diff --git a/src/share/classes/javax/lang/model/type/TypeKind.java b/src/share/classes/javax/lang/model/type/TypeKind.java index ef95bb0356af7eb69346618a8aad73317df5616c..44d3486378529d088e3997b0b8205c9572554fd8 100644 --- a/src/share/classes/javax/lang/model/type/TypeKind.java +++ b/src/share/classes/javax/lang/model/type/TypeKind.java @@ -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 @@ -137,7 +137,14 @@ public enum TypeKind { * An implementation-reserved type. * This is not the type you are looking for. */ - OTHER; + OTHER, + + /** + * A disjunctive type. + * + * @since 1.7 + */ + DISJUNCTIVE; /** * Returns {@code true} if this kind corresponds to a primitive diff --git a/src/share/classes/javax/lang/model/type/TypeVisitor.java b/src/share/classes/javax/lang/model/type/TypeVisitor.java index 89dafeeebdcca3ef945241309cef74bca55881da..97e81415fea73896dcfec6afb9ba6c9c81670668 100644 --- a/src/share/classes/javax/lang/model/type/TypeVisitor.java +++ b/src/share/classes/javax/lang/model/type/TypeVisitor.java @@ -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 @@ -162,4 +162,14 @@ public interface TypeVisitor { * a visitor implementation may optionally throw this exception */ R visitUnknown(TypeMirror t, P p); + + /** + * Visits a disjunctive type. + * + * @param t the type to visit + * @param p a visitor-specified parameter + * @return a visitor-specified result + * @since 1.7 + */ + R visitDisjunctive(DisjunctiveType t, P p); } diff --git a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java index 1485eeefa67a2b8e5776d1db7041dfb746761090..278cc842622207e06bcb423adfcb1eacf6c56d8d 100644 --- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java @@ -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 @@ -29,7 +29,8 @@ import javax.lang.model.type.*; /** * A skeletal visitor of types with default behavior appropriate for - * the version 6 language level. + * the {@link javax.lang.model.SourceVersion#RELEASE_6 RELEASE_6} + * source version. * *

WARNING: The {@code TypeVisitor} interface implemented * by this class may have methods added to it in the future to @@ -94,6 +95,20 @@ public abstract class AbstractTypeVisitor6 implements TypeVisitor { return t.accept(this, null); } + /** + * 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} * diff --git a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java index 0b14c91f7d5d5c889ed6c7951263d9c85a49f4e9..d505e8cee7db957a84a1063bcaaadf67162a23d9 100644 --- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java @@ -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 @@ import javax.lang.model.type.*; /** * 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 @@ public abstract class AbstractTypeVisitor7 extends AbstractTypeVisitor6 * 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 @@ public class ElementKindVisitor6 case PARAMETER: return visitVariableAsParameter(e, p); + case RESOURCE_VARIABLE: + return visitVariableAsResourceVariable(e, p); + default: throw new AssertionError("Bad kind " + k + " for VariableElement" + e); } - } /** @@ -289,6 +292,20 @@ public class ElementKindVisitor6 return defaultAction(e, p); } + /** + * 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, diff --git a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java index 9b7c3a43b3212fa3ec342bd20a91be1b4364fe87..ec5a82337de1f78484de267a43efc2decc08d73b 100644 --- a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java @@ -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 @@ import javax.lang.model.SourceVersion; /** * 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 @@ public class ElementKindVisitor7 extends ElementKindVisitor6 { 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 --git a/src/share/classes/javax/lang/model/util/ElementScanner6.java b/src/share/classes/javax/lang/model/util/ElementScanner6.java index 8237febcf115c22cff89b52a98a9fd2d5363c088..1438fdf74031e34a8ae48bb03d34ad134649c1f7 100644 --- a/src/share/classes/javax/lang/model/util/ElementScanner6.java +++ b/src/share/classes/javax/lang/model/util/ElementScanner6.java @@ -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 @@ public class ElementScanner6 extends AbstractElementVisitor6 { /** * {@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 @@ public class ElementScanner6 extends AbstractElementVisitor6 { /** * {@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 @@ public class ElementScanner6 extends AbstractElementVisitor6 { } /** - * {@inheritDoc} This implementation scans the enclosed elements. + * {@inheritDoc} + * + * This implementation scans the enclosed elements, unless the + * element is a {@code RESOURCE_VARIABLE} in which case {@code + * visitUnknown} is called. * - * @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 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 @@ public class ElementScanner6 extends AbstractElementVisitor6 { /** * {@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 --git a/src/share/classes/javax/lang/model/util/ElementScanner7.java b/src/share/classes/javax/lang/model/util/ElementScanner7.java index c2dcf0204d140820ec8e79d29bdc1fc6dadb76e3..e525e86e9d09b5a4824ce1c382faa608077fc603 100644 --- a/src/share/classes/javax/lang/model/util/ElementScanner7.java +++ b/src/share/classes/javax/lang/model/util/ElementScanner7.java @@ -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 @@ public class ElementScanner7 extends ElementScanner6 { 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 --git a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java index e4ba035533f164491dac5a4739c0c1dd29b6ab38..0e3f4498749ed4927819dfc6659a1b40ebfd62bd 100644 --- a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java +++ b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java @@ -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 @@ import javax.annotation.processing.SupportedSourceVersion; /** * 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 --git a/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java index a9adac2592e8e1d9b1d2994f2a3050ade7400847..f43fa2da8239e648e17b66effc71a57266432c0b 100644 --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java @@ -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 @@ import static javax.lang.model.SourceVersion.*; * 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 @@ public class SimpleElementVisitor6 extends AbstractElementVisitor6 { } /** - * {@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 --git a/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java b/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java index abdd04e2d0f84593214a652d257a153ec74f3b2c..a02d2a11e8ddeb112e050f2f5aa1da38299edced 100644 --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java @@ -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 @@ import static javax.lang.model.SourceVersion.*; * 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 @@ public class SimpleElementVisitor7 extends SimpleElementVisitor6 { 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 --git a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java index 7a52802474aec6b7ee10aec9f82665ab9fd3d3ac..c68688bbe7216d5f29a472349fd36ce5dbeda07b 100644 --- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java @@ -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 @@ import static javax.lang.model.SourceVersion.*; * {@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 --git a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java index 48c87293ad8e527cc5973ceb2fed54cf93437ab0..af106e66118b1609b483726899f7572d8772b05c 100644 --- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java @@ -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 @@ import static javax.lang.model.SourceVersion.*; * 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 @@ public class SimpleTypeVisitor7 extends SimpleTypeVisitor6 { 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 --git a/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java b/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java index 202080099eb137bbb83f3ada6529bdab02e09f67..7981bd7d0f07831f17286a09c84d564f31d72999 100644 --- a/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java +++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java @@ -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 @@ public class TypeKindVisitor7 extends TypeKindVisitor6 { 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 --git a/src/share/classes/javax/lang/model/util/Types.java b/src/share/classes/javax/lang/model/util/Types.java index 07d6941b83626b44912c329089ee004b34d02cb2..67924ce1d284f7d39b86283724302e38ab96253c 100644 --- a/src/share/classes/javax/lang/model/util/Types.java +++ b/src/share/classes/javax/lang/model/util/Types.java @@ -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 --git a/test/tools/javac/processing/model/element/TestResourceVariable.java b/test/tools/javac/processing/model/element/TestResourceVariable.java index 4b5fcd26b0ee14c6e2a076046b3b0ce85663922d..bd2c942d21ef3f6dd4b6a0de27a34fb7c9974e60 100644 --- a/test/tools/javac/processing/model/element/TestResourceVariable.java +++ b/test/tools/javac/processing/model/element/TestResourceVariable.java @@ -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 @@ public class TestResourceVariable extends JavacTestingAbstractProcessor implemen 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() {}; + + try { + visitor6.visit(element); + throw new RuntimeException("Expected UnknownElementException not thrown."); + } catch (UnknownElementException uee) { + ; // Expected. + } + + ElementKindVisitor7 visitor7 = new ElementKindVisitor7() { + @Override + public Object visitVariableAsResourceVariable(VariableElement e, + Void p) { + return e; // a non-null value + } + }; + + if (visitor7.visit(element) == null) { + throw new RuntimeException("Null result of resource variable visitation."); + } + } + class ResourceVariableScanner extends TreeScanner { private Trees trees; @@ -92,17 +117,14 @@ public class TestResourceVariable extends JavacTestingAbstractProcessor implemen @Override public Void visitVariable(VariableTree node, CompilationUnitTree cu) { Element element = trees.getElement(trees.getPath(cu, node)); - if (element == null) { - System.out.println("Null variable element: " + node); - } else { - System.out.println("Name: " + element.getSimpleName() + - "\tKind: " + element.getKind()); - } - if (element != null && - element.getKind() == ElementKind.RESOURCE_VARIABLE) { + + System.out.println("Name: " + element.getSimpleName() + + "\tKind: " + element.getKind()); + if (element.getKind() == ElementKind.RESOURCE_VARIABLE) { + testResourceVariable(element); resourceVariableCount++; } return super.visitVariable(node, cu); } - } + } }