cd6d4007aa
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
604 lines
18 KiB
Java
604 lines
18 KiB
Java
/* ArrayList.java -- JDK1.2's answer to Vector; this is an array-backed
|
|
implementation of the List interface
|
|
Copyright (C) 1998, 1999, 2000, 2001, 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 java.util;
|
|
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
import java.io.Serializable;
|
|
import java.lang.reflect.Array;
|
|
|
|
/**
|
|
* An array-backed implementation of the List interface. This implements
|
|
* all optional list operations, and permits null elements, so that it is
|
|
* better than Vector, which it replaces. Random access is roughly constant
|
|
* time, and iteration is roughly linear time, so it is nice and fast, with
|
|
* less overhead than a LinkedList.
|
|
* <p>
|
|
*
|
|
* Each list has a capacity, and as the array reaches that capacity it
|
|
* is automatically transferred to a larger array. You also have access to
|
|
* ensureCapacity and trimToSize to control the backing array's size, avoiding
|
|
* reallocation or wasted memory.
|
|
* <p>
|
|
*
|
|
* ArrayList is not synchronized, so if you need multi-threaded access,
|
|
* consider using:<br>
|
|
* <code>List l = Collections.synchronizedList(new ArrayList(...));</code>
|
|
* <p>
|
|
*
|
|
* The iterators are <i>fail-fast</i>, meaning that any structural
|
|
* modification, except for <code>remove()</code> called on the iterator
|
|
* itself, cause the iterator to throw a
|
|
* {@link ConcurrentModificationException} rather than exhibit
|
|
* non-deterministic behavior.
|
|
*
|
|
* @author Jon A. Zeppieri
|
|
* @author Bryce McKinlay
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @see Collection
|
|
* @see List
|
|
* @see LinkedList
|
|
* @see Vector
|
|
* @see Collections#synchronizedList(List)
|
|
* @see AbstractList
|
|
* @status updated to 1.4
|
|
*/
|
|
public class ArrayList<E> extends AbstractList<E>
|
|
implements List<E>, RandomAccess, Cloneable, Serializable
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.2
|
|
*/
|
|
private static final long serialVersionUID = 8683452581122892189L;
|
|
|
|
/**
|
|
* The default capacity for new ArrayLists.
|
|
*/
|
|
private static final int DEFAULT_CAPACITY = 10;
|
|
|
|
/**
|
|
* The number of elements in this list.
|
|
* @serial the list size
|
|
*/
|
|
private int size;
|
|
|
|
/**
|
|
* Where the data is stored.
|
|
*/
|
|
private transient E[] data;
|
|
|
|
/**
|
|
* Construct a new ArrayList with the supplied initial capacity.
|
|
*
|
|
* @param capacity initial capacity of this ArrayList
|
|
* @throws IllegalArgumentException if capacity is negative
|
|
*/
|
|
public ArrayList(int capacity)
|
|
{
|
|
// Must explicitly check, to get correct exception.
|
|
if (capacity < 0)
|
|
throw new IllegalArgumentException();
|
|
data = (E[]) new Object[capacity];
|
|
}
|
|
|
|
/**
|
|
* Construct a new ArrayList with the default capacity (16).
|
|
*/
|
|
public ArrayList()
|
|
{
|
|
this(DEFAULT_CAPACITY);
|
|
}
|
|
|
|
/**
|
|
* Construct a new ArrayList, and initialize it with the elements
|
|
* in the supplied Collection. The initial capacity is 110% of the
|
|
* Collection's size.
|
|
*
|
|
* @param c the collection whose elements will initialize this list
|
|
* @throws NullPointerException if c is null
|
|
*/
|
|
public ArrayList(Collection<? extends E> c)
|
|
{
|
|
this((int) (c.size() * 1.1f));
|
|
addAll(c);
|
|
}
|
|
|
|
/**
|
|
* Trims the capacity of this List to be equal to its size;
|
|
* a memory saver.
|
|
*/
|
|
public void trimToSize()
|
|
{
|
|
// Not a structural change from the perspective of iterators on this list,
|
|
// so don't update modCount.
|
|
if (size != data.length)
|
|
{
|
|
E[] newData = (E[]) new Object[size];
|
|
System.arraycopy(data, 0, newData, 0, size);
|
|
data = newData;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Guarantees that this list will have at least enough capacity to
|
|
* hold minCapacity elements. This implementation will grow the list to
|
|
* max(current * 2, minCapacity) if (minCapacity > current). The JCL says
|
|
* explictly that "this method increases its capacity to minCap", while
|
|
* the JDK 1.3 online docs specify that the list will grow to at least the
|
|
* size specified.
|
|
*
|
|
* @param minCapacity the minimum guaranteed capacity
|
|
*/
|
|
public void ensureCapacity(int minCapacity)
|
|
{
|
|
int current = data.length;
|
|
|
|
if (minCapacity > current)
|
|
{
|
|
E[] newData = (E[]) new Object[Math.max(current * 2, minCapacity)];
|
|
System.arraycopy(data, 0, newData, 0, size);
|
|
data = newData;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the number of elements in this list.
|
|
*
|
|
* @return the list size
|
|
*/
|
|
public int size()
|
|
{
|
|
return size;
|
|
}
|
|
|
|
/**
|
|
* Checks if the list is empty.
|
|
*
|
|
* @return true if there are no elements
|
|
*/
|
|
public boolean isEmpty()
|
|
{
|
|
return size == 0;
|
|
}
|
|
|
|
/**
|
|
* Returns true iff element is in this ArrayList.
|
|
*
|
|
* @param e the element whose inclusion in the List is being tested
|
|
* @return true if the list contains e
|
|
*/
|
|
public boolean contains(Object e)
|
|
{
|
|
return indexOf(e) != -1;
|
|
}
|
|
|
|
/**
|
|
* Returns the lowest index at which element appears in this List, or
|
|
* -1 if it does not appear.
|
|
*
|
|
* @param e the element whose inclusion in the List is being tested
|
|
* @return the index where e was found
|
|
*/
|
|
public int indexOf(Object e)
|
|
{
|
|
for (int i = 0; i < size; i++)
|
|
if (equals(e, data[i]))
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Returns the highest index at which element appears in this List, or
|
|
* -1 if it does not appear.
|
|
*
|
|
* @param e the element whose inclusion in the List is being tested
|
|
* @return the index where e was found
|
|
*/
|
|
public int lastIndexOf(Object e)
|
|
{
|
|
for (int i = size - 1; i >= 0; i--)
|
|
if (equals(e, data[i]))
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Creates a shallow copy of this ArrayList (elements are not cloned).
|
|
*
|
|
* @return the cloned object
|
|
*/
|
|
public Object clone()
|
|
{
|
|
ArrayList<E> clone = null;
|
|
try
|
|
{
|
|
clone = (ArrayList<E>) super.clone();
|
|
clone.data = (E[]) data.clone();
|
|
}
|
|
catch (CloneNotSupportedException e)
|
|
{
|
|
// Impossible to get here.
|
|
}
|
|
return clone;
|
|
}
|
|
|
|
/**
|
|
* Returns an Object array containing all of the elements in this ArrayList.
|
|
* The array is independent of this list.
|
|
*
|
|
* @return an array representation of this list
|
|
*/
|
|
public Object[] toArray()
|
|
{
|
|
E[] array = (E[]) new Object[size];
|
|
System.arraycopy(data, 0, array, 0, size);
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns an Array whose component type is the runtime component type of
|
|
* the passed-in Array. The returned Array is populated with all of the
|
|
* elements in this ArrayList. If the passed-in Array is not large enough
|
|
* to store all of the elements in this List, a new Array will be created
|
|
* and returned; if the passed-in Array is <i>larger</i> than the size
|
|
* of this List, then size() index will be set to null.
|
|
*
|
|
* @param a the passed-in Array
|
|
* @return an array representation of this list
|
|
* @throws ArrayStoreException if the runtime type of a does not allow
|
|
* an element in this list
|
|
* @throws NullPointerException if a is null
|
|
*/
|
|
public <T> T[] toArray(T[] a)
|
|
{
|
|
if (a.length < size)
|
|
a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
|
|
else if (a.length > size)
|
|
a[size] = null;
|
|
System.arraycopy(data, 0, a, 0, size);
|
|
return a;
|
|
}
|
|
|
|
/**
|
|
* Retrieves the element at the user-supplied index.
|
|
*
|
|
* @param index the index of the element we are fetching
|
|
* @throws IndexOutOfBoundsException if index < 0 || index >= size()
|
|
*/
|
|
public E get(int index)
|
|
{
|
|
checkBoundExclusive(index);
|
|
return data[index];
|
|
}
|
|
|
|
/**
|
|
* Sets the element at the specified index. The new element, e,
|
|
* can be an object of any type or null.
|
|
*
|
|
* @param index the index at which the element is being set
|
|
* @param e the element to be set
|
|
* @return the element previously at the specified index
|
|
* @throws IndexOutOfBoundsException if index < 0 || index >= 0
|
|
*/
|
|
public E set(int index, E e)
|
|
{
|
|
checkBoundExclusive(index);
|
|
E result = data[index];
|
|
data[index] = e;
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Appends the supplied element to the end of this list.
|
|
* The element, e, can be an object of any type or null.
|
|
*
|
|
* @param e the element to be appended to this list
|
|
* @return true, the add will always succeed
|
|
*/
|
|
public boolean add(E e)
|
|
{
|
|
modCount++;
|
|
if (size == data.length)
|
|
ensureCapacity(size + 1);
|
|
data[size++] = e;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Adds the supplied element at the specified index, shifting all
|
|
* elements currently at that index or higher one to the right.
|
|
* The element, e, can be an object of any type or null.
|
|
*
|
|
* @param index the index at which the element is being added
|
|
* @param e the item being added
|
|
* @throws IndexOutOfBoundsException if index < 0 || index > size()
|
|
*/
|
|
public void add(int index, E e)
|
|
{
|
|
checkBoundInclusive(index);
|
|
modCount++;
|
|
if (size == data.length)
|
|
ensureCapacity(size + 1);
|
|
if (index != size)
|
|
System.arraycopy(data, index, data, index + 1, size - index);
|
|
data[index] = e;
|
|
size++;
|
|
}
|
|
|
|
/**
|
|
* Removes the element at the user-supplied index.
|
|
*
|
|
* @param index the index of the element to be removed
|
|
* @return the removed Object
|
|
* @throws IndexOutOfBoundsException if index < 0 || index >= size()
|
|
*/
|
|
public E remove(int index)
|
|
{
|
|
checkBoundExclusive(index);
|
|
E r = data[index];
|
|
modCount++;
|
|
if (index != --size)
|
|
System.arraycopy(data, index + 1, data, index, size - index);
|
|
// Aid for garbage collection by releasing this pointer.
|
|
data[size] = null;
|
|
return r;
|
|
}
|
|
|
|
/**
|
|
* Removes all elements from this List
|
|
*/
|
|
public void clear()
|
|
{
|
|
if (size > 0)
|
|
{
|
|
modCount++;
|
|
// Allow for garbage collection.
|
|
Arrays.fill(data, 0, size, null);
|
|
size = 0;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Add each element in the supplied Collection to this List. It is undefined
|
|
* what happens if you modify the list while this is taking place; for
|
|
* example, if the collection contains this list. c can contain objects
|
|
* of any type, as well as null values.
|
|
*
|
|
* @param c a Collection containing elements to be added to this List
|
|
* @return true if the list was modified, in other words c is not empty
|
|
* @throws NullPointerException if c is null
|
|
*/
|
|
public boolean addAll(Collection<? extends E> c)
|
|
{
|
|
return addAll(size, c);
|
|
}
|
|
|
|
/**
|
|
* Add all elements in the supplied collection, inserting them beginning
|
|
* at the specified index. c can contain objects of any type, as well
|
|
* as null values.
|
|
*
|
|
* @param index the index at which the elements will be inserted
|
|
* @param c the Collection containing the elements to be inserted
|
|
* @throws IndexOutOfBoundsException if index < 0 || index > 0
|
|
* @throws NullPointerException if c is null
|
|
*/
|
|
public boolean addAll(int index, Collection<? extends E> c)
|
|
{
|
|
checkBoundInclusive(index);
|
|
Iterator<? extends E> itr = c.iterator();
|
|
int csize = c.size();
|
|
|
|
modCount++;
|
|
if (csize + size > data.length)
|
|
ensureCapacity(size + csize);
|
|
int end = index + csize;
|
|
if (size > 0 && index != size)
|
|
System.arraycopy(data, index, data, end, size - index);
|
|
size += csize;
|
|
for ( ; index < end; index++)
|
|
data[index] = itr.next();
|
|
return csize > 0;
|
|
}
|
|
|
|
/**
|
|
* Removes all elements in the half-open interval [fromIndex, toIndex).
|
|
* Does nothing when toIndex is equal to fromIndex.
|
|
*
|
|
* @param fromIndex the first index which will be removed
|
|
* @param toIndex one greater than the last index which will be removed
|
|
* @throws IndexOutOfBoundsException if fromIndex > toIndex
|
|
*/
|
|
protected void removeRange(int fromIndex, int toIndex)
|
|
{
|
|
int change = toIndex - fromIndex;
|
|
if (change > 0)
|
|
{
|
|
modCount++;
|
|
System.arraycopy(data, toIndex, data, fromIndex, size - toIndex);
|
|
size -= change;
|
|
}
|
|
else if (change < 0)
|
|
throw new IndexOutOfBoundsException();
|
|
}
|
|
|
|
/**
|
|
* Checks that the index is in the range of possible elements (inclusive).
|
|
*
|
|
* @param index the index to check
|
|
* @throws IndexOutOfBoundsException if index > size
|
|
*/
|
|
private void checkBoundInclusive(int index)
|
|
{
|
|
// Implementation note: we do not check for negative ranges here, since
|
|
// use of a negative index will cause an ArrayIndexOutOfBoundsException,
|
|
// a subclass of the required exception, with no effort on our part.
|
|
if (index > size)
|
|
raiseBoundsError(index);
|
|
}
|
|
|
|
/**
|
|
* Checks that the index is in the range of existing elements (exclusive).
|
|
*
|
|
* @param index the index to check
|
|
* @throws IndexOutOfBoundsException if index >= size
|
|
*/
|
|
private void checkBoundExclusive(int index)
|
|
{
|
|
// Implementation note: we do not check for negative ranges here, since
|
|
// use of a negative index will cause an ArrayIndexOutOfBoundsException,
|
|
// a subclass of the required exception, with no effort on our part.
|
|
if (index >= size)
|
|
raiseBoundsError(index);
|
|
}
|
|
|
|
/**
|
|
* Raise the ArrayIndexOfOutBoundsException.
|
|
*
|
|
* @param index the index of the access
|
|
* @throws IndexOutOfBoundsException unconditionally
|
|
*/
|
|
private void raiseBoundsError(int index)
|
|
{
|
|
// Implementaion note: put in a separate method to make the JITs job easier
|
|
// (separate common from uncommon code at method boundaries when trivial to
|
|
// do so).
|
|
throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
|
|
}
|
|
|
|
|
|
/**
|
|
* Remove from this list all elements contained in the given collection.
|
|
* This is not public, due to Sun's API, but this performs in linear
|
|
* time while the default behavior of AbstractList would be quadratic.
|
|
*
|
|
* @param c the collection to filter out
|
|
* @return true if this list changed
|
|
* @throws NullPointerException if c is null
|
|
*/
|
|
boolean removeAllInternal(Collection<?> c)
|
|
{
|
|
int i;
|
|
int j;
|
|
for (i = 0; i < size; i++)
|
|
if (c.contains(data[i]))
|
|
break;
|
|
if (i == size)
|
|
return false;
|
|
|
|
modCount++;
|
|
for (j = i++; i < size; i++)
|
|
if (! c.contains(data[i]))
|
|
data[j++] = data[i];
|
|
size -= i - j;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Retain in this vector only the elements contained in the given collection.
|
|
* This is not public, due to Sun's API, but this performs in linear
|
|
* time while the default behavior of AbstractList would be quadratic.
|
|
*
|
|
* @param c the collection to filter by
|
|
* @return true if this vector changed
|
|
* @throws NullPointerException if c is null
|
|
* @since 1.2
|
|
*/
|
|
boolean retainAllInternal(Collection<?> c)
|
|
{
|
|
int i;
|
|
int j;
|
|
for (i = 0; i < size; i++)
|
|
if (! c.contains(data[i]))
|
|
break;
|
|
if (i == size)
|
|
return false;
|
|
|
|
modCount++;
|
|
for (j = i++; i < size; i++)
|
|
if (c.contains(data[i]))
|
|
data[j++] = data[i];
|
|
size -= i - j;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Serializes this object to the given stream.
|
|
*
|
|
* @param s the stream to write to
|
|
* @throws IOException if the underlying stream fails
|
|
* @serialData the size field (int), the length of the backing array
|
|
* (int), followed by its elements (Objects) in proper order.
|
|
*/
|
|
private void writeObject(ObjectOutputStream s) throws IOException
|
|
{
|
|
// The 'size' field.
|
|
s.defaultWriteObject();
|
|
// We serialize unused list entries to preserve capacity.
|
|
int len = data.length;
|
|
s.writeInt(len);
|
|
// it would be more efficient to just write "size" items,
|
|
// this need readObject read "size" items too.
|
|
for (int i = 0; i < size; i++)
|
|
s.writeObject(data[i]);
|
|
}
|
|
|
|
/**
|
|
* Deserializes this object from the given stream.
|
|
*
|
|
* @param s the stream to read from
|
|
* @throws ClassNotFoundException if the underlying stream fails
|
|
* @throws IOException if the underlying stream fails
|
|
* @serialData the size field (int), the length of the backing array
|
|
* (int), followed by its elements (Objects) in proper order.
|
|
*/
|
|
private void readObject(ObjectInputStream s)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
// the `size' field.
|
|
s.defaultReadObject();
|
|
int capacity = s.readInt();
|
|
data = (E[]) new Object[capacity];
|
|
for (int i = 0; i < size; i++)
|
|
data[i] = (E) s.readObject();
|
|
}
|
|
}
|