Mercurial > hg > openjdk > aarch64-port > langtools
changeset 557:89cd267c2167 jdk7-b96
Merge
author | mikejwre |
---|---|
date | Wed, 02 Jun 2010 15:40:01 -0700 |
parents | 637c646c6412 (current diff) 9c2d50e46e31 (diff) |
children | aecce211bc6f |
files | |
diffstat | 5 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/javadoc/package.html Thu May 27 10:57:35 2010 -0700 +++ b/src/share/classes/com/sun/javadoc/package.html Wed Jun 02 15:40:01 2010 -0700 @@ -22,9 +22,9 @@ 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. +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. --> </head> <body bgcolor="white">
--- a/src/share/classes/com/sun/mirror/overview.html Thu May 27 10:57:35 2010 -0700 +++ b/src/share/classes/com/sun/mirror/overview.html Wed Jun 02 15:40:01 2010 -0700 @@ -22,9 +22,9 @@ 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. +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. --> </head>
--- a/src/share/classes/com/sun/source/tree/DisjointTypeTree.java Thu May 27 10:57:35 2010 -0700 +++ b/src/share/classes/com/sun/source/tree/DisjointTypeTree.java Wed Jun 02 15:40:01 2010 -0700 @@ -1,12 +1,12 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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. + * 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 com.sun.source.tree; @@ -37,4 +37,4 @@ */ public interface DisjointTypeTree extends Tree { List<? extends Tree> getTypeComponents(); -} \ No newline at end of file +}
--- a/src/share/classes/javax/lang/model/overview.html Thu May 27 10:57:35 2010 -0700 +++ b/src/share/classes/javax/lang/model/overview.html Wed Jun 02 15:40:01 2010 -0700 @@ -21,9 +21,9 @@ 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. +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. --> </head>
--- a/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html Thu May 27 10:57:35 2010 -0700 +++ b/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html Wed Jun 02 15:40:01 2010 -0700 @@ -21,9 +21,9 @@ 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. +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. -->