libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
1242 lines
35 KiB
Java
1242 lines
35 KiB
Java
/* ImageIO.java --
|
|
Copyright (C) 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 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.awt.image.BufferedImage;
|
|
import java.awt.image.RenderedImage;
|
|
import java.io.File;
|
|
import java.io.FileInputStream;
|
|
import java.io.FileOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.net.URL;
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.Iterator;
|
|
|
|
import javax.imageio.spi.IIORegistry;
|
|
import javax.imageio.spi.ImageInputStreamSpi;
|
|
import javax.imageio.spi.ImageOutputStreamSpi;
|
|
import javax.imageio.spi.ImageReaderSpi;
|
|
import javax.imageio.spi.ImageTranscoderSpi;
|
|
import javax.imageio.spi.ImageWriterSpi;
|
|
import javax.imageio.spi.ServiceRegistry;
|
|
import javax.imageio.stream.ImageInputStream;
|
|
import javax.imageio.stream.ImageOutputStream;
|
|
import javax.imageio.stream.MemoryCacheImageInputStream;
|
|
import javax.imageio.stream.MemoryCacheImageOutputStream;
|
|
|
|
/**
|
|
* An uninstantiable class that provides static methods for locating
|
|
* and using image readers and writers.
|
|
*/
|
|
public final class ImageIO
|
|
{
|
|
/**
|
|
* Construct an ImageIO. Private since ImageIO is not instantiable.
|
|
*/
|
|
private 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)
|
|
{
|
|
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 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 ReaderObjectFilter implements ServiceRegistry.Filter
|
|
{
|
|
private Object object;
|
|
|
|
public ReaderObjectFilter(Object object)
|
|
{
|
|
this.object = object;
|
|
}
|
|
|
|
public boolean filter(Object provider)
|
|
{
|
|
if (provider instanceof ImageReaderSpi)
|
|
{
|
|
ImageReaderSpi spi = (ImageReaderSpi) provider;
|
|
|
|
try
|
|
{
|
|
if (spi.canDecodeInput(object))
|
|
return true;
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Return false in this case
|
|
}
|
|
}
|
|
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 ImageWriterSpi)
|
|
{
|
|
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 WriterMIMETypeFilter implements ServiceRegistry.Filter
|
|
{
|
|
private String MIMEType;
|
|
|
|
public WriterMIMETypeFilter(String MIMEType)
|
|
{
|
|
this.MIMEType = MIMEType;
|
|
}
|
|
|
|
public boolean filter(Object provider)
|
|
{
|
|
if (provider instanceof ImageWriterSpi)
|
|
{
|
|
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 ImageWriterSpi)
|
|
{
|
|
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 WriterObjectFilter implements ServiceRegistry.Filter
|
|
{
|
|
private ImageTypeSpecifier type;
|
|
private String formatName;
|
|
|
|
public WriterObjectFilter(ImageTypeSpecifier type,
|
|
String formatName)
|
|
{
|
|
this.type = type;
|
|
this.formatName = formatName;
|
|
}
|
|
|
|
public boolean filter(Object provider)
|
|
{
|
|
if (provider instanceof ImageWriterSpi)
|
|
{
|
|
ImageWriterSpi spi = (ImageWriterSpi) provider;
|
|
|
|
if (spi.canEncodeImage(type))
|
|
{
|
|
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 TranscoderFilter implements ServiceRegistry.Filter
|
|
{
|
|
private ImageReader reader;
|
|
private ImageWriter writer;
|
|
|
|
public TranscoderFilter(ImageReader reader,
|
|
ImageWriter writer)
|
|
{
|
|
this.reader = reader;
|
|
this.writer = writer;
|
|
}
|
|
|
|
public boolean filter(Object provider)
|
|
{
|
|
if (provider instanceof ImageTranscoderSpi)
|
|
{
|
|
ImageTranscoderSpi spi = (ImageTranscoderSpi) provider;
|
|
|
|
if (spi.getReaderServiceProviderName().equals
|
|
(reader.getOriginatingProvider().getClass().getName())
|
|
&& spi.getWriterServiceProviderName().equals
|
|
(writer.getOriginatingProvider().getClass().getName()))
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|
|
|
|
private static final class ImageReaderIterator
|
|
implements Iterator<ImageReader>
|
|
{
|
|
Iterator<ImageReaderSpi> it;
|
|
Object readerExtension;
|
|
|
|
public ImageReaderIterator(Iterator<ImageReaderSpi> it,
|
|
Object readerExtension)
|
|
{
|
|
this.it = it;
|
|
this.readerExtension = readerExtension;
|
|
}
|
|
|
|
public ImageReaderIterator(Iterator<ImageReaderSpi> it)
|
|
{
|
|
this.it = it;
|
|
}
|
|
|
|
public boolean hasNext()
|
|
{
|
|
return it.hasNext();
|
|
}
|
|
|
|
public ImageReader next()
|
|
{
|
|
try
|
|
{
|
|
ImageReaderSpi spi = it.next();
|
|
return (readerExtension == null
|
|
? spi.createReaderInstance()
|
|
: spi.createReaderInstance(readerExtension));
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
public void remove()
|
|
{
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
}
|
|
|
|
private static final class ImageWriterIterator
|
|
implements Iterator<ImageWriter>
|
|
{
|
|
Iterator<ImageWriterSpi> it;
|
|
Object writerExtension;
|
|
|
|
public ImageWriterIterator(Iterator<ImageWriterSpi> it,
|
|
Object writerExtension)
|
|
{
|
|
this.it = it;
|
|
this.writerExtension = writerExtension;
|
|
}
|
|
|
|
public ImageWriterIterator(Iterator<ImageWriterSpi> it)
|
|
{
|
|
this.it = it;
|
|
}
|
|
|
|
public boolean hasNext()
|
|
{
|
|
return it.hasNext();
|
|
}
|
|
|
|
public ImageWriter next()
|
|
{
|
|
try
|
|
{
|
|
ImageWriterSpi spi = it.next();
|
|
return (writerExtension == null
|
|
? spi.createWriterInstance()
|
|
: spi.createWriterInstance(writerExtension));
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
public void remove()
|
|
{
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
}
|
|
|
|
private static File cacheDirectory;
|
|
private static boolean useCache = true;
|
|
|
|
private static Iterator<ImageReader> getReadersByFilter(Class<ImageReaderSpi> type,
|
|
ServiceRegistry.Filter filter,
|
|
Object readerExtension)
|
|
{
|
|
try
|
|
{
|
|
Iterator<ImageReaderSpi> it
|
|
= getRegistry().getServiceProviders(type, filter, true);
|
|
return new ImageReaderIterator(it, readerExtension);
|
|
}
|
|
catch (IllegalArgumentException e)
|
|
{
|
|
return Collections.EMPTY_SET.iterator();
|
|
}
|
|
}
|
|
|
|
private static Iterator<ImageWriter> getWritersByFilter(Class<ImageWriterSpi> type,
|
|
ServiceRegistry.Filter filter,
|
|
Object writerExtension)
|
|
{
|
|
try
|
|
{
|
|
Iterator<ImageWriterSpi> it
|
|
= getRegistry().getServiceProviders(type, filter, true);
|
|
return new ImageWriterIterator(it, writerExtension);
|
|
}
|
|
catch (IllegalArgumentException e)
|
|
{
|
|
return Collections.EMPTY_SET.iterator();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Retrieve the current cache directory.
|
|
*
|
|
* @return the current cache directory or null if none is set.
|
|
*/
|
|
public static File getCacheDirectory()
|
|
{
|
|
return cacheDirectory;
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over all registered readers for the given
|
|
* format.
|
|
*
|
|
* @param formatName an infomal format name (e.g. "jpeg" or "bmp")
|
|
*
|
|
* @return an iterator over a collection of image readers
|
|
*
|
|
* @exception IllegalArgumentException if formatName is null
|
|
*/
|
|
public static Iterator<ImageReader> getImageReadersByFormatName(String formatName)
|
|
{
|
|
if (formatName == null)
|
|
throw new IllegalArgumentException("formatName may not be null");
|
|
|
|
return getReadersByFilter(ImageReaderSpi.class,
|
|
new ReaderFormatFilter(formatName),
|
|
formatName);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over all registered readers for the given
|
|
* MIME type.
|
|
*
|
|
* @param MIMEType a MIME specification for an image type
|
|
* (e.g. "image/jpeg" or "image/x-bmp")
|
|
*
|
|
* @return an iterator over a collection of image readers
|
|
*
|
|
* @exception IllegalArgumentException if MIMEType is null
|
|
*/
|
|
public static Iterator<ImageReader> getImageReadersByMIMEType(String MIMEType)
|
|
{
|
|
if (MIMEType == null)
|
|
throw new IllegalArgumentException("MIMEType may not be null");
|
|
|
|
return getReadersByFilter(ImageReaderSpi.class,
|
|
new ReaderMIMETypeFilter(MIMEType),
|
|
MIMEType);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over all registered readers for the given
|
|
* file suffix.
|
|
*
|
|
* @param fileSuffix an image file suffix (e.g. "jpg" or "bmp")
|
|
*
|
|
* @return an iterator over a collection of image readers
|
|
*
|
|
* @exception IllegalArgumentException if fileSuffix is null
|
|
*/
|
|
public static Iterator<ImageReader> getImageReadersBySuffix(String fileSuffix)
|
|
{
|
|
if (fileSuffix == null)
|
|
throw new IllegalArgumentException("formatName may not be null");
|
|
|
|
return getReadersByFilter(ImageReaderSpi.class,
|
|
new ReaderSuffixFilter(fileSuffix),
|
|
fileSuffix);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over all registered writers for the given
|
|
* format.
|
|
*
|
|
* @param formatName an infomal format name (e.g. "jpeg" or "bmp")
|
|
*
|
|
* @return an iterator over a collection of image writers
|
|
*
|
|
* @exception IllegalArgumentException if formatName is null
|
|
*/
|
|
public static Iterator<ImageWriter> getImageWritersByFormatName(String formatName)
|
|
{
|
|
if (formatName == null)
|
|
throw new IllegalArgumentException("formatName may not be null");
|
|
|
|
return getWritersByFilter(ImageWriterSpi.class,
|
|
new WriterFormatFilter(formatName),
|
|
formatName);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over all registered writers for the given
|
|
* MIME type.
|
|
*
|
|
* @param MIMEType a MIME specification for an image type
|
|
* (e.g. "image/jpeg" or "image/x-bmp")
|
|
*
|
|
* @return an iterator over a collection of image writers
|
|
*
|
|
* @exception IllegalArgumentException if MIMEType is null
|
|
*/
|
|
public static Iterator<ImageWriter> getImageWritersByMIMEType(String MIMEType)
|
|
{
|
|
if (MIMEType == null)
|
|
throw new IllegalArgumentException("MIMEType may not be null");
|
|
|
|
return getWritersByFilter(ImageWriterSpi.class,
|
|
new WriterMIMETypeFilter(MIMEType),
|
|
MIMEType);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over all registered writers for the given
|
|
* file suffix.
|
|
*
|
|
* @param fileSuffix an image file suffix (e.g. "jpg" or "bmp")
|
|
*
|
|
* @return an iterator over a collection of image writers
|
|
*
|
|
* @exception IllegalArgumentException if fileSuffix is null
|
|
*/
|
|
public static Iterator<ImageWriter> getImageWritersBySuffix(String fileSuffix)
|
|
{
|
|
if (fileSuffix == null)
|
|
throw new IllegalArgumentException("fileSuffix may not be null");
|
|
|
|
return getWritersByFilter(ImageWriterSpi.class,
|
|
new WriterSuffixFilter(fileSuffix),
|
|
fileSuffix);
|
|
}
|
|
|
|
/**
|
|
* Retrieve all the informal format names supported by the
|
|
* collection of registered image readers.
|
|
*
|
|
* @return an array of format names
|
|
*/
|
|
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];
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Retrieve all the MIME types supported by the collection of
|
|
* registered image readers.
|
|
*
|
|
* @return an array of MIME types
|
|
*/
|
|
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();
|
|
}
|
|
|
|
/**
|
|
* Check whether or not an on-disk cache is used for image input and
|
|
* output streams.
|
|
*
|
|
* @return true if an on-disk cache is available, false otherwise
|
|
*/
|
|
public static boolean getUseCache()
|
|
{
|
|
return useCache;
|
|
}
|
|
|
|
/**
|
|
* Retrieve all the informal format names supported by the
|
|
* collection of registered image writers.
|
|
*
|
|
* @return an array of format names
|
|
*/
|
|
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];
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Retrieve all the MIME types supported by the collection of
|
|
* registered image writers.
|
|
*
|
|
* @return an array of MIME types
|
|
*/
|
|
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();
|
|
}
|
|
|
|
/**
|
|
* Set the directory to be used for caching image data. A null
|
|
* argument means to use the default system temporary directory.
|
|
* This cache directory is only used if getUseCache returns true.
|
|
*
|
|
* @param cacheDirectory the directory where image data should be
|
|
* cached
|
|
*
|
|
* @exception IllegalArgumentException if cacheDirectory is not a
|
|
* directory
|
|
*/
|
|
public static void setCacheDirectory(File cacheDirectory)
|
|
{
|
|
// FIXME: add SecurityManager call
|
|
if (cacheDirectory != null)
|
|
{
|
|
if (!cacheDirectory.isDirectory())
|
|
throw new IllegalArgumentException("cacheDirectory must be a directory");
|
|
|
|
cacheDirectory.canWrite();
|
|
}
|
|
|
|
ImageIO.cacheDirectory = cacheDirectory;
|
|
}
|
|
|
|
/**
|
|
* Control whether or not an on-disk cache is used. This cache is
|
|
* used to store input or output data from an image data stream when
|
|
* data in the stream needs to be re-processed.
|
|
*
|
|
* If useCache is false the cache will be stored in memory. Doing
|
|
* so eliminates file creation and deletion overhead. The default
|
|
* is to use an on-disk cache.
|
|
*
|
|
* @param useCache true to use an on-disk cache, false otherwise
|
|
*/
|
|
public static void setUseCache(boolean useCache)
|
|
{
|
|
ImageIO.useCache = useCache;
|
|
}
|
|
|
|
/**
|
|
* Write an image to a file using a registered writer that supports
|
|
* the given format, overwriting the file if it already exists.
|
|
*
|
|
* @param im the image data to write
|
|
* @param formatName an informal description of the output format
|
|
* @param output the file to which the image will be written
|
|
*
|
|
* @return false if no registered writer supports the given format,
|
|
* true otherwise
|
|
*
|
|
* @exception IllegalArgumentException if any argument is null
|
|
* @exception IOException if a writing error occurs
|
|
*/
|
|
public static boolean write(RenderedImage im,
|
|
String formatName,
|
|
File output)
|
|
throws IOException
|
|
{
|
|
if (im == null || formatName == null || output == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
return write(im, formatName, new FileOutputStream(output));
|
|
}
|
|
|
|
/**
|
|
* Write an image to an output stream using a registered writer that
|
|
* supports the given format.
|
|
*
|
|
* @param im the image data to write
|
|
* @param formatName an informal description of the output format
|
|
* @param output the output stream to which the image will be
|
|
* written
|
|
*
|
|
* @return false if no registered writer supports the given format,
|
|
* true otherwise
|
|
*
|
|
* @exception IllegalArgumentException if any argument is null
|
|
* @exception IOException if a writing error occurs
|
|
*/
|
|
public static boolean write(RenderedImage im,
|
|
String formatName,
|
|
OutputStream output)
|
|
throws IOException
|
|
{
|
|
if (im == null || formatName == null || output == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
return write(im, formatName, new MemoryCacheImageOutputStream(output));
|
|
}
|
|
|
|
/**
|
|
* Write an image to an ImageOutputStream using a registered writer
|
|
* that supports the given format. Image data is written starting
|
|
* at the ImageOutputStream's current stream pointer, overwriting
|
|
* any existing data.
|
|
*
|
|
* @param im the image data to write
|
|
* @param formatName an informal description of the output format
|
|
* @param output the image output stream to which the image will be
|
|
* written
|
|
*
|
|
* @return false if no registered writer supports the given format,
|
|
* true otherwise
|
|
*
|
|
* @exception IllegalArgumentException if any argument is null
|
|
* @exception IOException if a writing error occurs
|
|
*/
|
|
public static boolean write(RenderedImage im,
|
|
String formatName,
|
|
ImageOutputStream output)
|
|
throws IOException
|
|
{
|
|
if (im == null || formatName == null || output == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
Iterator writers = getImageWritersByFormatName(formatName);
|
|
IIOImage img = new IIOImage(im, null, null);
|
|
while (writers.hasNext())
|
|
{
|
|
ImageWriter w = (ImageWriter) writers.next();
|
|
try
|
|
{
|
|
w.setOutput(output);
|
|
}
|
|
catch (IllegalArgumentException e)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
w.write(null, img, null);
|
|
w.dispose();
|
|
output.close();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Create a buffered image from an image input stream. An image
|
|
* reader that supports the given image data is automatically
|
|
* selected from the collection of registered readers. If no
|
|
* registered reader can handle the input format, null is returned.
|
|
*
|
|
* @param stream the image input stream from which to read image
|
|
* data
|
|
*
|
|
* @return a new buffered image created from the given image data,
|
|
* or null
|
|
*
|
|
* @exception IllegalArgumentException if stream is null
|
|
* @exception IOException if a reading error occurs
|
|
*/
|
|
public static BufferedImage read(ImageInputStream stream)
|
|
throws IOException
|
|
{
|
|
if (stream == null)
|
|
throw new IllegalArgumentException("null argument");
|
|
|
|
Iterator providers = getRegistry().getServiceProviders(ImageReaderSpi.class, true);
|
|
while (providers.hasNext())
|
|
{
|
|
ImageReaderSpi spi = (ImageReaderSpi) providers.next();
|
|
if (spi.canDecodeInput(stream))
|
|
{
|
|
ImageReader reader = spi.createReaderInstance();
|
|
reader.setInput(stream);
|
|
return reader.read(0, null);
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Create a buffered image from a URL. An image reader that
|
|
* supports the given image data is automatically selected from the
|
|
* collection of registered readers. If no registered reader can
|
|
* handle the input format, null is returned.
|
|
*
|
|
* The image data will be cached in the current cache directory if
|
|
* caching is enabled.
|
|
*
|
|
* This method does not locate readers that read data directly from
|
|
* a URL. To locate such readers manually, use IIORegistry and
|
|
* ImageReaderSpi.
|
|
*
|
|
* @param input the URL from which to retrieve the image file
|
|
*
|
|
* @return a new buffered image created from the given image URL, or
|
|
* null
|
|
*
|
|
* @exception IllegalArgumentException if input is null
|
|
* @exception IOException if a reading error occurs
|
|
*/
|
|
public static BufferedImage read(URL input)
|
|
throws IOException
|
|
{
|
|
if (input == null)
|
|
throw new IllegalArgumentException("null argument");
|
|
|
|
return read(input.openStream());
|
|
}
|
|
|
|
/**
|
|
* Create a buffered image from an input stream. An image reader
|
|
* that supports the given image data is automatically selected from
|
|
* the collection of registered readers. If no registered reader
|
|
* can handle the input format, null is returned.
|
|
*
|
|
* The image data will be cached in the current cache directory if
|
|
* caching is enabled.
|
|
*
|
|
* This method does not locate readers that read data directly from
|
|
* an input stream. To locate such readers manually, use
|
|
* IIORegistry and ImageReaderSpi.
|
|
*
|
|
* @param input the input stream from which to read the image data
|
|
*
|
|
* @return a new buffered image created from the given input stream,
|
|
* or null
|
|
*
|
|
* @exception IllegalArgumentException if input is null
|
|
* @exception IOException if a reading error occurs
|
|
*/
|
|
public static BufferedImage read(InputStream input)
|
|
throws IOException
|
|
{
|
|
if (input == null)
|
|
throw new IllegalArgumentException("null argument");
|
|
|
|
return read(new MemoryCacheImageInputStream(input));
|
|
}
|
|
|
|
/**
|
|
* Create a buffered image from a file. An image reader that
|
|
* supports the given image data is automatically selected from the
|
|
* collection of registered readers. If no registered reader can
|
|
* handle the input format, null is returned.
|
|
*
|
|
* The image data will be cached in the current cache directory if
|
|
* caching is enabled.
|
|
*
|
|
* This method does not locate readers that read data directly from
|
|
* a file. To locate such readers manually, use IIORegistry and
|
|
* ImageReaderSpi.
|
|
*
|
|
* @param input the file from which to read image data
|
|
*
|
|
* @return a new buffered image created from the given image file,
|
|
* or null
|
|
*
|
|
* @exception IllegalArgumentException if input is null
|
|
* @exception IOException if a reading error occurs
|
|
*/
|
|
public static BufferedImage read(File input)
|
|
throws IOException
|
|
{
|
|
if (input == null)
|
|
throw new IllegalArgumentException("null argument");
|
|
|
|
return read(new FileInputStream(input));
|
|
}
|
|
|
|
/**
|
|
* Create an image input stream from the given object. The
|
|
* collection of ImageInputStreamSpis registered with the
|
|
* IIORegistry is searched for an image input stream that can take
|
|
* input from the given object. null is returned if no such SPI is
|
|
* registered.
|
|
*
|
|
* The image data will be cached in the current cache directory if
|
|
* caching is enabled.
|
|
*
|
|
* @param input an object from which to read image data
|
|
*
|
|
* @return an ImageInputStream that can read data from input, or
|
|
* null
|
|
*
|
|
* @exception IllegalArgumentException if input is null
|
|
* @exception IOException if caching is required but not enabled
|
|
*/
|
|
public static ImageInputStream createImageInputStream (Object input)
|
|
throws IOException
|
|
{
|
|
if (input == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
Iterator spis = getRegistry().getServiceProviders
|
|
(ImageInputStreamSpi.class, true);
|
|
|
|
ImageInputStreamSpi foundSpi = null;
|
|
|
|
while(spis.hasNext())
|
|
{
|
|
ImageInputStreamSpi spi = (ImageInputStreamSpi) spis.next();
|
|
|
|
if (input.getClass().equals(spi.getInputClass()))
|
|
{
|
|
foundSpi = spi;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return foundSpi == null ? null :
|
|
foundSpi.createInputStreamInstance (input,
|
|
getUseCache(),
|
|
getCacheDirectory());
|
|
}
|
|
|
|
/**
|
|
* Create an image output stream from the given object. The
|
|
* collection of ImageOutputStreamSpis registered with the
|
|
* IIORegistry is searched for an image output stream that can send
|
|
* output to the given object. null is returned if no such SPI is
|
|
* registered.
|
|
*
|
|
* The image data will be cached in the current cache directory if
|
|
* caching is enabled.
|
|
*
|
|
* @param output an object to which to write image data
|
|
*
|
|
* @return an ImageOutputStream that can send data to output, or
|
|
* null
|
|
*
|
|
* @exception IllegalArgumentException if output is null
|
|
* @exception IOException if caching is required but not enabled
|
|
*/
|
|
public static ImageOutputStream createImageOutputStream (Object output)
|
|
throws IOException
|
|
{
|
|
if (output == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
Iterator spis = getRegistry().getServiceProviders
|
|
(ImageOutputStreamSpi.class, true);
|
|
|
|
ImageOutputStreamSpi foundSpi = null;
|
|
|
|
while(spis.hasNext())
|
|
{
|
|
ImageOutputStreamSpi spi = (ImageOutputStreamSpi) spis.next();
|
|
|
|
if (output.getClass().equals(spi.getOutputClass()))
|
|
{
|
|
foundSpi = spi;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return foundSpi == null ? null :
|
|
foundSpi.createOutputStreamInstance (output,
|
|
getUseCache(),
|
|
getCacheDirectory());
|
|
}
|
|
|
|
/**
|
|
* Retrieve an image reader corresponding to an image writer, or
|
|
* null if writer is not registered or if no corresponding reader is
|
|
* registered.
|
|
*
|
|
* @param writer a registered image writer
|
|
*
|
|
* @return an image reader corresponding to writer, or null
|
|
*
|
|
* @exception IllegalArgumentException if writer is null
|
|
*/
|
|
public static ImageReader getImageReader (ImageWriter writer)
|
|
{
|
|
if (writer == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
ImageWriterSpi spi = writer.getOriginatingProvider();
|
|
|
|
String[] readerSpiNames = spi.getImageReaderSpiNames();
|
|
|
|
ImageReader r = null;
|
|
|
|
if (readerSpiNames != null)
|
|
{
|
|
try
|
|
{
|
|
Class readerClass = Class.forName (readerSpiNames[0]);
|
|
r = (ImageReader) readerClass.newInstance ();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
return r;
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over the collection of registered image
|
|
* readers that support reading data from the given object.
|
|
*
|
|
* @param input the object for which to retrieve image readers
|
|
*
|
|
* @return an iterator over a collection of image readers
|
|
*/
|
|
public static Iterator<ImageReader> getImageReaders (Object input)
|
|
{
|
|
if (input == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
Iterator<ImageReaderSpi> spiIterator
|
|
= getRegistry().getServiceProviders (ImageReaderSpi.class,
|
|
new ReaderObjectFilter(input),
|
|
true);
|
|
return new ImageReaderIterator(spiIterator);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over the collection of registered image
|
|
* writers that support writing images of the given type and in the
|
|
* given format.
|
|
*
|
|
* @param type the output image's colour and sample models
|
|
* @param formatName the output image format
|
|
*
|
|
* @return an iterator over a collection of image writers
|
|
*/
|
|
public static Iterator<ImageWriter> getImageWriters (ImageTypeSpecifier type,
|
|
String formatName)
|
|
{
|
|
if (type == null || formatName == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
final Iterator<ImageWriterSpi> spiIterator
|
|
= getRegistry().getServiceProviders (ImageWriterSpi.class,
|
|
new WriterObjectFilter(type,
|
|
formatName),
|
|
true);
|
|
return new ImageWriterIterator(spiIterator);
|
|
}
|
|
|
|
/**
|
|
* Retrieve an image writer corresponding to an image reader, or
|
|
* null if reader is not registered or if no corresponding writer is
|
|
* registered. This method is useful for preserving metadata
|
|
* without needing to understand its format, since the returned
|
|
* writer will be able to write, unchanged, the metadata passed to
|
|
* it by the reader.
|
|
*
|
|
* @param reader a registered image reader
|
|
*
|
|
* @return an image writer corresponding to reader, or null
|
|
*
|
|
* @exception IllegalArgumentException if reader is null
|
|
*/
|
|
public static ImageWriter getImageWriter (ImageReader reader)
|
|
{
|
|
if (reader == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
ImageReaderSpi spi = reader.getOriginatingProvider();
|
|
|
|
String[] writerSpiNames = spi.getImageWriterSpiNames();
|
|
|
|
ImageWriter w = null;
|
|
|
|
if (writerSpiNames != null)
|
|
{
|
|
try
|
|
{
|
|
Class writerClass = Class.forName (writerSpiNames[0]);
|
|
w = (ImageWriter) writerClass.newInstance ();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
return w;
|
|
}
|
|
|
|
/**
|
|
* Retrieve an iterator over a collection of image transcoders that
|
|
* support transcoding from the given image reader's metadata format
|
|
* to the given writer's metadata format.
|
|
*
|
|
* @param reader an image reader
|
|
* @param writer an image writer
|
|
*
|
|
* @return an iterator over a collection of image transcoders
|
|
*
|
|
* @exception IllegalArgumentException if either reader or writer is
|
|
* null
|
|
*/
|
|
public static Iterator<ImageTranscoder> getImageTranscoders (ImageReader reader,
|
|
ImageWriter writer)
|
|
{
|
|
if (reader == null || writer == null)
|
|
throw new IllegalArgumentException ("null argument");
|
|
|
|
final Iterator<ImageTranscoderSpi> spiIterator
|
|
= getRegistry().getServiceProviders (ImageTranscoderSpi.class,
|
|
new TranscoderFilter (reader,
|
|
writer),
|
|
true);
|
|
return new Iterator<ImageTranscoder>()
|
|
{
|
|
public boolean hasNext()
|
|
{
|
|
return spiIterator.hasNext();
|
|
}
|
|
|
|
public ImageTranscoder next()
|
|
{
|
|
return spiIterator.next().createTranscoderInstance();
|
|
}
|
|
|
|
public void remove()
|
|
{
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
};
|
|
}
|
|
}
|