2004-04-21 Michael Koch <konqueror@gmx.de>

	* javax/imageio/IIOException.java,
	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: New files.
	* configure.ac: Added all Makefiles under javax.imageio to
	AC_OUTPUT_FILES.
	* javax/Makefile.am
	(SUBDIRS): Added imageio.
	* javax/imageio/Makefile.am
	(SUBDIRS): Added event.
	(EXTRA_DIST): Added IIOException.java.
	* javax/imageio/event/Makefile.am: New file.
	* javax/imageio/event/.cvsignore,
	javax/imageio/spi/.cvsignore,
	javax/imageio/stream/.cvsignore: New files to ignore generated files.

11 files changed, 547 insertions, 1 deletions

diff --git a/javax/imageio/IIOException.java b/javax/imageio/IIOException.java
new file mode 100644
index 000000000..5b743963a
--- /dev/null
+++ b/javax/imageio/IIOException.java
@@ -0,0 +1,69 @@
+/* IIOException.java --
+   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. */
+
+package javax.imageio;
+
+import java.io.IOException;
+
+
+/**
+ * @author Michael Koch <konqueror@gmx.de>
+ */
+public class IIOException extends IOException
+{
+  /**
+   * Create an exception with a descriptive error message.
+   *
+   * @param message The descriptive error message.
+   */
+  public IIOException(String message)
+  {
+    super(message);
+  }
+
+  /**
+   * Create an exception with a descriptive error message.
+   *
+   * @param message The descriptive error message.
+   * @param cause The cause for this exception.
+   */
+  public IIOException(String message, Throwable cause)
+  {
+    super(message);
+    initCause(cause);
+  }
+}
diff --git a/javax/imageio/Makefile.am b/javax/imageio/Makefile.am
index ef0f95f79..29d5c0109 100644
--- a/javax/imageio/Makefile.am
+++ b/javax/imageio/Makefile.am
@@ -1,8 +1,9 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = stream spi
+SUBDIRS = event stream spi
 
 EXTRA_DIST = \
+IIOException.java \
 ImageReader.java \
 ImageTranscoder.java \
 ImageWriter.java \
