jdk8-mips64-public/langtools: changeset 558:89cd267c2167

     1.1 --- a/src/share/classes/com/sun/javadoc/package.html	Thu May 27 10:57:35 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/javadoc/package.html	Wed Jun 02 15:40:01 2010 -0700
     1.3 @@ -22,9 +22,9 @@
     1.4  2 along with this work; if not, write to the Free Software Foundation,
     1.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     1.6  
     1.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     1.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     1.9 -have any questions.
    1.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.11 +or visit www.oracle.com if you need additional information or have any
    1.12 +questions.
    1.13  -->
    1.14  </head>
    1.15  <body bgcolor="white">

     2.1 --- a/src/share/classes/com/sun/mirror/overview.html	Thu May 27 10:57:35 2010 -0700
     2.2 +++ b/src/share/classes/com/sun/mirror/overview.html	Wed Jun 02 15:40:01 2010 -0700
     2.3 @@ -22,9 +22,9 @@
     2.4  2 along with this work; if not, write to the Free Software Foundation,
     2.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     2.6  
     2.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     2.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     2.9 -have any questions.
    2.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.11 +or visit www.oracle.com if you need additional information or have any
    2.12 +questions.
    2.13  -->
    2.14  </head>
    2.15

     3.1 --- a/src/share/classes/com/sun/source/tree/DisjointTypeTree.java	Thu May 27 10:57:35 2010 -0700
     3.2 +++ b/src/share/classes/com/sun/source/tree/DisjointTypeTree.java	Wed Jun 02 15:40:01 2010 -0700
     3.3 @@ -1,12 +1,12 @@
     3.4  /*
     3.5 - * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
     3.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10   * under the terms of the GNU General Public License version 2 only, as
    3.11 - * published by the Free Software Foundation.  Sun designates this
    3.12 + * published by the Free Software Foundation.  Oracle designates this
    3.13   * particular file as subject to the "Classpath" exception as provided
    3.14 - * by Sun in the LICENSE file that accompanied this code.
    3.15 + * by Oracle in the LICENSE file that accompanied this code.
    3.16   *
    3.17   * This code is distributed in the hope that it will be useful, but WITHOUT
    3.18   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.19 @@ -18,9 +18,9 @@
    3.20   * 2 along with this work; if not, write to the Free Software Foundation,
    3.21   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.22   *
    3.23 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    3.24 - * CA 95054 USA or visit www.sun.com if you need additional information or
    3.25 - * have any questions.
    3.26 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.27 + * or visit www.oracle.com if you need additional information or have any
    3.28 + * questions.
    3.29   */
    3.30  
    3.31  package com.sun.source.tree;
    3.32 @@ -37,4 +37,4 @@
    3.33   */
    3.34  public interface DisjointTypeTree extends Tree {
    3.35      List<? extends Tree> getTypeComponents();
    3.36 -}
    3.37 \ No newline at end of file
    3.38 +}

     4.1 --- a/src/share/classes/javax/lang/model/overview.html	Thu May 27 10:57:35 2010 -0700
     4.2 +++ b/src/share/classes/javax/lang/model/overview.html	Wed Jun 02 15:40:01 2010 -0700
     4.3 @@ -21,9 +21,9 @@
     4.4  2 along with this work; if not, write to the Free Software Foundation,
     4.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     4.6  
     4.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     4.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     4.9 -have any questions.
    4.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.11 +or visit www.oracle.com if you need additional information or have any
    4.12 +questions.
    4.13  -->
    4.14  
    4.15  </head>

     5.1 --- a/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html	Thu May 27 10:57:35 2010 -0700
     5.2 +++ b/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html	Wed Jun 02 15:40:01 2010 -0700
     5.3 @@ -21,9 +21,9 @@
     5.4  2 along with this work; if not, write to the Free Software Foundation,
     5.5  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     5.6  
     5.7 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
     5.8 -CA 95054 USA or visit www.sun.com if you need additional information or
     5.9 -have any questions.
    5.10 +Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.11 +or visit www.oracle.com if you need additional information or have any
    5.12 +questions.
    5.13  
    5.14  -->
    5.15

Mercurial > jdk8-mips64-public > langtools / changeset

changeset

Merge jdk7-b96