
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
586 lines
18 KiB
Java
586 lines
18 KiB
Java
/* Copyright (C) 2000, 2002, 2003, 2004, 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 java.util.Arrays;
|
|
|
|
import gnu.java.awt.BitMaskExtent;
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
/**
|
|
* A <code>SampleModel</code> used when all samples are stored in a single
|
|
* data element in the {@link DataBuffer}, and each data element contains
|
|
* samples for one pixel only.
|
|
*
|
|
* @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
|
|
*/
|
|
public class SinglePixelPackedSampleModel extends SampleModel
|
|
{
|
|
private int scanlineStride;
|
|
private int[] bitMasks;
|
|
private int[] bitOffsets;
|
|
private int[] sampleSize;
|
|
|
|
/**
|
|
* Creates a new <code>SinglePixelPackedSampleModel</code>.
|
|
*
|
|
* @param dataType the data buffer type.
|
|
* @param w the width (in pixels).
|
|
* @param h the height (in pixels).
|
|
* @param bitMasks an array containing the bit mask used to extract the
|
|
* sample value for each band.
|
|
*/
|
|
public SinglePixelPackedSampleModel(int dataType, int w, int h,
|
|
int[] bitMasks)
|
|
{
|
|
this(dataType, w, h, w, bitMasks);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>SinglePixelPackedSampleModel</code>.
|
|
*
|
|
* @param dataType the data buffer type.
|
|
* @param w the width (in pixels).
|
|
* @param h the height (in pixels).
|
|
* @param scanlineStride the number of data elements between a pixel on one
|
|
* row and the corresponding pixel on the next row.
|
|
* @param bitMasks an array containing the bit mask used to extract the
|
|
* sample value for each band.
|
|
*/
|
|
public SinglePixelPackedSampleModel(int dataType, int w, int h,
|
|
int scanlineStride, int[] bitMasks)
|
|
{
|
|
super(dataType, w, h, bitMasks.length);
|
|
|
|
switch (dataType)
|
|
{
|
|
case DataBuffer.TYPE_BYTE:
|
|
case DataBuffer.TYPE_USHORT:
|
|
case DataBuffer.TYPE_INT:
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException(
|
|
"SinglePixelPackedSampleModel unsupported dataType");
|
|
}
|
|
|
|
this.scanlineStride = scanlineStride;
|
|
this.bitMasks = bitMasks;
|
|
|
|
bitOffsets = new int[numBands];
|
|
sampleSize = new int[numBands];
|
|
|
|
BitMaskExtent extent = new BitMaskExtent();
|
|
for (int b = 0; b < numBands; b++)
|
|
{
|
|
// the mask is an unsigned integer
|
|
long mask = bitMasks[b] & 0xFFFFFFFFL;
|
|
extent.setMask(mask);
|
|
sampleSize[b] = extent.bitWidth;
|
|
bitOffsets[b] = extent.leastSignificantBit;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the number of data elements.
|
|
*
|
|
* @return <code>1</code>.
|
|
*/
|
|
public int getNumDataElements()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>SampleModel</code> that is compatible with this
|
|
* model and has the specified width and height.
|
|
*
|
|
* @param w the width (in pixels).
|
|
* @param h the height (in pixels).
|
|
*
|
|
* @return The new sample model.
|
|
*/
|
|
public SampleModel createCompatibleSampleModel(int w, int h)
|
|
{
|
|
/* FIXME: We can avoid recalculation of bit offsets and sample
|
|
sizes here by passing these from the current instance to a
|
|
special private constructor. */
|
|
return new SinglePixelPackedSampleModel(dataType, w, h, bitMasks);
|
|
}
|
|
|
|
|
|
/**
|
|
* Creates a DataBuffer for holding pixel data in the format and
|
|
* layout described by this SampleModel. The returned buffer will
|
|
* consist of one single bank.
|
|
*
|
|
* @return The data buffer.
|
|
*/
|
|
public DataBuffer createDataBuffer()
|
|
{
|
|
// We can save (scanlineStride - width) pixels at the very end of
|
|
// the buffer. The Sun reference implementation (J2SE 1.3.1 and
|
|
// 1.4.1_01) seems to do this; tested with Mauve test code.
|
|
int size = scanlineStride * (height - 1) + width;
|
|
|
|
DataBuffer buffer = null;
|
|
switch (getTransferType())
|
|
{
|
|
case DataBuffer.TYPE_BYTE:
|
|
buffer = new DataBufferByte(size);
|
|
break;
|
|
case DataBuffer.TYPE_USHORT:
|
|
buffer = new DataBufferUShort(size);
|
|
break;
|
|
case DataBuffer.TYPE_INT:
|
|
buffer = new DataBufferInt(size);
|
|
break;
|
|
}
|
|
return buffer;
|
|
}
|
|
|
|
/**
|
|
* Returns an array containing the size (in bits) for each band accessed by
|
|
* the <code>SampleModel</code>.
|
|
*
|
|
* @return An array.
|
|
*
|
|
* @see #getSampleSize(int)
|
|
*/
|
|
public int[] getSampleSize()
|
|
{
|
|
return (int[]) sampleSize.clone();
|
|
}
|
|
|
|
/**
|
|
* Returns the size (in bits) of the samples for the specified band.
|
|
*
|
|
* @param band the band (in the range <code>0</code> to
|
|
* <code>getNumBands() - 1</code>).
|
|
*
|
|
* @return The sample size (in bits).
|
|
*/
|
|
public int getSampleSize(int band)
|
|
{
|
|
return sampleSize[band];
|
|
}
|
|
|
|
/**
|
|
* Returns the index in the data buffer that stores the pixel at (x, y).
|
|
*
|
|
* @param x the x-coordinate.
|
|
* @param y the y-coordinate.
|
|
*
|
|
* @return The index in the data buffer that stores the pixel at (x, y).
|
|
*/
|
|
public int getOffset(int x, int y)
|
|
{
|
|
return scanlineStride*y + x;
|
|
}
|
|
|
|
public int[] getBitOffsets()
|
|
{
|
|
return bitOffsets;
|
|
}
|
|
|
|
public int[] getBitMasks()
|
|
{
|
|
return bitMasks;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of data elements from a pixel in one row to the
|
|
* corresponding pixel in the next row.
|
|
*
|
|
* @return The scanline stride.
|
|
*/
|
|
public int getScanlineStride()
|
|
{
|
|
return scanlineStride;
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>SinglePixelPackedSampleModel</code> that accesses
|
|
* the specified subset of bands.
|
|
*
|
|
* @param bands an array containing band indices (<code>null</code> not
|
|
* permitted).
|
|
*
|
|
* @return A new sample model.
|
|
*
|
|
* @throws NullPointerException if <code>bands</code> is <code>null</code>.
|
|
* @throws RasterFormatException if <code>bands.length</code> is greater
|
|
* than the number of bands in this model.
|
|
*/
|
|
public SampleModel createSubsetSampleModel(int[] bands)
|
|
{
|
|
if (bands.length > numBands)
|
|
throw new RasterFormatException("Too many bands.");
|
|
|
|
int numBands = bands.length;
|
|
|
|
int[] bitMasks = new int[numBands];
|
|
|
|
for (int b = 0; b < numBands; b++)
|
|
bitMasks[b] = this.bitMasks[bands[b]];
|
|
|
|
return new SinglePixelPackedSampleModel(dataType, width, height,
|
|
scanlineStride, bitMasks);
|
|
}
|
|
|
|
public Object getDataElements(int x, int y, Object obj,
|
|
DataBuffer data)
|
|
{
|
|
int type = getTransferType();
|
|
Object ret = null;
|
|
switch (type)
|
|
{
|
|
case DataBuffer.TYPE_BYTE:
|
|
{
|
|
byte[] in = (byte[]) obj;
|
|
if (in == null)
|
|
in = new byte[1];
|
|
in[0] = (byte) data.getElem(x + y * scanlineStride);
|
|
ret = in;
|
|
}
|
|
break;
|
|
case DataBuffer.TYPE_USHORT:
|
|
{
|
|
short[] in = (short[]) obj;
|
|
if (in == null)
|
|
in = new short[1];
|
|
in[0] = (short) data.getElem(x + y * scanlineStride);
|
|
ret = in;
|
|
}
|
|
break;
|
|
case DataBuffer.TYPE_INT:
|
|
{
|
|
int[] in = (int[]) obj;
|
|
if (in == null)
|
|
in = new int[1];
|
|
in[0] = data.getElem(x + y * scanlineStride);
|
|
ret = in;
|
|
}
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* Returns an array containing the samples for the pixel at (x, y) in the
|
|
* specified data buffer. If <code>iArray</code> is not <code>null</code>,
|
|
* it will be populated with the sample values and returned as the result of
|
|
* this function (this avoids allocating a new array instance).
|
|
*
|
|
* @param x the x-coordinate of the pixel.
|
|
* @param y the y-coordinate of the pixel.
|
|
* @param iArray an array to populate with the sample values and return as
|
|
* the result (if <code>null</code>, a new array will be allocated).
|
|
* @param data the data buffer (<code>null</code> not permitted).
|
|
*
|
|
* @return The pixel sample values.
|
|
*
|
|
* @throws NullPointerException if <code>data</code> is <code>null</code>.
|
|
*/
|
|
public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
if (iArray == null) iArray = new int[numBands];
|
|
int samples = data.getElem(offset);
|
|
|
|
for (int b = 0; b < numBands; b++)
|
|
iArray[b] = (samples & bitMasks[b]) >>> bitOffsets[b];
|
|
|
|
return iArray;
|
|
}
|
|
|
|
/**
|
|
* Returns an array containing the samples for the pixels in the region
|
|
* specified by (x, y, w, h) in the specified data buffer. The array is
|
|
* ordered by pixels (that is, all the samples for the first pixel are
|
|
* grouped together, followed by all the samples for the second pixel, and so
|
|
* on). If <code>iArray</code> is not <code>null</code>, it will be
|
|
* populated with the sample values and returned as the result of this
|
|
* function (this avoids allocating a new array instance).
|
|
*
|
|
* @param x the x-coordinate of the top-left pixel.
|
|
* @param y the y-coordinate of the top-left pixel.
|
|
* @param w the width of the region of pixels.
|
|
* @param h the height of the region of pixels.
|
|
* @param iArray an array to populate with the sample values and return as
|
|
* the result (if <code>null</code>, a new array will be allocated).
|
|
* @param data the data buffer (<code>null</code> not permitted).
|
|
*
|
|
* @return The pixel sample values.
|
|
*
|
|
* @throws NullPointerException if <code>data</code> is <code>null</code>.
|
|
*/
|
|
public int[] getPixels(int x, int y, int w, int h, int[] iArray,
|
|
DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
if (iArray == null) iArray = new int[numBands*w*h];
|
|
int outOffset = 0;
|
|
for (y = 0; y < h; y++)
|
|
{
|
|
int lineOffset = offset;
|
|
for (x = 0; x < w; x++)
|
|
{
|
|
int samples = data.getElem(lineOffset++);
|
|
for (int b = 0; b < numBands; b++)
|
|
iArray[outOffset++] = (samples & bitMasks[b]) >>> bitOffsets[b];
|
|
}
|
|
offset += scanlineStride;
|
|
}
|
|
return iArray;
|
|
}
|
|
|
|
/**
|
|
* Returns the sample value for the pixel at (x, y) in the specified data
|
|
* buffer.
|
|
*
|
|
* @param x the x-coordinate of the pixel.
|
|
* @param y the y-coordinate of the pixel.
|
|
* @param b the band (in the range <code>0</code> to
|
|
* <code>getNumBands() - 1</code>).
|
|
* @param data the data buffer (<code>null</code> not permitted).
|
|
*
|
|
* @return The sample value.
|
|
*
|
|
* @throws NullPointerException if <code>data</code> is <code>null</code>.
|
|
*/
|
|
public int getSample(int x, int y, int b, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
int samples = data.getElem(offset);
|
|
return (samples & bitMasks[b]) >>> bitOffsets[b];
|
|
}
|
|
|
|
public void setDataElements(int x, int y, Object obj, DataBuffer data)
|
|
{
|
|
int transferType = getTransferType();
|
|
switch (transferType)
|
|
{
|
|
case DataBuffer.TYPE_BYTE:
|
|
{
|
|
byte[] in = (byte[]) obj;
|
|
data.setElem(y * scanlineStride + x, ((int) in[0]) & 0xff);
|
|
}
|
|
break;
|
|
case DataBuffer.TYPE_USHORT:
|
|
{
|
|
short[] in = (short[]) obj;
|
|
data.setElem(y * scanlineStride + x, ((int) in[0]) & 0xffff);
|
|
}
|
|
break;
|
|
case DataBuffer.TYPE_INT:
|
|
{
|
|
int[] in = (int[]) obj;
|
|
data.setElem(y * scanlineStride + x, in[0]);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the samples for the pixel at (x, y) in the specified data buffer to
|
|
* the specified values.
|
|
*
|
|
* @param x the x-coordinate of the pixel.
|
|
* @param y the y-coordinate of the pixel.
|
|
* @param iArray the sample values (<code>null</code> not permitted).
|
|
* @param data the data buffer (<code>null</code> not permitted).
|
|
*
|
|
* @throws NullPointerException if either <code>iArray</code> or
|
|
* <code>data</code> is <code>null</code>.
|
|
*/
|
|
public void setPixel(int x, int y, int[] iArray, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
|
|
int samples = 0;
|
|
for (int b = 0; b < numBands; b++)
|
|
samples |= (iArray[b] << bitOffsets[b]) & bitMasks[b];
|
|
|
|
data.setElem(offset, samples);
|
|
}
|
|
|
|
/**
|
|
* This method implements a more efficient way to set pixels than the default
|
|
* implementation of the super class. It copies the pixel components directly
|
|
* from the input array instead of creating a intermediate buffer.
|
|
* @param x The x-coordinate of the pixel rectangle in <code>obj</code>.
|
|
* @param y The y-coordinate of the pixel rectangle in <code>obj</code>.
|
|
* @param w The width of the pixel rectangle in <code>obj</code>.
|
|
* @param h The height of the pixel rectangle in <code>obj</code>.
|
|
* @param iArray The primitive array containing the pixels to set.
|
|
* @param data The DataBuffer to store the pixels into.
|
|
* @see java.awt.image.SampleModel#setPixels(int, int, int, int, int[],
|
|
* java.awt.image.DataBuffer)
|
|
*/
|
|
public void setPixels(int x, int y, int w, int h, int[] iArray,
|
|
DataBuffer data)
|
|
{
|
|
int inOffset = 0;
|
|
for (int yy=y; yy<(y+h); yy++)
|
|
{
|
|
int offset = scanlineStride*yy + x;
|
|
for (int xx=x; xx<(x+w); xx++)
|
|
{
|
|
int samples = 0;
|
|
for (int b = 0; b < numBands; b++)
|
|
samples |= (iArray[inOffset+b] << bitOffsets[b]) & bitMasks[b];
|
|
data.setElem(0, offset, samples);
|
|
inOffset += numBands;
|
|
offset += 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the sample value for a band for the pixel at (x, y) in the
|
|
* specified data buffer.
|
|
*
|
|
* @param x the x-coordinate of the pixel.
|
|
* @param y the y-coordinate of the pixel.
|
|
* @param b the band (in the range <code>0</code> to
|
|
* <code>getNumBands() - 1</code>).
|
|
* @param s the sample value.
|
|
* @param data the data buffer (<code>null</code> not permitted).
|
|
*
|
|
* @throws NullPointerException if <code>data</code> is <code>null</code>.
|
|
*/
|
|
public void setSample(int x, int y, int b, int s, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
int samples = data.getElem(offset);
|
|
int bitMask = bitMasks[b];
|
|
samples &= ~bitMask;
|
|
samples |= (s << bitOffsets[b]) & bitMask;
|
|
data.setElem(offset, samples);
|
|
}
|
|
|
|
/**
|
|
* Tests this sample model for equality with an arbitrary object. This
|
|
* method returns <code>true</code> if and only if:
|
|
* <ul>
|
|
* <li><code>obj</code> is not <code>null</code>;
|
|
* <li><code>obj</code> is an instance of
|
|
* <code>SinglePixelPackedSampleModel</code>;
|
|
* <li>both models have the same:
|
|
* <ul>
|
|
* <li><code>dataType</code>;
|
|
* <li><code>width</code>;
|
|
* <li><code>height</code>;
|
|
* <li><code>numBands</code>;
|
|
* <li><code>scanlineStride</code>;
|
|
* <li><code>bitMasks</code>;
|
|
* <li><code>bitOffsets</code>.
|
|
* </ul>
|
|
* </li>
|
|
* </ul>
|
|
*
|
|
* @param obj the object (<code>null</code> permitted)
|
|
*
|
|
* @return <code>true</code> if this model is equal to <code>obj</code>, and
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (this == obj)
|
|
return true;
|
|
if (! (obj instanceof SinglePixelPackedSampleModel))
|
|
return false;
|
|
SinglePixelPackedSampleModel that = (SinglePixelPackedSampleModel) obj;
|
|
if (this.dataType != that.dataType)
|
|
return false;
|
|
if (this.width != that.width)
|
|
return false;
|
|
if (this.height != that.height)
|
|
return false;
|
|
if (this.numBands != that.numBands)
|
|
return false;
|
|
if (this.scanlineStride != that.scanlineStride)
|
|
return false;
|
|
if (!Arrays.equals(this.bitMasks, that.bitMasks))
|
|
return false;
|
|
if (!Arrays.equals(this.bitOffsets, that.bitOffsets))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Returns a hash code for this <code>SinglePixelPackedSampleModel</code>.
|
|
*
|
|
* @return A hash code.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
// this hash code won't match Sun's, but that shouldn't matter...
|
|
int result = 193;
|
|
result = 37 * result + dataType;
|
|
result = 37 * result + width;
|
|
result = 37 * result + height;
|
|
result = 37 * result + numBands;
|
|
result = 37 * result + scanlineStride;
|
|
for (int i = 0; i < bitMasks.length; i++)
|
|
result = 37 * result + bitMasks[i];
|
|
for (int i = 0; i < bitOffsets.length; i++)
|
|
result = 37 * result + bitOffsets[i];
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Creates a String with some information about this SampleModel.
|
|
* @return A String describing this SampleModel.
|
|
* @see java.lang.Object#toString()
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder result = new CPStringBuilder();
|
|
result.append(getClass().getName());
|
|
result.append("[");
|
|
result.append("scanlineStride=").append(scanlineStride);
|
|
for(int i = 0; i < bitMasks.length; i+=1)
|
|
{
|
|
result.append(", mask[").append(i).append("]=0x").append(
|
|
Integer.toHexString(bitMasks[i]));
|
|
}
|
|
|
|
result.append("]");
|
|
return result.toString();
|
|
}
|
|
}
|