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
840 lines
24 KiB
Java
840 lines
24 KiB
Java
/* BufferedImage.java --
|
|
Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, Free Software Foundation
|
|
|
|
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 java.awt.image;
|
|
|
|
import gnu.java.awt.Buffers;
|
|
import gnu.java.awt.ClasspathGraphicsEnvironment;
|
|
import gnu.java.awt.ComponentDataBlitOp;
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.awt.Graphics;
|
|
import java.awt.Graphics2D;
|
|
import java.awt.GraphicsEnvironment;
|
|
import java.awt.Image;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.Transparency;
|
|
import java.awt.color.ColorSpace;
|
|
import java.util.Hashtable;
|
|
import java.util.Vector;
|
|
|
|
/**
|
|
* A buffered image always starts at coordinates (0, 0).
|
|
*
|
|
* The buffered image is not subdivided into multiple tiles. Instead,
|
|
* the image consists of one large tile (0,0) with the width and
|
|
* height of the image. This tile is always considered to be checked
|
|
* out.
|
|
*
|
|
* @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
|
|
*/
|
|
public class BufferedImage extends Image
|
|
implements WritableRenderedImage, Transparency
|
|
{
|
|
public static final int TYPE_CUSTOM = 0,
|
|
TYPE_INT_RGB = 1,
|
|
TYPE_INT_ARGB = 2,
|
|
TYPE_INT_ARGB_PRE = 3,
|
|
TYPE_INT_BGR = 4,
|
|
TYPE_3BYTE_BGR = 5,
|
|
TYPE_4BYTE_ABGR = 6,
|
|
TYPE_4BYTE_ABGR_PRE = 7,
|
|
TYPE_USHORT_565_RGB = 8,
|
|
TYPE_USHORT_555_RGB = 9,
|
|
TYPE_BYTE_GRAY = 10,
|
|
TYPE_USHORT_GRAY = 11,
|
|
TYPE_BYTE_BINARY = 12,
|
|
TYPE_BYTE_INDEXED = 13;
|
|
|
|
/**
|
|
* Vector of TileObservers (or null)
|
|
*/
|
|
Vector<TileObserver> tileObservers;
|
|
|
|
/**
|
|
* The image's WritableRaster
|
|
*/
|
|
WritableRaster raster;
|
|
|
|
/**
|
|
* The associated ColorModel
|
|
*/
|
|
ColorModel colorModel;
|
|
|
|
/**
|
|
* The image's properties (or null)
|
|
*/
|
|
Hashtable properties;
|
|
|
|
/**
|
|
* Whether alpha is premultiplied
|
|
*/
|
|
boolean isPremultiplied;
|
|
|
|
/**
|
|
* The predefined type, if any.
|
|
*/
|
|
int type;
|
|
|
|
/**
|
|
* Creates a new <code>BufferedImage</code> with the specified width, height
|
|
* and type. Valid <code>type</code> values are:
|
|
*
|
|
* <ul>
|
|
* <li>{@link #TYPE_INT_RGB}</li>
|
|
* <li>{@link #TYPE_INT_ARGB}</li>
|
|
* <li>{@link #TYPE_INT_ARGB_PRE}</li>
|
|
* <li>{@link #TYPE_INT_BGR}</li>
|
|
* <li>{@link #TYPE_3BYTE_BGR}</li>
|
|
* <li>{@link #TYPE_4BYTE_ABGR}</li>
|
|
* <li>{@link #TYPE_4BYTE_ABGR_PRE}</li>
|
|
* <li>{@link #TYPE_USHORT_565_RGB}</li>
|
|
* <li>{@link #TYPE_USHORT_555_RGB}</li>
|
|
* <li>{@link #TYPE_BYTE_GRAY}</li>
|
|
* <li>{@link #TYPE_USHORT_GRAY}</li>
|
|
* <li>{@link #TYPE_BYTE_BINARY}</li>
|
|
* <li>{@link #TYPE_BYTE_INDEXED}</li>
|
|
* </ul>
|
|
*
|
|
* @param width the width (must be > 0).
|
|
* @param height the height (must be > 0).
|
|
* @param type the image type (see the list of valid types above).
|
|
*
|
|
* @throws IllegalArgumentException if <code>width</code> or
|
|
* <code>height</code> is less than or equal to zero.
|
|
* @throws IllegalArgumentException if <code>type</code> is not one of the
|
|
* specified values.
|
|
*/
|
|
public BufferedImage(int width, int height, int type)
|
|
{
|
|
SampleModel sm = null;
|
|
ColorModel cm = null;
|
|
boolean premultiplied = (type == BufferedImage.TYPE_INT_ARGB_PRE
|
|
|| type == BufferedImage.TYPE_4BYTE_ABGR_PRE);
|
|
|
|
switch( type )
|
|
{
|
|
case BufferedImage.TYPE_INT_RGB:
|
|
sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT,
|
|
width, height,
|
|
new int[]{ 0x00FF0000,
|
|
0x0000FF00,
|
|
0x000000FF } ) ;
|
|
cm = new DirectColorModel( 24, 0xff0000, 0xff00, 0xff );
|
|
break;
|
|
|
|
case BufferedImage.TYPE_3BYTE_BGR:
|
|
sm = new PixelInterleavedSampleModel( DataBuffer.TYPE_BYTE,
|
|
width, height,
|
|
3, width * 3,
|
|
new int[]{ 2, 1, 0 } );
|
|
cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
|
|
false, false,
|
|
BufferedImage.OPAQUE,
|
|
DataBuffer.TYPE_BYTE);
|
|
break;
|
|
|
|
case BufferedImage.TYPE_INT_ARGB:
|
|
case BufferedImage.TYPE_INT_ARGB_PRE:
|
|
sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT,
|
|
width, height,
|
|
new int[]{ 0x00FF0000,
|
|
0x0000FF00,
|
|
0x000000FF,
|
|
0xFF000000 } );
|
|
if (premultiplied)
|
|
cm = new DirectColorModel( ColorSpace.getInstance(ColorSpace.CS_sRGB),
|
|
32, 0xff0000, 0xff00, 0xff, 0xff000000,
|
|
true,
|
|
Buffers.smallestAppropriateTransferType(32));
|
|
else
|
|
cm = new DirectColorModel( 32, 0xff0000, 0xff00, 0xff, 0xff000000 );
|
|
|
|
break;
|
|
|
|
case BufferedImage.TYPE_4BYTE_ABGR:
|
|
case BufferedImage.TYPE_4BYTE_ABGR_PRE:
|
|
sm = new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE,
|
|
width, height,
|
|
4, 4*width,
|
|
new int[]{3, 2, 1, 0});
|
|
cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
|
|
true, premultiplied,
|
|
BufferedImage.TRANSLUCENT,
|
|
DataBuffer.TYPE_BYTE);
|
|
break;
|
|
|
|
case BufferedImage.TYPE_INT_BGR:
|
|
sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT,
|
|
width, height,
|
|
new int[]{ 0x000000FF,
|
|
0x0000FF00,
|
|
0x00FF0000 } ) ;
|
|
cm = new DirectColorModel( 24, 0xff, 0xff00, 0xff0000 );
|
|
break;
|
|
|
|
case BufferedImage.TYPE_USHORT_565_RGB:
|
|
sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_USHORT,
|
|
width, height,
|
|
new int[]{ 0xF800,
|
|
0x7E0,
|
|
0x1F } ) ;
|
|
cm = new DirectColorModel( 16, 0xF800, 0x7E0, 0x1F );
|
|
break;
|
|
|
|
case BufferedImage.TYPE_USHORT_555_RGB:
|
|
sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_USHORT,
|
|
width, height,
|
|
new int[]{ 0x7C00,
|
|
0x3E0,
|
|
0x1F } ) ;
|
|
cm = new DirectColorModel( 15, 0x7C00, 0x3E0, 0x1F );
|
|
break;
|
|
|
|
case BufferedImage.TYPE_BYTE_INDEXED:
|
|
cm = createDefaultIndexedColorModel( false );
|
|
|
|
case BufferedImage.TYPE_BYTE_GRAY:
|
|
sm = new PixelInterleavedSampleModel( DataBuffer.TYPE_BYTE,
|
|
width, height,
|
|
1, width, new int[]{ 0 } );
|
|
break;
|
|
|
|
case BufferedImage.TYPE_USHORT_GRAY:
|
|
sm = new PixelInterleavedSampleModel( DataBuffer.TYPE_USHORT,
|
|
width, height,
|
|
1, width, new int[]{ 0 } );
|
|
break;
|
|
|
|
case BufferedImage.TYPE_BYTE_BINARY:
|
|
cm = createDefaultIndexedColorModel( true );
|
|
sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
|
|
width, height, 1);
|
|
break;
|
|
|
|
default:
|
|
sm = null;
|
|
}
|
|
|
|
if( sm == null )
|
|
throw new IllegalArgumentException("Unknown predefined image type.");
|
|
|
|
if( cm == null ) // only for the grayscale types
|
|
{
|
|
int buftype;
|
|
int[] bits = new int[1];
|
|
if( type == BufferedImage.TYPE_BYTE_GRAY )
|
|
{
|
|
buftype = DataBuffer.TYPE_BYTE;
|
|
bits[0] = 8;
|
|
}
|
|
else
|
|
{
|
|
buftype = DataBuffer.TYPE_USHORT;
|
|
bits[0] = 16;
|
|
}
|
|
ColorSpace graySpace = ColorSpace.getInstance( ColorSpace.CS_GRAY );
|
|
|
|
cm = new ComponentColorModel( graySpace, bits, false, false,
|
|
Transparency.OPAQUE, buftype );
|
|
}
|
|
|
|
WritableRaster rst = null;
|
|
|
|
// Attempt to create an accelerated backend for this image
|
|
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
|
if (env instanceof ClasspathGraphicsEnvironment)
|
|
rst = ((ClasspathGraphicsEnvironment)env).createRaster(cm, sm);
|
|
|
|
// Default to a standard Java raster & databuffer if needed
|
|
if (rst == null)
|
|
rst = Raster.createWritableRaster(sm, new Point( 0, 0 ) );
|
|
|
|
init(cm, rst, premultiplied,
|
|
null, // no properties
|
|
type );
|
|
}
|
|
|
|
public BufferedImage(int w, int h, int type, IndexColorModel indexcolormodel)
|
|
{
|
|
if ((type != TYPE_BYTE_BINARY) && (type != TYPE_BYTE_INDEXED))
|
|
throw new IllegalArgumentException("Type must be TYPE_BYTE_BINARY or TYPE_BYTE_INDEXED");
|
|
if( indexcolormodel.getMapSize() > 16 && type == TYPE_BYTE_BINARY )
|
|
throw new IllegalArgumentException("Type TYPE_BYTE_BINARY cannot have a larger than 16-color palette.");
|
|
if( indexcolormodel.getMapSize() > 256 )
|
|
throw new IllegalArgumentException("Byte type cannot have a larger than 256-color palette.");
|
|
|
|
init( indexcolormodel,
|
|
indexcolormodel.createCompatibleWritableRaster(w, h),
|
|
indexcolormodel.isAlphaPremultiplied(),
|
|
null, // no properties
|
|
type );
|
|
}
|
|
|
|
public BufferedImage(ColorModel colormodel, WritableRaster writableraster,
|
|
boolean premultiplied, Hashtable<?,?> properties)
|
|
{
|
|
init(colormodel, writableraster, premultiplied, properties, TYPE_CUSTOM);
|
|
}
|
|
|
|
|
|
private void init(ColorModel cm, WritableRaster writableraster,
|
|
boolean premultiplied, Hashtable properties, int type)
|
|
{
|
|
raster = writableraster;
|
|
colorModel = cm;
|
|
this.properties = properties;
|
|
isPremultiplied = premultiplied;
|
|
this.type = type;
|
|
}
|
|
|
|
/**
|
|
* Creates the default palettes for the predefined indexed color types
|
|
* (256-color or black-and-white)
|
|
*
|
|
* @param binary - If <code>true</code>, a black and white palette,
|
|
* otherwise a default 256-color palette is returned.
|
|
*/
|
|
private IndexColorModel createDefaultIndexedColorModel( boolean binary )
|
|
{
|
|
if( binary )
|
|
{
|
|
byte[] t = new byte[]{ 0, (byte)255 };
|
|
return new IndexColorModel( 1, 2, t, t, t );
|
|
}
|
|
|
|
byte[] r = new byte[256];
|
|
byte[] g = new byte[256];
|
|
byte[] b = new byte[256];
|
|
|
|
int index = 0;
|
|
for( int i = 0; i < 6; i++ )
|
|
for( int j = 0; j < 6; j++ )
|
|
for( int k = 0; k < 6; k++ )
|
|
{
|
|
r[ index ] = (byte)(i * 51);
|
|
g[ index ] = (byte)(j * 51);
|
|
b[ index ] = (byte)(k * 51);
|
|
index++;
|
|
}
|
|
|
|
while( index < 256 )
|
|
{
|
|
r[ index ] = g[ index ] = b[ index ] =
|
|
(byte)(18 + (index - 216) * 6);
|
|
index++;
|
|
}
|
|
|
|
return new IndexColorModel( 8, 256, r, g, b );
|
|
}
|
|
|
|
public void coerceData(boolean premultiplied)
|
|
{
|
|
colorModel = colorModel.coerceData(raster, premultiplied);
|
|
isPremultiplied = premultiplied;
|
|
}
|
|
|
|
public WritableRaster copyData(WritableRaster dest)
|
|
{
|
|
if (dest == null)
|
|
dest = raster.createCompatibleWritableRaster(getMinX(), getMinY(),
|
|
getWidth(),getHeight());
|
|
|
|
int x = dest.getMinX();
|
|
int y = dest.getMinY();
|
|
int w = dest.getWidth();
|
|
int h = dest.getHeight();
|
|
|
|
// create a src child that has the right bounds...
|
|
WritableRaster src =
|
|
raster.createWritableChild(x, y, w, h, x, y,
|
|
null); // same bands
|
|
|
|
if (src.getSampleModel () instanceof ComponentSampleModel
|
|
&& dest.getSampleModel () instanceof ComponentSampleModel)
|
|
// Refer to ComponentDataBlitOp for optimized data blitting:
|
|
ComponentDataBlitOp.INSTANCE.filter(src, dest);
|
|
|
|
else
|
|
{
|
|
// slower path
|
|
int samples[] = src.getPixels (x, y, w, h, (int [])null);
|
|
dest.setPixels (x, y, w, h, samples);
|
|
}
|
|
return dest;
|
|
}
|
|
|
|
public Graphics2D createGraphics()
|
|
{
|
|
GraphicsEnvironment env;
|
|
env = GraphicsEnvironment.getLocalGraphicsEnvironment ();
|
|
return env.createGraphics (this);
|
|
}
|
|
|
|
public void flush()
|
|
{
|
|
}
|
|
|
|
public WritableRaster getAlphaRaster()
|
|
{
|
|
return colorModel.getAlphaRaster(raster);
|
|
}
|
|
|
|
public ColorModel getColorModel()
|
|
{
|
|
return colorModel;
|
|
}
|
|
|
|
public Raster getData()
|
|
{
|
|
return copyData(null);
|
|
/* TODO: this might be optimized by returning the same
|
|
raster (not writable) as long as image data doesn't change. */
|
|
}
|
|
|
|
public Raster getData(Rectangle rectangle)
|
|
{
|
|
WritableRaster dest =
|
|
raster.createCompatibleWritableRaster(rectangle);
|
|
return copyData(dest);
|
|
}
|
|
|
|
public Graphics getGraphics()
|
|
{
|
|
return createGraphics();
|
|
}
|
|
|
|
public int getHeight()
|
|
{
|
|
return raster.getHeight();
|
|
}
|
|
|
|
public int getHeight(ImageObserver imageobserver)
|
|
{
|
|
return getHeight();
|
|
}
|
|
|
|
public int getMinTileX()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getMinTileY()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getMinX()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getMinY()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getNumXTiles()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
public int getNumYTiles()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
/**
|
|
* Returns the value of the specified property, or
|
|
* {@link Image#UndefinedProperty} if the property is not defined.
|
|
*
|
|
* @param string the property key (<code>null</code> not permitted).
|
|
*
|
|
* @return The property value.
|
|
*
|
|
* @throws NullPointerException if <code>string</code> is <code>null</code>.
|
|
*/
|
|
public Object getProperty(String string)
|
|
{
|
|
if (string == null)
|
|
throw new NullPointerException("The property name cannot be null.");
|
|
Object result = Image.UndefinedProperty;
|
|
if (properties != null)
|
|
{
|
|
Object v = properties.get(string);
|
|
if (v != null)
|
|
result = v;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public Object getProperty(String string, ImageObserver imageobserver)
|
|
{
|
|
return getProperty(string);
|
|
}
|
|
|
|
/**
|
|
* Returns <code>null</code> always.
|
|
*
|
|
* @return <code>null</code> always.
|
|
*/
|
|
public String[] getPropertyNames()
|
|
{
|
|
// This method should always return null, see:
|
|
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4640609
|
|
return null;
|
|
}
|
|
|
|
public int getRGB(int x, int y)
|
|
{
|
|
Object rgbElem = raster.getDataElements(x, y, null);
|
|
return colorModel.getRGB(rgbElem);
|
|
}
|
|
|
|
public int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray,
|
|
int offset, int scanlineStride)
|
|
{
|
|
if (rgbArray == null)
|
|
{
|
|
/*
|
|
000000000000000000
|
|
00000[#######----- [ = start
|
|
-----########----- ] = end
|
|
-----#######]00000
|
|
000000000000000000
|
|
*/
|
|
int size = (h-1)*scanlineStride + w;
|
|
rgbArray = new int[size];
|
|
}
|
|
|
|
int endX = startX + w;
|
|
int endY = startY + h;
|
|
|
|
/* *TODO*:
|
|
Opportunity for optimization by examining color models...
|
|
|
|
Perhaps wrap the rgbArray up in a WritableRaster with packed
|
|
sRGB color model and perform optimized rendering into the
|
|
array. */
|
|
|
|
Object rgbElem = null;
|
|
for (int y=startY; y<endY; y++)
|
|
{
|
|
int xoffset = offset;
|
|
for (int x=startX; x<endX; x++)
|
|
{
|
|
int rgb;
|
|
rgbElem = raster.getDataElements(x, y, rgbElem);
|
|
rgb = colorModel.getRGB(rgbElem);
|
|
rgbArray[xoffset++] = rgb;
|
|
}
|
|
offset += scanlineStride;
|
|
}
|
|
return rgbArray;
|
|
}
|
|
|
|
public WritableRaster getRaster()
|
|
{
|
|
return raster;
|
|
}
|
|
|
|
public SampleModel getSampleModel()
|
|
{
|
|
return raster.getSampleModel();
|
|
}
|
|
|
|
public ImageProducer getSource()
|
|
{
|
|
return new ImageProducer()
|
|
{
|
|
Vector<ImageConsumer> consumers = new Vector<ImageConsumer>();
|
|
|
|
public void addConsumer(ImageConsumer ic)
|
|
{
|
|
if(!consumers.contains(ic))
|
|
consumers.add(ic);
|
|
}
|
|
|
|
public boolean isConsumer(ImageConsumer ic)
|
|
{
|
|
return consumers.contains(ic);
|
|
}
|
|
|
|
public void removeConsumer(ImageConsumer ic)
|
|
{
|
|
consumers.remove(ic);
|
|
}
|
|
|
|
public void startProduction(ImageConsumer ic)
|
|
{
|
|
int x = 0;
|
|
int y = 0;
|
|
int width = getWidth();
|
|
int height = getHeight();
|
|
int stride = width;
|
|
int offset = 0;
|
|
int[] pixels = getRGB(x, y,
|
|
width, height,
|
|
(int[])null, offset, stride);
|
|
// We already convert the color to RGB in the getRGB call, so
|
|
// we pass a simple RGB color model to the consumers.
|
|
ColorModel model = new DirectColorModel(32, 0xff0000, 0xff00, 0xff,
|
|
0xff000000);
|
|
|
|
consumers.add(ic);
|
|
|
|
for(int i = 0; i < consumers.size(); i++)
|
|
{
|
|
ImageConsumer c = consumers.elementAt(i);
|
|
c.setHints(ImageConsumer.SINGLEPASS);
|
|
c.setDimensions(getWidth(), getHeight());
|
|
c.setPixels(x, y, width, height, model, pixels, offset, stride);
|
|
c.imageComplete(ImageConsumer.STATICIMAGEDONE);
|
|
}
|
|
}
|
|
|
|
public void requestTopDownLeftRightResend(ImageConsumer ic)
|
|
{
|
|
startProduction(ic);
|
|
}
|
|
|
|
};
|
|
}
|
|
|
|
public Vector<RenderedImage> getSources()
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public BufferedImage getSubimage(int x, int y, int w, int h)
|
|
{
|
|
WritableRaster subRaster =
|
|
getRaster().createWritableChild(x, y, w, h, 0, 0, null);
|
|
|
|
return new BufferedImage(getColorModel(), subRaster, isPremultiplied,
|
|
properties);
|
|
}
|
|
|
|
public Raster getTile(int tileX, int tileY)
|
|
{
|
|
return getWritableTile(tileX, tileY);
|
|
}
|
|
|
|
public int getTileGridXOffset()
|
|
{
|
|
return 0; // according to javadocs
|
|
}
|
|
|
|
public int getTileGridYOffset()
|
|
{
|
|
return 0; // according to javadocs
|
|
}
|
|
|
|
public int getTileHeight()
|
|
{
|
|
return getHeight(); // image is one big tile
|
|
}
|
|
|
|
public int getTileWidth()
|
|
{
|
|
return getWidth(); // image is one big tile
|
|
}
|
|
|
|
public int getType()
|
|
{
|
|
return type;
|
|
}
|
|
|
|
public int getWidth()
|
|
{
|
|
return raster.getWidth();
|
|
}
|
|
|
|
public int getWidth(ImageObserver imageobserver)
|
|
{
|
|
return getWidth();
|
|
}
|
|
|
|
public WritableRaster getWritableTile(int tileX, int tileY)
|
|
{
|
|
isTileWritable(tileX, tileY); // for exception
|
|
return raster;
|
|
}
|
|
|
|
private static final Point[] tileIndices = { new Point() };
|
|
|
|
public Point[] getWritableTileIndices()
|
|
{
|
|
return tileIndices;
|
|
}
|
|
|
|
public boolean hasTileWriters()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public boolean isAlphaPremultiplied()
|
|
{
|
|
return isPremultiplied;
|
|
}
|
|
|
|
public boolean isTileWritable(int tileX, int tileY)
|
|
{
|
|
if ((tileX != 0) || (tileY != 0))
|
|
throw new ArrayIndexOutOfBoundsException("only tile is (0,0)");
|
|
return true;
|
|
}
|
|
|
|
public void releaseWritableTile(int tileX, int tileY)
|
|
{
|
|
isTileWritable(tileX, tileY); // for exception
|
|
}
|
|
|
|
//public void removeTileObserver(TileObserver tileobserver) {}
|
|
|
|
public void setData(Raster src)
|
|
{
|
|
int x = src.getMinX();
|
|
int y = src.getMinY();
|
|
int w = src.getWidth();
|
|
int h = src.getHeight();
|
|
|
|
// create a dest child that has the right bounds...
|
|
WritableRaster dest =
|
|
raster.createWritableChild(x, y, w, h, x, y, null);
|
|
|
|
if (src.getSampleModel () instanceof ComponentSampleModel
|
|
&& dest.getSampleModel () instanceof ComponentSampleModel)
|
|
|
|
// Refer to ComponentDataBlitOp for optimized data blitting:
|
|
ComponentDataBlitOp.INSTANCE.filter(src, dest);
|
|
else
|
|
{
|
|
// slower path
|
|
int samples[] = src.getPixels (x, y, w, h, (int [])null);
|
|
dest.setPixels (x, y, w, h, samples);
|
|
}
|
|
}
|
|
|
|
public void setRGB(int x, int y, int argb)
|
|
{
|
|
Object rgbElem = colorModel.getDataElements(argb, null);
|
|
raster.setDataElements(x, y, rgbElem);
|
|
}
|
|
|
|
public void setRGB(int startX, int startY, int w, int h,
|
|
int[] argbArray, int offset, int scanlineStride)
|
|
{
|
|
int endX = startX + w;
|
|
int endY = startY + h;
|
|
|
|
Object rgbElem = null;
|
|
for (int y=startY; y<endY; y++)
|
|
{
|
|
int xoffset = offset;
|
|
for (int x=startX; x<endX; x++)
|
|
{
|
|
int argb = argbArray[xoffset++];
|
|
rgbElem = colorModel.getDataElements(argb, rgbElem);
|
|
raster.setDataElements(x, y, rgbElem);
|
|
}
|
|
offset += scanlineStride;
|
|
}
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
CPStringBuilder buf;
|
|
|
|
buf = new CPStringBuilder(/* estimated length */ 120);
|
|
buf.append("BufferedImage@");
|
|
buf.append(Integer.toHexString(hashCode()));
|
|
buf.append(": type=");
|
|
buf.append(type);
|
|
buf.append(' ');
|
|
buf.append(colorModel);
|
|
buf.append(' ');
|
|
buf.append(raster);
|
|
|
|
return buf.toString();
|
|
}
|
|
|
|
|
|
/**
|
|
* Adds a tile observer. If the observer is already present, it receives
|
|
* multiple notifications.
|
|
*
|
|
* @param to The TileObserver to add.
|
|
*/
|
|
public void addTileObserver (TileObserver to)
|
|
{
|
|
if (tileObservers == null)
|
|
tileObservers = new Vector<TileObserver>();
|
|
|
|
tileObservers.add (to);
|
|
}
|
|
|
|
/**
|
|
* Removes a tile observer. If the observer was not registered,
|
|
* nothing happens. If the observer was registered for multiple
|
|
* notifications, it is now registered for one fewer notification.
|
|
*
|
|
* @param to The TileObserver to remove.
|
|
*/
|
|
public void removeTileObserver (TileObserver to)
|
|
{
|
|
if (tileObservers == null)
|
|
return;
|
|
|
|
tileObservers.remove (to);
|
|
}
|
|
|
|
/**
|
|
* Return the transparency type.
|
|
*
|
|
* @return One of {@link #OPAQUE}, {@link #BITMASK}, or {@link #TRANSLUCENT}.
|
|
* @see Transparency#getTransparency()
|
|
* @since 1.5
|
|
*/
|
|
public int getTransparency()
|
|
{
|
|
return colorModel.getTransparency();
|
|
}
|
|
}
|