Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5790] classlib6/core/src/openjdk/javax/javax/imageio/ stream
|
From: <ls...@us...> - 2011-02-28 20:08:21
|
Revision: 5790
http://jnode.svn.sourceforge.net/jnode/?rev=5790&view=rev
Author: lsantha
Date: 2011-02-28 20:08:14 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
Integrating OpenJDK 6 b21.
Modified Paths:
--------------
classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageInputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageOutputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageInputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageOutputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/IIOByteBuffer.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStreamImpl.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStreamImpl.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCache.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageInputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageOutputStream.java
classlib6/core/src/openjdk/javax/javax/imageio/stream/package.html
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageInputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageInputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageInputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
@@ -62,6 +62,10 @@
/** The DisposerRecord that closes the underlying cache. */
private final DisposerRecord disposerRecord;
+ /** The CloseAction that closes the stream in
+ * the StreamCloser's shutdown hook */
+ private final StreamCloser.CloseAction closeAction;
+
/**
* Constructs a <code>FileCacheImageInputStream</code> that will read
* from a given <code>InputStream</code>.
@@ -96,8 +100,10 @@
this.cacheFile =
File.createTempFile("imageio", ".tmp", cacheDir);
this.cache = new RandomAccessFile(cacheFile, "rw");
- StreamCloser.addToQueue(this);
+ this.closeAction = StreamCloser.createCloseAction(this);
+ StreamCloser.addToQueue(closeAction);
+
disposerRecord = new StreamDisposerRecord(cacheFile, cache);
if (getClass() == FileCacheImageInputStream.class) {
disposerReferent = new Object();
@@ -242,7 +248,7 @@
stream = null;
cache = null;
cacheFile = null;
- StreamCloser.removeFromQueue(this);
+ StreamCloser.removeFromQueue(closeAction);
}
/**
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageOutputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/FileCacheImageOutputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
@@ -48,6 +48,10 @@
// Pos after last (rightmost) byte written
private long maxStreamPos = 0L;
+ /** The CloseAction that closes the stream in
+ * the StreamCloser's shutdown hook */
+ private final StreamCloser.CloseAction closeAction;
+
/**
* Constructs a <code>FileCacheImageOutputStream</code> that will write
* to a given <code>outputStream</code>.
@@ -82,7 +86,9 @@
this.cacheFile =
File.createTempFile("imageio", ".tmp", cacheDir);
this.cache = new RandomAccessFile(cacheFile, "rw");
- StreamCloser.addToQueue(this);
+
+ this.closeAction = StreamCloser.createCloseAction(this);
+ StreamCloser.addToQueue(closeAction);
}
public int read() throws IOException {
@@ -227,7 +233,7 @@
cacheFile = null;
stream.flush();
stream = null;
- StreamCloser.removeFromQueue(this);
+ StreamCloser.removeFromQueue(closeAction);
}
public void flushBefore(long pos) throws IOException {
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageInputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageInputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageInputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageOutputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/FileImageOutputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/IIOByteBuffer.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/IIOByteBuffer.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/IIOByteBuffer.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2001, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStreamImpl.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStreamImpl.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageInputStreamImpl.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStreamImpl.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStreamImpl.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/ImageOutputStreamImpl.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCache.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCache.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCache.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package javax.imageio.stream;
import java.util.ArrayList;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageInputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageInputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageInputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2007, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageOutputStream.java
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageOutputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/MemoryCacheImageOutputStream.java 2011-02-28 20:08:14 UTC (rev 5790)
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2006, 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 javax.imageio.stream;
Modified: classlib6/core/src/openjdk/javax/javax/imageio/stream/package.html
===================================================================
--- classlib6/core/src/openjdk/javax/javax/imageio/stream/package.html 2011-02-28 20:05:14 UTC (rev 5789)
+++ classlib6/core/src/openjdk/javax/javax/imageio/stream/package.html 2011-02-28 20:08:14 UTC (rev 5790)
@@ -2,14 +2,14 @@
<html>
<head>
<!--
-Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
+Copyright (c) 2000, 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
@@ -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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|