
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
958 lines
30 KiB
Java
958 lines
30 KiB
Java
/* Vector.java -- Class that provides growable arrays.
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2006,
|
|
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.ObjectOutputStream;
|
|
import java.io.Serializable;
|
|
import java.lang.reflect.Array;
|
|
|
|
/**
|
|
* The <code>Vector</code> classes implements growable arrays of Objects.
|
|
* You can access elements in a Vector with an index, just as you
|
|
* can in a built in array, but Vectors can grow and shrink to accommodate
|
|
* more or fewer objects.<p>
|
|
*
|
|
* Vectors try to mantain efficiency in growing by having a
|
|
* <code>capacityIncrement</code> that can be specified at instantiation.
|
|
* When a Vector can no longer hold a new Object, it grows by the amount
|
|
* in <code>capacityIncrement</code>. If this value is 0, the vector doubles in
|
|
* size.<p>
|
|
*
|
|
* Vector implements the JDK 1.2 List interface, and is therefore a fully
|
|
* compliant Collection object. The iterators are fail-fast - if external
|
|
* code structurally modifies the vector, any operation on the iterator will
|
|
* then throw a {@link ConcurrentModificationException}. The Vector class is
|
|
* fully synchronized, but the iterators are not. So, when iterating over a
|
|
* vector, be sure to synchronize on the vector itself. If you don't want the
|
|
* expense of synchronization, use ArrayList instead. On the other hand, the
|
|
* Enumeration of elements() is not thread-safe, nor is it fail-fast; so it
|
|
* can lead to undefined behavior even in a single thread if you modify the
|
|
* vector during iteration.<p>
|
|
*
|
|
* Note: Some methods, especially those specified by List, specify throwing
|
|
* {@link IndexOutOfBoundsException}, but it is easier to implement by
|
|
* throwing the subclass {@link ArrayIndexOutOfBoundsException}. Others
|
|
* directly specify this subclass.
|
|
*
|
|
* @author Scott G. Miller
|
|
* @author Bryce McKinlay
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @see Collection
|
|
* @see List
|
|
* @see ArrayList
|
|
* @see LinkedList
|
|
* @since 1.0
|
|
* @status updated to 1.4
|
|
*/
|
|
public class Vector<T> extends AbstractList<T>
|
|
implements List<T>, RandomAccess, Cloneable, Serializable
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.0+.
|
|
*/
|
|
private static final long serialVersionUID = -2767605614048989439L;
|
|
|
|
/**
|
|
* The internal array used to hold members of a Vector. The elements are
|
|
* in positions 0 through elementCount - 1, and all remaining slots are null.
|
|
* @serial the elements
|
|
*/
|
|
protected Object[] elementData;
|
|
|
|
/**
|
|
* The number of elements currently in the vector, also returned by
|
|
* {@link #size}.
|
|
* @serial the size
|
|
*/
|
|
protected int elementCount;
|
|
|
|
/**
|
|
* The amount the Vector's internal array should be increased in size when
|
|
* a new element is added that exceeds the current size of the array,
|
|
* or when {@link #ensureCapacity} is called. If <= 0, the vector just
|
|
* doubles in size.
|
|
* @serial the amount to grow the vector by
|
|
*/
|
|
protected int capacityIncrement;
|
|
|
|
/**
|
|
* Constructs an empty vector with an initial size of 10, and
|
|
* a capacity increment of 0
|
|
*/
|
|
public Vector()
|
|
{
|
|
this(10, 0);
|
|
}
|
|
|
|
/**
|
|
* Constructs a vector containing the contents of Collection, in the
|
|
* order given by the collection.
|
|
*
|
|
* @param c collection of elements to add to the new vector
|
|
* @throws NullPointerException if c is null
|
|
* @since 1.2
|
|
*/
|
|
public Vector(Collection<? extends T> c)
|
|
{
|
|
elementCount = c.size();
|
|
elementData = c.toArray(new Object[elementCount]);
|
|
}
|
|
|
|
/**
|
|
* Constructs a Vector with the initial capacity and capacity
|
|
* increment specified.
|
|
*
|
|
* @param initialCapacity the initial size of the Vector's internal array
|
|
* @param capacityIncrement the amount the internal array should be
|
|
* increased by when necessary, 0 to double the size
|
|
* @throws IllegalArgumentException if initialCapacity < 0
|
|
*/
|
|
public Vector(int initialCapacity, int capacityIncrement)
|
|
{
|
|
if (initialCapacity < 0)
|
|
throw new IllegalArgumentException();
|
|
elementData = new Object[initialCapacity];
|
|
this.capacityIncrement = capacityIncrement;
|
|
}
|
|
|
|
/**
|
|
* Constructs a Vector with the initial capacity specified, and a capacity
|
|
* increment of 0 (double in size).
|
|
*
|
|
* @param initialCapacity the initial size of the Vector's internal array
|
|
* @throws IllegalArgumentException if initialCapacity < 0
|
|
*/
|
|
public Vector(int initialCapacity)
|
|
{
|
|
this(initialCapacity, 0);
|
|
}
|
|
|
|
/**
|
|
* Copies the contents of the Vector into the provided array. If the
|
|
* array is too small to fit all the elements in the Vector, an
|
|
* {@link IndexOutOfBoundsException} is thrown without modifying the array.
|
|
* Old elements in the array are overwritten by the new elements.
|
|
*
|
|
* @param a target array for the copy
|
|
* @throws IndexOutOfBoundsException the array is not large enough
|
|
* @throws NullPointerException the array is null
|
|
* @see #toArray(Object[])
|
|
*/
|
|
public synchronized void copyInto(Object[] a)
|
|
{
|
|
System.arraycopy(elementData, 0, a, 0, elementCount);
|
|
}
|
|
|
|
/**
|
|
* Trims the Vector down to size. If the internal data array is larger
|
|
* than the number of Objects its holding, a new array is constructed
|
|
* that precisely holds the elements. Otherwise this does nothing.
|
|
*/
|
|
public synchronized void trimToSize()
|
|
{
|
|
// Don't bother checking for the case where size() == the capacity of the
|
|
// vector since that is a much less likely case; it's more efficient to
|
|
// not do the check and lose a bit of performance in that infrequent case
|
|
|
|
T[] newArray = (T[]) new Object[elementCount];
|
|
System.arraycopy(elementData, 0, newArray, 0, elementCount);
|
|
elementData = newArray;
|
|
}
|
|
|
|
/**
|
|
* Ensures that <code>minCapacity</code> elements can fit within this Vector.
|
|
* If <code>elementData</code> is too small, it is expanded as follows:
|
|
* If the <code>elementCount + capacityIncrement</code> is adequate, that
|
|
* is the new size. If <code>capacityIncrement</code> is non-zero, the
|
|
* candidate size is double the current. If that is not enough, the new
|
|
* size is <code>minCapacity</code>.
|
|
*
|
|
* @param minCapacity the desired minimum capacity, negative values ignored
|
|
*/
|
|
public synchronized void ensureCapacity(int minCapacity)
|
|
{
|
|
if (elementData.length >= minCapacity)
|
|
return;
|
|
|
|
int newCapacity;
|
|
if (capacityIncrement <= 0)
|
|
newCapacity = elementData.length * 2;
|
|
else
|
|
newCapacity = elementData.length + capacityIncrement;
|
|
|
|
T[] newArray = (T[]) new Object[Math.max(newCapacity, minCapacity)];
|
|
|
|
System.arraycopy(elementData, 0, newArray, 0, elementCount);
|
|
elementData = newArray;
|
|
}
|
|
|
|
/**
|
|
* Explicitly sets the size of the vector (but not necessarily the size of
|
|
* the internal data array). If the new size is smaller than the old one,
|
|
* old values that don't fit are lost. If the new size is larger than the
|
|
* old one, the vector is padded with null entries.
|
|
*
|
|
* @param newSize The new size of the internal array
|
|
* @throws ArrayIndexOutOfBoundsException if the new size is negative
|
|
*/
|
|
public synchronized void setSize(int newSize)
|
|
{
|
|
// Don't bother checking for the case where size() == the capacity of the
|
|
// vector since that is a much less likely case; it's more efficient to
|
|
// not do the check and lose a bit of performance in that infrequent case
|
|
modCount++;
|
|
ensureCapacity(newSize);
|
|
if (newSize < elementCount)
|
|
Arrays.fill(elementData, newSize, elementCount, null);
|
|
elementCount = newSize;
|
|
}
|
|
|
|
/**
|
|
* Returns the size of the internal data array (not the amount of elements
|
|
* contained in the Vector).
|
|
*
|
|
* @return capacity of the internal data array
|
|
*/
|
|
public synchronized int capacity()
|
|
{
|
|
return elementData.length;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of elements stored in this Vector.
|
|
*
|
|
* @return the number of elements in this Vector
|
|
*/
|
|
public synchronized int size()
|
|
{
|
|
return elementCount;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this Vector is empty, false otherwise
|
|
*
|
|
* @return true if the Vector is empty, false otherwise
|
|
*/
|
|
public synchronized boolean isEmpty()
|
|
{
|
|
return elementCount == 0;
|
|
}
|
|
|
|
/**
|
|
* Returns an Enumeration of the elements of this Vector. The enumeration
|
|
* visits the elements in increasing index order, but is NOT thread-safe.
|
|
*
|
|
* @return an Enumeration
|
|
* @see #iterator()
|
|
*/
|
|
// No need to synchronize as the Enumeration is not thread-safe!
|
|
public Enumeration<T> elements()
|
|
{
|
|
return new Enumeration<T>()
|
|
{
|
|
private int i = 0;
|
|
|
|
public boolean hasMoreElements()
|
|
{
|
|
return i < elementCount;
|
|
}
|
|
|
|
@SuppressWarnings("unchecked")
|
|
public T nextElement()
|
|
{
|
|
if (i >= elementCount)
|
|
throw new NoSuchElementException();
|
|
return (T) elementData[i++];
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Returns true when <code>elem</code> is contained in this Vector.
|
|
*
|
|
* @param elem the element to check
|
|
* @return true if the object is contained in this Vector, false otherwise
|
|
*/
|
|
public boolean contains(Object elem)
|
|
{
|
|
return indexOf(elem, 0) >= 0;
|
|
}
|
|
|
|
/**
|
|
* Returns the first occurrence of <code>elem</code> in the Vector, or -1 if
|
|
* <code>elem</code> is not found.
|
|
*
|
|
* @param elem the object to search for
|
|
* @return the index of the first occurrence, or -1 if not found
|
|
*/
|
|
public int indexOf(Object elem)
|
|
{
|
|
return indexOf(elem, 0);
|
|
}
|
|
|
|
/**
|
|
* Searches the vector starting at <code>index</code> for object
|
|
* <code>elem</code> and returns the index of the first occurrence of this
|
|
* Object. If the object is not found, or index is larger than the size
|
|
* of the vector, -1 is returned.
|
|
*
|
|
* @param e the Object to search for
|
|
* @param index start searching at this index
|
|
* @return the index of the next occurrence, or -1 if it is not found
|
|
* @throws IndexOutOfBoundsException if index < 0
|
|
*/
|
|
public synchronized int indexOf(Object e, int index)
|
|
{
|
|
for (int i = index; i < elementCount; i++)
|
|
if (equals(e, elementData[i]))
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Returns the last index of <code>elem</code> within this Vector, or -1
|
|
* if the object is not within the Vector.
|
|
*
|
|
* @param elem the object to search for
|
|
* @return the last index of the object, or -1 if not found
|
|
*/
|
|
public int lastIndexOf(Object elem)
|
|
{
|
|
return lastIndexOf(elem, elementCount - 1);
|
|
}
|
|
|
|
/**
|
|
* Returns the index of the first occurrence of <code>elem</code>, when
|
|
* searching backwards from <code>index</code>. If the object does not
|
|
* occur in this Vector, or index is less than 0, -1 is returned.
|
|
*
|
|
* @param e the object to search for
|
|
* @param index the index to start searching in reverse from
|
|
* @return the index of the Object if found, -1 otherwise
|
|
* @throws IndexOutOfBoundsException if index >= size()
|
|
*/
|
|
public synchronized int lastIndexOf(Object e, int index)
|
|
{
|
|
checkBoundExclusive(index);
|
|
for (int i = index; i >= 0; i--)
|
|
if (equals(e, elementData[i]))
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Returns the Object stored at <code>index</code>.
|
|
*
|
|
* @param index the index of the Object to retrieve
|
|
* @return the object at <code>index</code>
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index >= size()
|
|
* @see #get(int)
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public synchronized T elementAt(int index)
|
|
{
|
|
checkBoundExclusive(index);
|
|
return (T) elementData[index];
|
|
}
|
|
|
|
/**
|
|
* Returns the first element (index 0) in the Vector.
|
|
*
|
|
* @return the first Object in the Vector
|
|
* @throws NoSuchElementException the Vector is empty
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public synchronized T firstElement()
|
|
{
|
|
if (elementCount == 0)
|
|
throw new NoSuchElementException();
|
|
|
|
return (T) elementData[0];
|
|
}
|
|
|
|
/**
|
|
* Returns the last element in the Vector.
|
|
*
|
|
* @return the last Object in the Vector
|
|
* @throws NoSuchElementException the Vector is empty
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public synchronized T lastElement()
|
|
{
|
|
if (elementCount == 0)
|
|
throw new NoSuchElementException();
|
|
|
|
return (T) elementData[elementCount - 1];
|
|
}
|
|
|
|
/**
|
|
* Changes the element at <code>index</code> to be <code>obj</code>
|
|
*
|
|
* @param obj the object to store
|
|
* @param index the position in the Vector to store the object
|
|
* @throws ArrayIndexOutOfBoundsException the index is out of range
|
|
* @see #set(int, Object)
|
|
*/
|
|
public void setElementAt(T obj, int index)
|
|
{
|
|
set(index, obj);
|
|
}
|
|
|
|
/**
|
|
* Removes the element at <code>index</code>, and shifts all elements at
|
|
* positions greater than index to their index - 1.
|
|
*
|
|
* @param index the index of the element to remove
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index >= size();
|
|
* @see #remove(int)
|
|
*/
|
|
public void removeElementAt(int index)
|
|
{
|
|
remove(index);
|
|
}
|
|
|
|
/**
|
|
* Inserts a new element into the Vector at <code>index</code>. Any elements
|
|
* at or greater than index are shifted up one position.
|
|
*
|
|
* @param obj the object to insert
|
|
* @param index the index at which the object is inserted
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index > size()
|
|
* @see #add(int, Object)
|
|
*/
|
|
public synchronized void insertElementAt(T obj, int index)
|
|
{
|
|
checkBoundInclusive(index);
|
|
if (elementCount == elementData.length)
|
|
ensureCapacity(elementCount + 1);
|
|
modCount++;
|
|
System.arraycopy(elementData, index, elementData, index + 1,
|
|
elementCount - index);
|
|
elementCount++;
|
|
elementData[index] = obj;
|
|
}
|
|
|
|
/**
|
|
* Adds an element to the Vector at the end of the Vector. The vector
|
|
* is increased by ensureCapacity(size() + 1) if needed.
|
|
*
|
|
* @param obj the object to add to the Vector
|
|
*/
|
|
public synchronized void addElement(T obj)
|
|
{
|
|
if (elementCount == elementData.length)
|
|
ensureCapacity(elementCount + 1);
|
|
modCount++;
|
|
elementData[elementCount++] = obj;
|
|
}
|
|
|
|
/**
|
|
* Removes the first (the lowest index) occurrence of the given object from
|
|
* the Vector. If such a remove was performed (the object was found), true
|
|
* is returned. If there was no such object, false is returned.
|
|
*
|
|
* @param obj the object to remove from the Vector
|
|
* @return true if the Object was in the Vector, false otherwise
|
|
* @see #remove(Object)
|
|
*/
|
|
public synchronized boolean removeElement(Object obj)
|
|
{
|
|
int idx = indexOf(obj, 0);
|
|
if (idx >= 0)
|
|
{
|
|
remove(idx);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Removes all elements from the Vector. Note that this does not
|
|
* resize the internal data array.
|
|
*
|
|
* @see #clear()
|
|
*/
|
|
public synchronized void removeAllElements()
|
|
{
|
|
if (elementCount == 0)
|
|
return;
|
|
|
|
modCount++;
|
|
Arrays.fill(elementData, 0, elementCount, null);
|
|
elementCount = 0;
|
|
}
|
|
|
|
/**
|
|
* Creates a new Vector with the same contents as this one. The clone is
|
|
* shallow; elements are not cloned.
|
|
*
|
|
* @return the clone of this vector
|
|
*/
|
|
public synchronized Object clone()
|
|
{
|
|
try
|
|
{
|
|
Vector clone = (Vector) super.clone();
|
|
clone.elementData = (Object[]) elementData.clone();
|
|
return clone;
|
|
}
|
|
catch (CloneNotSupportedException ex)
|
|
{
|
|
// Impossible to get here.
|
|
throw new InternalError(ex.toString());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns an Object array with the contents of this Vector, in the order
|
|
* they are stored within this Vector. Note that the Object array returned
|
|
* is not the internal data array, and that it holds only the elements
|
|
* within the Vector. This is similar to creating a new Object[] with the
|
|
* size of this Vector, then calling Vector.copyInto(yourArray).
|
|
*
|
|
* @return an Object[] containing the contents of this Vector in order
|
|
* @since 1.2
|
|
*/
|
|
public synchronized Object[] toArray()
|
|
{
|
|
Object[] newArray = new Object[elementCount];
|
|
copyInto(newArray);
|
|
return newArray;
|
|
}
|
|
|
|
/**
|
|
* Returns an array containing the contents of this Vector.
|
|
* If the provided array is large enough, the contents are copied
|
|
* into that array, and a null is placed in the position size().
|
|
* In this manner, you can obtain the size of a Vector by the position
|
|
* of the null element, if you know the vector does not itself contain
|
|
* null entries. If the array is not large enough, reflection is used
|
|
* to create a bigger one of the same runtime type.
|
|
*
|
|
* @param a an array to copy the Vector into if large enough
|
|
* @return an array with the contents of this Vector in order
|
|
* @throws ArrayStoreException the runtime type of the provided array
|
|
* cannot hold the elements of the Vector
|
|
* @throws NullPointerException if <code>a</code> is null
|
|
* @since 1.2
|
|
*/
|
|
public synchronized <S> S[] toArray(S[] a)
|
|
{
|
|
if (a.length < elementCount)
|
|
a = (S[]) Array.newInstance(a.getClass().getComponentType(),
|
|
elementCount);
|
|
else if (a.length > elementCount)
|
|
a[elementCount] = null;
|
|
System.arraycopy(elementData, 0, a, 0, elementCount);
|
|
return a;
|
|
}
|
|
|
|
/**
|
|
* Returns the element at position <code>index</code>.
|
|
*
|
|
* @param index the position from which an element will be retrieved
|
|
* @return the element at that position
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index >= size()
|
|
* @since 1.2
|
|
*/
|
|
public T get(int index)
|
|
{
|
|
return elementAt(index);
|
|
}
|
|
|
|
/**
|
|
* Puts <code>element</code> into the Vector at position <code>index</code>
|
|
* and returns the Object that previously occupied that position.
|
|
*
|
|
* @param index the index within the Vector to place the Object
|
|
* @param element the Object to store in the Vector
|
|
* @return the previous object at the specified index
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index >= size()
|
|
* @since 1.2
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public synchronized T set(int index, T element)
|
|
{
|
|
checkBoundExclusive(index);
|
|
T temp = (T) elementData[index];
|
|
elementData[index] = element;
|
|
return temp;
|
|
}
|
|
|
|
/**
|
|
* Adds an object to the Vector.
|
|
*
|
|
* @param o the element to add to the Vector
|
|
* @return true, as specified by List
|
|
* @since 1.2
|
|
*/
|
|
public boolean add(T o)
|
|
{
|
|
addElement(o);
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Removes the given Object from the Vector. If it exists, true
|
|
* is returned, if not, false is returned.
|
|
*
|
|
* @param o the object to remove from the Vector
|
|
* @return true if the Object existed in the Vector, false otherwise
|
|
* @since 1.2
|
|
*/
|
|
public boolean remove(Object o)
|
|
{
|
|
return removeElement(o);
|
|
}
|
|
|
|
/**
|
|
* Adds an object at the specified index. Elements at or above
|
|
* index are shifted up one position.
|
|
*
|
|
* @param index the index at which to add the element
|
|
* @param element the element to add to the Vector
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index > size()
|
|
* @since 1.2
|
|
*/
|
|
public void add(int index, T element)
|
|
{
|
|
insertElementAt(element, index);
|
|
}
|
|
|
|
/**
|
|
* Removes the element at the specified index, and returns it.
|
|
*
|
|
* @param index the position from which to remove the element
|
|
* @return the object removed
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index >= size()
|
|
* @since 1.2
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public synchronized T remove(int index)
|
|
{
|
|
checkBoundExclusive(index);
|
|
T temp = (T) elementData[index];
|
|
modCount++;
|
|
elementCount--;
|
|
if (index < elementCount)
|
|
System.arraycopy(elementData, index + 1, elementData, index,
|
|
elementCount - index);
|
|
elementData[elementCount] = null;
|
|
return temp;
|
|
}
|
|
|
|
/**
|
|
* Clears all elements in the Vector and sets its size to 0.
|
|
*/
|
|
public void clear()
|
|
{
|
|
removeAllElements();
|
|
}
|
|
|
|
/**
|
|
* Returns true if this Vector contains all the elements in c.
|
|
*
|
|
* @param c the collection to compare to
|
|
* @return true if this vector contains all elements of c
|
|
* @throws NullPointerException if c is null
|
|
* @since 1.2
|
|
*/
|
|
public synchronized boolean containsAll(Collection<?> c)
|
|
{
|
|
// Here just for the sychronization.
|
|
return super.containsAll(c);
|
|
}
|
|
|
|
/**
|
|
* Appends all elements of the given collection to the end of this Vector.
|
|
* Behavior is undefined if the collection is modified during this operation
|
|
* (for example, if this == c).
|
|
*
|
|
* @param c the collection to append
|
|
* @return true if this vector changed, in other words c was not empty
|
|
* @throws NullPointerException if c is null
|
|
* @since 1.2
|
|
*/
|
|
public synchronized boolean addAll(Collection<? extends T> c)
|
|
{
|
|
return addAll(elementCount, c);
|
|
}
|
|
|
|
/**
|
|
* Remove from this vector all elements contained in the given collection.
|
|
*
|
|
* @param c the collection to filter out
|
|
* @return true if this vector changed
|
|
* @throws NullPointerException if c is null
|
|
* @since 1.2
|
|
*/
|
|
public synchronized boolean removeAll(Collection<?> c)
|
|
{
|
|
// The NullPointerException is thrown implicitly when the Vector
|
|
// is not empty and c is null. The RI allows null arguments when
|
|
// the vector is empty. See Mauve test:
|
|
// gnu/testlet/java/util/Vector/removeAll.java
|
|
|
|
int i;
|
|
int j;
|
|
for (i = 0; i < elementCount; i++)
|
|
if (c.contains(elementData[i]))
|
|
break;
|
|
if (i == elementCount)
|
|
return false;
|
|
|
|
modCount++;
|
|
for (j = i++; i < elementCount; i++)
|
|
if (! c.contains(elementData[i]))
|
|
elementData[j++] = elementData[i];
|
|
elementCount -= i - j;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Retain in this vector only the elements contained in the given collection.
|
|
*
|
|
* @param c the collection to filter by
|
|
* @return true if this vector changed
|
|
* @throws NullPointerException if c is null
|
|
* @since 1.2
|
|
*/
|
|
public synchronized boolean retainAll(Collection<?> c)
|
|
{
|
|
// The NullPointerException is thrown implicitly when the Vector
|
|
// is not empty and c is null. The RI allows null arguments when
|
|
// the vector is empty. See Mauve test:
|
|
// gnu/testlet/java/util/Vector/retainAll.java
|
|
|
|
int i;
|
|
int j;
|
|
for (i = 0; i < elementCount; i++)
|
|
if (! c.contains(elementData[i]))
|
|
break;
|
|
if (i == elementCount)
|
|
return false;
|
|
|
|
modCount++;
|
|
for (j = i++; i < elementCount; i++)
|
|
if (c.contains(elementData[i]))
|
|
elementData[j++] = elementData[i];
|
|
elementCount -= i - j;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Inserts all elements of the given collection at the given index of
|
|
* this Vector. Behavior is undefined if the collection is modified during
|
|
* this operation (for example, if this == c).
|
|
*
|
|
* @param c the collection to append
|
|
* @return true if this vector changed, in other words c was not empty
|
|
* @throws NullPointerException if c is null
|
|
* @throws ArrayIndexOutOfBoundsException index < 0 || index > size()
|
|
* @since 1.2
|
|
*/
|
|
public synchronized boolean addAll(int index, Collection<? extends T> c)
|
|
{
|
|
checkBoundInclusive(index);
|
|
Iterator<? extends T> itr = c.iterator();
|
|
int csize = c.size();
|
|
|
|
modCount++;
|
|
ensureCapacity(elementCount + csize);
|
|
int end = index + csize;
|
|
if (elementCount > 0 && index != elementCount)
|
|
System.arraycopy(elementData, index,
|
|
elementData, end, elementCount - index);
|
|
elementCount += csize;
|
|
for ( ; index < end; index++)
|
|
elementData[index] = itr.next();
|
|
return (csize > 0);
|
|
}
|
|
|
|
/**
|
|
* Compares this to the given object.
|
|
*
|
|
* @param o the object to compare to
|
|
* @return true if the two are equal
|
|
* @since 1.2
|
|
*/
|
|
public synchronized boolean equals(Object o)
|
|
{
|
|
// Here just for the sychronization.
|
|
return super.equals(o);
|
|
}
|
|
|
|
/**
|
|
* Computes the hashcode of this object.
|
|
*
|
|
* @return the hashcode
|
|
* @since 1.2
|
|
*/
|
|
public synchronized int hashCode()
|
|
{
|
|
// Here just for the sychronization.
|
|
return super.hashCode();
|
|
}
|
|
|
|
/**
|
|
* Returns a string representation of this Vector in the form
|
|
* "[element0, element1, ... elementN]".
|
|
*
|
|
* @return the String representation of this Vector
|
|
*/
|
|
public synchronized String toString()
|
|
{
|
|
// Here just for the sychronization.
|
|
return super.toString();
|
|
}
|
|
|
|
/**
|
|
* Obtain a List view of a subsection of this list, from fromIndex
|
|
* (inclusive) to toIndex (exclusive). If the two indices are equal, the
|
|
* sublist is empty. The returned list is modifiable, and changes in one
|
|
* reflect in the other. If this list is structurally modified in
|
|
* any way other than through the returned list, the result of any subsequent
|
|
* operations on the returned list is undefined.
|
|
* <p>
|
|
*
|
|
* @param fromIndex the index that the returned list should start from
|
|
* (inclusive)
|
|
* @param toIndex the index that the returned list should go to (exclusive)
|
|
* @return a List backed by a subsection of this vector
|
|
* @throws IndexOutOfBoundsException if fromIndex < 0
|
|
* || toIndex > size()
|
|
* @throws IllegalArgumentException if fromIndex > toIndex
|
|
* @see ConcurrentModificationException
|
|
* @since 1.2
|
|
*/
|
|
public synchronized List<T> subList(int fromIndex, int toIndex)
|
|
{
|
|
List<T> sub = super.subList(fromIndex, toIndex);
|
|
// We must specify the correct object to synchronize upon, hence the
|
|
// use of a non-public API
|
|
return new Collections.SynchronizedList<T>(this, sub);
|
|
}
|
|
|
|
/**
|
|
* Removes a range of elements from this list.
|
|
* Does nothing when toIndex is equal to fromIndex.
|
|
*
|
|
* @param fromIndex the index to start deleting from (inclusive)
|
|
* @param toIndex the index to delete up to (exclusive)
|
|
* @throws IndexOutOfBoundsException if fromIndex > toIndex
|
|
*/
|
|
// This does not need to be synchronized, because it is only called through
|
|
// clear() of a sublist, and clear() had already synchronized.
|
|
protected void removeRange(int fromIndex, int toIndex)
|
|
{
|
|
int change = toIndex - fromIndex;
|
|
if (change > 0)
|
|
{
|
|
modCount++;
|
|
System.arraycopy(elementData, toIndex, elementData, fromIndex,
|
|
elementCount - toIndex);
|
|
int save = elementCount;
|
|
elementCount -= change;
|
|
Arrays.fill(elementData, elementCount, save, null);
|
|
}
|
|
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 ArrayIndexOutOfBoundsException 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
|
|
// with no effort on our part.
|
|
if (index > elementCount)
|
|
raiseBoundsError(index, " > ");
|
|
}
|
|
|
|
/**
|
|
* Checks that the index is in the range of existing elements (exclusive).
|
|
*
|
|
* @param index the index to check
|
|
* @throws ArrayIndexOutOfBoundsException 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
|
|
// with no effort on our part.
|
|
if (index >= elementCount)
|
|
raiseBoundsError(index, " >= ");
|
|
}
|
|
|
|
/**
|
|
* Raise the ArrayIndexOfOutBoundsException.
|
|
*
|
|
* @param index the index of the access
|
|
* @param operator the operator to include in the error message
|
|
* @throws IndexOutOfBoundsException unconditionally
|
|
*/
|
|
private void raiseBoundsError(int index, String operator)
|
|
{
|
|
// 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 ArrayIndexOutOfBoundsException(index + operator + elementCount);
|
|
}
|
|
|
|
/**
|
|
* Serializes this object to the given stream.
|
|
*
|
|
* @param s the stream to write to
|
|
* @throws IOException if the underlying stream fails
|
|
* @serialData just calls default write function
|
|
*/
|
|
private synchronized void writeObject(ObjectOutputStream s)
|
|
throws IOException
|
|
{
|
|
s.defaultWriteObject();
|
|
}
|
|
|
|
}
|