[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups in javax.imageio
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 23 13:04:29 PDT 2004
PatchSet 5343
Date: 2004/10/23 20:00:17
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: small cleanups in javax.imageio
2004-10-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/imageio/metadata/package.html:
New file taken from GNU Classpath.
* libraries/javalib/javax/imageio/event/IIOReadProgressListener.java,
libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java,
libraries/javalib/javax/imageio/event/IIOReadWarningListener.java,
libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java,
libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java,
libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java,
libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java:
Resynced with GNU Classpath.
2004-10-21 Michael Koch <konqueror at gmx.de>
* javax/imageio/event/IIOReadProgressListener.java,
javax/imageio/event/IIOReadUpdateListener.java,
javax/imageio/event/IIOReadWarningListener.java,
javax/imageio/event/IIOWriteProgressListener.java,
javax/imageio/event/IIOWriteWarningListener.java,
javax/imageio/metadata/IIOMetadataFormat.java,
javax/imageio/stream/FileCacheImageInputStream.java,
javax/imageio/stream/FileCacheImageOutputStream.java,
javax/imageio/stream/ImageInputStreamImpl.java:
Import cleanup.
* javax/imageio/metadata/package.html: New file.
Members:
ChangeLog:1.2895->1.2896
libraries/javalib/javax/imageio/event/IIOReadProgressListener.java:1.1->1.2
libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java:1.1->1.2
libraries/javalib/javax/imageio/event/IIOReadWarningListener.java:1.1->1.2
libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java:1.1->1.2
libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java:1.1->1.2
libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java:1.1->1.2
libraries/javalib/javax/imageio/metadata/package.html:INITIAL->1.1
libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2895 kaffe/ChangeLog:1.2896
--- kaffe/ChangeLog:1.2895 Sat Oct 23 19:31:03 2004
+++ kaffe/ChangeLog Sat Oct 23 20:00:17 2004
@@ -1,5 +1,33 @@
2004-10-23 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/javax/imageio/metadata/package.html:
+ New file taken from GNU Classpath.
+
+ * libraries/javalib/javax/imageio/event/IIOReadProgressListener.java,
+ libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java,
+ libraries/javalib/javax/imageio/event/IIOReadWarningListener.java,
+ libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java,
+ libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java,
+ libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java,
+ libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-21 Michael Koch <konqueror at gmx.de>
+
+ * javax/imageio/event/IIOReadProgressListener.java,
+ javax/imageio/event/IIOReadUpdateListener.java,
+ javax/imageio/event/IIOReadWarningListener.java,
+ javax/imageio/event/IIOWriteProgressListener.java,
+ javax/imageio/event/IIOWriteWarningListener.java,
+ javax/imageio/metadata/IIOMetadataFormat.java,
+ javax/imageio/stream/FileCacheImageInputStream.java,
+ javax/imageio/stream/FileCacheImageOutputStream.java,
+ javax/imageio/stream/ImageInputStreamImpl.java:
+ Import cleanup.
+ * javax/imageio/metadata/package.html: New file.
+
+2004-10-23 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/crypto/BadPaddingException.java,
libraries/javalib/javax/crypto/CipherInputStream.java,
libraries/javalib/javax/crypto/CipherOutputStream.java,
Index: kaffe/libraries/javalib/javax/imageio/event/IIOReadProgressListener.java
diff -u kaffe/libraries/javalib/javax/imageio/event/IIOReadProgressListener.java:1.1 kaffe/libraries/javalib/javax/imageio/event/IIOReadProgressListener.java:1.2
--- kaffe/libraries/javalib/javax/imageio/event/IIOReadProgressListener.java:1.1 Tue May 18 20:23:05 2004
+++ kaffe/libraries/javalib/javax/imageio/event/IIOReadProgressListener.java Sat Oct 23 20:00:20 2004
@@ -35,11 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.imageio.event;
import java.util.EventListener;
-import javax.imageio.ImageReader;
+import javax.imageio.ImageReader;
public interface IIOReadProgressListener extends EventListener
{
Index: kaffe/libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java
diff -u kaffe/libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java:1.1 kaffe/libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java:1.2
--- kaffe/libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java:1.1 Tue May 18 20:23:05 2004
+++ kaffe/libraries/javalib/javax/imageio/event/IIOReadUpdateListener.java Sat Oct 23 20:00:20 2004
@@ -35,12 +35,13 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.imageio.event;
import java.awt.image.BufferedImage;
import java.util.EventListener;
-import javax.imageio.ImageReader;
+import javax.imageio.ImageReader;
public interface IIOReadUpdateListener extends EventListener
{
Index: kaffe/libraries/javalib/javax/imageio/event/IIOReadWarningListener.java
diff -u kaffe/libraries/javalib/javax/imageio/event/IIOReadWarningListener.java:1.1 kaffe/libraries/javalib/javax/imageio/event/IIOReadWarningListener.java:1.2
--- kaffe/libraries/javalib/javax/imageio/event/IIOReadWarningListener.java:1.1 Tue May 18 20:23:05 2004
+++ kaffe/libraries/javalib/javax/imageio/event/IIOReadWarningListener.java Sat Oct 23 20:00:20 2004
@@ -35,11 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.imageio.event;
import java.util.EventListener;
-import javax.imageio.ImageReader;
+import javax.imageio.ImageReader;
public interface IIOReadWarningListener extends EventListener
{
Index: kaffe/libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java
diff -u kaffe/libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java:1.1 kaffe/libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java:1.2
--- kaffe/libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java:1.1 Tue May 18 20:23:05 2004
+++ kaffe/libraries/javalib/javax/imageio/event/IIOWriteProgressListener.java Sat Oct 23 20:00:20 2004
@@ -35,11 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.imageio.event;
import java.util.EventListener;
-import javax.imageio.ImageWriter;
+import javax.imageio.ImageWriter;
public interface IIOWriteProgressListener extends EventListener
{
Index: kaffe/libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java
diff -u kaffe/libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java:1.1 kaffe/libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java:1.2
--- kaffe/libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java:1.1 Tue May 18 20:23:05 2004
+++ kaffe/libraries/javalib/javax/imageio/event/IIOWriteWarningListener.java Sat Oct 23 20:00:20 2004
@@ -35,11 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.imageio.event;
import java.util.EventListener;
-import javax.imageio.ImageWriter;
+import javax.imageio.ImageWriter;
/**
* @author Michael Koch (konqueror at gmx.de)
Index: kaffe/libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java
diff -u kaffe/libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java:1.1 kaffe/libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java:1.2
--- kaffe/libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java:1.1 Mon Oct 4 15:36:10 2004
+++ kaffe/libraries/javalib/javax/imageio/metadata/IIOMetadataFormat.java Sat Oct 23 20:00:21 2004
@@ -39,6 +39,7 @@
package javax.imageio.metadata;
import java.util.Locale;
+
import javax.imageio.ImageTypeSpecifier;
/**
===================================================================
Checking out kaffe/libraries/javalib/javax/imageio/metadata/package.html
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/javax/imageio/metadata/package.html,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/javax/imageio/metadata/package.html Sat Oct 23 20:04:28 2004
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.imageio.metadata package.
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.imageio.metadata</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: kaffe/libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java
diff -u kaffe/libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java:1.1 kaffe/libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java:1.2
--- kaffe/libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java:1.1 Sun Oct 10 14:55:15 2004
+++ kaffe/libraries/javalib/javax/imageio/stream/ImageInputStreamImpl.java Sat Oct 23 20:00:21 2004
@@ -38,7 +38,6 @@
package javax.imageio.stream;
-import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteOrder;
More information about the kaffe
mailing list