gcc/libjava/javax/imageio/ImageIO.java
Mark Wielaard 6c56bdc2fa [multiple changes]
2004-11-06  Mark Wielaard  <mark@klomp.org>

	* Makefile.am: Add new javax.imageio files.
	* Makefile.in: Regenerated.

2004-11-06  Michael Koch  <konqueror@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-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/spi/ImageReaderSpi.java
	(isOwnReader): New method.
	* javax/imageio/spi/ImageWriterSpi.java
	(isOwnWriter): Likewise.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/ImageWriter.java
	(convertImageMetadata): New abstract method.
	(convertStreamMetadata): Likewise.
	(write): Likewise.
	* javax/imageio/stream/FileCacheImageInputStream.java
	(close): Fixed setting of stream to null.
	(checkStreamClosed): Throws IOException.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/stream/FileCacheImageInputStream.java,
	javax/imageio/stream/FileCacheImageOutputStream.java,
	javax/imageio/stream/FileImageInputStream.java,
	javax/imageio/stream/FileImageOutputStream.java,
	javax/imageio/stream/MemoryCacheImageInputStream.java,
	javax/imageio/stream/MemoryCacheImageOutputStream.java:
	New files.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/metadata/IIOInvalidTreeException.java,
	javax/imageio/metadata/IIOMetadataFormatImpl.java,
	javax/imageio/metadata/IIOMetadataNode.java:
	New stub files.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/stream/ImageInputStreamImpl.java,
	javax/imageio/stream/ImageOutputStreamImpl.java:
	New files.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/ImageIO.java:
	Added much new methods.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/ImageReader.java,
	javax/imageio/ImageWriter.java,
	javax/imageio/spi/ImageWriterSpi.java:
	Add SOME new methods.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/IIOParam.java,
	javax/imageio/ImageReadParam.java,
	javax/imageio/ImageReader.java,
	javax/imageio/ImageWriter.java:
	Mostly implemented.
	* javax/imageio/spi/ImageReaderSpi.java,
	javax/imageio/spi/ImageWriterSpi.java:
	New files.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/ImageWriteParam.java,
	javax/imageio/metadata/IIOMetadataFormat.java:
	Implemented.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/ImageTypeSpecifier.java:
	Mostly implemented.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/metadata/IIOMetadata.java:
	Mostly implemented.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/IIOImage.java,
	javax/imageio/ImageReadParam.java,
	javax/imageio/metadata/IIOMetadataController.java,
	javax/imageio/metadata/IIOMetadataFormat.java:
	New files.
	* javax/imageio/stream/ImageOutputStream.java:
	Implemented.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/IIOParam.java,
	javax/imageio/IIOParamController.java,
	javax/imageio/ImageTypeSpecifier.java,
	javax/imageio/ImageWriteParam.java,
	javax/imageio/metadata/IIOMetadata.java:
	New files.
	* javax/imageio/ImageTranscoder.java:
	Implemented.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/spi/ImageInputStreamSpi.java,
	javax/imageio/spi/ImageOutputStreamSpi.java:
	Reworked import startments.
	* javax/imageio/spi/ServiceRegistry.java:
	Reworked import startments. Fixed XHTML in javadocs.
	(ServiceRegistry): Added @param tag to javadoc.
	* javax/imageio/stream/ImageInputStream.java
	(mark): Doesn't throws IOException;

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/ImageIO.java:
	New file.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/spi/IIORegistry.java
	(static): Don't register ImageReaderSpi.class and
	ImageWriterSpi.class yet.

2004-11-06  Michael Koch  <konqueror@gmx.de>

	* javax/imageio/spi/IIORegistry.java:
	New file.

From-SVN: r90181
2004-11-06 18:09:00 +00:00

495 lines
12 KiB
Java

/* ImageIO.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.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.spi.ImageWriterSpi;
import javax.imageio.spi.ServiceRegistry;
public final class ImageIO
{
private static final class ReaderFormatFilter implements ServiceRegistry.Filter
{
private String formatName;
public ReaderFormatFilter(String formatName)
{
this.formatName = formatName;
}
public boolean filter (Object provider)
{
if (provider instanceof ImageReaderSpi)
{
ImageWriterSpi spi = (ImageWriterSpi) provider;
String[] formatNames = spi.getFormatNames();
for (int i = formatNames.length - 1; i >= 0; --i)
if (formatName.equals(formatNames[i]))
return true;
}
return false;
}
}
private static final class ReaderMIMETypeFilter implements ServiceRegistry.Filter
{
private String MIMEType;
public ReaderMIMETypeFilter(String MIMEType)
{
this.MIMEType = MIMEType;
}
public boolean filter(Object provider)
{
if (provider instanceof ImageReaderSpi)
{
ImageReaderSpi spi = (ImageReaderSpi) provider;
String[] mimetypes = spi.getMIMETypes();
for (int i = mimetypes.length - 1; i >= 0; --i)
if (MIMEType.equals(mimetypes[i]))
return true;
}
return false;
}
}
private static final class ReaderSuffixFilter implements ServiceRegistry.Filter
{
private String fileSuffix;
public ReaderSuffixFilter(String fileSuffix)
{
this.fileSuffix = fileSuffix;
}
public boolean filter(Object provider)
{
if (provider instanceof ImageReaderSpi)
{
ImageReaderSpi spi = (ImageReaderSpi) provider;
String[] suffixes = spi.getFileSuffixes();
for (int i = suffixes.length - 1; i >= 0; --i)
if (fileSuffix.equals(suffixes[i]))
return true;
}
return false;
}
}
private static final class WriterFormatFilter implements ServiceRegistry.Filter
{
private String formatName;
public WriterFormatFilter(String formatName)
{
this.formatName = formatName;
}
public boolean filter(Object provider)
{
if (provider instanceof ImageReaderSpi)
{
ImageReaderSpi spi = (ImageReaderSpi) provider;
String[] formatNames = spi.getFormatNames();
for (int i = formatNames.length - 1; i >= 0; --i)
if (formatName.equals(formatNames[i]))
return true;
}
return false;
}
}
private static final class WriterMIMETypeFilter implements ServiceRegistry.Filter
{
private String MIMEType;
public WriterMIMETypeFilter(String MIMEType)
{
this.MIMEType = MIMEType;
}
public boolean filter(Object provider)
{
if (provider instanceof ImageReaderSpi)
{
ImageWriterSpi spi = (ImageWriterSpi) provider;
String[] mimetypes = spi.getMIMETypes();
for (int i = mimetypes.length - 1; i >= 0; --i)
if (MIMEType.equals(mimetypes[i]))
return true;
}
return false;
}
}
private static final class WriterSuffixFilter implements ServiceRegistry.Filter
{
private String fileSuffix;
public WriterSuffixFilter(String fileSuffix)
{
this.fileSuffix = fileSuffix;
}
public boolean filter(Object provider)
{
if (provider instanceof ImageReaderSpi)
{
ImageWriterSpi spi = (ImageWriterSpi) provider;
String[] suffixes = spi.getFileSuffixes();
for (int i = suffixes.length - 1; i >= 0; --i)
if (fileSuffix.equals(suffixes[i]))
return true;
}
return false;
}
}
private static final class ImageReaderIterator implements Iterator
{
Iterator it;
public ImageReaderIterator(Iterator it)
{
this.it = it;
}
public boolean hasNext()
{
return it.hasNext();
}
public Object next()
{
try
{
return ((ImageReaderSpi) it.next()).createReaderInstance();
}
catch (IOException e)
{
return null;
}
}
public void remove()
{
throw new UnsupportedOperationException();
}
}
private static final class ImageWriterIterator implements Iterator
{
Iterator it;
public ImageWriterIterator(Iterator it)
{
this.it = it;
}
public boolean hasNext()
{
return it.hasNext();
}
public Object next()
{
try
{
return ((ImageWriterSpi) it.next()).createWriterInstance();
}
catch (IOException e)
{
return null;
}
}
public void remove()
{
throw new UnsupportedOperationException();
}
}
private static File cacheDirectory;
private static boolean useCache = true;
private static Iterator getReadersByFilter(Class type,
ServiceRegistry.Filter filter)
{
try
{
Iterator it = getRegistry().getServiceProviders(type, filter, true);
return new ImageReaderIterator(it);
}
catch (IllegalArgumentException e)
{
return Collections.EMPTY_SET.iterator();
}
}
private static Iterator getWritersByFilter(Class type,
ServiceRegistry.Filter filter)
{
try
{
Iterator it = getRegistry().getServiceProviders(type, filter, true);
return new ImageWriterIterator(it);
}
catch (IllegalArgumentException e)
{
return Collections.EMPTY_SET.iterator();
}
}
public static File getCacheDirectory()
{
return cacheDirectory;
}
public static Iterator getImageReadersByFormatName(String formatName)
{
if (formatName == null)
throw new IllegalArgumentException("formatName may not be null");
return getReadersByFilter(ImageReaderSpi.class,
new ReaderFormatFilter(formatName));
}
public static Iterator getImageReadersByMIMEType(String MIMEType)
{
if (MIMEType == null)
throw new IllegalArgumentException("MIMEType may not be null");
return getReadersByFilter(ImageReaderSpi.class,
new ReaderMIMETypeFilter(MIMEType));
}
public static Iterator getImageReadersBySuffix(String fileSuffix)
{
if (fileSuffix == null)
throw new IllegalArgumentException("formatName may not be null");
return getReadersByFilter(ImageReaderSpi.class,
new ReaderSuffixFilter(fileSuffix));
}
public static Iterator getImageWritersByFormatName(String formatName)
{
if (formatName == null)
throw new IllegalArgumentException("formatName may not be null");
return getWritersByFilter(ImageWriterSpi.class,
new WriterFormatFilter(formatName));
}
public static Iterator getImageWritersByMIMEType(String MIMEType)
{
if (MIMEType == null)
throw new IllegalArgumentException("MIMEType may not be null");
return getWritersByFilter(ImageWriterSpi.class,
new WriterMIMETypeFilter(MIMEType));
}
public static Iterator getImageWritersBySuffix(String fileSuffix)
{
if (fileSuffix == null)
throw new IllegalArgumentException("fileSuffix may not be null");
return getWritersByFilter(ImageWriterSpi.class,
new WriterSuffixFilter(fileSuffix));
}
public static String[] getReaderFormatNames()
{
try
{
Iterator it =
getRegistry().getServiceProviders(ImageReaderSpi.class, true);
ArrayList result = new ArrayList();
while (it.hasNext())
{
ImageReaderSpi spi = (ImageReaderSpi) it.next();
String[] names = spi.getFormatNames();
for (int i = names.length - 1; i >= 0; --i)
result.add(names[i]);
}
return (String[]) result.toArray(new String[result.size()]);
}
catch (IllegalArgumentException e)
{
return new String[0];
}
}
public static String[] getReaderMIMETypes()
{
try
{
Iterator it =
getRegistry().getServiceProviders(ImageReaderSpi.class, true);
ArrayList result = new ArrayList();
while (it.hasNext())
{
ImageReaderSpi spi = (ImageReaderSpi) it.next();
String[] names = spi.getMIMETypes();
for (int i = names.length - 1; i >= 0; --i)
result.add(names[i]);
}
return (String[]) result.toArray(new String[result.size()]);
}
catch (IllegalArgumentException e)
{
return new String[0];
}
}
private static IIORegistry getRegistry()
{
return IIORegistry.getDefaultInstance();
}
public static boolean getUseCache()
{
return useCache;
}
public static String[] getWriterFormatNames()
{
try
{
Iterator it =
getRegistry().getServiceProviders(ImageWriterSpi.class, true);
ArrayList result = new ArrayList();
while (it.hasNext())
{
ImageWriterSpi spi = (ImageWriterSpi) it.next();
String[] names = spi.getFormatNames();
for (int i = names.length - 1; i >= 0; --i)
result.add(names[i]);
}
return (String[]) result.toArray(new String[result.size()]);
}
catch (IllegalArgumentException e)
{
return new String[0];
}
}
public static String[] getWriterMIMETypes()
{
try
{
Iterator it =
getRegistry().getServiceProviders(ImageWriterSpi.class, true);
ArrayList result = new ArrayList();
while (it.hasNext())
{
ImageWriterSpi spi = (ImageWriterSpi) it.next();
String[] names = spi.getMIMETypes();
for (int i = names.length - 1; i >= 0; --i)
result.add(names[i]);
}
return (String[]) result.toArray(new String[result.size()]);
}
catch (IllegalArgumentException e)
{
return new String[0];
}
}
/**
* Rescans the application classpath for ImageIO service providers
* and registers them.
*/
public static void scanForPlugins()
{
IIORegistry.getDefaultInstance().registerApplicationClasspathSpis();
}
public static void setCacheDirectory(File cacheDirectory)
{
if (cacheDirectory != null)
{
if (!cacheDirectory.isDirectory())
throw new IllegalArgumentException("cacheDirectory must be a directory");
cacheDirectory.canWrite();
}
ImageIO.cacheDirectory = cacheDirectory;
}
public static void setUseCache(boolean useCache)
{
ImageIO.useCache = useCache;
}
}