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
1028 lines
34 KiB
Java
1028 lines
34 KiB
Java
/* AbstractStringBuffer.java -- Growable strings
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
|
|
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.lang;
|
|
|
|
import java.io.Serializable;
|
|
|
|
/**
|
|
* This class is based on gnu.classpath.ClasspathStringBuffer but
|
|
* is package-private to java.lang so it can be used as the basis
|
|
* for StringBuffer and StringBuilder.
|
|
* If you modify this, please consider also modifying that code.
|
|
*/
|
|
abstract class AbstractStringBuffer
|
|
implements Serializable, CharSequence, Appendable
|
|
{
|
|
|
|
/**
|
|
* Index of next available character (and thus the size of the current
|
|
* string contents). Note that this has permissions set this way so that
|
|
* String can get the value.
|
|
*
|
|
* @serial the number of characters in the buffer
|
|
*/
|
|
int count;
|
|
|
|
/**
|
|
* The buffer. Note that this has permissions set this way so that String
|
|
* can get the value.
|
|
*
|
|
* @serial the buffer
|
|
*/
|
|
char[] value;
|
|
|
|
/**
|
|
* The default capacity of a buffer.
|
|
*/
|
|
private static final int DEFAULT_CAPACITY = 16;
|
|
|
|
/**
|
|
* Create a new AbstractStringBuffer with default capacity 16.
|
|
*/
|
|
AbstractStringBuffer()
|
|
{
|
|
this(DEFAULT_CAPACITY);
|
|
}
|
|
|
|
/**
|
|
* Create an empty <code>StringBuffer</code> with the specified initial
|
|
* capacity.
|
|
*
|
|
* @param capacity the initial capacity
|
|
* @throws NegativeArraySizeException if capacity is negative
|
|
*/
|
|
AbstractStringBuffer(int capacity)
|
|
{
|
|
value = new char[capacity];
|
|
}
|
|
|
|
/**
|
|
* Create a new <code>StringBuffer</code> with the characters in the
|
|
* specified <code>String</code>. Initial capacity will be the size of the
|
|
* String plus 16.
|
|
*
|
|
* @param str the <code>String</code> to convert
|
|
* @throws NullPointerException if str is null
|
|
*/
|
|
AbstractStringBuffer(String str)
|
|
{
|
|
count = str.count;
|
|
value = new char[count + DEFAULT_CAPACITY];
|
|
str.getChars(0, count, value, 0);
|
|
}
|
|
|
|
/**
|
|
* Create a new <code>StringBuffer</code> with the characters in the
|
|
* specified <code>CharSequence</code>. Initial capacity will be the
|
|
* length of the sequence plus 16; if the sequence reports a length
|
|
* less than or equal to 0, then the initial capacity will be 16.
|
|
*
|
|
* @param seq the initializing <code>CharSequence</code>
|
|
* @throws NullPointerException if str is null
|
|
* @since 1.5
|
|
*/
|
|
AbstractStringBuffer(CharSequence seq)
|
|
{
|
|
int len = seq.length();
|
|
count = len <= 0 ? 0 : len;
|
|
value = new char[count + DEFAULT_CAPACITY];
|
|
for (int i = 0; i < len; ++i)
|
|
value[i] = seq.charAt(i);
|
|
}
|
|
|
|
/**
|
|
* Increase the capacity of this <code>StringBuffer</code>. This will
|
|
* ensure that an expensive growing operation will not occur until
|
|
* <code>minimumCapacity</code> is reached. The buffer is grown to the
|
|
* larger of <code>minimumCapacity</code> and
|
|
* <code>capacity() * 2 + 2</code>, if it is not already large enough.
|
|
*
|
|
* @param minimumCapacity the new capacity
|
|
* @see #capacity()
|
|
*/
|
|
public void ensureCapacity(int minimumCapacity)
|
|
{
|
|
ensureCapacity_unsynchronized(minimumCapacity);
|
|
}
|
|
|
|
/**
|
|
* Set the length of this StringBuffer. If the new length is greater than
|
|
* the current length, all the new characters are set to '\0'. If the new
|
|
* length is less than the current length, the first <code>newLength</code>
|
|
* characters of the old array will be preserved, and the remaining
|
|
* characters are truncated.
|
|
*
|
|
* @param newLength the new length
|
|
* @throws IndexOutOfBoundsException if the new length is negative
|
|
* (while unspecified, this is a StringIndexOutOfBoundsException)
|
|
* @see #length()
|
|
*/
|
|
public void setLength(int newLength)
|
|
{
|
|
if (newLength < 0)
|
|
throw new StringIndexOutOfBoundsException(newLength);
|
|
|
|
int valueLength = value.length;
|
|
|
|
/* Always call ensureCapacity_unsynchronized in order to preserve
|
|
copy-on-write semantics. */
|
|
ensureCapacity_unsynchronized(newLength);
|
|
|
|
if (newLength < valueLength)
|
|
{
|
|
/* If the StringBuffer's value just grew, then we know that
|
|
value is newly allocated and the region between count and
|
|
newLength is filled with '\0'. */
|
|
count = newLength;
|
|
}
|
|
else
|
|
{
|
|
/* The StringBuffer's value doesn't need to grow. However,
|
|
we should clear out any cruft that may exist. */
|
|
while (count < newLength)
|
|
value[count++] = '\0';
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the character at the specified index.
|
|
*
|
|
* @param index the index of the character to get, starting at 0
|
|
* @return the character at the specified index
|
|
* @throws IndexOutOfBoundsException if index is negative or >= length()
|
|
* (while unspecified, this is a StringIndexOutOfBoundsException)
|
|
*/
|
|
public char charAt(int index)
|
|
{
|
|
if (index < 0 || index >= count)
|
|
throw new StringIndexOutOfBoundsException(index);
|
|
return value[index];
|
|
}
|
|
|
|
/**
|
|
* Get the code point at the specified index. This is like #charAt(int),
|
|
* but if the character is the start of a surrogate pair, and the
|
|
* following character completes the pair, then the corresponding
|
|
* supplementary code point is returned.
|
|
* @param index the index of the codepoint to get, starting at 0
|
|
* @return the codepoint at the specified index
|
|
* @throws IndexOutOfBoundsException if index is negative or >= length()
|
|
* @since 1.5
|
|
*/
|
|
public int codePointAt(int index)
|
|
{
|
|
return Character.codePointAt(value, index, count);
|
|
}
|
|
|
|
/**
|
|
* Get the code point before the specified index. This is like
|
|
* #codePointAt(int), but checks the characters at <code>index-1</code> and
|
|
* <code>index-2</code> to see if they form a supplementary code point.
|
|
* @param index the index just past the codepoint to get, starting at 0
|
|
* @return the codepoint at the specified index
|
|
* @throws IndexOutOfBoundsException if index is negative or >= length()
|
|
* @since 1.5
|
|
*/
|
|
public int codePointBefore(int index)
|
|
{
|
|
// Character.codePointBefore() doesn't perform this check. We
|
|
// could use the CharSequence overload, but this is just as easy.
|
|
if (index >= count)
|
|
throw new IndexOutOfBoundsException();
|
|
return Character.codePointBefore(value, index, 1);
|
|
}
|
|
|
|
/**
|
|
* Get the specified array of characters. <code>srcOffset - srcEnd</code>
|
|
* characters will be copied into the array you pass in.
|
|
*
|
|
* @param srcOffset the index to start copying from (inclusive)
|
|
* @param srcEnd the index to stop copying from (exclusive)
|
|
* @param dst the array to copy into
|
|
* @param dstOffset the index to start copying into
|
|
* @throws NullPointerException if dst is null
|
|
* @throws IndexOutOfBoundsException if any source or target indices are
|
|
* out of range (while unspecified, source problems cause a
|
|
* StringIndexOutOfBoundsException, and dest problems cause an
|
|
* ArrayIndexOutOfBoundsException)
|
|
* @see System#arraycopy(Object, int, Object, int, int)
|
|
*/
|
|
public void getChars(int srcOffset, int srcEnd,
|
|
char[] dst, int dstOffset)
|
|
{
|
|
if (srcOffset < 0 || srcEnd > count || srcEnd < srcOffset)
|
|
throw new StringIndexOutOfBoundsException();
|
|
System.arraycopy(value, srcOffset, dst, dstOffset, srcEnd - srcOffset);
|
|
}
|
|
|
|
/**
|
|
* Set the character at the specified index.
|
|
*
|
|
* @param index the index of the character to set starting at 0
|
|
* @param ch the value to set that character to
|
|
* @throws IndexOutOfBoundsException if index is negative or >= length()
|
|
* (while unspecified, this is a StringIndexOutOfBoundsException)
|
|
*/
|
|
public void setCharAt(int index, char ch)
|
|
{
|
|
if (index < 0 || index >= count)
|
|
throw new StringIndexOutOfBoundsException(index);
|
|
// Call ensureCapacity to enforce copy-on-write.
|
|
ensureCapacity_unsynchronized(count);
|
|
value[index] = ch;
|
|
}
|
|
|
|
/**
|
|
* Append the <code>String</code> value of the argument to this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param obj the <code>Object</code> to convert and append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see String#valueOf(Object)
|
|
* @see #append(String)
|
|
*/
|
|
public AbstractStringBuffer append(Object obj)
|
|
{
|
|
return append(String.valueOf(obj));
|
|
}
|
|
|
|
/**
|
|
* Append the <code>String</code> to this <code>StringBuffer</code>. If
|
|
* str is null, the String "null" is appended.
|
|
*
|
|
* @param str the <code>String</code> to append
|
|
* @return this <code>StringBuffer</code>
|
|
*/
|
|
public AbstractStringBuffer append(String str)
|
|
{
|
|
if (str == null)
|
|
str = "null";
|
|
int len = str.count;
|
|
ensureCapacity_unsynchronized(count + len);
|
|
str.getChars(0, len, value, count);
|
|
count += len;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Append the <code>StringBuilder</code> value of the argument to this
|
|
* <code>StringBuilder</code>. This behaves the same as
|
|
* <code>append((Object) stringBuffer)</code>, except it is more efficient.
|
|
*
|
|
* @param stringBuffer the <code>StringBuilder</code> to convert and append
|
|
* @return this <code>StringBuilder</code>
|
|
* @see #append(Object)
|
|
*/
|
|
public AbstractStringBuffer append(StringBuffer stringBuffer)
|
|
{
|
|
if (stringBuffer == null)
|
|
return append("null");
|
|
synchronized (stringBuffer)
|
|
{
|
|
int len = stringBuffer.count;
|
|
ensureCapacity(count + len);
|
|
System.arraycopy(stringBuffer.value, 0, value, count, len);
|
|
count += len;
|
|
}
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Append the <code>char</code> array to this <code>StringBuffer</code>.
|
|
* This is similar (but more efficient) than
|
|
* <code>append(new String(data))</code>, except in the case of null.
|
|
*
|
|
* @param data the <code>char[]</code> to append
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws NullPointerException if <code>str</code> is <code>null</code>
|
|
* @see #append(char[], int, int)
|
|
*/
|
|
public AbstractStringBuffer append(char[] data)
|
|
{
|
|
return append(data, 0, data.length);
|
|
}
|
|
|
|
/**
|
|
* Append part of the <code>char</code> array to this
|
|
* <code>StringBuffer</code>. This is similar (but more efficient) than
|
|
* <code>append(new String(data, offset, count))</code>, except in the case
|
|
* of null.
|
|
*
|
|
* @param data the <code>char[]</code> to append
|
|
* @param offset the start location in <code>str</code>
|
|
* @param count the number of characters to get from <code>str</code>
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws NullPointerException if <code>str</code> is <code>null</code>
|
|
* @throws IndexOutOfBoundsException if offset or count is out of range
|
|
* (while unspecified, this is a StringIndexOutOfBoundsException)
|
|
*/
|
|
public AbstractStringBuffer append(char[] data, int offset, int count)
|
|
{
|
|
if (offset < 0 || count < 0 || offset > data.length - count)
|
|
throw new StringIndexOutOfBoundsException();
|
|
ensureCapacity_unsynchronized(this.count + count);
|
|
System.arraycopy(data, offset, value, this.count, count);
|
|
this.count += count;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Append the <code>String</code> value of the argument to this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param bool the <code>boolean</code> to convert and append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see String#valueOf(boolean)
|
|
*/
|
|
public AbstractStringBuffer append(boolean bool)
|
|
{
|
|
return append(bool ? "true" : "false");
|
|
}
|
|
|
|
/**
|
|
* Append the <code>char</code> to this <code>StringBuffer</code>.
|
|
*
|
|
* @param ch the <code>char</code> to append
|
|
* @return this <code>StringBuffer</code>
|
|
*/
|
|
public AbstractStringBuffer append(char ch)
|
|
{
|
|
ensureCapacity_unsynchronized(count + 1);
|
|
value[count++] = ch;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Append the characters in the <code>CharSequence</code> to this
|
|
* buffer.
|
|
*
|
|
* @param seq the <code>CharSequence</code> providing the characters
|
|
* @return this <code>StringBuffer</code>
|
|
* @since 1.5
|
|
*/
|
|
public AbstractStringBuffer append(CharSequence seq)
|
|
{
|
|
return append(seq, 0, seq.length());
|
|
}
|
|
|
|
/**
|
|
* Append some characters from the <code>CharSequence</code> to this
|
|
* buffer. If the argument is null, the <code>seq</code> is assumed
|
|
* to be equal to the string <code>"null"</code>.
|
|
*
|
|
* @param seq the <code>CharSequence</code> providing the characters
|
|
* @param start the starting index
|
|
* @param end one past the final index
|
|
* @return this <code>StringBuffer</code>
|
|
* @since 1.5
|
|
*/
|
|
public AbstractStringBuffer append(CharSequence seq, int start, int end)
|
|
{
|
|
if (seq == null)
|
|
seq = "null";
|
|
if (end - start > 0)
|
|
{
|
|
ensureCapacity_unsynchronized(count + end - start);
|
|
for (; start < end; ++start)
|
|
value[count++] = seq.charAt(start);
|
|
}
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Append the <code>String</code> value of the argument to this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param inum the <code>int</code> to convert and append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see String#valueOf(int)
|
|
*/
|
|
// GCJ LOCAL: this is native for efficiency.
|
|
public native AbstractStringBuffer append (int inum);
|
|
|
|
/**
|
|
* Append the <code>String</code> value of the argument to this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param lnum the <code>long</code> to convert and append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see String#valueOf(long)
|
|
*/
|
|
public AbstractStringBuffer append(long lnum)
|
|
{
|
|
return append(Long.toString(lnum, 10));
|
|
}
|
|
|
|
/**
|
|
* Append the <code>String</code> value of the argument to this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param fnum the <code>float</code> to convert and append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see String#valueOf(float)
|
|
*/
|
|
public AbstractStringBuffer append(float fnum)
|
|
{
|
|
return append(Float.toString(fnum));
|
|
}
|
|
|
|
/**
|
|
* Append the <code>String</code> value of the argument to this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param dnum the <code>double</code> to convert and append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see String#valueOf(double)
|
|
*/
|
|
public AbstractStringBuffer append(double dnum)
|
|
{
|
|
return append(Double.toString(dnum));
|
|
}
|
|
|
|
/**
|
|
* Append the code point to this <code>StringBuffer</code>.
|
|
* This is like #append(char), but will append two characters
|
|
* if a supplementary code point is given.
|
|
*
|
|
* @param code the code point to append
|
|
* @return this <code>StringBuffer</code>
|
|
* @see Character#toChars(int, char[], int)
|
|
* @since 1.5
|
|
*/
|
|
public AbstractStringBuffer appendCodePoint(int code)
|
|
{
|
|
int len = Character.charCount(code);
|
|
ensureCapacity_unsynchronized(count + len);
|
|
Character.toChars(code, value, count);
|
|
count += len;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Delete characters from this <code>StringBuffer</code>.
|
|
* <code>delete(10, 12)</code> will delete 10 and 11, but not 12. It is
|
|
* harmless for end to be larger than length().
|
|
*
|
|
* @param start the first character to delete
|
|
* @param end the index after the last character to delete
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if start or end are out of bounds
|
|
* @since 1.2
|
|
*/
|
|
public AbstractStringBuffer delete(int start, int end)
|
|
{
|
|
if (start < 0 || start > count || start > end)
|
|
throw new StringIndexOutOfBoundsException(start);
|
|
if (end > count)
|
|
end = count;
|
|
ensureCapacity_unsynchronized(count);
|
|
if (count - end != 0)
|
|
System.arraycopy(value, end, value, start, count - end);
|
|
count -= end - start;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Delete a character from this <code>StringBuffer</code>.
|
|
*
|
|
* @param index the index of the character to delete
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if index is out of bounds
|
|
* @since 1.2
|
|
*/
|
|
public AbstractStringBuffer deleteCharAt(int index)
|
|
{
|
|
return delete(index, index + 1);
|
|
}
|
|
|
|
/**
|
|
* Replace characters between index <code>start</code> (inclusive) and
|
|
* <code>end</code> (exclusive) with <code>str</code>. If <code>end</code>
|
|
* is larger than the size of this StringBuffer, all characters after
|
|
* <code>start</code> are replaced.
|
|
*
|
|
* @param start the beginning index of characters to delete (inclusive)
|
|
* @param end the ending index of characters to delete (exclusive)
|
|
* @param str the new <code>String</code> to insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if start or end are out of bounds
|
|
* @throws NullPointerException if str is null
|
|
* @since 1.2
|
|
*/
|
|
public AbstractStringBuffer replace(int start, int end, String str)
|
|
{
|
|
if (start < 0 || start > count || start > end)
|
|
throw new StringIndexOutOfBoundsException(start);
|
|
|
|
int len = str.count;
|
|
// Calculate the difference in 'count' after the replace.
|
|
int delta = len - (end > count ? count : end) + start;
|
|
ensureCapacity_unsynchronized(count + delta);
|
|
|
|
if (delta != 0 && end < count)
|
|
System.arraycopy(value, end, value, end + delta, count - end);
|
|
|
|
str.getChars(0, len, value, start);
|
|
count += delta;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Insert a subarray of the <code>char[]</code> argument into this
|
|
* <code>StringBuffer</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param str the <code>char[]</code> to insert
|
|
* @param str_offset the index in <code>str</code> to start inserting from
|
|
* @param len the number of characters to insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws NullPointerException if <code>str</code> is <code>null</code>
|
|
* @throws StringIndexOutOfBoundsException if any index is out of bounds
|
|
* @since 1.2
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, char[] str, int str_offset, int len)
|
|
{
|
|
if (offset < 0 || offset > count || len < 0
|
|
|| str_offset < 0 || str_offset > str.length - len)
|
|
throw new StringIndexOutOfBoundsException();
|
|
ensureCapacity_unsynchronized(count + len);
|
|
System.arraycopy(value, offset, value, offset + len, count - offset);
|
|
System.arraycopy(str, str_offset, value, offset, len);
|
|
count += len;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> value of the argument into this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param obj the <code>Object</code> to convert and insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @exception StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see String#valueOf(Object)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, Object obj)
|
|
{
|
|
return insert(offset, obj == null ? "null" : obj.toString());
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> argument into this
|
|
* <code>StringBuffer</code>. If str is null, the String "null" is used
|
|
* instead.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param str the <code>String</code> to insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, String str)
|
|
{
|
|
if (offset < 0 || offset > count)
|
|
throw new StringIndexOutOfBoundsException(offset);
|
|
if (str == null)
|
|
str = "null";
|
|
int len = str.count;
|
|
ensureCapacity_unsynchronized(count + len);
|
|
System.arraycopy(value, offset, value, offset + len, count - offset);
|
|
str.getChars(0, len, value, offset);
|
|
count += len;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>CharSequence</code> argument into this
|
|
* <code>StringBuffer</code>. If the sequence is null, the String
|
|
* "null" is used instead.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param sequence the <code>CharSequence</code> to insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws IndexOutOfBoundsException if offset is out of bounds
|
|
* @since 1.5
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, CharSequence sequence)
|
|
{
|
|
if (sequence == null)
|
|
sequence = "null";
|
|
return insert(offset, sequence, 0, sequence.length());
|
|
}
|
|
|
|
/**
|
|
* Insert a subsequence of the <code>CharSequence</code> argument into this
|
|
* <code>StringBuffer</code>. If the sequence is null, the String
|
|
* "null" is used instead.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param sequence the <code>CharSequence</code> to insert
|
|
* @param start the starting index of the subsequence
|
|
* @param end one past the ending index of the subsequence
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws IndexOutOfBoundsException if offset, start,
|
|
* or end are out of bounds
|
|
* @since 1.5
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, CharSequence sequence, int start, int end)
|
|
{
|
|
if (sequence == null)
|
|
sequence = "null";
|
|
if (start < 0 || end < 0 || start > end || end > sequence.length())
|
|
throw new IndexOutOfBoundsException();
|
|
int len = end - start;
|
|
ensureCapacity_unsynchronized(count + len);
|
|
System.arraycopy(value, offset, value, offset + len, count - offset);
|
|
for (int i = start; i < end; ++i)
|
|
value[offset++] = sequence.charAt(i);
|
|
count += len;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>char[]</code> argument into this
|
|
* <code>StringBuffer</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param data the <code>char[]</code> to insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws NullPointerException if <code>data</code> is <code>null</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see #insert(int, char[], int, int)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, char[] data)
|
|
{
|
|
return insert(offset, data, 0, data.length);
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> value of the argument into this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param bool the <code>boolean</code> to convert and insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see String#valueOf(boolean)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, boolean bool)
|
|
{
|
|
return insert(offset, bool ? "true" : "false");
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>char</code> argument into this <code>StringBuffer</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param ch the <code>char</code> to insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, char ch)
|
|
{
|
|
if (offset < 0 || offset > count)
|
|
throw new StringIndexOutOfBoundsException(offset);
|
|
ensureCapacity_unsynchronized(count + 1);
|
|
System.arraycopy(value, offset, value, offset + 1, count - offset);
|
|
value[offset] = ch;
|
|
count++;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> value of the argument into this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param inum the <code>int</code> to convert and insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see String#valueOf(int)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, int inum)
|
|
{
|
|
return insert(offset, String.valueOf(inum));
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> value of the argument into this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param lnum the <code>long</code> to convert and insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see String#valueOf(long)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, long lnum)
|
|
{
|
|
return insert(offset, Long.toString(lnum, 10));
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> value of the argument into this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param fnum the <code>float</code> to convert and insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see String#valueOf(float)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, float fnum)
|
|
{
|
|
return insert(offset, Float.toString(fnum));
|
|
}
|
|
|
|
/**
|
|
* Insert the <code>String</code> value of the argument into this
|
|
* <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert
|
|
* to <code>String</code>.
|
|
*
|
|
* @param offset the place to insert in this buffer
|
|
* @param dnum the <code>double</code> to convert and insert
|
|
* @return this <code>StringBuffer</code>
|
|
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
|
* @see String#valueOf(double)
|
|
*/
|
|
public AbstractStringBuffer insert(int offset, double dnum)
|
|
{
|
|
return insert(offset, Double.toString(dnum));
|
|
}
|
|
|
|
/**
|
|
* Finds the first instance of a substring in this StringBuilder.
|
|
*
|
|
* @param str String to find
|
|
* @return location (base 0) of the String, or -1 if not found
|
|
* @throws NullPointerException if str is null
|
|
* @see #indexOf(String, int)
|
|
*/
|
|
public int indexOf(String str)
|
|
{
|
|
return indexOf(str, 0);
|
|
}
|
|
|
|
/**
|
|
* Finds the first instance of a String in this StringBuffer, starting at
|
|
* a given index. If starting index is less than 0, the search starts at
|
|
* the beginning of this String. If the starting index is greater than the
|
|
* length of this String, or the substring is not found, -1 is returned.
|
|
*
|
|
* @param str String to find
|
|
* @param fromIndex index to start the search
|
|
* @return location (base 0) of the String, or -1 if not found
|
|
* @throws NullPointerException if str is null
|
|
* @since 1.4
|
|
*/
|
|
public int indexOf(String str, int fromIndex)
|
|
{
|
|
if (fromIndex < 0)
|
|
fromIndex = 0;
|
|
int limit = count - str.count;
|
|
for ( ; fromIndex <= limit; fromIndex++)
|
|
if (regionMatches(fromIndex, str))
|
|
return fromIndex;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Finds the last instance of a substring in this StringBuffer.
|
|
*
|
|
* @param str String to find
|
|
* @return location (base 0) of the String, or -1 if not found
|
|
* @throws NullPointerException if str is null
|
|
* @see #lastIndexOf(String, int)
|
|
* @since 1.4
|
|
*/
|
|
public int lastIndexOf(String str)
|
|
{
|
|
return lastIndexOf(str, count - str.count);
|
|
}
|
|
|
|
/**
|
|
* Finds the last instance of a String in this StringBuffer, starting at a
|
|
* given index. If starting index is greater than the maximum valid index,
|
|
* then the search begins at the end of this String. If the starting index
|
|
* is less than zero, or the substring is not found, -1 is returned.
|
|
*
|
|
* @param str String to find
|
|
* @param fromIndex index to start the search
|
|
* @return location (base 0) of the String, or -1 if not found
|
|
* @throws NullPointerException if str is null
|
|
* @since 1.4
|
|
*/
|
|
public int lastIndexOf(String str, int fromIndex)
|
|
{
|
|
fromIndex = Math.min(fromIndex, count - str.count);
|
|
for ( ; fromIndex >= 0; fromIndex--)
|
|
if (regionMatches(fromIndex, str))
|
|
return fromIndex;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Reverse the characters in this StringBuffer. The same sequence of
|
|
* characters exists, but in the reverse index ordering.
|
|
*
|
|
* @return this <code>StringBuffer</code>
|
|
*/
|
|
public AbstractStringBuffer reverse()
|
|
{
|
|
// Call ensureCapacity to enforce copy-on-write.
|
|
ensureCapacity_unsynchronized(count);
|
|
for (int i = count >> 1, j = count - i; --i >= 0; ++j)
|
|
{
|
|
char c = value[i];
|
|
value[i] = value[j];
|
|
value[j] = c;
|
|
}
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* This may reduce the amount of memory used by the StringBuffer,
|
|
* by resizing the internal array to remove unused space. However,
|
|
* this method is not required to resize, so this behavior cannot
|
|
* be relied upon.
|
|
* @since 1.5
|
|
*/
|
|
public void trimToSize()
|
|
{
|
|
int wouldSave = value.length - count;
|
|
// Some random heuristics: if we save less than 20 characters, who
|
|
// cares.
|
|
if (wouldSave < 20)
|
|
return;
|
|
// If we save more than 200 characters, shrink.
|
|
// If we save more than 1/4 of the buffer, shrink.
|
|
if (wouldSave > 200 || wouldSave * 4 > value.length)
|
|
{
|
|
char[] newValue = new char[count];
|
|
System.arraycopy(value, 0, newValue, 0, count);
|
|
value = newValue;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the number of code points between two indices in the
|
|
* <code>StringBuffer</code>. An unpaired surrogate counts as a
|
|
* code point for this purpose. Characters outside the indicated
|
|
* range are not examined, even if the range ends in the middle of a
|
|
* surrogate pair.
|
|
*
|
|
* @param start the starting index
|
|
* @param end one past the ending index
|
|
* @return the number of code points
|
|
* @since 1.5
|
|
*/
|
|
public int codePointCount(int start, int end)
|
|
{
|
|
if (start < 0 || end >= count || start > end)
|
|
throw new StringIndexOutOfBoundsException();
|
|
|
|
int count = 0;
|
|
while (start < end)
|
|
{
|
|
char base = value[start];
|
|
if (base < Character.MIN_HIGH_SURROGATE
|
|
|| base > Character.MAX_HIGH_SURROGATE
|
|
|| start == end
|
|
|| start == count
|
|
|| value[start + 1] < Character.MIN_LOW_SURROGATE
|
|
|| value[start + 1] > Character.MAX_LOW_SURROGATE)
|
|
{
|
|
// Nothing.
|
|
}
|
|
else
|
|
{
|
|
// Surrogate pair.
|
|
++start;
|
|
}
|
|
++start;
|
|
++count;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
/**
|
|
* Starting at the given index, this counts forward by the indicated
|
|
* number of code points, and then returns the resulting index. An
|
|
* unpaired surrogate counts as a single code point for this
|
|
* purpose.
|
|
*
|
|
* @param start the starting index
|
|
* @param codePoints the number of code points
|
|
* @return the resulting index
|
|
* @since 1.5
|
|
*/
|
|
public int offsetByCodePoints(int start, int codePoints)
|
|
{
|
|
while (codePoints > 0)
|
|
{
|
|
char base = value[start];
|
|
if (base < Character.MIN_HIGH_SURROGATE
|
|
|| base > Character.MAX_HIGH_SURROGATE
|
|
|| start == count
|
|
|| value[start + 1] < Character.MIN_LOW_SURROGATE
|
|
|| value[start + 1] > Character.MAX_LOW_SURROGATE)
|
|
{
|
|
// Nothing.
|
|
}
|
|
else
|
|
{
|
|
// Surrogate pair.
|
|
++start;
|
|
}
|
|
++start;
|
|
--codePoints;
|
|
}
|
|
return start;
|
|
}
|
|
|
|
/**
|
|
* Increase the capacity of this <code>StringBuilder</code>. This will
|
|
* ensure that an expensive growing operation will not occur until
|
|
* <code>minimumCapacity</code> is reached. The buffer is grown to the
|
|
* larger of <code>minimumCapacity</code> and
|
|
* <code>capacity() * 2 + 2</code>, if it is not already large enough.
|
|
*
|
|
* @param minimumCapacity the new capacity
|
|
* @see #capacity()
|
|
*/
|
|
void ensureCapacity_unsynchronized(int minimumCapacity)
|
|
{
|
|
if (minimumCapacity > value.length)
|
|
{
|
|
int max = value.length * 2 + 2;
|
|
minimumCapacity = (minimumCapacity < max ? max : minimumCapacity);
|
|
char[] nb = new char[minimumCapacity];
|
|
System.arraycopy(value, 0, nb, 0, count);
|
|
value = nb;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Predicate which determines if a substring of this matches another String
|
|
* starting at a specified offset for each String and continuing for a
|
|
* specified length. This is more efficient than creating a String to call
|
|
* indexOf on.
|
|
*
|
|
* @param toffset index to start comparison at for this String
|
|
* @param other non-null String to compare to region of this
|
|
* @return true if regions match, false otherwise
|
|
* @see #indexOf(String, int)
|
|
* @see #lastIndexOf(String, int)
|
|
* @see String#regionMatches(boolean, int, String, int, int)
|
|
*/
|
|
// GCJ LOCAL: native for gcj.
|
|
private native boolean regionMatches(int toffset, String other);
|
|
|
|
}
|