diff options
Diffstat (limited to 'libjava/javax/imageio/spi')
8 files changed, 23 insertions, 19 deletions
diff --git a/libjava/javax/imageio/spi/IIORegistry.java b/libjava/javax/imageio/spi/IIORegistry.java index 7728cf428a3..6531fabca10 100644 --- a/libjava/javax/imageio/spi/IIORegistry.java +++ b/libjava/javax/imageio/spi/IIORegistry.java @@ -39,7 +39,9 @@ exception statement from your version. */ package javax.imageio.spi; import gnu.classpath.ServiceFactory; +import gnu.java.awt.ClasspathToolkit; +import java.awt.Toolkit; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -52,8 +54,8 @@ public final class IIORegistry extends ServiceRegistry static { - //defaultCategories.add(ImageReaderSpi.class); - //defaultCategories.add(ImageWriterSpi.class); + defaultCategories.add(ImageReaderSpi.class); + defaultCategories.add(ImageWriterSpi.class); defaultCategories.add(ImageTranscoderSpi.class); defaultCategories.add(ImageInputStreamSpi.class); defaultCategories.add(ImageOutputStreamSpi.class); @@ -78,6 +80,8 @@ public final class IIORegistry extends ServiceRegistry super(defaultCategories.iterator()); // XXX: Register built-in Spis here. + + ((ClasspathToolkit)Toolkit.getDefaultToolkit()).registerImageIOSpis(this); registerApplicationClasspathSpis(); } diff --git a/libjava/javax/imageio/spi/IIOServiceProvider.java b/libjava/javax/imageio/spi/IIOServiceProvider.java index bd0a449331c..a0d8b79bc54 100644 --- a/libjava/javax/imageio/spi/IIOServiceProvider.java +++ b/libjava/javax/imageio/spi/IIOServiceProvider.java @@ -1,5 +1,5 @@ /* IIOServiceProvider.java -- General service provider for image I/O. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ import java.util.Locale; * * @since 1.4 * - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Sascha Brawer (brawer@dandelis.ch) */ public abstract class IIOServiceProvider implements RegisterableService diff --git a/libjava/javax/imageio/spi/ImageInputStreamSpi.java b/libjava/javax/imageio/spi/ImageInputStreamSpi.java index 6e33d1d392c..8679ed1f4d7 100644 --- a/libjava/javax/imageio/spi/ImageInputStreamSpi.java +++ b/libjava/javax/imageio/spi/ImageInputStreamSpi.java @@ -1,5 +1,5 @@ /* ImageInputStreamSpi.java -- Service provider for image input streams. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ import javax.imageio.stream.ImageInputStream; * * @since 1.4 * - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Sascha Brawer (brawer@dandelis.ch) */ public abstract class ImageInputStreamSpi extends IIOServiceProvider diff --git a/libjava/javax/imageio/spi/ImageOutputStreamSpi.java b/libjava/javax/imageio/spi/ImageOutputStreamSpi.java index 935aa7c6799..43781aa1112 100644 --- a/libjava/javax/imageio/spi/ImageOutputStreamSpi.java +++ b/libjava/javax/imageio/spi/ImageOutputStreamSpi.java @@ -1,5 +1,5 @@ /* ImageOutputStreamSpi.java -- Service provider for image output streams. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ import javax.imageio.stream.ImageOutputStream; * * @since 1.4 * - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Sascha Brawer (brawer@dandelis.ch) */ public abstract class ImageOutputStreamSpi extends IIOServiceProvider diff --git a/libjava/javax/imageio/spi/ImageReaderWriterSpi.java b/libjava/javax/imageio/spi/ImageReaderWriterSpi.java index 74dbb3859bb..9821adf88af 100644 --- a/libjava/javax/imageio/spi/ImageReaderWriterSpi.java +++ b/libjava/javax/imageio/spi/ImageReaderWriterSpi.java @@ -1,5 +1,5 @@ /* ImageReaderWriterSpi.java -- Superclass for image reader and writer spis. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ package javax.imageio.spi; * * @since 1.4 * - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Sascha Brawer (brawer@dandelis.ch) */ public abstract class ImageReaderWriterSpi extends IIOServiceProvider diff --git a/libjava/javax/imageio/spi/ImageTranscoderSpi.java b/libjava/javax/imageio/spi/ImageTranscoderSpi.java index 85ca77d4639..d3a4d89b08e 100644 --- a/libjava/javax/imageio/spi/ImageTranscoderSpi.java +++ b/libjava/javax/imageio/spi/ImageTranscoderSpi.java @@ -1,5 +1,5 @@ /* ImageTranscoderSpi.java -- Factory for image metadata transcoders. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import javax.imageio.ImageTranscoder; * * @since 1.4 * - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Sascha Brawer (brawer@dandelis.ch) */ public abstract class ImageTranscoderSpi extends IIOServiceProvider diff --git a/libjava/javax/imageio/spi/RegisterableService.java b/libjava/javax/imageio/spi/RegisterableService.java index 40cb05f81ac..2afee80ab30 100644 --- a/libjava/javax/imageio/spi/RegisterableService.java +++ b/libjava/javax/imageio/spi/RegisterableService.java @@ -1,5 +1,5 @@ /* RegisterableService.java -- An interface for service providers. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ package javax.imageio.spi; * * @since 1.4 * - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Sascha Brawer (brawer@dandelis.ch) */ public interface RegisterableService { diff --git a/libjava/javax/imageio/spi/ServiceRegistry.java b/libjava/javax/imageio/spi/ServiceRegistry.java index 3d7134ed53f..a08ea69e8ee 100644 --- a/libjava/javax/imageio/spi/ServiceRegistry.java +++ b/libjava/javax/imageio/spi/ServiceRegistry.java @@ -1,5 +1,5 @@ /* ServiceRegistry.java -- A simple registry for service providers. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,8 +57,8 @@ import java.util.Set; * * @since 1.4 * - * @author <a href="mailto:konqueror@gmx.de">Michael Koch</a> - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Michael Koch (konqueror@gmx.de) + * @author Sascha Brawer (brawer@dandelis.ch) */ public class ServiceRegistry { @@ -941,8 +941,8 @@ public class ServiceRegistry * * @since 1.4 * - * @author <a href="mailto:konqueror@gmx.de">Michael Koch</a> - * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a> + * @author Michael Koch (konqueror@gmx.de) + * @author Sascha Brawer (brawer@dandelis.ch) */ public static interface Filter { |