diff --git a/javax/imageio/event/.cvsignore b/javax/imageio/event/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/javax/imageio/event/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/javax/imageio/event/IIOReadProgressListener.java b/javax/imageio/event/IIOReadProgressListener.java
new file mode 100644
index 000000000..157443257
--- /dev/null
+++ b/javax/imageio/event/IIOReadProgressListener.java
@@ -0,0 +1,116 @@
+/* IIOReadProgressListener.java --
+   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. */
+
+package javax.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageReader;
+
+
+public interface IIOReadProgressListener extends EventListener
+{
+  /**
+   * Reports that the current image read operation has completed.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void imageComplete(ImageReader source);
+
+  /**
+   * Reports the approximate percentage of completions of this image read
+   * operation.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param percentageDone the approximate percentage of encoding completed
+   */
+  void imageProgress(ImageReader source, float percentageDone);
+
+  /**
+   * Reports that the current image read operation has started.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param imageIndex the index of the image to read
+   */
+  void imageStarted(ImageReader source, int imageIndex);
+
+  /**
+   * Reports that a read operation has been aborted.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void readAborted(ImageReader source);
+
+  /**
+   * Reports that a sequence of read operationshas completed.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void sequenceComplete(ImageReader source);
+
+  /**
+   * Reports that a sequence of read operations is beginning.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param minIndex the index of the first image to be read
+   */
+  void sequenceStarted(ImageReader source, int minIndex);
+
+  /**
+   * Reports that a thumbnail read operation has completed.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void thumbnailComplete(ImageReader source);
+
+  /**
+   * Reports the approximate percentage of completion of a thumbnail read
+   * operation.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param percentageDone the approximate percentage of encoding completed
+   */
+  void thumbnailProgress(ImageReader source, float percentageDone);
+
+  /**
+   * Reports that a thumbnail read operation is beginning.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param imageIndex the index of the image being read
+   * @param thumbnailIndex the index of the thumbnail being read
+   */
+  void thumbnailStarted(ImageReader source, int imageIndex, int thumbnailIndex);
+}
diff --git a/javax/imageio/event/IIOReadUpdateListener.java b/javax/imageio/event/IIOReadUpdateListener.java
new file mode 100644
index 000000000..d51c85201
--- /dev/null
+++ b/javax/imageio/event/IIOReadUpdateListener.java
@@ -0,0 +1,132 @@
+/* IIOReadUpdateListener.java --
+   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. */
+
+package javax.imageio.event;
+
+import java.awt.image.BufferedImage;
+import java.util.EventListener;
+import javax.imageio.ImageReader;
+
+
+public interface IIOReadUpdateListener extends EventListener
+{
+  /**
+   * Reports that a given region of the image has been updated.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param width the number of updated pixels horizontally
+   * @param height the number of updated pixels vertically
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void imageUpdate(ImageReader source, BufferedImage image, int minX,
+                   int minY, int width, int height, int periodX, int periodY,
+                   int[] bands);
+
+  /**
+   * Reports that the current read operation has completed a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   */
+  void passComplete(ImageReader source, BufferedImage image);
+
+  /**
+   * Reports that the current read operation is about to begin a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param pass the numer of the pass that is about to begin, starting with 0
+   * @param minPass the index of the first pass that will be decoded
+   * @param maxPass the index of the last pass that will be decoded
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void passStarted(ImageReader source, BufferedImage image, int pass,
+                   int minPass, int maxPass, int minX, int minY, int periodX,
+                   int periodY, int[] bands);
+
+  /**
+   * Reports that the current thumbnail read operation has completed a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   */
+  void thumbnailPassComplete(ImageReader source, BufferedImage image);
+
+  /**
+   * Reports that the current thumbnail read operation is about to begin a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param pass the numer of the pass that is about to begin, starting with 0
+   * @param minPass the index of the first pass that will be decoded
+   * @param maxPass the index of the last pass that will be decoded
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void thumbnailPassStarted(ImageReader source, BufferedImage image, int pass,
+                            int minPass, int maxPass, int minX, int minY,
+                            int periodX, int periodY, int[] bands);
+
+  /**
+   * Reports that a given region of a thumbnail image has been updated.
+   *
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param width the number of updated pixels horizontally
+   * @param height the number of updated pixels vertically
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void thumbnailUpdate(ImageReader source, BufferedImage image, int minX,
+                       int minY, int width, int height, int periodX,
+                       int periodY, int[] bands);
+}
diff --git a/javax/imageio/event/IIOReadWarningListener.java b/javax/imageio/event/IIOReadWarningListener.java
new file mode 100644
index 000000000..ab12df01d
--- /dev/null
+++ b/javax/imageio/event/IIOReadWarningListener.java
@@ -0,0 +1,54 @@
+/* IIOReadProgressListener.java --
+   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. */
+
+package javax.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageReader;
+
+
+public interface IIOReadWarningListener extends EventListener
+{
+  /**
+   * Reports the occurrence of a non-fatal error in decoding.
+   * Decoding will continue after this method is called.
+   *
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param warning the warning
+   */
+  void warningOccurred(ImageReader source, String warning);
+}
diff --git a/javax/imageio/event/IIOWriteProgressListener.java b/javax/imageio/event/IIOWriteProgressListener.java
new file mode 100644
index 000000000..6158c54d5
--- /dev/null
+++ b/javax/imageio/event/IIOWriteProgressListener.java
@@ -0,0 +1,101 @@
+/* IIOWriteProgressListener.java --
+   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. */
+
+package javax.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageWriter;
+
+
+public interface IIOWriteProgressListener extends EventListener
+{
+  /**
+   * Reports that an image write operation has completed.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   */
+  void imageComplete(ImageWriter source);
+
+  /**
+   * Reports the approximate percentage of completion of an image write
+   * operation.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param percentageDone the approximate percentage of decoding completed
+   */
+  void imageProgress(ImageWriter source, float percentageDone);
+
+  /**
+   * Reports that a thumbnail write operation has started.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param imageIndex the index of the image being written
+   */
+  void imageStarted(ImageWriter source, int imageIndex);
+
+  /**
+   * Reports that a thumbnail write operation has completed.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   */
+  void thumbnailComplete(ImageWriter source);
+
+  /**
+   * Reports the approximate percentage of completion of a thumbnail write
+   * operation.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param percentageDone the approximate percentage of decoding completed
+   */
+  void thumbnailProgress(ImageWriter source, float percentageDone);
+
+  /**
+   * Reports that a thumbnail write operation is beginning.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param imageIndex the index of the image being written
+   * @param thumnailIndex the index of the thumbnail being written
+   */
+  void thumbnailStarted(ImageWriter source, int imageIndex, int thumnailIndex);
+
+  /**
+   * Reports that an image write operation is aborted.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   */
+  void writeAborted(ImageWriter source);
+}
diff --git a/javax/imageio/event/IIOWriteWarningListener.java b/javax/imageio/event/IIOWriteWarningListener.java
new file mode 100644
index 000000000..a0630c9ac
--- /dev/null
+++ b/javax/imageio/event/IIOWriteWarningListener.java
@@ -0,0 +1,59 @@
+/* IIOWriteWarningListener.java --
+   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. */
+
+package javax.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageWriter;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface IIOWriteWarningListener extends EventListener
+{
+  /**
+   * Reports the occurrence of a non-fatal error in encoding.
+   * Encoding will continue after this method is called.
+   *
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param imageIndex the index of the image generating this warning,
+   * starting with 0
+   * @param warning the warning
+   */
+  void warningOccurred(ImageWriter source, int imageIndex, String warning);
+}
diff --git a/javax/imageio/event/Makefile.am b/javax/imageio/event/Makefile.am
new file mode 100644
index 000000000..f6255134a
--- /dev/null
+++ b/javax/imageio/event/Makefile.am
@@ -0,0 +1,8 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = \
+IIOReadProgressListener.java \
+IIOReadUpdateListener.java \
+IIOReadWarningListener.java \
+IIOWriteProgressListener.java \
+IIOWriteWarningListener.java
diff --git a/javax/imageio/spi/.cvsignore b/javax/imageio/spi/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/javax/imageio/spi/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/javax/imageio/stream/.cvsignore b/javax/imageio/stream/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/javax/imageio/stream/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in