Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/javax/lang/model/type/IntersectionType.java	Fri Dec 13 14:13:03 2013 +0000
     1.2 +++ b/src/share/classes/javax/lang/model/type/IntersectionType.java	Tue Dec 17 10:26:10 2013 -0800
     1.3 @@ -35,10 +35,12 @@
     1.4   * {@code <T extends Number & Runnable>} is an (implicit) intersection
     1.5   * type.  As of {@link javax.lang.model.SourceVersion#RELEASE_8
     1.6   * RELEASE_8}, this is represented by an {@code IntersectionType} with
     1.7 - * {@code Number} and {@code Runnable} as its bounds.  Also as of the
     1.8 - * {@link javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8},
     1.9 - * intersection types can explicitly appear as the target type of a
    1.10 - * cast expression.
    1.11 + * {@code Number} and {@code Runnable} as its bounds.
    1.12 + *
    1.13 + * @implNote Also as of {@link
    1.14 + * javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8}, in the
    1.15 + * reference implementation an {@code IntersectionType} is used to
    1.16 + * model the explicit target type of a cast expression.
    1.17   *
    1.18   * @since 1.8
    1.19   */

     2.1 --- a/src/share/classes/javax/lang/model/util/Types.java	Fri Dec 13 14:13:03 2013 +0000
     2.2 +++ b/src/share/classes/javax/lang/model/util/Types.java	Tue Dec 17 10:26:10 2013 -0800
     2.3 @@ -60,13 +60,6 @@
     2.4      /**
     2.5       * Tests whether two {@code TypeMirror} objects represent the same type.
     2.6       *
     2.7 -     * <p>Since annotations are only meta-data associated with a type,
     2.8 -     * the set of annotations on either argument is <em>not</em> taken
     2.9 -     * into account when computing whether or not two {@code
    2.10 -     * TypeMirror} objects are the same type. In particular, two
    2.11 -     * {@code TypeMirror} objects can have different annotations and
    2.12 -     * still be considered the same.
    2.13 -     *
    2.14       * <p>Caveat: if either of the arguments to this method represents a
    2.15       * wildcard, this method will return false.  As a consequence, a wildcard
    2.16       * is not the same type as itself.  This might be surprising at first,
    2.17 @@ -77,6 +70,13 @@
    2.18       *   {@code list.add(list.get(0));}
    2.19       * </pre>
    2.20       *
    2.21 +     * <p>Since annotations are only meta-data associated with a type,
    2.22 +     * the set of annotations on either argument is <em>not</em> taken
    2.23 +     * into account when computing whether or not two {@code
    2.24 +     * TypeMirror} objects are the same type. In particular, two
    2.25 +     * {@code TypeMirror} objects can have different annotations and
    2.26 +     * still be considered the same.
    2.27 +     *
    2.28       * @param t1  the first type
    2.29       * @param t2  the second type
    2.30       * @return {@code true} if and only if the two types are the same