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
|
|
@ -32,6 +32,8 @@ public:
|
|||
static ::java::awt::AlphaComposite * getInstance(jint);
|
||||
static ::java::awt::AlphaComposite * getInstance(jint, jfloat);
|
||||
::java::awt::CompositeContext * createContext(::java::awt::image::ColorModel *, ::java::awt::image::ColorModel *, ::java::awt::RenderingHints *);
|
||||
::java::awt::AlphaComposite * derive(jint);
|
||||
::java::awt::AlphaComposite * derive(jfloat);
|
||||
jfloat getAlpha();
|
||||
jint getRule();
|
||||
jint hashCode();
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ extern "Java"
|
|||
class java::awt::MouseInfo : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public:
|
||||
MouseInfo();
|
||||
public:
|
||||
static ::java::awt::PointerInfo * getPointerInfo();
|
||||
static jint getNumberOfButtons();
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public:
|
|||
virtual jboolean equals(::java::lang::Object *);
|
||||
virtual ::java::awt::color::ColorSpace * getColorSpace();
|
||||
virtual ::java::awt::image::ColorModel * coerceData(::java::awt::image::WritableRaster *, jboolean);
|
||||
public: // actually protected
|
||||
public: // actually package-private
|
||||
virtual void coerceDataWorker(::java::awt::image::WritableRaster *, jboolean);
|
||||
public:
|
||||
virtual jboolean isCompatibleRaster(::java::awt::image::Raster *);
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ extern "Java"
|
|||
class java::beans::beancontext::BeanContextServicesSupport$BCSSProxyServiceProvider : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public: // actually protected
|
||||
BeanContextServicesSupport$BCSSProxyServiceProvider(::java::beans::beancontext::BeanContextServicesSupport *);
|
||||
public: // actually package-private
|
||||
BeanContextServicesSupport$BCSSProxyServiceProvider(::java::beans::beancontext::BeanContextServicesSupport *, ::java::beans::beancontext::BeanContextServiceProvider *);
|
||||
public:
|
||||
virtual ::java::util::Iterator * getCurrentServiceSelectors(::java::beans::beancontext::BeanContextServices *, ::java::lang::Class *);
|
||||
virtual ::java::lang::Object * getService(::java::beans::beancontext::BeanContextServices *, ::java::lang::Object *, ::java::lang::Class *, ::java::lang::Object *);
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@ private:
|
|||
void resize(jint);
|
||||
public:
|
||||
virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
|
||||
virtual ::java::io::Writer * CharArrayWriter$append(::java::lang::CharSequence *, jint, jint);
|
||||
virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *, jint, jint);
|
||||
virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
|
||||
virtual ::java::io::Writer * CharArrayWriter$append(::java::lang::CharSequence *);
|
||||
virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
|
||||
virtual ::java::lang::Appendable * append(jchar);
|
||||
virtual ::java::io::Writer * CharArrayWriter$append(jchar);
|
||||
virtual ::java::io::Writer * Writer$append(jchar);
|
||||
private:
|
||||
static const jint DEFAULT_INITIAL_BUFFER_SIZE = 32;
|
||||
public: // actually protected
|
||||
|
|
|
|||
85
libjava/java/lang/AbstractStringBuffer.h
Normal file
85
libjava/java/lang/AbstractStringBuffer.h
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
|
||||
// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
|
||||
|
||||
#ifndef __java_lang_AbstractStringBuffer__
|
||||
#define __java_lang_AbstractStringBuffer__
|
||||
|
||||
#pragma interface
|
||||
|
||||
#include <java/lang/Object.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
|
||||
class java::lang::AbstractStringBuffer : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public: // actually package-private
|
||||
AbstractStringBuffer();
|
||||
AbstractStringBuffer(jint);
|
||||
AbstractStringBuffer(::java::lang::String *);
|
||||
AbstractStringBuffer(::java::lang::CharSequence *);
|
||||
public:
|
||||
virtual void ensureCapacity(jint);
|
||||
virtual void setLength(jint);
|
||||
virtual jchar charAt(jint);
|
||||
virtual jint codePointAt(jint);
|
||||
virtual jint codePointBefore(jint);
|
||||
virtual void getChars(jint, jint, JArray< jchar > *, jint);
|
||||
virtual void setCharAt(jint, jchar);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(::java::lang::Object *);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(::java::lang::String *);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(::java::lang::StringBuffer *);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(JArray< jchar > *);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(JArray< jchar > *, jint, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(jboolean);
|
||||
virtual ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(jchar);
|
||||
virtual ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *);
|
||||
virtual ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *, jint, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(jlong);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(jfloat);
|
||||
virtual ::java::lang::AbstractStringBuffer * append(jdouble);
|
||||
virtual ::java::lang::AbstractStringBuffer * appendCodePoint(jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * delete$(jint, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * deleteCharAt(jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * replace(jint, jint, ::java::lang::String *);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *, jint, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::Object *);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::String *);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, jboolean);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, jchar);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, jlong);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, jfloat);
|
||||
virtual ::java::lang::AbstractStringBuffer * insert(jint, jdouble);
|
||||
virtual jint indexOf(::java::lang::String *);
|
||||
virtual jint indexOf(::java::lang::String *, jint);
|
||||
virtual jint lastIndexOf(::java::lang::String *);
|
||||
virtual jint lastIndexOf(::java::lang::String *, jint);
|
||||
virtual ::java::lang::AbstractStringBuffer * reverse();
|
||||
virtual void trimToSize();
|
||||
virtual jint codePointCount(jint, jint);
|
||||
virtual jint offsetByCodePoints(jint, jint);
|
||||
public: // actually package-private
|
||||
virtual void ensureCapacity_unsynchronized(jint);
|
||||
private:
|
||||
jboolean regionMatches(jint, ::java::lang::String *);
|
||||
public:
|
||||
virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
|
||||
virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
|
||||
virtual ::java::lang::Appendable * append(jchar);
|
||||
virtual jint length() = 0;
|
||||
virtual ::java::lang::CharSequence * subSequence(jint, jint) = 0;
|
||||
public: // actually package-private
|
||||
jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
|
||||
JArray< jchar > * value;
|
||||
private:
|
||||
static const jint DEFAULT_CAPACITY = 16;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
||||
#endif // __java_lang_AbstractStringBuffer__
|
||||
1027
libjava/java/lang/AbstractStringBuffer.java
Normal file
1027
libjava/java/lang/AbstractStringBuffer.java
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -775,7 +775,7 @@ public abstract class ClassLoader
|
|||
*/
|
||||
protected Enumeration<URL> findResources(String name) throws IOException
|
||||
{
|
||||
return (Enumeration<URL>) EmptyEnumeration.getInstance();
|
||||
return new EmptyEnumeration<URL>();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ public:
|
|||
static const jint SIZE = 64;
|
||||
static ::java::lang::Class * TYPE;
|
||||
private:
|
||||
static ::java::lang::Double * ZERO;
|
||||
static ::java::lang::Double * ONE;
|
||||
jdouble __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ public:
|
|||
static ::java::lang::Class * TYPE;
|
||||
static const jint SIZE = 32;
|
||||
private:
|
||||
static ::java::lang::Float * ZERO;
|
||||
static ::java::lang::Float * ONE;
|
||||
jfloat __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@ class java::lang::Integer : public ::java::lang::Number
|
|||
public:
|
||||
Integer(jint);
|
||||
Integer(::java::lang::String *);
|
||||
private:
|
||||
static jint stringSize(jint, jint);
|
||||
public:
|
||||
static ::java::lang::String * toString(jint, jint);
|
||||
static ::java::lang::String * toHexString(jint);
|
||||
static ::java::lang::String * toOctalString(jint);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
#pragma interface
|
||||
|
||||
#include <java/lang/Number.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
|
||||
class java::lang::Long : public ::java::lang::Number
|
||||
{
|
||||
|
|
@ -14,6 +16,9 @@ class java::lang::Long : public ::java::lang::Number
|
|||
public:
|
||||
Long(jlong);
|
||||
Long(::java::lang::String *);
|
||||
private:
|
||||
static jint stringSize(jlong, jint);
|
||||
public:
|
||||
static ::java::lang::String * toString(jlong, jint);
|
||||
static ::java::lang::String * toHexString(jlong);
|
||||
static ::java::lang::String * toOctalString(jlong);
|
||||
|
|
@ -61,6 +66,9 @@ public:
|
|||
static ::java::lang::Class * TYPE;
|
||||
static const jint SIZE = 64;
|
||||
private:
|
||||
static const jint MIN_CACHE = -128;
|
||||
static const jint MAX_CACHE = 127;
|
||||
static JArray< ::java::lang::Long * > * longCache;
|
||||
jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ public:
|
|||
jint offsetByCodePoints(jint, jint);
|
||||
jboolean isEmpty();
|
||||
private:
|
||||
static ::java::lang::String * toString(JArray< jchar > *, jint, jint);
|
||||
void init(JArray< jchar > *, jint, jint, jboolean);
|
||||
void init(JArray< jbyte > *, jint, jint, jint);
|
||||
void init(JArray< jbyte > *, jint, jint, ::java::lang::String *);
|
||||
|
|
|
|||
|
|
@ -1440,6 +1440,14 @@ public final class String
|
|||
return count == 0;
|
||||
}
|
||||
|
||||
// Generate a String that shares the value array: subsequent changes
|
||||
// to this array will affect the String. A private internal method
|
||||
// that is called from CPStringBuilder by compiler-generated code.
|
||||
private static String toString(char[] value, int startIndex, int count)
|
||||
{
|
||||
return new String(value, startIndex, count, true);
|
||||
}
|
||||
|
||||
private native void init(char[] chars, int offset, int count,
|
||||
boolean dont_copy);
|
||||
private native void init(byte[] chars, int hibyte, int offset, int count);
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
#pragma interface
|
||||
|
||||
#include <java/lang/Object.h>
|
||||
#include <java/lang/AbstractStringBuffer.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
|
||||
class java::lang::StringBuffer : public ::java::lang::Object
|
||||
class java::lang::StringBuffer : public ::java::lang::AbstractStringBuffer
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
@ -27,62 +27,87 @@ public:
|
|||
jint codePointBefore(jint);
|
||||
void getChars(jint, jint, JArray< jchar > *, jint);
|
||||
void setCharAt(jint, jchar);
|
||||
::java::lang::StringBuffer * append(::java::lang::Object *);
|
||||
::java::lang::StringBuffer * append(::java::lang::String *);
|
||||
::java::lang::StringBuffer * append(::java::lang::StringBuffer *);
|
||||
::java::lang::StringBuffer * append(JArray< jchar > *);
|
||||
::java::lang::StringBuffer * append(JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuffer * appendCodePoint(jint);
|
||||
::java::lang::StringBuffer * append(jboolean);
|
||||
::java::lang::StringBuffer * StringBuffer$append(::java::lang::Object *);
|
||||
::java::lang::StringBuffer * StringBuffer$append(::java::lang::String *);
|
||||
::java::lang::StringBuffer * StringBuffer$append(::java::lang::StringBuffer *);
|
||||
::java::lang::StringBuffer * StringBuffer$append(JArray< jchar > *);
|
||||
::java::lang::StringBuffer * StringBuffer$append(JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuffer * StringBuffer$append(jboolean);
|
||||
::java::lang::StringBuffer * StringBuffer$append(jchar);
|
||||
::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *);
|
||||
::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::StringBuffer * append(jint);
|
||||
::java::lang::StringBuffer * append(jlong);
|
||||
::java::lang::StringBuffer * append(jfloat);
|
||||
::java::lang::StringBuffer * append(jdouble);
|
||||
::java::lang::StringBuffer * delete$(jint, jint);
|
||||
::java::lang::StringBuffer * deleteCharAt(jint);
|
||||
::java::lang::StringBuffer * replace(jint, jint, ::java::lang::String *);
|
||||
::java::lang::StringBuffer * StringBuffer$append(jint);
|
||||
::java::lang::StringBuffer * StringBuffer$append(jlong);
|
||||
::java::lang::StringBuffer * StringBuffer$append(jfloat);
|
||||
::java::lang::StringBuffer * StringBuffer$append(jdouble);
|
||||
::java::lang::StringBuffer * StringBuffer$appendCodePoint(jint);
|
||||
::java::lang::StringBuffer * StringBuffer$delete(jint, jint);
|
||||
::java::lang::StringBuffer * StringBuffer$deleteCharAt(jint);
|
||||
::java::lang::StringBuffer * StringBuffer$replace(jint, jint, ::java::lang::String *);
|
||||
::java::lang::String * substring(jint);
|
||||
::java::lang::CharSequence * subSequence(jint, jint);
|
||||
::java::lang::String * substring(jint, jint);
|
||||
::java::lang::StringBuffer * insert(jint, JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuffer * insert(jint, ::java::lang::Object *);
|
||||
::java::lang::StringBuffer * insert(jint, ::java::lang::String *);
|
||||
::java::lang::StringBuffer * insert(jint, ::java::lang::CharSequence *);
|
||||
::java::lang::StringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::StringBuffer * insert(jint, JArray< jchar > *);
|
||||
::java::lang::StringBuffer * insert(jint, jboolean);
|
||||
::java::lang::StringBuffer * insert(jint, jchar);
|
||||
::java::lang::StringBuffer * insert(jint, jint);
|
||||
::java::lang::StringBuffer * insert(jint, jlong);
|
||||
::java::lang::StringBuffer * insert(jint, jfloat);
|
||||
::java::lang::StringBuffer * insert(jint, jdouble);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::Object *);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::String *);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::CharSequence *);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, JArray< jchar > *);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, jboolean);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, jchar);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, jint);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, jlong);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, jfloat);
|
||||
::java::lang::StringBuffer * StringBuffer$insert(jint, jdouble);
|
||||
jint indexOf(::java::lang::String *);
|
||||
jint indexOf(::java::lang::String *, jint);
|
||||
jint lastIndexOf(::java::lang::String *);
|
||||
jint lastIndexOf(::java::lang::String *, jint);
|
||||
::java::lang::StringBuffer * reverse();
|
||||
::java::lang::StringBuffer * StringBuffer$reverse();
|
||||
::java::lang::String * toString();
|
||||
void trimToSize();
|
||||
jint codePointCount(jint, jint);
|
||||
jint offsetByCodePoints(jint, jint);
|
||||
private:
|
||||
public: // actually package-private
|
||||
void ensureCapacity_unsynchronized(jint);
|
||||
jboolean regionMatches(jint, ::java::lang::String *);
|
||||
public:
|
||||
::java::lang::AbstractStringBuffer * reverse();
|
||||
::java::lang::AbstractStringBuffer * deleteCharAt(jint);
|
||||
::java::lang::AbstractStringBuffer * replace(jint, jint, ::java::lang::String *);
|
||||
::java::lang::AbstractStringBuffer * delete$(jint, jint);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jdouble);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jfloat);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jlong);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jint);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jchar);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jboolean);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::String *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::Object *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * append(jdouble);
|
||||
::java::lang::AbstractStringBuffer * append(jfloat);
|
||||
::java::lang::AbstractStringBuffer * append(jlong);
|
||||
::java::lang::AbstractStringBuffer * append(jint);
|
||||
::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::Appendable * append(::java::lang::CharSequence *);
|
||||
::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *);
|
||||
::java::lang::Appendable * append(jchar);
|
||||
::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(jchar);
|
||||
::java::lang::AbstractStringBuffer * append(jboolean);
|
||||
::java::lang::AbstractStringBuffer * append(JArray< jchar > *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * append(JArray< jchar > *);
|
||||
::java::lang::AbstractStringBuffer * append(::java::lang::StringBuffer *);
|
||||
::java::lang::AbstractStringBuffer * append(::java::lang::String *);
|
||||
::java::lang::AbstractStringBuffer * append(::java::lang::Object *);
|
||||
::java::lang::AbstractStringBuffer * appendCodePoint(jint);
|
||||
private:
|
||||
static const jlong serialVersionUID = 3388685877147921107LL;
|
||||
public: // actually package-private
|
||||
jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
|
||||
JArray< jchar > * value;
|
||||
jboolean shared;
|
||||
private:
|
||||
static const jint DEFAULT_CAPACITY = 16;
|
||||
jboolean __attribute__((aligned(__alignof__( ::java::lang::AbstractStringBuffer)))) shared;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* StringBuffer.java -- Growable strings
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
|
@ -73,6 +73,7 @@ import java.io.Serializable;
|
|||
* @status updated to 1.4
|
||||
*/
|
||||
public final class StringBuffer
|
||||
extends AbstractStringBuffer
|
||||
implements Serializable, CharSequence, Appendable
|
||||
{
|
||||
// Implementation note: if you change this class, you usually will
|
||||
|
|
@ -83,23 +84,6 @@ public final class StringBuffer
|
|||
*/
|
||||
private static final long serialVersionUID = 3388685877147921107L;
|
||||
|
||||
/**
|
||||
* 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;
|
||||
|
||||
/**
|
||||
* True if the buffer is shared with another object (StringBuffer or
|
||||
* String); this means the buffer must be copied before writing to it again.
|
||||
|
|
@ -110,17 +94,12 @@ public final class StringBuffer
|
|||
*/
|
||||
boolean shared;
|
||||
|
||||
/**
|
||||
* The default capacity of a buffer.
|
||||
*/
|
||||
private static final int DEFAULT_CAPACITY = 16;
|
||||
|
||||
/**
|
||||
* Create a new StringBuffer with default capacity 16.
|
||||
*/
|
||||
public StringBuffer()
|
||||
{
|
||||
this(DEFAULT_CAPACITY);
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -132,7 +111,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public StringBuffer(int capacity)
|
||||
{
|
||||
value = new char[capacity];
|
||||
super(capacity);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -146,26 +125,22 @@ public final class StringBuffer
|
|||
public StringBuffer(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);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new <code>StringBuffer</code> with the characters from the
|
||||
* Create a new <code>StringBuffer</code> with the characters in the
|
||||
* specified <code>CharSequence</code>. Initial capacity will be the
|
||||
* size of the CharSequence plus 16.
|
||||
* 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 <code>String</code> to convert
|
||||
* @param seq the initializing <code>CharSequence</code>
|
||||
* @throws NullPointerException if str is null
|
||||
* @since 1.5
|
||||
*/
|
||||
public StringBuffer(CharSequence seq)
|
||||
{
|
||||
count = Math.max(0, seq.length());
|
||||
value = new char[count + DEFAULT_CAPACITY];
|
||||
for (int i = 0; i < count; ++i)
|
||||
value[i] = seq.charAt(i);
|
||||
super(seq);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -224,29 +199,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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';
|
||||
}
|
||||
super.setLength(newLength);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -255,12 +208,11 @@ public final class StringBuffer
|
|||
* @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 synchronized char charAt(int index)
|
||||
{
|
||||
if (index < 0 || index >= count)
|
||||
throw new StringIndexOutOfBoundsException(index);
|
||||
return value[index];
|
||||
return super.charAt(index);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -275,7 +227,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized int codePointAt(int index)
|
||||
{
|
||||
return Character.codePointAt(value, index, count);
|
||||
return super.codePointAt(index);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -289,11 +241,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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);
|
||||
return super.codePointBefore(index);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -314,9 +262,7 @@ public final class StringBuffer
|
|||
public synchronized 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);
|
||||
super.getChars(srcOffset, srcEnd, dst, dstOffset);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -329,11 +275,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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;
|
||||
super.setCharAt(index, ch);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -346,9 +288,10 @@ public final class StringBuffer
|
|||
* @see String#valueOf(Object)
|
||||
* @see #append(String)
|
||||
*/
|
||||
public StringBuffer append(Object obj)
|
||||
public synchronized StringBuffer append(Object obj)
|
||||
{
|
||||
return append(obj == null ? "null" : obj.toString());
|
||||
super.append(obj);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -360,12 +303,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer append(String str)
|
||||
{
|
||||
if (str == null)
|
||||
str = "null";
|
||||
int len = str.count;
|
||||
ensureCapacity_unsynchronized(count + len);
|
||||
str.getChars(0, len, value, count);
|
||||
count += len;
|
||||
super.append(str);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -381,15 +319,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer append(StringBuffer stringBuffer)
|
||||
{
|
||||
if (stringBuffer == null)
|
||||
return append("null");
|
||||
synchronized (stringBuffer)
|
||||
{
|
||||
int len = stringBuffer.count;
|
||||
ensureCapacity_unsynchronized(count + len);
|
||||
System.arraycopy(stringBuffer.value, 0, value, count, len);
|
||||
count += len;
|
||||
}
|
||||
super.append(stringBuffer);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -403,9 +333,10 @@ public final class StringBuffer
|
|||
* @throws NullPointerException if <code>str</code> is <code>null</code>
|
||||
* @see #append(char[], int, int)
|
||||
*/
|
||||
public StringBuffer append(char[] data)
|
||||
public synchronized StringBuffer append(char[] data)
|
||||
{
|
||||
return append(data, 0, data.length);
|
||||
super.append(data, 0, data.length);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -424,11 +355,126 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer 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;
|
||||
super.append(data, offset, 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 synchronized StringBuffer append(boolean bool)
|
||||
{
|
||||
super.append(bool);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append the <code>char</code> to this <code>StringBuffer</code>.
|
||||
*
|
||||
* @param ch the <code>char</code> to append
|
||||
* @return this <code>StringBuffer</code>
|
||||
*/
|
||||
public synchronized StringBuffer append(char ch)
|
||||
{
|
||||
super.append(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 synchronized StringBuffer append(CharSequence seq)
|
||||
{
|
||||
super.append(seq, 0, seq.length());
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append some characters from the <code>CharSequence</code> to this
|
||||
* buffer. If the argument is null, the four characters "null" are
|
||||
* appended.
|
||||
*
|
||||
* @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 synchronized StringBuffer append(CharSequence seq, int start, int end)
|
||||
{
|
||||
super.append(seq, start, end);
|
||||
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)
|
||||
*/
|
||||
// This is native in libgcj, for efficiency.
|
||||
public synchronized StringBuffer append(int inum)
|
||||
{
|
||||
super.append(inum);
|
||||
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 lnum the <code>long</code> to convert and append
|
||||
* @return this <code>StringBuffer</code>
|
||||
* @see String#valueOf(long)
|
||||
*/
|
||||
public synchronized StringBuffer append(long lnum)
|
||||
{
|
||||
super.append(lnum);
|
||||
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 fnum the <code>float</code> to convert and append
|
||||
* @return this <code>StringBuffer</code>
|
||||
* @see String#valueOf(float)
|
||||
*/
|
||||
public synchronized StringBuffer append(float fnum)
|
||||
{
|
||||
super.append(fnum);
|
||||
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 dnum the <code>double</code> to convert and append
|
||||
* @return this <code>StringBuffer</code>
|
||||
* @see String#valueOf(double)
|
||||
*/
|
||||
public synchronized StringBuffer append(double dnum)
|
||||
{
|
||||
super.append(dnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -444,133 +490,10 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer appendCodePoint(int code)
|
||||
{
|
||||
int len = Character.charCount(code);
|
||||
ensureCapacity_unsynchronized(count + len);
|
||||
Character.toChars(code, value, count);
|
||||
count += len;
|
||||
super.appendCodePoint(code);
|
||||
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 StringBuffer 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 synchronized StringBuffer append(char ch)
|
||||
{
|
||||
ensureCapacity_unsynchronized(count + 1);
|
||||
value[count++] = ch;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append the <code>CharSequence</code> value of the argument to this
|
||||
* <code>StringBuffer</code>.
|
||||
*
|
||||
* @param seq the <code>CharSequence</code> to append
|
||||
* @return this <code>StringBuffer</code>
|
||||
* @see #append(Object)
|
||||
* @since 1.5
|
||||
*/
|
||||
public synchronized StringBuffer append(CharSequence seq)
|
||||
{
|
||||
if (seq == null)
|
||||
seq = "null";
|
||||
return append(seq, 0, seq.length());
|
||||
}
|
||||
|
||||
/**
|
||||
* Append the specified subsequence of the <code>CharSequence</code>
|
||||
* argument to this <code>StringBuffer</code>.
|
||||
*
|
||||
* @param seq the <code>CharSequence</code> to append
|
||||
* @param start the starting index
|
||||
* @param end one past the ending index
|
||||
* @return this <code>StringBuffer</code>
|
||||
* @see #append(Object)
|
||||
* @since 1.5
|
||||
*/
|
||||
public synchronized StringBuffer append(CharSequence seq, int start, int end)
|
||||
{
|
||||
if (seq == null)
|
||||
seq = "null";
|
||||
if (start < 0 || end < 0 || start > end || end > seq.length())
|
||||
throw new IndexOutOfBoundsException();
|
||||
ensureCapacity_unsynchronized(this.count + end - start);
|
||||
for (int i = start; i < end; ++i)
|
||||
value[count++] = seq.charAt(i);
|
||||
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 StringBuffer 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 StringBuffer 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 StringBuffer 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 StringBuffer append(double dnum)
|
||||
{
|
||||
return append(Double.toString(dnum));
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete characters from this <code>StringBuffer</code>.
|
||||
* <code>delete(10, 12)</code> will delete 10 and 11, but not 12. It is
|
||||
|
|
@ -584,15 +507,8 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer 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_unsynchronized(count);
|
||||
if (count - end != 0)
|
||||
System.arraycopy(value, end, value, start, count - end);
|
||||
count -= end - start;
|
||||
super.delete(start, end);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -604,9 +520,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if index is out of bounds
|
||||
* @since 1.2
|
||||
*/
|
||||
public StringBuffer deleteCharAt(int index)
|
||||
public synchronized StringBuffer deleteCharAt(int index)
|
||||
{
|
||||
return delete(index, index + 1);
|
||||
super.deleteCharAt(index);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -625,19 +542,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer 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;
|
||||
super.replace(start, end, str);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -717,13 +622,7 @@ public final class StringBuffer
|
|||
public synchronized StringBuffer 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;
|
||||
super.insert(offset, str, str_offset, len);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -738,9 +637,10 @@ public final class StringBuffer
|
|||
* @exception StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see String#valueOf(Object)
|
||||
*/
|
||||
public StringBuffer insert(int offset, Object obj)
|
||||
public synchronized StringBuffer insert(int offset, Object obj)
|
||||
{
|
||||
return insert(offset, obj == null ? "null" : obj.toString());
|
||||
super.insert(offset, obj);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -755,15 +655,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer 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;
|
||||
super.insert(offset, str);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -780,9 +672,8 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer insert(int offset, CharSequence sequence)
|
||||
{
|
||||
if (sequence == null)
|
||||
sequence = "null";
|
||||
return insert(offset, sequence, 0, sequence.length());
|
||||
super.insert(offset, sequence);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -802,16 +693,7 @@ public final class StringBuffer
|
|||
public synchronized StringBuffer 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;
|
||||
super.insert(offset, sequence, start, end);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -826,9 +708,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see #insert(int, char[], int, int)
|
||||
*/
|
||||
public StringBuffer insert(int offset, char[] data)
|
||||
public synchronized StringBuffer insert(int offset, char[] data)
|
||||
{
|
||||
return insert(offset, data, 0, data.length);
|
||||
super.insert(offset, data, 0, data.length);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -842,9 +725,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see String#valueOf(boolean)
|
||||
*/
|
||||
public StringBuffer insert(int offset, boolean bool)
|
||||
public synchronized StringBuffer insert(int offset, boolean bool)
|
||||
{
|
||||
return insert(offset, bool ? "true" : "false");
|
||||
super.insert(offset, bool);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -857,12 +741,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer 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++;
|
||||
super.insert(offset, ch);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -877,9 +756,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see String#valueOf(int)
|
||||
*/
|
||||
public StringBuffer insert(int offset, int inum)
|
||||
public synchronized StringBuffer insert(int offset, int inum)
|
||||
{
|
||||
return insert(offset, String.valueOf(inum));
|
||||
super.insert(offset, inum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -893,9 +773,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see String#valueOf(long)
|
||||
*/
|
||||
public StringBuffer insert(int offset, long lnum)
|
||||
public synchronized StringBuffer insert(int offset, long lnum)
|
||||
{
|
||||
return insert(offset, Long.toString(lnum, 10));
|
||||
super.insert(offset, lnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -909,9 +790,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see String#valueOf(float)
|
||||
*/
|
||||
public StringBuffer insert(int offset, float fnum)
|
||||
public synchronized StringBuffer insert(int offset, float fnum)
|
||||
{
|
||||
return insert(offset, Float.toString(fnum));
|
||||
super.insert(offset, fnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -925,9 +807,10 @@ public final class StringBuffer
|
|||
* @throws StringIndexOutOfBoundsException if offset is out of bounds
|
||||
* @see String#valueOf(double)
|
||||
*/
|
||||
public StringBuffer insert(int offset, double dnum)
|
||||
public synchronized StringBuffer insert(int offset, double dnum)
|
||||
{
|
||||
return insert(offset, Double.toString(dnum));
|
||||
super.insert(offset, dnum);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -939,9 +822,9 @@ public final class StringBuffer
|
|||
* @see #indexOf(String, int)
|
||||
* @since 1.4
|
||||
*/
|
||||
public int indexOf(String str)
|
||||
public synchronized int indexOf(String str)
|
||||
{
|
||||
return indexOf(str, 0);
|
||||
return super.indexOf(str, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -958,13 +841,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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;
|
||||
return super.indexOf(str, fromIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -976,9 +853,9 @@ public final class StringBuffer
|
|||
* @see #lastIndexOf(String, int)
|
||||
* @since 1.4
|
||||
*/
|
||||
public int lastIndexOf(String str)
|
||||
public synchronized int lastIndexOf(String str)
|
||||
{
|
||||
return lastIndexOf(str, count - str.count);
|
||||
return super.lastIndexOf(str, count - str.count);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -995,11 +872,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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;
|
||||
return super.lastIndexOf(str, fromIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1010,14 +883,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized StringBuffer 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;
|
||||
}
|
||||
super.reverse();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -1044,19 +910,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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;
|
||||
}
|
||||
super.trimToSize();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1073,31 +927,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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;
|
||||
return super.codePointCount(start, end);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1113,26 +943,7 @@ public final class StringBuffer
|
|||
*/
|
||||
public synchronized 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;
|
||||
return super.offsetByCodePoints(start, codePoints);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1144,7 +955,7 @@ public final class StringBuffer
|
|||
* @param minimumCapacity the minimum capacity
|
||||
* @see #ensureCapacity(int)
|
||||
*/
|
||||
private void ensureCapacity_unsynchronized(int minimumCapacity)
|
||||
void ensureCapacity_unsynchronized(int minimumCapacity)
|
||||
{
|
||||
if (shared || minimumCapacity > value.length)
|
||||
{
|
||||
|
|
@ -1162,19 +973,4 @@ public final class StringBuffer
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
#pragma interface
|
||||
|
||||
#include <java/lang/Object.h>
|
||||
#include <java/lang/AbstractStringBuffer.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
|
||||
class java::lang::StringBuilder : public ::java::lang::Object
|
||||
class java::lang::StringBuilder : public ::java::lang::AbstractStringBuffer
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
@ -20,66 +20,75 @@ public:
|
|||
StringBuilder(::java::lang::CharSequence *);
|
||||
jint length();
|
||||
jint capacity();
|
||||
void ensureCapacity(jint);
|
||||
void setLength(jint);
|
||||
jchar charAt(jint);
|
||||
void getChars(jint, jint, JArray< jchar > *, jint);
|
||||
void setCharAt(jint, jchar);
|
||||
::java::lang::StringBuilder * append(::java::lang::Object *);
|
||||
::java::lang::StringBuilder * append(::java::lang::String *);
|
||||
::java::lang::StringBuilder * append(::java::lang::StringBuffer *);
|
||||
::java::lang::StringBuilder * append(JArray< jchar > *);
|
||||
::java::lang::StringBuilder * append(JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuilder * append(jboolean);
|
||||
::java::lang::StringBuilder * StringBuilder$append(::java::lang::Object *);
|
||||
::java::lang::StringBuilder * StringBuilder$append(::java::lang::String *);
|
||||
::java::lang::StringBuilder * StringBuilder$append(::java::lang::StringBuffer *);
|
||||
::java::lang::StringBuilder * StringBuilder$append(JArray< jchar > *);
|
||||
::java::lang::StringBuilder * StringBuilder$append(JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuilder * StringBuilder$append(jboolean);
|
||||
::java::lang::StringBuilder * StringBuilder$append(jchar);
|
||||
::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *);
|
||||
::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::StringBuilder * appendCodePoint(jint);
|
||||
::java::lang::StringBuilder * append(jint);
|
||||
::java::lang::StringBuilder * append(jlong);
|
||||
::java::lang::StringBuilder * append(jfloat);
|
||||
::java::lang::StringBuilder * append(jdouble);
|
||||
::java::lang::StringBuilder * delete$(jint, jint);
|
||||
::java::lang::StringBuilder * deleteCharAt(jint);
|
||||
::java::lang::StringBuilder * replace(jint, jint, ::java::lang::String *);
|
||||
::java::lang::StringBuilder * StringBuilder$append(jint);
|
||||
::java::lang::StringBuilder * StringBuilder$append(jlong);
|
||||
::java::lang::StringBuilder * StringBuilder$append(jfloat);
|
||||
::java::lang::StringBuilder * StringBuilder$append(jdouble);
|
||||
::java::lang::StringBuilder * StringBuilder$appendCodePoint(jint);
|
||||
::java::lang::StringBuilder * StringBuilder$delete(jint, jint);
|
||||
::java::lang::StringBuilder * StringBuilder$deleteCharAt(jint);
|
||||
::java::lang::StringBuilder * StringBuilder$replace(jint, jint, ::java::lang::String *);
|
||||
::java::lang::String * substring(jint);
|
||||
::java::lang::CharSequence * subSequence(jint, jint);
|
||||
::java::lang::String * substring(jint, jint);
|
||||
::java::lang::StringBuilder * insert(jint, JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuilder * insert(jint, ::java::lang::Object *);
|
||||
::java::lang::StringBuilder * insert(jint, ::java::lang::String *);
|
||||
::java::lang::StringBuilder * insert(jint, ::java::lang::CharSequence *);
|
||||
::java::lang::StringBuilder * insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::StringBuilder * insert(jint, JArray< jchar > *);
|
||||
::java::lang::StringBuilder * insert(jint, jboolean);
|
||||
::java::lang::StringBuilder * insert(jint, jchar);
|
||||
::java::lang::StringBuilder * insert(jint, jint);
|
||||
::java::lang::StringBuilder * insert(jint, jlong);
|
||||
::java::lang::StringBuilder * insert(jint, jfloat);
|
||||
::java::lang::StringBuilder * insert(jint, jdouble);
|
||||
jint indexOf(::java::lang::String *);
|
||||
jint indexOf(::java::lang::String *, jint);
|
||||
jint lastIndexOf(::java::lang::String *);
|
||||
jint lastIndexOf(::java::lang::String *, jint);
|
||||
::java::lang::StringBuilder * reverse();
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, JArray< jchar > *, jint, jint);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::Object *);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::String *);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::CharSequence *);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, JArray< jchar > *);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, jboolean);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, jchar);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, jint);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, jlong);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, jfloat);
|
||||
::java::lang::StringBuilder * StringBuilder$insert(jint, jdouble);
|
||||
::java::lang::StringBuilder * StringBuilder$reverse();
|
||||
::java::lang::String * toString();
|
||||
private:
|
||||
jboolean regionMatches(jint, ::java::lang::String *);
|
||||
public:
|
||||
jint codePointAt(jint);
|
||||
jint codePointBefore(jint);
|
||||
jint codePointCount(jint, jint);
|
||||
void trimToSize();
|
||||
::java::lang::AbstractStringBuffer * reverse();
|
||||
::java::lang::AbstractStringBuffer * deleteCharAt(jint);
|
||||
::java::lang::AbstractStringBuffer * replace(jint, jint, ::java::lang::String *);
|
||||
::java::lang::AbstractStringBuffer * delete$(jint, jint);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jdouble);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jfloat);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jlong);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jint);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jchar);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, jboolean);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::String *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::Object *);
|
||||
::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * append(jdouble);
|
||||
::java::lang::AbstractStringBuffer * append(jfloat);
|
||||
::java::lang::AbstractStringBuffer * append(jlong);
|
||||
::java::lang::AbstractStringBuffer * append(jint);
|
||||
::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *, jint, jint);
|
||||
::java::lang::Appendable * append(::java::lang::CharSequence *);
|
||||
::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *);
|
||||
::java::lang::Appendable * append(jchar);
|
||||
::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(jchar);
|
||||
::java::lang::AbstractStringBuffer * append(jboolean);
|
||||
::java::lang::AbstractStringBuffer * append(JArray< jchar > *, jint, jint);
|
||||
::java::lang::AbstractStringBuffer * append(JArray< jchar > *);
|
||||
::java::lang::AbstractStringBuffer * append(::java::lang::StringBuffer *);
|
||||
::java::lang::AbstractStringBuffer * append(::java::lang::String *);
|
||||
::java::lang::AbstractStringBuffer * append(::java::lang::Object *);
|
||||
::java::lang::AbstractStringBuffer * appendCodePoint(jint);
|
||||
private:
|
||||
static const jlong serialVersionUID = 4383685877147921099LL;
|
||||
public: // actually package-private
|
||||
jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
|
||||
JArray< jchar > * value;
|
||||
private:
|
||||
static const jint DEFAULT_CAPACITY = 16;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* StringBuilder.java -- Unsynchronized growable strings
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
||||
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];
|
||||
System.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();
|
||||
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(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);
|
||||
System.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);
|
||||
System.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;
|
||||
}
|
||||
|
||||
|
|
@ -490,10 +306,11 @@ public final class StringBuilder
|
|||
* @return this <code>StringBuilder</code>
|
||||
* @see String#valueOf(int)
|
||||
*/
|
||||
// FIXME: this is native in libgcj in StringBuffer.
|
||||
// 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)
|
||||
System.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)
|
||||
System.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);
|
||||
System.arraycopy(value, offset, value, offset + len, count - offset);
|
||||
System.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);
|
||||
System.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);
|
||||
System.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);
|
||||
System.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,80 +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)
|
||||
*/
|
||||
// GCJ LOCAL: Native to access String internals properly.
|
||||
private native boolean regionMatches(int toffset, String other);
|
||||
|
||||
/**
|
||||
* 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];
|
||||
System.arraycopy(value, 0, newValue, 0, count);
|
||||
value = newValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,13 +18,6 @@ extern "Java"
|
|||
class RawData;
|
||||
class RawDataManaged;
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace util
|
||||
{
|
||||
class WeakIdentityHashMap;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -100,7 +93,7 @@ private:
|
|||
void initialize_native();
|
||||
static ::java::lang::String * gen_name();
|
||||
public: // actually package-private
|
||||
static ::java::util::Map * getThreadLocals();
|
||||
static ::java::lang::ThreadLocalMap * getThreadLocals();
|
||||
public:
|
||||
virtual void setUncaughtExceptionHandler(::java::lang::Thread$UncaughtExceptionHandler *);
|
||||
virtual ::java::lang::Thread$UncaughtExceptionHandler * getUncaughtExceptionHandler();
|
||||
|
|
@ -135,7 +128,7 @@ private:
|
|||
static jlong totalThreadsCreated;
|
||||
static ::java::lang::Thread$UncaughtExceptionHandler * defaultHandler;
|
||||
public: // actually package-private
|
||||
::gnu::java::util::WeakIdentityHashMap * locals;
|
||||
::java::lang::ThreadLocalMap * locals;
|
||||
::java::lang::Thread$UncaughtExceptionHandler * exceptionHandler;
|
||||
private:
|
||||
::java::lang::Object * parkBlocker;
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ public class Thread implements Runnable
|
|||
/** Thread local storage. Package accessible for use by
|
||||
* InheritableThreadLocal.
|
||||
*/
|
||||
WeakIdentityHashMap locals;
|
||||
ThreadLocalMap locals;
|
||||
|
||||
/** The uncaught exception handler. */
|
||||
UncaughtExceptionHandler exceptionHandler;
|
||||
|
|
@ -431,6 +431,12 @@ public class Thread implements Runnable
|
|||
this.threadId = nextThreadId++;
|
||||
}
|
||||
|
||||
// Always create the ThreadLocalMap when creating a thread; the
|
||||
// previous code did this lazily when getThreadLocals was called,
|
||||
// but this is a divergence from Classpath's implementation of
|
||||
// ThreadLocal.
|
||||
this.locals = new ThreadLocalMap();
|
||||
|
||||
if (current != null)
|
||||
{
|
||||
group.checkAccess();
|
||||
|
|
@ -1019,14 +1025,11 @@ public class Thread implements Runnable
|
|||
/**
|
||||
* Returns the map used by ThreadLocal to store the thread local values.
|
||||
*/
|
||||
static Map getThreadLocals()
|
||||
static ThreadLocalMap getThreadLocals()
|
||||
{
|
||||
Thread thread = currentThread();
|
||||
Map locals = thread.locals;
|
||||
if (locals == null)
|
||||
{
|
||||
locals = thread.locals = new WeakIdentityHashMap();
|
||||
}
|
||||
ThreadLocalMap locals = thread.locals;
|
||||
|
||||
return locals;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ extern "Java"
|
|||
class java::lang::ThreadLocal : public ::java::lang::Object
|
||||
{
|
||||
|
||||
jint computeNextHash();
|
||||
public:
|
||||
ThreadLocal();
|
||||
public: // actually protected
|
||||
|
|
@ -44,7 +45,11 @@ private:
|
|||
public: // actually package-private
|
||||
static ::java::lang::Object * sentinel;
|
||||
private:
|
||||
::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) TLSPointer;
|
||||
static jint nextHashBase;
|
||||
public: // actually package-private
|
||||
jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) fastHash;
|
||||
private:
|
||||
::gnu::gcj::RawData * TLSPointer;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -95,12 +95,31 @@ public class ThreadLocal<T>
|
|||
*/
|
||||
static final Object sentinel = new Object();
|
||||
|
||||
/**
|
||||
* The base for the computation of the next hash for a thread local.
|
||||
*/
|
||||
private static int nextHashBase = 1;
|
||||
|
||||
/**
|
||||
* Allocate a new hash.
|
||||
*/
|
||||
private synchronized int computeNextHash()
|
||||
{
|
||||
return nextHashBase++ * 6709;
|
||||
}
|
||||
|
||||
/**
|
||||
* Hash code computed for ThreadLocalMap
|
||||
*/
|
||||
final int fastHash;
|
||||
|
||||
/**
|
||||
* Creates a ThreadLocal object without associating any value to it yet.
|
||||
*/
|
||||
public ThreadLocal()
|
||||
{
|
||||
constructNative();
|
||||
fastHash = computeNextHash();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -128,16 +147,16 @@ public class ThreadLocal<T>
|
|||
|
||||
private final Object internalGet()
|
||||
{
|
||||
Map<ThreadLocal<T>,T> map = (Map<ThreadLocal<T>,T>) Thread.getThreadLocals();
|
||||
ThreadLocalMap map = Thread.getThreadLocals();
|
||||
// Note that we don't have to synchronize, as only this thread will
|
||||
// ever modify the map.
|
||||
T value = map.get(this);
|
||||
if (value == null)
|
||||
T value = (T) map.get(this);
|
||||
if (value == sentinel)
|
||||
{
|
||||
value = initialValue();
|
||||
map.put(this, (T) (value == null ? sentinel : value));
|
||||
map.set(this, value);
|
||||
}
|
||||
return value == (T) sentinel ? null : value;
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -152,10 +171,10 @@ public class ThreadLocal<T>
|
|||
|
||||
private final void internalSet(Object value)
|
||||
{
|
||||
Map map = Thread.getThreadLocals();
|
||||
ThreadLocalMap map = Thread.getThreadLocals();
|
||||
// Note that we don't have to synchronize, as only this thread will
|
||||
// ever modify the map.
|
||||
map.put(this, value == null ? sentinel : value);
|
||||
map.set(this, value);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -167,7 +186,7 @@ public class ThreadLocal<T>
|
|||
|
||||
private final void internalRemove()
|
||||
{
|
||||
Map map = Thread.getThreadLocals();
|
||||
ThreadLocalMap map = Thread.getThreadLocals();
|
||||
map.remove(this);
|
||||
}
|
||||
|
||||
|
|
|
|||
21
libjava/java/lang/ThreadLocalMap$Entry.h
Normal file
21
libjava/java/lang/ThreadLocalMap$Entry.h
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
|
||||
// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
|
||||
|
||||
#ifndef __java_lang_ThreadLocalMap$Entry__
|
||||
#define __java_lang_ThreadLocalMap$Entry__
|
||||
|
||||
#pragma interface
|
||||
|
||||
#include <java/lang/ref/WeakReference.h>
|
||||
|
||||
class java::lang::ThreadLocalMap$Entry : public ::java::lang::ref::WeakReference
|
||||
{
|
||||
|
||||
public: // actually package-private
|
||||
ThreadLocalMap$Entry(::java::lang::ThreadLocal *);
|
||||
::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) value;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
||||
#endif // __java_lang_ThreadLocalMap$Entry__
|
||||
41
libjava/java/lang/ThreadLocalMap.h
Normal file
41
libjava/java/lang/ThreadLocalMap.h
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
|
||||
// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
|
||||
|
||||
#ifndef __java_lang_ThreadLocalMap__
|
||||
#define __java_lang_ThreadLocalMap__
|
||||
|
||||
#pragma interface
|
||||
|
||||
#include <java/lang/Object.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
|
||||
class java::lang::ThreadLocalMap : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public: // actually package-private
|
||||
ThreadLocalMap();
|
||||
private:
|
||||
void newEntryArray(jint);
|
||||
void overflow();
|
||||
public:
|
||||
::java::lang::Object * get(::java::lang::ThreadLocal *);
|
||||
void set(::java::lang::ThreadLocal *, ::java::lang::Object *);
|
||||
void remove(::java::lang::ThreadLocal *);
|
||||
public: // actually package-private
|
||||
void clear();
|
||||
public:
|
||||
void inherit(::java::lang::ThreadLocalMap *);
|
||||
private:
|
||||
static const jint LOG_INITIAL_SIZE = 3;
|
||||
static jfloat MAX_OCCUPANCY;
|
||||
static jfloat TARGET_OCCUPANCY;
|
||||
static ::java::lang::ThreadLocalMap$Entry * deletedEntry;
|
||||
JArray< ::java::lang::ThreadLocalMap$Entry * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
|
||||
jint hashMask;
|
||||
jint count;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
||||
#endif // __java_lang_ThreadLocalMap__
|
||||
|
|
@ -9,6 +9,19 @@
|
|||
#include <java/lang/Object.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class java::lang::Throwable : public ::java::lang::Object
|
||||
{
|
||||
|
|
@ -28,7 +41,7 @@ public:
|
|||
virtual void printStackTrace(::java::io::PrintWriter *);
|
||||
private:
|
||||
::java::lang::String * stackTraceString();
|
||||
static void stackTraceStringBuffer(::java::lang::StringBuilder *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint);
|
||||
static void stackTraceStringBuffer(::gnu::java::lang::CPStringBuilder *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint);
|
||||
public:
|
||||
virtual ::java::lang::Throwable * fillInStackTrace();
|
||||
virtual JArray< ::java::lang::StackTraceElement * > * getStackTrace();
|
||||
|
|
|
|||
|
|
@ -10,15 +10,14 @@ details. */
|
|||
|
||||
#include <config.h>
|
||||
#include <gcj/cni.h>
|
||||
#include <java/lang/StringBuffer.h>
|
||||
#include <java/lang/AbstractStringBuffer.h>
|
||||
|
||||
java::lang::StringBuffer*
|
||||
java::lang::StringBuffer::append (jint num)
|
||||
java::lang::AbstractStringBuffer*
|
||||
java::lang::AbstractStringBuffer::append (jint num)
|
||||
{
|
||||
// Use an array large enough for "-2147483648"; i.e. 11 chars.
|
||||
jchar buffer[11];
|
||||
int i = _Jv_FormatInt (buffer+11, num);
|
||||
JvSynchronize dummy (this);
|
||||
jint needed = count + i;
|
||||
ensureCapacity_unsynchronized (needed);
|
||||
jchar* dst = elements (value) + count;
|
||||
|
|
@ -30,7 +29,7 @@ java::lang::StringBuffer::append (jint num)
|
|||
}
|
||||
|
||||
jboolean
|
||||
java::lang::StringBuffer::regionMatches(jint toffset, jstring other)
|
||||
java::lang::AbstractStringBuffer::regionMatches(jint toffset, jstring other)
|
||||
{
|
||||
jint len = other->count;
|
||||
jchar *tptr = elements(value) + toffset;
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
// Native methods for StringBuilder.
|
||||
|
||||
/* Copyright (C) 2005 Free Software Foundation
|
||||
|
||||
This file is part of libgcj.
|
||||
|
||||
This software is copyrighted work licensed under the terms of the
|
||||
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
||||
details. */
|
||||
|
||||
#include <config.h>
|
||||
#include <gcj/cni.h>
|
||||
#include <java/lang/StringBuilder.h>
|
||||
#include <java/lang/String.h>
|
||||
|
||||
jboolean
|
||||
java::lang::StringBuilder::regionMatches(jint offset, jstring other)
|
||||
{
|
||||
int len = other->count;
|
||||
int index = 0;
|
||||
jchar *sc = elements (value);
|
||||
jchar *oc = _Jv_GetStringChars (other);
|
||||
while (--len >= 0)
|
||||
{
|
||||
if (sc[offset++] != oc[index++])
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -11,6 +11,20 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
namespace math
|
||||
{
|
||||
class GMP;
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace math
|
||||
|
|
@ -38,6 +52,7 @@ public:
|
|||
static ::java::math::BigInteger * probablePrime(jint, ::java::util::Random *);
|
||||
static ::java::math::BigInteger * valueOf(jlong);
|
||||
private:
|
||||
static jboolean initializeLibrary();
|
||||
static ::java::math::BigInteger * make(JArray< jint > *, jint);
|
||||
static JArray< jint > * byteArrayToIntArray(JArray< jbyte > *, jint);
|
||||
static ::java::math::BigInteger * alloc(jint);
|
||||
|
|
@ -102,7 +117,7 @@ public:
|
|||
virtual ::java::math::BigInteger * shiftLeft(jint);
|
||||
virtual ::java::math::BigInteger * shiftRight(jint);
|
||||
private:
|
||||
void format(jint, ::java::lang::StringBuffer *);
|
||||
void format(jint, ::gnu::java::lang::CPStringBuilder *);
|
||||
public:
|
||||
virtual ::java::lang::String * toString();
|
||||
virtual ::java::lang::String * toString(jint);
|
||||
|
|
@ -114,7 +129,6 @@ private:
|
|||
public:
|
||||
virtual jboolean equals(::java::lang::Object *);
|
||||
private:
|
||||
static ::java::math::BigInteger * valueOf(::java::lang::String *, jint);
|
||||
static ::java::math::BigInteger * valueOf(JArray< jbyte > *, jint, jboolean, jint);
|
||||
public:
|
||||
virtual jdouble doubleValue();
|
||||
|
|
@ -162,11 +176,11 @@ private:
|
|||
public:
|
||||
virtual jint compareTo(::java::lang::Object *);
|
||||
private:
|
||||
static ::java::util::logging::Logger * log;
|
||||
jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) ival;
|
||||
JArray< jint > * words;
|
||||
jint bitCount__;
|
||||
jint bitLength__;
|
||||
jint firstNonzeroByteNum;
|
||||
jint lowestSetBit;
|
||||
JArray< jbyte > * magnitude;
|
||||
jint signum__;
|
||||
|
|
@ -175,6 +189,8 @@ private:
|
|||
static const jint maxFixNum = 1024;
|
||||
static const jint numFixNum = 1125;
|
||||
static JArray< ::java::math::BigInteger * > * smallFixNums;
|
||||
::gnu::java::math::GMP * mpz;
|
||||
static jboolean USING_NATIVE;
|
||||
public:
|
||||
static ::java::math::BigInteger * ZERO;
|
||||
static ::java::math::BigInteger * ONE;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,16 @@
|
|||
#include <java/lang/Object.h>
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace net
|
||||
|
|
@ -44,7 +54,7 @@ public:
|
|||
::java::net::URI * normalize();
|
||||
private:
|
||||
::java::lang::String * normalizePath(::java::lang::String *);
|
||||
void removeLastSegment(::java::lang::StringBuilder *);
|
||||
void removeLastSegment(::gnu::java::lang::CPStringBuilder *);
|
||||
public:
|
||||
::java::net::URI * resolve(::java::net::URI *);
|
||||
::java::net::URI * resolve(::java::lang::String *);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class java::nio::Buffer : public ::java::lang::Object
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
Buffer(jint, jint, jint, jint);
|
||||
Buffer(jint, jint, jint, jint, ::gnu::gcj::RawData *);
|
||||
public:
|
||||
virtual jint capacity();
|
||||
virtual ::java::nio::Buffer * clear();
|
||||
|
|
@ -52,7 +52,9 @@ public: // actually package-private
|
|||
virtual void checkIndex(jint);
|
||||
virtual void checkIfReadOnly();
|
||||
static void checkArraySize(jint, jint, jint);
|
||||
private:
|
||||
jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) cap;
|
||||
public: // actually package-private
|
||||
jint limit__;
|
||||
jint pos;
|
||||
jint mark__;
|
||||
|
|
|
|||
|
|
@ -45,22 +45,24 @@ import gnu.gcj.RawData;
|
|||
*/
|
||||
public abstract class Buffer
|
||||
{
|
||||
int cap = 0;
|
||||
int limit = 0;
|
||||
int pos = 0;
|
||||
int mark = -1;
|
||||
RawData address;
|
||||
private final int cap;
|
||||
int limit;
|
||||
int pos;
|
||||
int mark;
|
||||
final RawData address;
|
||||
|
||||
/**
|
||||
* Creates a new Buffer.
|
||||
*
|
||||
* Should be package private.
|
||||
*/
|
||||
Buffer (int capacity, int limit, int position, int mark)
|
||||
Buffer (int capacity, int limit, int position, int mark,
|
||||
RawData address)
|
||||
{
|
||||
if (capacity < 0)
|
||||
throw new IllegalArgumentException ();
|
||||
|
||||
this.address = address;
|
||||
cap = capacity;
|
||||
limit (limit);
|
||||
position (position);
|
||||
|
|
@ -72,6 +74,10 @@ public abstract class Buffer
|
|||
|
||||
this.mark = mark;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.mark = -1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -31,7 +38,7 @@ class java::nio::ByteBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
ByteBuffer(jint, jint, jint, jint);
|
||||
ByteBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jbyte > *, jint);
|
||||
public:
|
||||
static ::java::nio::ByteBuffer * allocateDirect(jint);
|
||||
static ::java::nio::ByteBuffer * allocate(jint);
|
||||
|
|
@ -96,8 +103,8 @@ public:
|
|||
virtual jint compareTo(::java::lang::Object *);
|
||||
public: // actually package-private
|
||||
::java::nio::ByteOrder * __attribute__((aligned(__alignof__( ::java::nio::Buffer)))) endian;
|
||||
jint array_offset;
|
||||
JArray< jbyte > * backing_buffer;
|
||||
jint array_offset;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -25,7 +32,7 @@ class java::nio::CharBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
CharBuffer(jint, jint, jint, jint);
|
||||
CharBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jchar > *, jint);
|
||||
public:
|
||||
static ::java::nio::CharBuffer * allocate(jint);
|
||||
static ::java::nio::CharBuffer * wrap(JArray< jchar > *, jint, jint);
|
||||
|
|
|
|||
|
|
@ -109,25 +109,23 @@ abstract class DirectByteBufferImpl extends ByteBuffer
|
|||
|
||||
DirectByteBufferImpl(int capacity)
|
||||
{
|
||||
super(capacity, capacity, 0, -1);
|
||||
super(capacity, capacity, 0, -1,
|
||||
VMDirectByteBuffer.allocate(capacity), null, 0);
|
||||
this.owner = this;
|
||||
this.address = VMDirectByteBuffer.allocate(capacity);
|
||||
}
|
||||
|
||||
DirectByteBufferImpl(RawData address, int capacity)
|
||||
{
|
||||
super(capacity, capacity, 0, -1);
|
||||
super(capacity, capacity, 0, -1, address, null, 0);
|
||||
this.owner = null;
|
||||
this.address = address;
|
||||
}
|
||||
|
||||
DirectByteBufferImpl(Object owner, RawData address,
|
||||
int capacity, int limit,
|
||||
int position)
|
||||
{
|
||||
super(capacity, limit, position, -1);
|
||||
super(capacity, limit, position, -1, address, null, 0);
|
||||
this.owner = owner;
|
||||
this.address = address;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -25,7 +32,7 @@ class java::nio::DoubleBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
DoubleBuffer(jint, jint, jint, jint);
|
||||
DoubleBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jdouble > *, jint);
|
||||
public:
|
||||
static ::java::nio::DoubleBuffer * allocate(jint);
|
||||
static ::java::nio::DoubleBuffer * wrap(JArray< jdouble > *, jint, jint);
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -25,7 +32,7 @@ class java::nio::FloatBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
FloatBuffer(jint, jint, jint, jint);
|
||||
FloatBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jfloat > *, jint);
|
||||
public:
|
||||
static ::java::nio::FloatBuffer * allocate(jint);
|
||||
static ::java::nio::FloatBuffer * wrap(JArray< jfloat > *, jint, jint);
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -25,7 +32,7 @@ class java::nio::IntBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
IntBuffer(jint, jint, jint, jint);
|
||||
IntBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jint > *, jint);
|
||||
public:
|
||||
static ::java::nio::IntBuffer * allocate(jint);
|
||||
static ::java::nio::IntBuffer * wrap(JArray< jint > *, jint, jint);
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -25,7 +32,7 @@ class java::nio::LongBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
LongBuffer(jint, jint, jint, jint);
|
||||
LongBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jlong > *, jint);
|
||||
public:
|
||||
static ::java::nio::LongBuffer * allocate(jint);
|
||||
static ::java::nio::LongBuffer * wrap(JArray< jlong > *, jint, jint);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,13 @@
|
|||
#include <java/nio/ByteBuffer.h>
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -22,7 +29,7 @@ class java::nio::MappedByteBuffer : public ::java::nio::ByteBuffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
MappedByteBuffer(jint, jint, jint, jint);
|
||||
MappedByteBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *);
|
||||
virtual void forceImpl();
|
||||
public:
|
||||
virtual ::java::nio::MappedByteBuffer * force();
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ public: // actually package-private
|
|||
jboolean isLoadedImpl();
|
||||
void loadImpl();
|
||||
void forceImpl();
|
||||
private:
|
||||
jboolean __attribute__((aligned(__alignof__( ::java::nio::MappedByteBuffer)))) readOnly;
|
||||
public:
|
||||
::gnu::gcj::RawData * implPtr;
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ import java.io.IOException;
|
|||
|
||||
final class MappedByteBufferImpl extends MappedByteBuffer
|
||||
{
|
||||
boolean readOnly;
|
||||
private final boolean readOnly;
|
||||
|
||||
/** Posix uses this for the pointer returned by mmap;
|
||||
* Win32 uses it for the pointer returned by MapViewOfFile. */
|
||||
|
|
@ -56,8 +56,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer
|
|||
public MappedByteBufferImpl(RawData address, int size, boolean readOnly)
|
||||
throws IOException
|
||||
{
|
||||
super(size, size, 0, -1);
|
||||
this.address = address;
|
||||
super(size, size, 0, -1, address);
|
||||
this.readOnly = readOnly;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace gcj
|
||||
{
|
||||
class RawData;
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace nio
|
||||
|
|
@ -25,7 +32,7 @@ class java::nio::ShortBuffer : public ::java::nio::Buffer
|
|||
{
|
||||
|
||||
public: // actually package-private
|
||||
ShortBuffer(jint, jint, jint, jint);
|
||||
ShortBuffer(jint, jint, jint, jint, ::gnu::gcj::RawData *, JArray< jshort > *, jint);
|
||||
public:
|
||||
static ::java::nio::ShortBuffer * allocate(jint);
|
||||
static ::java::nio::ShortBuffer * wrap(JArray< jshort > *, jint, jint);
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
static jboolean unexportObject(::java::rmi::Remote *, jboolean);
|
||||
public: // actually package-private
|
||||
static ::java::rmi::Remote * exportObject(::java::rmi::Remote *, jint, ::java::rmi::server::RMIServerSocketFactory *);
|
||||
public:
|
||||
private:
|
||||
static ::java::rmi::Remote * export$(::java::rmi::activation::ActivationID *, ::java::rmi::Remote *, jint, ::java::rmi::server::RMIServerSocketFactory *);
|
||||
static ::java::rmi::server::ObjID * makeId(::java::rmi::activation::ActivationID *);
|
||||
public: // actually package-private
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public:
|
|||
virtual jboolean equals(::java::lang::Object *);
|
||||
virtual jboolean equals(::java::sql::Timestamp *);
|
||||
virtual jint compareTo(::java::sql::Timestamp *);
|
||||
virtual jint Timestamp$compareTo(::java::util::Date *);
|
||||
virtual jint Date$compareTo(::java::util::Date *);
|
||||
public: // actually package-private
|
||||
static const jlong serialVersionUID = 2745179027874758501LL;
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -11,6 +11,16 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace text
|
||||
|
|
@ -41,7 +51,7 @@ public:
|
|||
static jdouble previousDouble(jdouble);
|
||||
virtual void setChoices(JArray< jdouble > *, JArray< ::java::lang::String * > *);
|
||||
private:
|
||||
void quoteString(::java::lang::StringBuffer *, ::java::lang::String *);
|
||||
void quoteString(::gnu::java::lang::CPStringBuilder *, ::java::lang::String *);
|
||||
public:
|
||||
virtual ::java::lang::String * toPattern();
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -54,12 +54,6 @@ public:
|
|||
static ::java::text::DateFormat$Field * HOUR1;
|
||||
static ::java::text::DateFormat$Field * HOUR0;
|
||||
static ::java::text::DateFormat$Field * TIME_ZONE;
|
||||
static ::java::text::DateFormat$Field * ISO_YEAR;
|
||||
static ::java::text::DateFormat$Field * LOCALIZED_DAY_OF_WEEK;
|
||||
static ::java::text::DateFormat$Field * EXTENDED_YEAR;
|
||||
static ::java::text::DateFormat$Field * MODIFIED_JULIAN_DAY;
|
||||
static ::java::text::DateFormat$Field * MILLISECOND_IN_DAY;
|
||||
static ::java::text::DateFormat$Field * RFC822_TIME_ZONE;
|
||||
public: // actually package-private
|
||||
static JArray< ::java::text::DateFormat$Field * > * allFields;
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -91,12 +91,6 @@ public:
|
|||
static const jint HOUR1_FIELD = 15;
|
||||
static const jint HOUR0_FIELD = 16;
|
||||
static const jint TIMEZONE_FIELD = 17;
|
||||
static const jint ISO_YEAR_FIELD = 18;
|
||||
static const jint LOCALIZED_DAY_OF_WEEK_FIELD = 19;
|
||||
static const jint EXTENDED_YEAR_FIELD = 20;
|
||||
static const jint MODIFIED_JULIAN_DAY_FIELD = 21;
|
||||
static const jint MILLISECOND_IN_DAY_FIELD = 22;
|
||||
static const jint RFC822_TIMEZONE_FIELD = 23;
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ public: // actually package-private
|
|||
JArray< ::java::lang::String * > * shortWeekdays;
|
||||
JArray< ::java::lang::String * > * weekdays;
|
||||
private:
|
||||
static ::java::util::Properties * properties;
|
||||
JArray< JArray< ::java::lang::String * > * > * runtimeZoneStrings;
|
||||
JArray< JArray< ::java::lang::String * > * > * zoneStrings;
|
||||
static const jlong serialVersionUID = -5987973545549424702LL;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,16 @@
|
|||
#include <java/text/NumberFormat.h>
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace math
|
||||
|
|
@ -73,7 +83,7 @@ public:
|
|||
private:
|
||||
jboolean equals(::java::lang::String *, ::java::lang::String *);
|
||||
::java::lang::String * patternChars(::java::text::DecimalFormatSymbols *);
|
||||
::java::lang::StringBuffer * quoteFix(::java::lang::String *, ::java::lang::String *);
|
||||
::gnu::java::lang::CPStringBuilder * quoteFix(::java::lang::String *, ::java::lang::String *);
|
||||
::java::lang::String * computePattern(::java::text::DecimalFormatSymbols *);
|
||||
void applyPatternWithSymbols(::java::lang::String *, ::java::text::DecimalFormatSymbols *);
|
||||
jint scanFix(::java::lang::String *, ::java::text::DecimalFormatSymbols *, jint, jboolean);
|
||||
|
|
|
|||
|
|
@ -24,8 +24,9 @@ extern "Java"
|
|||
class java::text::Format : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public:
|
||||
public: // actually protected
|
||||
Format();
|
||||
public:
|
||||
virtual ::java::lang::String * format(::java::lang::Object *);
|
||||
virtual ::java::lang::StringBuffer * format(::java::lang::Object *, ::java::lang::StringBuffer *, ::java::text::FieldPosition *) = 0;
|
||||
virtual ::java::lang::Object * parseObject(::java::lang::String *);
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ extern "Java"
|
|||
class java::text::MessageFormat : public ::java::text::Format
|
||||
{
|
||||
|
||||
static jint scanString(::java::lang::String *, jint, ::java::lang::StringBuffer *);
|
||||
static jint scanFormatElement(::java::lang::String *, jint, ::java::lang::StringBuffer *, jchar);
|
||||
static jint scanFormat(::java::lang::String *, jint, ::java::lang::StringBuffer *, ::java::util::Vector *, ::java::util::Locale *);
|
||||
static jint scanString(::java::lang::String *, jint, ::java::lang::StringBuilder *);
|
||||
static jint scanFormatElement(::java::lang::String *, jint, ::java::lang::StringBuilder *, jchar);
|
||||
static jint scanFormat(::java::lang::String *, jint, ::java::lang::StringBuilder *, ::java::util::Vector *, ::java::util::Locale *);
|
||||
public:
|
||||
virtual void applyPattern(::java::lang::String *);
|
||||
virtual ::java::lang::Object * clone();
|
||||
|
|
|
|||
|
|
@ -52,7 +52,9 @@ public:
|
|||
virtual jint hashCode();
|
||||
virtual jboolean isGroupingUsed();
|
||||
virtual jboolean isParseIntegerOnly();
|
||||
public: // actually protected
|
||||
NumberFormat();
|
||||
public:
|
||||
virtual ::java::lang::Number * parse(::java::lang::String *, ::java::text::ParsePosition *) = 0;
|
||||
virtual ::java::lang::Number * parse(::java::lang::String *);
|
||||
virtual ::java::lang::Object * parseObject(::java::lang::String *, ::java::text::ParsePosition *);
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ private:
|
|||
jint serialVersionOnStream;
|
||||
static const jlong serialVersionUID = 4774881970558875024LL;
|
||||
static ::java::lang::String * standardChars;
|
||||
static const jint RFC822_TIMEZONE_FIELD = 18;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ public: // actually protected
|
|||
private:
|
||||
void checkBoundInclusive(jint);
|
||||
void checkBoundExclusive(jint);
|
||||
void raiseBoundsError(jint);
|
||||
public: // actually package-private
|
||||
virtual jboolean removeAllInternal(::java::util::Collection *);
|
||||
virtual jboolean retainAllInternal(::java::util::Collection *);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,19 @@
|
|||
#include <java/lang/Object.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class java::util::Arrays : public ::java::lang::Object
|
||||
{
|
||||
|
|
@ -144,7 +157,7 @@ public:
|
|||
static ::java::lang::String * toString(JArray< jdouble > *);
|
||||
static ::java::lang::String * toString(JArray< ::java::lang::Object * > *);
|
||||
private:
|
||||
static void deepToString(JArray< ::java::lang::Object * > *, ::java::lang::StringBuilder *, ::java::util::HashSet *);
|
||||
static void deepToString(JArray< ::java::lang::Object * > *, ::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *);
|
||||
public:
|
||||
static ::java::lang::String * deepToString(JArray< ::java::lang::Object * > *);
|
||||
static JArray< jboolean > * copyOf(JArray< jboolean > *, jint);
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ public: // actually package-private
|
|||
static const jlong serialVersionUID = -1807547505821590642LL;
|
||||
private:
|
||||
static ::java::lang::String * bundleName;
|
||||
static ::java::util::Properties * properties;
|
||||
static ::java::util::HashMap * cache;
|
||||
static JArray< ::java::lang::Class * > * ctorArgTypes;
|
||||
static JArray< ::java::lang::String * > * fieldNames;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,16 @@
|
|||
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace text
|
||||
|
|
@ -44,7 +54,7 @@ private:
|
|||
::java::lang::String * getName(jint);
|
||||
void checkFlags(jint, jint, jchar);
|
||||
void noPrecision(jint);
|
||||
void applyLocalization(::java::lang::StringBuilder *, jint, jint, jboolean);
|
||||
void applyLocalization(::gnu::java::lang::CPStringBuilder *, jint, jint, jboolean);
|
||||
void genericFormat(::java::lang::String *, jint, jint, jint);
|
||||
void booleanFormat(::java::lang::Object *, jint, jint, jint, jchar);
|
||||
void hashCodeFormat(::java::lang::Object *, jint, jint, jint, jchar);
|
||||
|
|
@ -52,10 +62,10 @@ private:
|
|||
void characterFormat(::java::lang::Object *, jint, jint, jint, jchar);
|
||||
void percentFormat(jint, jint, jint);
|
||||
void newLineFormat(jint, jint, jint);
|
||||
::java::lang::StringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar);
|
||||
::gnu::java::lang::CPStringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar);
|
||||
void hexOrOctalConversion(::java::lang::Object *, jint, jint, jint, jint, jchar);
|
||||
void decimalConversion(::java::lang::Object *, jint, jint, jint, jchar);
|
||||
void singleDateTimeConversion(::java::lang::StringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *);
|
||||
void singleDateTimeConversion(::gnu::java::lang::CPStringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *);
|
||||
void dateTimeConversion(::java::lang::Object *, jint, jint, jint, jchar, jchar);
|
||||
void advance();
|
||||
jint parseInt();
|
||||
|
|
|
|||
|
|
@ -7,6 +7,19 @@
|
|||
#pragma interface
|
||||
|
||||
#include <java/util/Hashtable.h>
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class java::util::Properties : public ::java::util::Hashtable
|
||||
{
|
||||
|
|
@ -15,6 +28,7 @@ public:
|
|||
Properties();
|
||||
Properties(::java::util::Properties *);
|
||||
virtual ::java::lang::Object * setProperty(::java::lang::String *, ::java::lang::String *);
|
||||
virtual void load(::java::io::Reader *);
|
||||
virtual void load(::java::io::InputStream *);
|
||||
virtual void save(::java::io::OutputStream *, ::java::lang::String *);
|
||||
virtual void store(::java::io::OutputStream *, ::java::lang::String *);
|
||||
|
|
@ -24,7 +38,7 @@ public:
|
|||
virtual void list(::java::io::PrintStream *);
|
||||
virtual void list(::java::io::PrintWriter *);
|
||||
private:
|
||||
void formatForOutput(::java::lang::String *, ::java::lang::StringBuilder *, jboolean);
|
||||
void formatForOutput(::java::lang::String *, ::gnu::java::lang::CPStringBuilder *, jboolean);
|
||||
public:
|
||||
virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *);
|
||||
virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *, ::java::lang::String *);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ class java::util::PropertyResourceBundle : public ::java::util::ResourceBundle
|
|||
|
||||
public:
|
||||
PropertyResourceBundle(::java::io::InputStream *);
|
||||
PropertyResourceBundle(::java::io::Reader *);
|
||||
virtual ::java::lang::Object * handleGetObject(::java::lang::String *);
|
||||
virtual ::java::util::Enumeration * getKeys();
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ public: // actually package-private
|
|||
public:
|
||||
virtual jint hashCode();
|
||||
virtual jboolean equals(::java::lang::Object *);
|
||||
virtual ::java::lang::String * toString();
|
||||
public: // actually package-private
|
||||
::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultLocale;
|
||||
::java::lang::String * baseName;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@ public:
|
|||
private:
|
||||
static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::lang::ClassLoader *);
|
||||
static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *, jboolean);
|
||||
public:
|
||||
static void clearCache();
|
||||
static void clearCache(::java::lang::ClassLoader *);
|
||||
private:
|
||||
static const jint CACHE_SIZE = 100;
|
||||
public: // actually protected
|
||||
::java::util::ResourceBundle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent;
|
||||
|
|
|
|||
178
libjava/java/util/Scanner.h
Normal file
178
libjava/java/util/Scanner.h
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
|
||||
// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
|
||||
|
||||
#ifndef __java_util_Scanner__
|
||||
#define __java_util_Scanner__
|
||||
|
||||
#pragma interface
|
||||
|
||||
#include <java/lang/Object.h>
|
||||
#include <gcj/array.h>
|
||||
|
||||
extern "Java"
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace math
|
||||
{
|
||||
class BigDecimal;
|
||||
class BigInteger;
|
||||
}
|
||||
namespace nio
|
||||
{
|
||||
namespace channels
|
||||
{
|
||||
class ReadableByteChannel;
|
||||
}
|
||||
}
|
||||
namespace text
|
||||
{
|
||||
class DecimalFormat;
|
||||
class DecimalFormatSymbols;
|
||||
class NumberFormat;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class java::util::Scanner : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public:
|
||||
Scanner(::java::io::File *);
|
||||
Scanner(::java::io::File *, ::java::lang::String *);
|
||||
Scanner(::java::io::InputStream *);
|
||||
Scanner(::java::io::InputStream *, ::java::lang::String *);
|
||||
Scanner(::java::lang::Readable *);
|
||||
Scanner(::java::nio::channels::ReadableByteChannel *);
|
||||
Scanner(::java::nio::channels::ReadableByteChannel *, ::java::lang::String *);
|
||||
Scanner(::java::lang::String *);
|
||||
virtual void close();
|
||||
virtual ::java::util::regex::Pattern * delimiter();
|
||||
virtual ::java::lang::String * findInLine(::java::util::regex::Pattern *);
|
||||
virtual ::java::lang::String * findInLine(::java::lang::String *);
|
||||
virtual ::java::lang::String * findWithinHorizon(::java::util::regex::Pattern *, jint);
|
||||
virtual ::java::lang::String * findWithinHorizon(::java::lang::String *, jint);
|
||||
virtual jboolean hasNext();
|
||||
virtual jboolean hasNext(::java::util::regex::Pattern *);
|
||||
virtual jboolean hasNext(::java::lang::String *);
|
||||
virtual jboolean hasNextBigDecimal();
|
||||
virtual jboolean hasNextBigInteger();
|
||||
virtual jboolean hasNextBigInteger(jint);
|
||||
virtual jboolean hasNextBoolean();
|
||||
virtual jboolean hasNextByte();
|
||||
virtual jboolean hasNextByte(jint);
|
||||
virtual jboolean hasNextDouble();
|
||||
virtual jboolean hasNextFloat();
|
||||
virtual jboolean hasNextInt();
|
||||
virtual jboolean hasNextInt(jint);
|
||||
virtual jboolean hasNextLine();
|
||||
virtual jboolean hasNextLong();
|
||||
virtual jboolean hasNextLong(jint);
|
||||
virtual jboolean hasNextShort();
|
||||
virtual jboolean hasNextShort(jint);
|
||||
virtual ::java::io::IOException * ioException();
|
||||
virtual jboolean isUseLocale();
|
||||
virtual ::java::util::Locale * locale();
|
||||
virtual ::java::util::regex::MatchResult * match();
|
||||
virtual ::java::lang::String * Scanner$next();
|
||||
virtual ::java::lang::String * next(::java::util::regex::Pattern *);
|
||||
virtual ::java::lang::String * next(::java::lang::String *);
|
||||
virtual ::java::math::BigDecimal * nextBigDecimal();
|
||||
virtual ::java::math::BigInteger * nextBigInteger();
|
||||
virtual ::java::math::BigInteger * nextBigInteger(jint);
|
||||
virtual jboolean nextBoolean();
|
||||
virtual jbyte nextByte();
|
||||
virtual jbyte nextByte(jint);
|
||||
virtual jdouble nextDouble();
|
||||
virtual jfloat nextFloat();
|
||||
virtual jint nextInt();
|
||||
virtual jint nextInt(jint);
|
||||
virtual ::java::lang::String * nextLine();
|
||||
virtual jlong nextLong();
|
||||
virtual jlong nextLong(jint);
|
||||
virtual jshort nextShort();
|
||||
virtual jshort nextShort(jint);
|
||||
virtual jint radix();
|
||||
virtual void remove();
|
||||
virtual void setUseLocale(jboolean);
|
||||
virtual ::java::util::Scanner * skip(::java::util::regex::Pattern *);
|
||||
virtual ::java::util::Scanner * skip(::java::lang::String *);
|
||||
virtual ::java::lang::String * toString();
|
||||
virtual ::java::util::Scanner * useDelimiter(::java::util::regex::Pattern *);
|
||||
virtual ::java::util::Scanner * useDelimiter(::java::lang::String *);
|
||||
virtual ::java::util::Scanner * useLocale(::java::util::Locale *);
|
||||
virtual ::java::util::Scanner * useRadix(jint);
|
||||
private:
|
||||
::java::lang::String * myApplyLocale(::java::lang::String *, jint);
|
||||
::java::lang::String * myApplyLocaleBD(::java::lang::String *);
|
||||
::java::math::BigDecimal * myBigDecimal(jboolean);
|
||||
::java::lang::String * myConvert(::java::lang::String *);
|
||||
::java::lang::String * myCoreNext(jboolean, ::java::util::regex::Pattern *);
|
||||
void myFillBuffer();
|
||||
jboolean myFillBuffer_loop(::java::util::regex::Matcher *, jint, jboolean);
|
||||
::java::lang::String * myFindPInStr(::java::util::regex::Pattern *, ::java::lang::String *, jint);
|
||||
::java::lang::String * myNext(::java::util::regex::Pattern *, jboolean);
|
||||
::java::math::BigInteger * myNextBigInteger(jint, jboolean, ::java::lang::String *);
|
||||
jboolean myNextBoolean(jboolean);
|
||||
jbyte myNextByte(jint, jboolean);
|
||||
jdouble myNextDouble(jboolean);
|
||||
jint myNextInt(jint, jboolean);
|
||||
::java::lang::String * myNextLine(jboolean);
|
||||
jlong myNextLong(jint, jboolean);
|
||||
jshort myNextShort(jint, jboolean);
|
||||
::java::lang::String * myPrepareForNext(::java::util::regex::Pattern *, jboolean);
|
||||
jboolean shallUseLastFound(::java::util::regex::Pattern *);
|
||||
public:
|
||||
virtual ::java::lang::Object * next();
|
||||
private:
|
||||
static ::java::lang::String * NOT_LONG;
|
||||
static ::java::lang::String * ERR_PREFIX;
|
||||
static ::java::lang::String * NOT_INT;
|
||||
static ::java::lang::String * NOT_DOUBLE;
|
||||
static ::java::lang::String * NOT_BYTE;
|
||||
static ::java::lang::String * NOT_BOOLEAN;
|
||||
static ::java::lang::String * IS_NOT;
|
||||
static ::java::lang::String * DEFAULT_PATTERN_S;
|
||||
static ::java::util::regex::Pattern * DEFAULT_PATTERN;
|
||||
static ::java::lang::String * BIG_INTEGER;
|
||||
static ::java::lang::String * NEW_LINE;
|
||||
::java::io::IOException * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastIOException;
|
||||
::java::io::InputStream * bIS;
|
||||
const jint MaxBufferLen;
|
||||
const jint MIN_BUF_LEN;
|
||||
const jint MAX_PREFIX;
|
||||
::java::lang::String * actBuffer;
|
||||
jint currentRadix;
|
||||
::java::util::Locale * actLocale;
|
||||
::java::util::regex::Pattern * p;
|
||||
jint actPos;
|
||||
JArray< jbyte > * tmpBuffer;
|
||||
::java::lang::String * charsetName;
|
||||
::java::util::regex::Matcher * myMatcher;
|
||||
::java::util::regex::MatchResult * actResult;
|
||||
::java::lang::Readable * readableSource;
|
||||
::java::nio::channels::ReadableByteChannel * rbcSource;
|
||||
jboolean isClosed;
|
||||
::java::lang::String * lastFound;
|
||||
jboolean lastFoundPresent;
|
||||
jint lastNextPos;
|
||||
jint lastPatternHash;
|
||||
jint last_RegionStart;
|
||||
jint last_RegionEnd;
|
||||
jboolean last_anchor;
|
||||
jboolean last_transparent;
|
||||
::java::util::regex::MatchResult * lastResult;
|
||||
jint procesedChars;
|
||||
jboolean needInput;
|
||||
jboolean skipped;
|
||||
jboolean doSkipp;
|
||||
jboolean matchValid;
|
||||
::java::text::NumberFormat * actFormat;
|
||||
::java::text::DecimalFormat * df;
|
||||
jboolean useLocale__;
|
||||
::java::text::DecimalFormatSymbols * dfs;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
||||
#endif // __java_util_Scanner__
|
||||
|
|
@ -64,6 +64,7 @@ public: // actually protected
|
|||
private:
|
||||
void checkBoundInclusive(jint);
|
||||
void checkBoundExclusive(jint);
|
||||
void raiseBoundsError(jint, ::java::lang::String *);
|
||||
void writeObject(::java::io::ObjectOutputStream *);
|
||||
static const jlong serialVersionUID = -2767605614048989439LL;
|
||||
public: // actually protected
|
||||
|
|
|
|||
|
|
@ -9,6 +9,16 @@
|
|||
#include <java/util/logging/Formatter.h>
|
||||
extern "Java"
|
||||
{
|
||||
namespace gnu
|
||||
{
|
||||
namespace java
|
||||
{
|
||||
namespace lang
|
||||
{
|
||||
class CPStringBuilder;
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace java
|
||||
{
|
||||
namespace text
|
||||
|
|
@ -24,8 +34,8 @@ class java::util::logging::XMLFormatter : public ::java::util::logging::Formatte
|
|||
public:
|
||||
XMLFormatter();
|
||||
private:
|
||||
static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, ::java::lang::String *);
|
||||
static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, jlong);
|
||||
static void appendTag(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *, ::java::lang::String *);
|
||||
static void appendTag(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *, jlong);
|
||||
public:
|
||||
virtual ::java::lang::String * format(::java::util::logging::LogRecord *);
|
||||
virtual ::java::lang::String * getHead(::java::util::logging::Handler *);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public:
|
|||
public: // actually package-private
|
||||
::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
|
||||
private:
|
||||
::java::util::prefs::PreferenceChangeListener * val$l;
|
||||
::java::util::prefs::PreferenceChangeListener * val$listener;
|
||||
::java::util::prefs::PreferenceChangeEvent * val$event;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ public: // actually package-private
|
|||
::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
|
||||
private:
|
||||
jboolean val$added;
|
||||
::java::util::prefs::NodeChangeListener * val$l;
|
||||
::java::util::prefs::NodeChangeListener * val$listener;
|
||||
::java::util::prefs::NodeChangeEvent * val$event;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
|
|
|
|||
|
|
@ -53,12 +53,26 @@ public:
|
|||
::java::lang::String * toString();
|
||||
private:
|
||||
void assertMatchOp();
|
||||
public:
|
||||
::java::util::regex::Matcher * region(jint, jint);
|
||||
jint regionStart();
|
||||
jint regionEnd();
|
||||
jboolean hasTransparentBounds();
|
||||
::java::util::regex::Matcher * useTransparentBounds(jboolean);
|
||||
jboolean hasAnchoringBounds();
|
||||
::java::util::regex::Matcher * useAnchoringBounds(jboolean);
|
||||
::java::util::regex::MatchResult * toMatchResult();
|
||||
private:
|
||||
::java::util::regex::Pattern * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pattern__;
|
||||
::java::lang::CharSequence * input;
|
||||
::gnu::java::util::regex::CharIndexed * inputCharIndexed;
|
||||
jint position;
|
||||
jint appendPosition;
|
||||
::gnu::java::util::regex::REMatch * match;
|
||||
jint regionStart__;
|
||||
jint regionEnd__;
|
||||
jboolean transparentBounds;
|
||||
jint anchoringBounds;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@ public:
|
|||
virtual ::java::lang::String * getName();
|
||||
virtual void setTime(jlong);
|
||||
virtual jlong getTime();
|
||||
private:
|
||||
static ::java::util::Calendar * getCalendar();
|
||||
public:
|
||||
virtual void setSize(jlong);
|
||||
virtual jlong getSize();
|
||||
virtual void setCompressedSize(jlong);
|
||||
|
|
@ -47,21 +44,22 @@ public:
|
|||
virtual ::java::lang::String * toString();
|
||||
virtual jint hashCode();
|
||||
private:
|
||||
static const jint KNOWN_SIZE = 1;
|
||||
static const jint KNOWN_CSIZE = 2;
|
||||
static const jint KNOWN_CRC = 4;
|
||||
static const jint KNOWN_TIME = 8;
|
||||
static const jint KNOWN_EXTRA = 16;
|
||||
static ::java::util::Calendar * cal;
|
||||
static const jbyte KNOWN_SIZE = 1;
|
||||
static const jbyte KNOWN_CSIZE = 2;
|
||||
static const jbyte KNOWN_CRC = 4;
|
||||
static const jbyte KNOWN_TIME = 8;
|
||||
static const jbyte KNOWN_DOSTIME = 16;
|
||||
static const jbyte KNOWN_EXTRA = 32;
|
||||
::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
|
||||
jint size;
|
||||
jlong compressedSize;
|
||||
jint crc;
|
||||
jint dostime;
|
||||
jshort known;
|
||||
jshort method;
|
||||
JArray< jbyte > * extra;
|
||||
::java::lang::String * comment;
|
||||
jbyte method;
|
||||
jbyte known;
|
||||
jint dostime;
|
||||
jlong time;
|
||||
JArray< jbyte > * extra;
|
||||
public: // actually package-private
|
||||
jint flags;
|
||||
jint offset;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue