diff options
| author | mikejwre <none@none> | 2010-06-02 15:40:01 -0700 |
|---|---|---|
| committer | mikejwre <none@none> | 2010-06-02 15:40:01 -0700 |
| commit | 02e5049043ce0ba773c08a0c77f92acf363dca2f (patch) | |
| tree | 3c63120e23e1e8917f7ae568795aa607234c1094 | |
| parent | ec04cf8069c55dcb5cbf1ef967f5713fd513d948 (diff) | |
| parent | 82d80df6ef66c0dd40db29d56392358c0a26baf9 (diff) | |
Mergejdk7-b96
5 files changed, 19 insertions, 19 deletions
diff --git a/src/share/classes/com/sun/javadoc/package.html b/src/share/classes/com/sun/javadoc/package.html index 3d82402d..b44dd461 100644 --- a/src/share/classes/com/sun/javadoc/package.html +++ b/src/share/classes/com/sun/javadoc/package.html @@ -22,9 +22,9 @@ 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 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"> diff --git a/src/share/classes/com/sun/mirror/overview.html b/src/share/classes/com/sun/mirror/overview.html index 1a9f24f5..f04c3179 100644 --- a/src/share/classes/com/sun/mirror/overview.html +++ b/src/share/classes/com/sun/mirror/overview.html @@ -22,9 +22,9 @@ 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 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> diff --git a/src/share/classes/com/sun/source/tree/DisjointTypeTree.java b/src/share/classes/com/sun/source/tree/DisjointTypeTree.java index 513a70a2..6d122aae 100644 --- a/src/share/classes/com/sun/source/tree/DisjointTypeTree.java +++ b/src/share/classes/com/sun/source/tree/DisjointTypeTree.java @@ -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 @@ import java.util.List; */ public interface DisjointTypeTree extends Tree { List<? extends Tree> getTypeComponents(); -}
\ No newline at end of file +} diff --git a/src/share/classes/javax/lang/model/overview.html b/src/share/classes/javax/lang/model/overview.html index 0e84d9bf..c0e98332 100644 --- a/src/share/classes/javax/lang/model/overview.html +++ b/src/share/classes/javax/lang/model/overview.html @@ -21,9 +21,9 @@ 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 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> diff --git a/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html b/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html index db0683ed..39bab307 100644 --- a/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html +++ b/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html @@ -21,9 +21,9 @@ 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 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. --> |