Index: configure.ac =================================================================== RCS file: /cvsroot/classpath/classpath/configure.ac,v retrieving revision 1.19 diff -u -r1.19 configure.ac --- configure.ac 12 Apr 2004 10:43:41 -0000 1.19 +++ configure.ac 21 Apr 2004 15:48:06 -0000 @@ -378,6 +378,10 @@ java/util/zip/Makefile javax/Makefile javax/accessibility/Makefile +javax/imageio/Makefile +javax/imageio/event/Makefile +javax/imageio/spi/Makefile +javax/imageio/stream/Makefile javax/naming/Makefile javax/naming/directory/Makefile javax/naming/event/Makefile Index: javax/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/javax/Makefile.am,v retrieving revision 1.9 diff -u -r1.9 Makefile.am --- javax/Makefile.am 29 Apr 2003 09:44:33 -0000 1.9 +++ javax/Makefile.am 21 Apr 2004 15:48:06 -0000 @@ -1,3 +1,3 @@ ## Input file for automake to generate the Makefile.in used by configure -SUBDIRS = accessibility naming print rmi security sql swing transaction +SUBDIRS = accessibility imageio naming print rmi security sql swing transaction Index: javax/imageio/IIOException.java =================================================================== RCS file: javax/imageio/IIOException.java diff -N javax/imageio/IIOException.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ javax/imageio/IIOException.java 21 Apr 2004 15:48:06 -0000 @@ -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
+ */ +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); + } +} Index: javax/imageio/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/javax/imageio/Makefile.am,v retrieving revision 1.1 diff -u -r1.1 Makefile.am --- javax/imageio/Makefile.am 15 Apr 2004 09:30:57 -0000 1.1 +++ javax/imageio/Makefile.am 21 Apr 2004 15:48:06 -0000 @@ -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 \ Index: javax/imageio/event/IIOReadProgressListener.java =================================================================== RCS file: javax/imageio/event/IIOReadProgressListener.java diff -N javax/imageio/event/IIOReadProgressListener.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ javax/imageio/event/IIOReadProgressListener.java 21 Apr 2004 15:48:06 -0000 @@ -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 theImageReader
object calling this method
+ */
+ void imageComplete(ImageReader source);
+
+ /**
+ * Reports the approximate percentage of completions of this image read
+ * operation.
+ *
+ * @param source the ImageReader
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 ImageReader
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 ImageReader
object calling this method
+ */
+ void readAborted(ImageReader source);
+
+ /**
+ * Reports that a sequence of read operationshas completed.
+ *
+ * @param source the ImageReader
object calling this method
+ */
+ void sequenceComplete(ImageReader source);
+
+ /**
+ * Reports that a sequence of read operations is beginning.
+ *
+ * @param source the ImageReader
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 ImageReader
object calling this method
+ */
+ void thumbnailComplete(ImageReader source);
+
+ /**
+ * Reports the approximate percentage of completion of a thumbnail read
+ * operation.
+ *
+ * @param source the ImageReader
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 ImageReader
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);
+}
Index: javax/imageio/event/IIOReadUpdateListener.java
===================================================================
RCS file: javax/imageio/event/IIOReadUpdateListener.java
diff -N javax/imageio/event/IIOReadUpdateListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOReadUpdateListener.java 21 Apr 2004 15:48:06 -0000
@@ -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 ImageReader
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 int
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 ImageReader
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 ImageReader
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 int
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 ImageReader
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 ImageReader
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 int
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 ImageReader
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 int
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);
+}
Index: javax/imageio/event/IIOReadWarningListener.java
===================================================================
RCS file: javax/imageio/event/IIOReadWarningListener.java
diff -N javax/imageio/event/IIOReadWarningListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOReadWarningListener.java 21 Apr 2004 15:48:06 -0000
@@ -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 ImageReader
object calling this method
+ * @param warning the warning
+ */
+ void warningOccurred(ImageReader source, String warning);
+}
Index: javax/imageio/event/IIOWriteProgressListener.java
===================================================================
RCS file: javax/imageio/event/IIOWriteProgressListener.java
diff -N javax/imageio/event/IIOWriteProgressListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOWriteProgressListener.java 21 Apr 2004 15:48:06 -0000
@@ -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 ImageWriter
object calling this method
+ */
+ void imageComplete(ImageWriter source);
+
+ /**
+ * Reports the approximate percentage of completion of an image write
+ * operation.
+ *
+ * @param source the ImageWriter
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 ImageWriter
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 ImageWriter
object calling this method
+ */
+ void thumbnailComplete(ImageWriter source);
+
+ /**
+ * Reports the approximate percentage of completion of a thumbnail write
+ * operation.
+ *
+ * @param source the ImageWriter
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 ImageWriter
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 ImageWriter
object calling this method
+ */
+ void writeAborted(ImageWriter source);
+}
Index: javax/imageio/event/IIOWriteWarningListener.java
===================================================================
RCS file: javax/imageio/event/IIOWriteWarningListener.java
diff -N javax/imageio/event/IIOWriteWarningListener.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOWriteWarningListener.java 21 Apr 2004 15:48:06 -0000
@@ -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 (address@hidden)
+ */
+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 ImageWriter
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);
+}
Index: javax/imageio/event/Makefile.am
===================================================================
RCS file: javax/imageio/event/Makefile.am
diff -N javax/imageio/event/Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/Makefile.am 21 Apr 2004 15:48:06 -0000
@@ -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
Index: javax/imageio/event/.cvsignore
===================================================================
RCS file: javax/imageio/event/.cvsignore
diff -N javax/imageio/event/.cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/.cvsignore 21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: javax/imageio/spi/.cvsignore
===================================================================
RCS file: javax/imageio/spi/.cvsignore
diff -N javax/imageio/spi/.cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/spi/.cvsignore 21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: javax/imageio/stream/.cvsignore
===================================================================
RCS file: javax/imageio/stream/.cvsignore
diff -N javax/imageio/stream/.cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/imageio/stream/.cvsignore 21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in