# HG changeset patch # User mikejwre # Date 1275518401 25200 # Node ID 766529b3422f7c8ea6c1ce1252637237443eac91 # Parent 8bdbb1a73f302f76ebff28c63900a4d27ac8b724# Parent 8450cc6bc21ce4bad9f629b776d6e397e2d2fe86 Merge diff -r 8bdbb1a73f30 -r 766529b3422f langtools/src/share/classes/com/sun/javadoc/package.html --- a/langtools/src/share/classes/com/sun/javadoc/package.html Thu May 27 10:57:35 2010 -0700 +++ b/langtools/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. --> diff -r 8bdbb1a73f30 -r 766529b3422f langtools/src/share/classes/com/sun/mirror/overview.html --- a/langtools/src/share/classes/com/sun/mirror/overview.html Thu May 27 10:57:35 2010 -0700 +++ b/langtools/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. --> diff -r 8bdbb1a73f30 -r 766529b3422f langtools/src/share/classes/com/sun/source/tree/DisjointTypeTree.java --- a/langtools/src/share/classes/com/sun/source/tree/DisjointTypeTree.java Thu May 27 10:57:35 2010 -0700 +++ b/langtools/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 getTypeComponents(); -} \ No newline at end of file +} diff -r 8bdbb1a73f30 -r 766529b3422f langtools/src/share/classes/javax/lang/model/overview.html --- a/langtools/src/share/classes/javax/lang/model/overview.html Thu May 27 10:57:35 2010 -0700 +++ b/langtools/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. --> diff -r 8bdbb1a73f30 -r 766529b3422f langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html --- a/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html Thu May 27 10:57:35 2010 -0700 +++ b/langtools/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. -->