Index: javax/imageio/event/IIOReadProgressListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/event/IIOReadProgressListener.java,v
retrieving revision 1.1
diff -u -r1.1 IIOReadProgressListener.java
--- javax/imageio/event/IIOReadProgressListener.java	21 Apr 2004 15:53:37 -0000	1.1
+++ javax/imageio/event/IIOReadProgressListener.java	21 Oct 2004 20:46:41 -0000
@@ -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: javax/imageio/event/IIOReadUpdateListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/event/IIOReadUpdateListener.java,v
retrieving revision 1.1
diff -u -r1.1 IIOReadUpdateListener.java
--- javax/imageio/event/IIOReadUpdateListener.java	21 Apr 2004 15:53:37 -0000	1.1
+++ javax/imageio/event/IIOReadUpdateListener.java	21 Oct 2004 20:46:41 -0000
@@ -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: javax/imageio/event/IIOReadWarningListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/event/IIOReadWarningListener.java,v
retrieving revision 1.1
diff -u -r1.1 IIOReadWarningListener.java
--- javax/imageio/event/IIOReadWarningListener.java	21 Apr 2004 15:53:37 -0000	1.1
+++ javax/imageio/event/IIOReadWarningListener.java	21 Oct 2004 20:46:41 -0000
@@ -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: javax/imageio/event/IIOWriteProgressListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/event/IIOWriteProgressListener.java,v
retrieving revision 1.1
diff -u -r1.1 IIOWriteProgressListener.java
--- javax/imageio/event/IIOWriteProgressListener.java	21 Apr 2004 15:53:37 -0000	1.1
+++ javax/imageio/event/IIOWriteProgressListener.java	21 Oct 2004 20:46:41 -0000
@@ -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: javax/imageio/event/IIOWriteWarningListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/event/IIOWriteWarningListener.java,v
retrieving revision 1.1
diff -u -r1.1 IIOWriteWarningListener.java
--- javax/imageio/event/IIOWriteWarningListener.java	21 Apr 2004 15:53:37 -0000	1.1
+++ javax/imageio/event/IIOWriteWarningListener.java	21 Oct 2004 20:46:41 -0000
@@ -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 (address@hidden)
Index: javax/imageio/metadata/IIOMetadataFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/metadata/IIOMetadataFormat.java,v
retrieving revision 1.2
diff -u -r1.2 IIOMetadataFormat.java
--- javax/imageio/metadata/IIOMetadataFormat.java	4 Oct 2004 13:25:51 -0000	1.2
+++ javax/imageio/metadata/IIOMetadataFormat.java	21 Oct 2004 20:46:41 -0000
@@ -39,6 +39,7 @@
 package javax.imageio.metadata;
 
 import java.util.Locale;
+
 import javax.imageio.ImageTypeSpecifier;
 
 /**
Index: javax/imageio/metadata/package.html
===================================================================
RCS file: javax/imageio/metadata/package.html
diff -N javax/imageio/metadata/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/metadata/package.html	21 Oct 2004 20:46:41 -0000
@@ -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: javax/imageio/stream/FileCacheImageInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/stream/FileCacheImageInputStream.java,v
retrieving revision 1.2
diff -u -r1.2 FileCacheImageInputStream.java
--- javax/imageio/stream/FileCacheImageInputStream.java	20 Oct 2004 09:20:30 -0000	1.2
+++ javax/imageio/stream/FileCacheImageInputStream.java	21 Oct 2004 20:46:41 -0000
@@ -39,8 +39,8 @@
 package javax.imageio.stream;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * @author Michael Koch (address@hidden)
Index: javax/imageio/stream/FileCacheImageOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/stream/FileCacheImageOutputStream.java,v
retrieving revision 1.1
diff -u -r1.1 FileCacheImageOutputStream.java
--- javax/imageio/stream/FileCacheImageOutputStream.java	20 Oct 2004 08:40:25 -0000	1.1
+++ javax/imageio/stream/FileCacheImageOutputStream.java	21 Oct 2004 20:46:41 -0000
@@ -39,8 +39,8 @@
 package javax.imageio.stream;
 
 import java.io.File;
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * @author Michael Koch (address@hidden)
Index: javax/imageio/stream/ImageInputStreamImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/stream/ImageInputStreamImpl.java,v
retrieving revision 1.1
diff -u -r1.1 ImageInputStreamImpl.java
--- javax/imageio/stream/ImageInputStreamImpl.java	9 Oct 2004 14:59:50 -0000	1.1
+++ javax/imageio/stream/ImageInputStreamImpl.java	21 Oct 2004 20:46:41 -0000
@@ -38,7 +38,6 @@
 
 package javax.imageio.stream;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteOrder;