re PR libgcj/37636 (java tools are unable to find resource files)
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
This commit is contained in:
Matthias Klose
parent
d9cc481a35
commit
cd6d4007aa
2325 changed files with 121399 additions and 23635 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/* StringBuilder.java -- Unsynchronized growable strings
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
|
@ -75,6 +75,7 @@ import java.io.Serializable;
|
|||
* @since 1.5
|
||||
*/
|
||||
public final class StringBuilder
|
||||
extends AbstractStringBuffer
|
||||
implements Serializable, CharSequence, Appendable
|
||||
{
|
||||
// Implementation note: if you change this class, you usually will
|
||||
|
|
@ -85,34 +86,12 @@ public final class StringBuilder
|
|||
*/
|
||||
private static final long serialVersionUID = 4383685877147921099L;
|
||||
|
||||
/**
|
||||
* 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 StringBuilder with default capacity 16.
|
||||
*/
|
||||
public StringBuilder()
|
||||
{
|
||||
this(DEFAULT_CAPACITY);
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -124,7 +103,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder(int capacity)
|
||||
{
|
||||
value = new char[capacity];
|
||||
super(capacity);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -137,10 +116,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder(String str)
|
||||
{
|
||||
// Unfortunately, because the size is 16 larger, we cannot share.
|
||||
count = str.count;
|
||||
value = new char[count + DEFAULT_CAPACITY];
|
||||
str.getChars(0, count, value, 0);
|
||||
super(str);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -154,11 +130,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder(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);
|
||||
super(seq);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -188,122 +160,6 @@ public final class StringBuilder
|
|||
return value.length;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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()
|
||||
*/
|
||||
public void ensureCapacity(int minimumCapacity)
|
||||
{
|
||||
if (minimumCapacity > value.length)
|
||||
{
|
||||
int max = value.length * 2 + 2;
|
||||
minimumCapacity = (minimumCapacity < max ? max : minimumCapacity);
|
||||
char[] nb = new char[minimumCapacity];
|
||||
VMSystem.arraycopy(value, 0, nb, 0, count);
|
||||
value = nb;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the length of this StringBuilder. 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 in order to preserve copy-on-write
|
||||
semantics. */
|
||||
ensureCapacity(newLength);
|
||||
|
||||
if (newLength < valueLength)
|
||||
{
|
||||
/* If the StringBuilder'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 StringBuilder'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 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();
|
||||
VMSystem.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(count);
|
||||
value[index] = ch;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append the <code>String</code> value of the argument to this
|
||||
* <code>StringBuilder</code>. Uses <code>String.valueOf()</code> to convert
|
||||
|
|
@ -316,7 +172,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(Object obj)
|
||||
{
|
||||
return append(obj == null ? "null" : obj.toString());
|
||||
super.append(obj);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -328,12 +185,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(String str)
|
||||
{
|
||||
if (str == null)
|
||||
str = "null";
|
||||
int len = str.count;
|
||||
ensureCapacity(count + len);
|
||||
str.getChars(0, len, value, count);
|
||||
count += len;
|
||||
super.append(str);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -348,15 +200,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(StringBuffer stringBuffer)
|
||||
{
|
||||
if (stringBuffer == null)
|
||||
return append("null");
|
||||
synchronized (stringBuffer)
|
||||
{
|
||||
int len = stringBuffer.count;
|
||||
ensureCapacity(count + len);
|
||||
VMSystem.arraycopy(stringBuffer.value, 0, value, count, len);
|
||||
count += len;
|
||||
}
|
||||
super.append(stringBuffer);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -372,7 +216,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(char[] data)
|
||||
{
|
||||
return append(data, 0, data.length);
|
||||
super.append(data, 0, data.length);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -391,11 +236,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(char[] data, int offset, int count)
|
||||
{
|
||||
if (offset < 0 || count < 0 || offset > data.length - count)
|
||||
throw new StringIndexOutOfBoundsException();
|
||||
ensureCapacity(this.count + count);
|
||||
VMSystem.arraycopy(data, offset, value, this.count, count);
|
||||
this.count += count;
|
||||
super.append(data, offset, count);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -410,7 +251,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(boolean bool)
|
||||
{
|
||||
return append(bool ? "true" : "false");
|
||||
super.append(bool);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -421,8 +263,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(char ch)
|
||||
{
|
||||
ensureCapacity(count + 1);
|
||||
value[count++] = ch;
|
||||
super.append(ch);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -435,7 +276,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(CharSequence seq)
|
||||
{
|
||||
return append(seq, 0, seq.length());
|
||||
super.append(seq, 0, seq.length());
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -451,33 +293,7 @@ public final class StringBuilder
|
|||
public StringBuilder append(CharSequence seq, int start,
|
||||
int end)
|
||||
{
|
||||
if (seq == null)
|
||||
return append("null");
|
||||
if (end - start > 0)
|
||||
{
|
||||
ensureCapacity(count + end - start);
|
||||
for (; start < end; ++start)
|
||||
value[count++] = seq.charAt(start);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append the code point to this <code>StringBuilder</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>StringBuilder</code>
|
||||
* @see Character#toChars(int, char[], int)
|
||||
* @since 1.5
|
||||
*/
|
||||
public synchronized StringBuilder appendCodePoint(int code)
|
||||
{
|
||||
int len = Character.charCount(code);
|
||||
ensureCapacity(count + len);
|
||||
Character.toChars(code, value, count);
|
||||
count += len;
|
||||
super.append(seq, start, end);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -493,7 +309,8 @@ public final class StringBuilder
|
|||
// This is native in libgcj, for efficiency.
|
||||
public StringBuilder append(int inum)
|
||||
{
|
||||
return append(String.valueOf(inum));
|
||||
super.append(inum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -507,7 +324,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(long lnum)
|
||||
{
|
||||
return append(Long.toString(lnum, 10));
|
||||
super.append(lnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -521,7 +339,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(float fnum)
|
||||
{
|
||||
return append(Float.toString(fnum));
|
||||
super.append(fnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -535,7 +354,24 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder append(double dnum)
|
||||
{
|
||||
return append(Double.toString(dnum));
|
||||
super.append(dnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append the code point to this <code>StringBuilder</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>StringBuilder</code>
|
||||
* @see Character#toChars(int, char[], int)
|
||||
* @since 1.5
|
||||
*/
|
||||
public StringBuilder appendCodePoint(int code)
|
||||
{
|
||||
super.appendCodePoint(code);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -550,15 +386,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder delete(int start, int end)
|
||||
{
|
||||
if (start < 0 || start > count || start > end)
|
||||
throw new StringIndexOutOfBoundsException(start);
|
||||
if (end > count)
|
||||
end = count;
|
||||
// This will unshare if required.
|
||||
ensureCapacity(count);
|
||||
if (count - end != 0)
|
||||
VMSystem.arraycopy(value, end, value, start, count - end);
|
||||
count -= end - start;
|
||||
super.delete(start, end);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -571,7 +399,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder deleteCharAt(int index)
|
||||
{
|
||||
return delete(index, index + 1);
|
||||
super.deleteCharAt(index);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -589,19 +418,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder 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(count + delta);
|
||||
|
||||
if (delta != 0 && end < count)
|
||||
VMSystem.arraycopy(value, end, value, end + delta, count - end);
|
||||
|
||||
str.getChars(0, len, value, start);
|
||||
count += delta;
|
||||
super.replace(start, end, str);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -672,13 +489,7 @@ public final class StringBuilder
|
|||
public StringBuilder 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(count + len);
|
||||
VMSystem.arraycopy(value, offset, value, offset + len, count - offset);
|
||||
VMSystem.arraycopy(str, str_offset, value, offset, len);
|
||||
count += len;
|
||||
super.insert(offset, str, str_offset, len);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -695,7 +506,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, Object obj)
|
||||
{
|
||||
return insert(offset, obj == null ? "null" : obj.toString());
|
||||
super.insert(offset, obj);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -710,15 +522,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, String str)
|
||||
{
|
||||
if (offset < 0 || offset > count)
|
||||
throw new StringIndexOutOfBoundsException(offset);
|
||||
if (str == null)
|
||||
str = "null";
|
||||
int len = str.count;
|
||||
ensureCapacity(count + len);
|
||||
VMSystem.arraycopy(value, offset, value, offset + len, count - offset);
|
||||
str.getChars(0, len, value, offset);
|
||||
count += len;
|
||||
super.insert(offset, str);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -732,11 +536,10 @@ public final class StringBuilder
|
|||
* @return this <code>StringBuilder</code>
|
||||
* @throws IndexOutOfBoundsException if offset is out of bounds
|
||||
*/
|
||||
public synchronized StringBuilder insert(int offset, CharSequence sequence)
|
||||
public StringBuilder insert(int offset, CharSequence sequence)
|
||||
{
|
||||
if (sequence == null)
|
||||
sequence = "null";
|
||||
return insert(offset, sequence, 0, sequence.length());
|
||||
super.insert(offset, sequence);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -752,19 +555,10 @@ public final class StringBuilder
|
|||
* @throws IndexOutOfBoundsException if offset, start,
|
||||
* or end are out of bounds
|
||||
*/
|
||||
public synchronized StringBuilder insert(int offset, CharSequence sequence,
|
||||
int start, int end)
|
||||
public StringBuilder 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(count + len);
|
||||
VMSystem.arraycopy(value, offset, value, offset + len, count - offset);
|
||||
for (int i = start; i < end; ++i)
|
||||
value[offset++] = sequence.charAt(i);
|
||||
count += len;
|
||||
super.insert(offset, sequence, start, end);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -781,7 +575,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, char[] data)
|
||||
{
|
||||
return insert(offset, data, 0, data.length);
|
||||
super.insert(offset, data);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -797,7 +592,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, boolean bool)
|
||||
{
|
||||
return insert(offset, bool ? "true" : "false");
|
||||
super.insert(offset, bool);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -810,12 +606,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, char ch)
|
||||
{
|
||||
if (offset < 0 || offset > count)
|
||||
throw new StringIndexOutOfBoundsException(offset);
|
||||
ensureCapacity(count + 1);
|
||||
VMSystem.arraycopy(value, offset, value, offset + 1, count - offset);
|
||||
value[offset] = ch;
|
||||
count++;
|
||||
super.insert(offset, ch);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -832,7 +623,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, int inum)
|
||||
{
|
||||
return insert(offset, String.valueOf(inum));
|
||||
super.insert(offset, inum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -848,7 +640,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, long lnum)
|
||||
{
|
||||
return insert(offset, Long.toString(lnum, 10));
|
||||
super.insert(offset, lnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -864,7 +657,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder insert(int offset, float fnum)
|
||||
{
|
||||
return insert(offset, Float.toString(fnum));
|
||||
super.insert(offset, fnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -880,75 +674,8 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder 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 StringBuilder, 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
|
||||
*/
|
||||
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 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 #lastIndexOf(String, int)
|
||||
*/
|
||||
public int lastIndexOf(String str)
|
||||
{
|
||||
return lastIndexOf(str, count - str.count);
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds the last instance of a String in this StringBuilder, 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
|
||||
*/
|
||||
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;
|
||||
super.insert(offset, dnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -959,14 +686,7 @@ public final class StringBuilder
|
|||
*/
|
||||
public StringBuilder reverse()
|
||||
{
|
||||
// Call ensureCapacity to enforce copy-on-write.
|
||||
ensureCapacity(count);
|
||||
for (int i = count >> 1, j = count - i; --i >= 0; ++j)
|
||||
{
|
||||
char c = value[i];
|
||||
value[i] = value[j];
|
||||
value[j] = c;
|
||||
}
|
||||
super.reverse();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -983,87 +703,4 @@ public final class StringBuilder
|
|||
return new String(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
*/
|
||||
private boolean regionMatches(int toffset, String other)
|
||||
{
|
||||
int len = other.count;
|
||||
int index = other.offset;
|
||||
while (--len >= 0)
|
||||
if (value[toffset++] != other.value[index++])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of Unicode code points in the specified sub sequence.
|
||||
* Surrogate pairs count as one code point.
|
||||
* @param beginIndex the start of the subarray
|
||||
* @param endIndex the index after the last char in the subarray
|
||||
* @return the number of code points
|
||||
* @throws IndexOutOfBoundsException if beginIndex is less than zero or
|
||||
* greater than endIndex or if endIndex is greater than the length of this
|
||||
* StringBuilder
|
||||
*/
|
||||
public int codePointCount(int beginIndex,int endIndex)
|
||||
{
|
||||
if (beginIndex < 0 || beginIndex > endIndex || endIndex > count)
|
||||
throw new IndexOutOfBoundsException("invalid indices: " + beginIndex
|
||||
+ ", " + endIndex);
|
||||
return Character.codePointCount(value, beginIndex, endIndex - beginIndex);
|
||||
}
|
||||
|
||||
public void trimToSize()
|
||||
{
|
||||
if (count < value.length)
|
||||
{
|
||||
char[] newValue = new char[count];
|
||||
VMSystem.arraycopy(value, 0, newValue, 0, count);
|
||||
value = newValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue