diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-21 17:55:01 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-21 17:55:01 +0000 |
| commit | 2bc043354c4edb1f5aad751285060fb722a63ea1 (patch) | |
| tree | 6de8da5758622565799768e49cd0de6698ca3cb8 /libjava/gnu | |
| parent | be9f921eb27de7f5f22e4755df15340ab8042a09 (diff) | |
| download | gcc-2bc043354c4edb1f5aad751285060fb722a63ea1.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141271 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
62 files changed, 844 insertions, 175 deletions
diff --git a/libjava/gnu/CORBA/NamingService/NameTransformer.h b/libjava/gnu/CORBA/NamingService/NameTransformer.h index c628e17a990..715ebc5018e 100644 --- a/libjava/gnu/CORBA/NamingService/NameTransformer.h +++ b/libjava/gnu/CORBA/NamingService/NameTransformer.h @@ -20,6 +20,13 @@ extern "Java" class NameTransformer; } } + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } } namespace org { @@ -45,7 +52,7 @@ public: virtual JArray< ::org::omg::CosNaming::NameComponent * > * toName(::java::lang::String *); virtual ::java::lang::String * toString(JArray< ::org::omg::CosNaming::NameComponent * > *); private: - void appEscaping(::java::lang::StringBuffer *, ::java::lang::String *); + void appEscaping(::gnu::java::lang::CPStringBuilder *, ::java::lang::String *); void assertEndOfNode(::org::omg::CORBA::IntHolder *, JArray< ::java::lang::String * > *); ::org::omg::CosNaming::NameComponent * readNode(::org::omg::CORBA::IntHolder *, JArray< ::java::lang::String * > *); ::java::lang::String * readPart(::org::omg::CORBA::IntHolder *, JArray< ::java::lang::String * > *); diff --git a/libjava/gnu/classpath/Configuration.h b/libjava/gnu/classpath/Configuration.h index 34cd719eea0..699fb0fe363 100644 --- a/libjava/gnu/classpath/Configuration.h +++ b/libjava/gnu/classpath/Configuration.h @@ -34,6 +34,7 @@ public: static ::java::lang::String * default_awt_peer_toolkit; static const jboolean JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = 0; static ::java::lang::String * ECJ_JAR; + static const jboolean WANT_NATIVE_BIG_INTEGER = 1; static ::java::lang::Class class$; }; diff --git a/libjava/gnu/classpath/Configuration.java b/libjava/gnu/classpath/Configuration.java index 73e3c2f0408..2420878fbce 100644 --- a/libjava/gnu/classpath/Configuration.java +++ b/libjava/gnu/classpath/Configuration.java @@ -1,5 +1,5 @@ /* Configuration.java -- - Copyright (C) 1998, 2001, 2003, 2005, 2006, 2007 + Copyright (C) 1998, 2001, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,7 +66,7 @@ public final class Configuration * It is set according to the value of 'version' in the configure[.in] file * and used to set the System property gnu.classpath.version. */ - public static final String CLASSPATH_VERSION = "0.95"; + public static final String CLASSPATH_VERSION = "0.98-pre"; /** * The value of DEBUG is substituted according to whether the @@ -110,4 +110,13 @@ public final class Configuration * com.sun.tools.javac implementation in tools.zip. */ public static final String ECJ_JAR = ecj(); + + /** + * Set to <code>true</code> if the config script found that (a) an + * implementation of java.math.BigInteger, based on the GNU MP library, is + * desired in preference to a pure Java one, and (b) the GNU MP library was + * found on the platform where the JVM is to run. Otherwise, this field is + * set to <code>false</code>. + */ + public static final boolean WANT_NATIVE_BIG_INTEGER = true; } diff --git a/libjava/gnu/classpath/jdwp/util/Signature.h b/libjava/gnu/classpath/jdwp/util/Signature.h index 4ec84ce100a..310b1b8041f 100644 --- a/libjava/gnu/classpath/jdwp/util/Signature.h +++ b/libjava/gnu/classpath/jdwp/util/Signature.h @@ -23,6 +23,13 @@ extern "Java" } } } + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } } } @@ -36,7 +43,7 @@ public: static ::java::lang::String * computeMethodSignature(::java::lang::reflect::Method *); private: static ::java::lang::String * _computeSignature(::java::lang::Class *, JArray< ::java::lang::Class * > *); - static void _addToSignature(::java::lang::StringBuffer *, ::java::lang::Class *); + static void _addToSignature(::gnu::java::lang::CPStringBuilder *, ::java::lang::Class *); public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/gcj/util/natDebug.cc b/libjava/gnu/gcj/util/natDebug.cc index cad70958750..e2631b14a74 100644 --- a/libjava/gnu/gcj/util/natDebug.cc +++ b/libjava/gnu/gcj/util/natDebug.cc @@ -70,28 +70,28 @@ gnu::gcj::util::Debug::getField (::java::lang::Object *o, if (! type->isPrimitive ()) return * (jobject*) addr; if (type == JvPrimClass (double)) - return new java::lang::Double (* (jdouble*) addr); + return new ::java::lang::Double (* (jdouble*) addr); if (type == JvPrimClass (float)) - return new java::lang::Float (* (jfloat*) addr); + return new ::java::lang::Float (* (jfloat*) addr); if (type == JvPrimClass (long)) - return new java::lang::Long (* (jlong*) addr); + return new ::java::lang::Long (* (jlong*) addr); if (type == JvPrimClass (int)) - return new java::lang::Integer (* (jint*) addr); + return new ::java::lang::Integer (* (jint*) addr); if (type == JvPrimClass (short)) - return new java::lang::Short (* (jshort*) addr); + return new ::java::lang::Short (* (jshort*) addr); if (type == JvPrimClass (byte)) - return new java::lang::Byte (* (jbyte*) addr); + return new ::java::lang::Byte (* (jbyte*) addr); if (type == JvPrimClass (char)) - return new java::lang::Character (* (jchar*) addr); + return new ::java::lang::Character (* (jchar*) addr); if (type == JvPrimClass (boolean)) { - _Jv_InitClass (&java::lang::Boolean::class$); + _Jv_InitClass (&::java::lang::Boolean::class$); if (* (jboolean*) addr) - return java::lang::Boolean::TRUE; + return ::java::lang::Boolean::TRUE; else - return java::lang::Boolean::FALSE; + return ::java::lang::Boolean::FALSE; } - throw new java::lang::IllegalArgumentException; + throw new ::java::lang::IllegalArgumentException; } /* A simple method of printing an object that can be called from a diff --git a/libjava/gnu/gcj/xlib/natColormap.cc b/libjava/gnu/gcj/xlib/natColormap.cc index 83c897e8a17..2f6a6c7448d 100644 --- a/libjava/gnu/gcj/xlib/natColormap.cc +++ b/libjava/gnu/gcj/xlib/natColormap.cc @@ -30,7 +30,7 @@ jlong gnu::gcj::xlib::Colormap::allocateColorPixel(XColor* color) ::XColor* col = (::XColor*) (color->structure); Status result = XAllocColor(dpy, xid, col); if (result == 0) - throw new java::lang::RuntimeException( + throw new ::java::lang::RuntimeException( JvNewStringLatin1("Unable to allocate color pixel.")); return col->pixel; diff --git a/libjava/gnu/gcj/xlib/natDisplay.cc b/libjava/gnu/gcj/xlib/natDisplay.cc index fadf4fb2696..f89cb740c64 100644 --- a/libjava/gnu/gcj/xlib/natDisplay.cc +++ b/libjava/gnu/gcj/xlib/natDisplay.cc @@ -118,8 +118,8 @@ void gnu::gcj::xlib::Display::staticInit() { if (XInitThreads() == 0) { - char msg[] = "threads is not supported on this platform"; - throw new java::lang::RuntimeException(JvNewStringLatin1(msg)); + char msg[] = "threads are not supported on this platform"; + throw new ::java::lang::RuntimeException(JvNewStringLatin1(msg)); } XSetErrorHandler(&handleXError); diff --git a/libjava/gnu/gcj/xlib/natDrawable.cc b/libjava/gnu/gcj/xlib/natDrawable.cc index 87c9d3572b2..371a92bfe04 100644 --- a/libjava/gnu/gcj/xlib/natDrawable.cc +++ b/libjava/gnu/gcj/xlib/natDrawable.cc @@ -64,7 +64,7 @@ jint gnu::gcj::xlib::Drawable::getDepth () } java::awt::Rectangle* -gnu::gcj::xlib::Drawable::getBounds(java::awt::Rectangle* rv) +gnu::gcj::xlib::Drawable::getBounds(::java::awt::Rectangle* rv) { ::Display* dpy = (::Display*) (getDisplay()->display); @@ -86,7 +86,7 @@ gnu::gcj::xlib::Drawable::getBounds(java::awt::Rectangle* rv) if (rv == 0) { - rv = new java::awt::Rectangle(x, y, w, h); + rv = new ::java::awt::Rectangle(x, y, w, h); } else { diff --git a/libjava/gnu/gcj/xlib/natFont.cc b/libjava/gnu/gcj/xlib/natFont.cc index cd5d87c7ab6..be842d0a9b4 100644 --- a/libjava/gnu/gcj/xlib/natFont.cc +++ b/libjava/gnu/gcj/xlib/natFont.cc @@ -75,7 +75,7 @@ jint gnu::gcj::xlib::Font::getDescent() return returnValue-1; // -1 to exclude the baseline } -jint gnu::gcj::xlib::Font::getStringWidth(java::lang::String* text) +jint gnu::gcj::xlib::Font::getStringWidth(::java::lang::String* text) { XFontStruct* fontStruct = (XFontStruct*) structure; diff --git a/libjava/gnu/gcj/xlib/natWMSizeHints.cc b/libjava/gnu/gcj/xlib/natWMSizeHints.cc index 0724a5a0925..fd546997f8b 100644 --- a/libjava/gnu/gcj/xlib/natWMSizeHints.cc +++ b/libjava/gnu/gcj/xlib/natWMSizeHints.cc @@ -23,7 +23,7 @@ void gnu::gcj::xlib::WMSizeHints::init(WMSizeHints* copyFrom) if (hints == 0) { jstring errorMessage = JvNewStringLatin1("XAllocSizeHints failed"); - throw new java::lang::OutOfMemoryError(errorMessage); + throw new ::java::lang::OutOfMemoryError(errorMessage); } if (copyFrom != 0) diff --git a/libjava/gnu/gcj/xlib/natWindow.cc b/libjava/gnu/gcj/xlib/natWindow.cc index 62cd086ccb4..42ef649c50e 100644 --- a/libjava/gnu/gcj/xlib/natWindow.cc +++ b/libjava/gnu/gcj/xlib/natWindow.cc @@ -23,7 +23,7 @@ details. */ #include <gnu/gcj/xlib/Visual.h> #include <gnu/gcj/xlib/XException.h> -jint gnu::gcj::xlib::Window::createChildXID(java::awt::Rectangle* bounds, +jint gnu::gcj::xlib::Window::createChildXID(::java::awt::Rectangle* bounds, jint borderWidth, WindowAttributes* attributes, jint windowIOClass, diff --git a/libjava/gnu/gcj/xlib/natXImage.cc b/libjava/gnu/gcj/xlib/natXImage.cc index a92cf9f8c6f..81022227d2b 100644 --- a/libjava/gnu/gcj/xlib/natXImage.cc +++ b/libjava/gnu/gcj/xlib/natXImage.cc @@ -40,7 +40,7 @@ void gnu::gcj::xlib::XImage::init(Visual* visual, jint depth, if (ximage == 0) { jstring errorMessage = JvNewStringLatin1("XCreateImage failed"); - throw new java::lang::OutOfMemoryError(errorMessage); + throw new ::java::lang::OutOfMemoryError(errorMessage); } bool reinitialize = false; diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h index 92f78733b29..8effd32a584 100644 --- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h +++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h @@ -168,7 +168,7 @@ public: public: // actually protected virtual void fillShape(::java::awt::Shape *, jboolean); virtual ::java::awt::image::ColorModel * getColorModel() = 0; - virtual ::java::awt::Rectangle * getDeviceBounds(); + virtual ::java::awt::Rectangle * getDeviceBounds() = 0; virtual void rawDrawLine(jint, jint, jint, jint); virtual void rawDrawRect(jint, jint, jint, jint); virtual void rawClearRect(jint, jint, jint, jint); @@ -189,6 +189,12 @@ private: void updateClip(::java::awt::geom::AffineTransform *); ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter(); void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *); + ::java::awt::PaintContext * getPaintContext(); +public: + static ::java::awt::Image * prepareImage(::java::awt::Image *, jint, jint); +public: // actually protected + static ::java::util::WeakHashMap * imageCache; +private: static jboolean DEFAULT_TEXT_AA; static ::java::awt::Font * FONT; static const jint GV_CACHE_SIZE = 50; @@ -202,6 +208,8 @@ private: ::java::awt::Paint * paint; ::java::awt::PaintContext * paintContext; ::java::awt::Color * background; + ::java::awt::Color * foreground; + jboolean isForegroundColorNull; ::java::awt::Font * font; ::java::awt::Composite * composite; ::java::awt::Stroke * stroke; diff --git a/libjava/gnu/java/awt/java2d/RasterGraphics.h b/libjava/gnu/java/awt/java2d/RasterGraphics.h index 41ab8d7dceb..37baf269c3a 100644 --- a/libjava/gnu/java/awt/java2d/RasterGraphics.h +++ b/libjava/gnu/java/awt/java2d/RasterGraphics.h @@ -18,6 +18,7 @@ extern "Java" namespace java2d { class RasterGraphics; + class ScanlineCoverage; } } } @@ -27,6 +28,7 @@ extern "Java" namespace awt { class GraphicsConfiguration; + class Rectangle; namespace image { class ColorModel; @@ -41,11 +43,14 @@ class gnu::java::awt::java2d::RasterGraphics : public ::gnu::java::awt::java2d:: public: RasterGraphics(::java::awt::image::WritableRaster *, ::java::awt::image::ColorModel *); + virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *); public: // actually protected virtual ::java::awt::image::ColorModel * getColorModel(); virtual ::java::awt::image::WritableRaster * getDestinationRaster(); public: virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration(); +public: // actually protected + virtual ::java::awt::Rectangle * getDeviceBounds(); private: ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::AbstractGraphics2D)))) raster; ::java::awt::image::ColorModel * colorModel; diff --git a/libjava/gnu/java/lang/CPStringBuilder.h b/libjava/gnu/java/lang/CPStringBuilder.h new file mode 100644 index 00000000000..5b03bf3a77e --- /dev/null +++ b/libjava/gnu/java/lang/CPStringBuilder.h @@ -0,0 +1,100 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_lang_CPStringBuilder__ +#define __gnu_java_lang_CPStringBuilder__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } +} + +class gnu::java::lang::CPStringBuilder : public ::java::lang::Object +{ + +public: + CPStringBuilder(); + CPStringBuilder(jint); + CPStringBuilder(::java::lang::String *); + CPStringBuilder(::java::lang::StringBuffer *); + CPStringBuilder(::java::lang::StringBuilder *); + CPStringBuilder(::java::lang::CharSequence *); + void setLength(jint); + jchar charAt(jint); + jint codePointAt(jint); + jint codePointBefore(jint); + void getChars(jint, jint, JArray< jchar > *, jint); + void setCharAt(jint, jchar); + ::gnu::java::lang::CPStringBuilder * append(::java::lang::Object *); + ::gnu::java::lang::CPStringBuilder * append(::java::lang::String *); + ::gnu::java::lang::CPStringBuilder * append(::java::lang::StringBuffer *); + ::gnu::java::lang::CPStringBuilder * append(JArray< jchar > *); + ::gnu::java::lang::CPStringBuilder * append(JArray< jchar > *, jint, jint); + ::gnu::java::lang::CPStringBuilder * append(jboolean); + ::gnu::java::lang::CPStringBuilder * CPStringBuilder$append(jchar); + ::gnu::java::lang::CPStringBuilder * CPStringBuilder$append(::java::lang::CharSequence *); + ::gnu::java::lang::CPStringBuilder * CPStringBuilder$append(::java::lang::CharSequence *, jint, jint); + ::gnu::java::lang::CPStringBuilder * append(jint); + ::gnu::java::lang::CPStringBuilder * append(jlong); + ::gnu::java::lang::CPStringBuilder * append(jfloat); + ::gnu::java::lang::CPStringBuilder * append(jdouble); + ::gnu::java::lang::CPStringBuilder * appendCodePoint(jint); + ::gnu::java::lang::CPStringBuilder * delete$(jint, jint); + ::gnu::java::lang::CPStringBuilder * deleteCharAt(jint); + ::gnu::java::lang::CPStringBuilder * replace(jint, jint, ::java::lang::String *); + ::gnu::java::lang::CPStringBuilder * insert(jint, JArray< jchar > *, jint, jint); + ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::Object *); + ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::String *); + ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::CharSequence *); + ::gnu::java::lang::CPStringBuilder * insert(jint, ::java::lang::CharSequence *, jint, jint); + ::gnu::java::lang::CPStringBuilder * insert(jint, JArray< jchar > *); + ::gnu::java::lang::CPStringBuilder * insert(jint, jboolean); + ::gnu::java::lang::CPStringBuilder * insert(jint, jchar); + ::gnu::java::lang::CPStringBuilder * insert(jint, jint); + ::gnu::java::lang::CPStringBuilder * insert(jint, jlong); + ::gnu::java::lang::CPStringBuilder * insert(jint, jfloat); + ::gnu::java::lang::CPStringBuilder * 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); + ::gnu::java::lang::CPStringBuilder * reverse(); + void trimToSize(); + jint codePointCount(jint, jint); + jint offsetByCodePoints(jint, jint); + void ensureCapacity(jint); +private: + void allocateArray(jint); +public: + jint length(); + ::java::lang::CharSequence * subSequence(jint, jint); + ::java::lang::String * substring(jint); + ::java::lang::String * substring(jint, jint); + ::java::lang::String * toString(); + ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint); + ::java::lang::Appendable * append(::java::lang::CharSequence *); + ::java::lang::Appendable * append(jchar); +private: + jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count; + JArray< jchar > * value; + jboolean allocated; + static jint DEFAULT_CAPACITY; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_lang_CPStringBuilder__ diff --git a/libjava/gnu/java/lang/VMCPStringBuilder.h b/libjava/gnu/java/lang/VMCPStringBuilder.h new file mode 100644 index 00000000000..f8c2eb30960 --- /dev/null +++ b/libjava/gnu/java/lang/VMCPStringBuilder.h @@ -0,0 +1,39 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_lang_VMCPStringBuilder__ +#define __gnu_java_lang_VMCPStringBuilder__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class VMCPStringBuilder; + } + } + } +} + +class gnu::java::lang::VMCPStringBuilder : public ::java::lang::Object +{ + +public: // actually package-private + VMCPStringBuilder(); +public: + static ::java::lang::String * toString(JArray< jchar > *, jint, jint); +private: + static ::java::lang::reflect::Constructor * cons; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_lang_VMCPStringBuilder__ diff --git a/libjava/gnu/java/lang/VMCPStringBuilder.java b/libjava/gnu/java/lang/VMCPStringBuilder.java new file mode 100644 index 00000000000..8e137cd3fec --- /dev/null +++ b/libjava/gnu/java/lang/VMCPStringBuilder.java @@ -0,0 +1,112 @@ +/* VMCPStringBuilder.java -- Growable strings without locking or copying + Copyright (C) 2008 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.java.lang; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; + +/** + * This class provides VM support for CPStringBuilder + * by allowing the package-private constructor + * of java.lang.String to be invoked. The default + * implementation uses reflection. VMs may replace + * this class with a more efficient version. + */ +final class VMCPStringBuilder +{ + + /** + * The package-private constructor for String objects without copying. + */ + private static final Constructor cons; + + static + { + try + { + cons = String.class.getDeclaredConstructor(new Class[] { char[].class, + Integer.TYPE, + Integer.TYPE, + Boolean.TYPE }); + cons.setAccessible(true); + } + catch (NoSuchMethodException e) + { + throw (Error) + new InternalError("Could not get no-copy String constructor").initCause(e); + } + } + + /** + * Convert this <code>StringBuilder</code> to a <code>String</code>. The + * String is composed of the characters currently in this StringBuilder. Note + * that the result is not a copy, so the builder will allocate a new array + * if a further write operation is attempted. + * + * @param value the buffered characters. + * @param startIndex the index at which to start taking characters from the buffer. + * @param count the number of characters used in the buffer. + * @return the characters in this StringBuilder + */ + public static String toString(char[] value, int startIndex, int count) + { + try + { + return (String) + cons.newInstance(new Object[] { value, Integer.valueOf(startIndex), + Integer.valueOf(count), + Boolean.valueOf(true) }); + } + catch (InstantiationException e) + { + throw (Error) + new InternalError("Could not instantiate no-copy String constructor").initCause(e); + } + catch (IllegalAccessException e) + { + throw (Error) + new InternalError("Could not access no-copy String constructor").initCause(e); + } + catch (InvocationTargetException e) + { + throw (Error) + new InternalError("Error calling no-copy String constructor").initCause(e); + } + } + +} diff --git a/libjava/gnu/java/math/GMP.h b/libjava/gnu/java/math/GMP.h new file mode 100644 index 00000000000..b038f10046e --- /dev/null +++ b/libjava/gnu/java/math/GMP.h @@ -0,0 +1,125 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_java_math_GMP__ +#define __gnu_java_math_GMP__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + +extern "Java" +{ + namespace gnu + { + namespace classpath + { + class Pointer; + } + namespace java + { + namespace math + { + class GMP; + } + } + } +} + +class gnu::java::math::GMP : public ::java::lang::Object +{ + +public: + GMP(); +private: + void acquireRef(); + void releaseRef(); +public: // actually protected + void finalize(); +public: + void fromByteArray(JArray< jbyte > *); + void fromBI(::gnu::java::math::GMP *); + void fromLong(jlong); + jint fromString(::java::lang::String *, jint); + void fromSignedMagnitude(JArray< jbyte > *, jboolean); + ::java::lang::String * toString(jint); + void toByteArray(JArray< jbyte > *); + jdouble doubleValue(); + jint absIntValue(); + jint compare(::gnu::java::math::GMP *); + void add(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void subtract(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void multiply(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void quotient(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void remainder(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void quotientAndRemainder(::gnu::java::math::GMP *, ::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void modulo(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void pow(jint, ::gnu::java::math::GMP *); + void modPow(::gnu::java::math::GMP *, ::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void modInverse(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void gcd(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void shiftLeft(jint, ::gnu::java::math::GMP *); + void shiftRight(jint, ::gnu::java::math::GMP *); + void abs(::gnu::java::math::GMP *); + void negate(::gnu::java::math::GMP *); + jint bitLength(); + jint bitCount(); + void and$(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void or$(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void xor$(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void andNot(::gnu::java::math::GMP *, ::gnu::java::math::GMP *); + void not$(::gnu::java::math::GMP *); + void flipBit(jint, ::gnu::java::math::GMP *); + jint testBit(jint); + void setBit(jint, jboolean, ::gnu::java::math::GMP *); + jint testPrimality(jint); + jint lowestSetBit(); + static void natInitializeLibrary(); +private: + void natInitialize(); + void natFinalize(); + void natFromLong(jlong); + void natFromBI(::gnu::classpath::Pointer *); + void natFromByteArray(JArray< jbyte > *); + jint natFromString(::java::lang::String *, jint); + void natFromSignedMagnitude(JArray< jbyte > *, jboolean); + ::java::lang::String * natToString(jint); + void natToByteArray(JArray< jbyte > *); + jint natAbsIntValue(); + jdouble natDoubleValue(); + jint natCompare(::gnu::classpath::Pointer *); + void natAdd(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natSubtract(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natMultiply(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natQuotient(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natRemainder(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natQuotientAndRemainder(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natModulo(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natPow(jint, ::gnu::classpath::Pointer *); + void natModPow(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natModInverse(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natGCD(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + jint natTestPrimality(jint); + void natShiftLeft(jint, ::gnu::classpath::Pointer *); + void natShiftRight(jint, ::gnu::classpath::Pointer *); + jint natLowestSetBit(); + void natAbs(::gnu::classpath::Pointer *); + void natNegate(::gnu::classpath::Pointer *); + jint natBitLength(); + jint natSetBitCount(); + void natXor(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natOr(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natAnd(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natAndNot(::gnu::classpath::Pointer *, ::gnu::classpath::Pointer *); + void natFlipBit(jint, ::gnu::classpath::Pointer *); + jint natTestBit(jint); + void natSetBit(jint, jboolean, ::gnu::classpath::Pointer *); + void natNot(::gnu::classpath::Pointer *); + ::gnu::classpath::Pointer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) native_ptr; + jint refCount; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_java_math_GMP__ diff --git a/libjava/gnu/java/text/AttributedFormatBuffer.h b/libjava/gnu/java/text/AttributedFormatBuffer.h index a37b3996749..382afe1a3de 100644 --- a/libjava/gnu/java/text/AttributedFormatBuffer.h +++ b/libjava/gnu/java/text/AttributedFormatBuffer.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace text { class AttributedFormatBuffer; @@ -34,7 +38,7 @@ class gnu::java::text::AttributedFormatBuffer : public ::java::lang::Object { public: - AttributedFormatBuffer(::java::lang::StringBuffer *); + AttributedFormatBuffer(::gnu::java::lang::CPStringBuilder *); AttributedFormatBuffer(jint); AttributedFormatBuffer(); private: @@ -51,11 +55,11 @@ public: virtual jint length(); virtual void clear(); virtual void sync(); - virtual ::java::lang::StringBuffer * getBuffer(); + virtual ::gnu::java::lang::CPStringBuilder * getBuffer(); virtual JArray< jint > * getRanges(); virtual JArray< ::java::util::HashMap * > * getAttributes(); private: - ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer; + ::gnu::java::lang::CPStringBuilder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) buffer; ::java::util::ArrayList * ranges; ::java::util::ArrayList * attributes; JArray< jint > * a_ranges; diff --git a/libjava/gnu/java/util/EmptyEnumeration.h b/libjava/gnu/java/util/EmptyEnumeration.h index 78ab0fc1e78..c56509628ad 100644 --- a/libjava/gnu/java/util/EmptyEnumeration.h +++ b/libjava/gnu/java/util/EmptyEnumeration.h @@ -24,8 +24,8 @@ extern "Java" class gnu::java::util::EmptyEnumeration : public ::java::lang::Object { - EmptyEnumeration(); public: + EmptyEnumeration(); static ::gnu::java::util::EmptyEnumeration * getInstance(); jboolean hasMoreElements(); ::java::lang::Object * nextElement(); diff --git a/libjava/gnu/java/util/prefs/EventDispatcher.h b/libjava/gnu/java/util/prefs/EventDispatcher.h deleted file mode 100644 index 235aabb5ccf..00000000000 --- a/libjava/gnu/java/util/prefs/EventDispatcher.h +++ /dev/null @@ -1,41 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_util_prefs_EventDispatcher__ -#define __gnu_java_util_prefs_EventDispatcher__ - -#pragma interface - -#include <java/lang/Thread.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace util - { - namespace prefs - { - class EventDispatcher; - } - } - } - } -} - -class gnu::java::util::prefs::EventDispatcher : public ::java::lang::Thread -{ - - EventDispatcher(); -public: - virtual void run(); - static void dispatch(::java::lang::Runnable *); -private: - static ::java::lang::Thread * dispatchThread; - static ::java::util::ArrayList * queue; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_util_prefs_EventDispatcher__ diff --git a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h b/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h index 5d0945a32dc..e0e37d7f136 100644 --- a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h +++ b/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h @@ -7,8 +7,6 @@ #pragma interface #include <java/lang/Object.h> -#include <gcj/array.h> - extern "Java" { namespace gnu @@ -35,8 +33,6 @@ class gnu::java::util::prefs::gconf::GConfNativePeer : public ::java::lang::Obje public: GConfNativePeer(); jboolean nodeExist(::java::lang::String *); - void startWatchingNode(::java::lang::String *); - void stopWatchingNode(::java::lang::String *); jboolean setString(::java::lang::String *, ::java::lang::String *); jboolean unset(::java::lang::String *); ::java::lang::String * getKey(::java::lang::String *); @@ -52,19 +48,15 @@ private: static void init_class(); static void finalize_class(); public: // actually protected - static jboolean gconf_client_dir_exists(::java::lang::String *); - static void gconf_client_add_dir(::java::lang::String *); - static void gconf_client_remove_dir(::java::lang::String *); - static jboolean gconf_client_set_string(::java::lang::String *, ::java::lang::String *); - static ::java::lang::String * gconf_client_get_string(::java::lang::String *); - static jboolean gconf_client_unset(::java::lang::String *); - static void gconf_client_suggest_sync(); - static ::java::util::List * gconf_client_all_nodes(::java::lang::String *); - static ::java::util::List * gconf_client_all_keys(::java::lang::String *); + static jboolean gconf_dir_exists(::java::lang::String *); + static jboolean gconf_set_string(::java::lang::String *, ::java::lang::String *); + static ::java::lang::String * gconf_get_string(::java::lang::String *); + static jboolean gconf_unset(::java::lang::String *); + static void gconf_suggest_sync(); + static ::java::util::List * gconf_all_nodes(::java::lang::String *); + static ::java::util::List * gconf_all_keys(::java::lang::String *); static ::java::lang::String * gconf_escape_key(::java::lang::String *); static ::java::lang::String * gconf_unescape_key(::java::lang::String *); -private: - static JArray< ::java::lang::Object * > * semaphore; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RE.h b/libjava/gnu/java/util/regex/RE.h index 4d431958915..ee798b7ad35 100644 --- a/libjava/gnu/java/util/regex/RE.h +++ b/libjava/gnu/java/util/regex/RE.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -87,9 +91,9 @@ public: virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *); virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint); virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint); - virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint, ::java::lang::StringBuffer *); + virtual ::gnu::java::util::regex::REMatch * getMatch(::java::lang::Object *, jint, jint, ::gnu::java::lang::CPStringBuilder *); public: // actually package-private - virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::java::lang::StringBuffer *); + virtual ::gnu::java::util::regex::REMatch * getMatchImpl(::gnu::java::util::regex::CharIndexed *, jint, jint, ::gnu::java::lang::CPStringBuilder *); public: virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *); virtual ::gnu::java::util::regex::REMatchEnumeration * getMatchEnumeration(::java::lang::Object *, jint); @@ -110,12 +114,12 @@ public: private: void addToken(::gnu::java::util::regex::REToken *); static ::gnu::java::util::regex::REToken * setRepeated(::gnu::java::util::regex::REToken *, jint, jint, jint); - static jint getPosixSet(JArray< jchar > *, jint, ::java::lang::StringBuffer *); + static jint getPosixSet(JArray< jchar > *, jint, ::gnu::java::lang::CPStringBuilder *); jint getMinMax(JArray< jchar > *, jint, ::gnu::java::util::regex::RE$IntPair *, ::gnu::java::util::regex::RESyntax *); public: virtual ::java::lang::String * toString(); public: // actually package-private - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); public: static ::gnu::java::util::regex::CharIndexed * makeCharIndexed(::java::lang::Object *, jint); private: diff --git a/libjava/gnu/java/util/regex/REMatchEnumeration.h b/libjava/gnu/java/util/regex/REMatchEnumeration.h index caab8c81e2f..6b0d888b753 100644 --- a/libjava/gnu/java/util/regex/REMatchEnumeration.h +++ b/libjava/gnu/java/util/regex/REMatchEnumeration.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,9 +39,9 @@ public: // actually package-private public: virtual jboolean hasMoreElements(); virtual jboolean hasMoreMatches(); - virtual jboolean hasMoreMatches(::java::lang::StringBuffer *); + virtual jboolean hasMoreMatches(::gnu::java::lang::CPStringBuilder *); + virtual ::gnu::java::util::regex::REMatch * REMatchEnumeration$nextElement(); virtual ::java::lang::Object * nextElement(); - virtual ::gnu::java::util::regex::REMatch * nextMatch(); private: static const jint YES = 1; static const jint MAYBE = 0; diff --git a/libjava/gnu/java/util/regex/REToken.h b/libjava/gnu/java/util/regex/REToken.h index 49ef5aef0c7..552d47a3bea 100644 --- a/libjava/gnu/java/util/regex/REToken.h +++ b/libjava/gnu/java/util/regex/REToken.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -53,8 +57,8 @@ public: // actually package-private virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); virtual ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *); virtual jboolean chain(::gnu::java::util::regex::REToken *); - virtual void dump(::java::lang::StringBuffer *) = 0; - virtual void dumpAll(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *) = 0; + virtual void dumpAll(::gnu::java::lang::CPStringBuilder *); public: virtual ::java::lang::String * toString(); static jchar toLowerCase(jchar, jboolean); diff --git a/libjava/gnu/java/util/regex/RETokenAny.h b/libjava/gnu/java/util/regex/RETokenAny.h index d50be3d64fb..77f00aaad21 100644 --- a/libjava/gnu/java/util/regex/RETokenAny.h +++ b/libjava/gnu/java/util/regex/RETokenAny.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -37,7 +41,7 @@ public: // actually package-private jboolean matchOneChar(jchar); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline; jboolean matchNull; diff --git a/libjava/gnu/java/util/regex/RETokenBackRef.h b/libjava/gnu/java/util/regex/RETokenBackRef.h index 33cf3b679c2..4cadd540594 100644 --- a/libjava/gnu/java/util/regex/RETokenBackRef.h +++ b/libjava/gnu/java/util/regex/RETokenBackRef.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -32,7 +36,7 @@ class gnu::java::util::regex::RETokenBackRef : public ::gnu::java::util::regex:: public: // actually package-private RETokenBackRef(jint, jint, jboolean); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) num; jboolean insens; diff --git a/libjava/gnu/java/util/regex/RETokenChar.h b/libjava/gnu/java/util/regex/RETokenChar.h index abff1cdd803..723bed8c67d 100644 --- a/libjava/gnu/java/util/regex/RETokenChar.h +++ b/libjava/gnu/java/util/regex/RETokenChar.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -44,7 +48,7 @@ public: // actually package-private jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); jboolean chain(::gnu::java::util::regex::REToken *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: JArray< jchar > * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) ch; jboolean insens; diff --git a/libjava/gnu/java/util/regex/RETokenEnd.h b/libjava/gnu/java/util/regex/RETokenEnd.h index cdcb5b06000..975bb1625ec 100644 --- a/libjava/gnu/java/util/regex/RETokenEnd.h +++ b/libjava/gnu/java/util/regex/RETokenEnd.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -38,7 +42,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline; jboolean check_java_line_terminators; diff --git a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h b/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h index 72f54647e82..be5683341ba 100644 --- a/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h +++ b/libjava/gnu/java/util/regex/RETokenEndOfPreviousMatch.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); virtual jboolean returnsFixedLengthmatches(); virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RETokenEndSub.h b/libjava/gnu/java/util/regex/RETokenEndSub.h index 50f3281cae7..109e28b3e64 100644 --- a/libjava/gnu/java/util/regex/RETokenEndSub.h +++ b/libjava/gnu/java/util/regex/RETokenEndSub.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); void setHitEnd(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RETokenIndependent.h b/libjava/gnu/java/util/regex/RETokenIndependent.h index f13c6b3eb6c..7800296841d 100644 --- a/libjava/gnu/java/util/regex/RETokenIndependent.h +++ b/libjava/gnu/java/util/regex/RETokenIndependent.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private jint getMinimumLength(); jint getMaximumLength(); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/java/util/regex/RETokenLookAhead.h b/libjava/gnu/java/util/regex/RETokenLookAhead.h index 64c147c530e..b3e1a72df0a 100644 --- a/libjava/gnu/java/util/regex/RETokenLookAhead.h +++ b/libjava/gnu/java/util/regex/RETokenLookAhead.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -34,7 +38,7 @@ public: // actually package-private RETokenLookAhead(::gnu::java::util::regex::REToken *, jboolean); jint getMaximumLength(); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re; jboolean negative; public: diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h b/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h index 83d9b477a23..dc771b480d6 100644 --- a/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h +++ b/libjava/gnu/java/util/regex/RETokenLookBehind$RETokenMatchHereOnly.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -33,7 +37,7 @@ public: // actually package-private virtual jint getMaximumLength(); RETokenLookBehind$RETokenMatchHereOnly(jint); virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); private: jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) index; public: diff --git a/libjava/gnu/java/util/regex/RETokenLookBehind.h b/libjava/gnu/java/util/regex/RETokenLookBehind.h index b07cf6ccc9f..3aa8013f038 100644 --- a/libjava/gnu/java/util/regex/RETokenLookBehind.h +++ b/libjava/gnu/java/util/regex/RETokenLookBehind.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -34,7 +38,7 @@ public: // actually package-private RETokenLookBehind(::gnu::java::util::regex::REToken *, jboolean); jint getMaximumLength(); ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) re; jboolean negative; public: diff --git a/libjava/gnu/java/util/regex/RETokenNamedProperty.h b/libjava/gnu/java/util/regex/RETokenNamedProperty.h index 9f610cd7ade..a20a1a3ef91 100644 --- a/libjava/gnu/java/util/regex/RETokenNamedProperty.h +++ b/libjava/gnu/java/util/regex/RETokenNamedProperty.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -42,7 +46,7 @@ private: public: // actually package-private jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: ::gnu::java::util::regex::RETokenNamedProperty$Handler * getHandler(::java::lang::String *); public: // actually package-private diff --git a/libjava/gnu/java/util/regex/RETokenOneOf.h b/libjava/gnu/java/util/regex/RETokenOneOf.h index dec0561b405..b7f819dd795 100644 --- a/libjava/gnu/java/util/regex/RETokenOneOf.h +++ b/libjava/gnu/java/util/regex/RETokenOneOf.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -31,8 +35,8 @@ class gnu::java::util::regex::RETokenOneOf : public ::gnu::java::util::regex::RE public: // actually package-private RETokenOneOf(jint, ::java::lang::String *, jboolean, jboolean); - RETokenOneOf(jint, ::java::util::Vector *, jboolean); - RETokenOneOf(jint, ::java::util::Vector *, ::java::util::Vector *, jboolean); + RETokenOneOf(jint, ::java::util::List *, jboolean); + RETokenOneOf(jint, ::java::util::List *, ::java::util::List *, jboolean); jint getMinimumLength(); jint getMaximumLength(); jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); @@ -49,12 +53,12 @@ private: public: // actually package-private jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: - ::java::util::Vector * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options; + ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) options; jboolean negative; jboolean matchesOneChar; - ::java::util::Vector * addition; + ::java::util::List * addition; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/util/regex/RETokenPOSIX.h b/libjava/gnu/java/util/regex/RETokenPOSIX.h index a6a40c09ab3..5704ab8e6fd 100644 --- a/libjava/gnu/java/util/regex/RETokenPOSIX.h +++ b/libjava/gnu/java/util/regex/RETokenPOSIX.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -40,7 +44,7 @@ public: // actually package-private jboolean matchOneChar(jchar); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); jint __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) type; jboolean insens; jboolean negated; diff --git a/libjava/gnu/java/util/regex/RETokenRange.h b/libjava/gnu/java/util/regex/RETokenRange.h index 22ff21a3f03..fa3c923b7bf 100644 --- a/libjava/gnu/java/util/regex/RETokenRange.h +++ b/libjava/gnu/java/util/regex/RETokenRange.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -37,7 +41,7 @@ public: // actually package-private jboolean matchOneChar(jchar); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jchar __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) lo; jchar hi; diff --git a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h b/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h deleted file mode 100644 index 11bf5c18225..00000000000 --- a/libjava/gnu/java/util/regex/RETokenRepeated$FindMatchControlStack.h +++ /dev/null @@ -1,44 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__ -#define __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__ - -#pragma interface - -#include <java/util/ArrayList.h> -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace util - { - namespace regex - { - class RETokenRepeated$FindMatchControl; - class RETokenRepeated$FindMatchControlStack; - } - } - } - } -} - -class gnu::java::util::regex::RETokenRepeated$FindMatchControlStack : public ::java::util::ArrayList -{ - - RETokenRepeated$FindMatchControlStack(); - void push(::gnu::java::util::regex::RETokenRepeated$FindMatchControl *); - ::gnu::java::util::regex::RETokenRepeated$FindMatchControl * pop(); - jboolean empty(); -public: // actually package-private - RETokenRepeated$FindMatchControlStack(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); - static void access$1(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *, ::gnu::java::util::regex::RETokenRepeated$FindMatchControl *); - static jboolean access$2(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); - static ::gnu::java::util::regex::RETokenRepeated$FindMatchControl * access$3(::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_util_regex_RETokenRepeated$FindMatchControlStack__ diff --git a/libjava/gnu/java/util/regex/RETokenRepeated.h b/libjava/gnu/java/util/regex/RETokenRepeated.h index 17de5445b1f..09aca7a5803 100644 --- a/libjava/gnu/java/util/regex/RETokenRepeated.h +++ b/libjava/gnu/java/util/regex/RETokenRepeated.h @@ -15,6 +15,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -25,7 +29,6 @@ extern "Java" class REToken; class RETokenRepeated; class RETokenRepeated$DoablesFinder; - class RETokenRepeated$FindMatchControlStack; class RETokenRepeated$TryAnotherResult; } } @@ -48,7 +51,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * backtrack(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *); private: ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *); - ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *, ::gnu::java::util::regex::RETokenRepeated$FindMatchControlStack *); + ::gnu::java::util::regex::REMatch * findMatch(::gnu::java::util::regex::BacktrackStack *, ::java::util::Deque *); ::gnu::java::util::regex::RETokenRepeated$TryAnotherResult * tryAnother(::gnu::java::util::regex::BacktrackStack *, ::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, ::gnu::java::util::regex::RETokenRepeated$DoablesFinder *, JArray< jint > *); public: // actually package-private jboolean match(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); @@ -61,7 +64,7 @@ private: ::gnu::java::util::regex::REMatch * backtrackFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, ::java::lang::Object *); ::gnu::java::util::regex::REMatch * findMatchFixedLength(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint, jint); public: // actually package-private - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: ::gnu::java::util::regex::REToken * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) token; jint min; diff --git a/libjava/gnu/java/util/regex/RETokenStart.h b/libjava/gnu/java/util/regex/RETokenStart.h index da6ad7f38bd..95654f79593 100644 --- a/libjava/gnu/java/util/regex/RETokenStart.h +++ b/libjava/gnu/java/util/regex/RETokenStart.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -34,9 +38,9 @@ public: // actually package-private RETokenStart(jint, ::java::lang::String *, jboolean); virtual jint getMaximumLength(); virtual ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); - virtual jboolean returnsFixedLengthmatches(); + virtual jboolean returnsFixedLengthMatches(); virtual jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - virtual void dump(::java::lang::StringBuffer *); + virtual void dump(::gnu::java::lang::CPStringBuilder *); private: ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) newline; jboolean check_java_line_terminators; diff --git a/libjava/gnu/java/util/regex/RETokenWordBoundary.h b/libjava/gnu/java/util/regex/RETokenWordBoundary.h index 1d3bb6b97c4..18d5b2ca101 100644 --- a/libjava/gnu/java/util/regex/RETokenWordBoundary.h +++ b/libjava/gnu/java/util/regex/RETokenWordBoundary.h @@ -13,6 +13,10 @@ extern "Java" { namespace java { + namespace lang + { + class CPStringBuilder; + } namespace util { namespace regex @@ -35,7 +39,7 @@ public: // actually package-private ::gnu::java::util::regex::REMatch * matchThis(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *); jboolean returnsFixedLengthMatches(); jint findFixedLengthMatches(::gnu::java::util::regex::CharIndexed *, ::gnu::java::util::regex::REMatch *, jint); - void dump(::java::lang::StringBuffer *); + void dump(::gnu::java::lang::CPStringBuilder *); private: jboolean __attribute__((aligned(__alignof__( ::gnu::java::util::regex::REToken)))) negated; jint where; diff --git a/libjava/gnu/javax/activation/viewers/ImageViewer.h b/libjava/gnu/javax/activation/viewers/ImageViewer.h new file mode 100644 index 00000000000..bda76a6f038 --- /dev/null +++ b/libjava/gnu/javax/activation/viewers/ImageViewer.h @@ -0,0 +1,58 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_activation_viewers_ImageViewer__ +#define __gnu_javax_activation_viewers_ImageViewer__ + +#pragma interface + +#include <java/awt/Component.h> +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace activation + { + namespace viewers + { + class ImageViewer; + } + } + } + } + namespace java + { + namespace awt + { + class Dimension; + class Graphics; + class Image; + } + } + namespace javax + { + namespace activation + { + class DataHandler; + } + } +} + +class gnu::javax::activation::viewers::ImageViewer : public ::java::awt::Component +{ + +public: + ImageViewer(); + virtual ::java::awt::Dimension * getPreferredSize(); + virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *); + virtual jboolean imageUpdate(::java::awt::Image *, jint, jint, jint, jint, jint); + virtual void paint(::java::awt::Graphics *); +private: + ::java::awt::Image * __attribute__((aligned(__alignof__( ::java::awt::Component)))) image; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_activation_viewers_ImageViewer__ diff --git a/libjava/gnu/javax/activation/viewers/TextEditor.h b/libjava/gnu/javax/activation/viewers/TextEditor.h new file mode 100644 index 00000000000..0047d43c926 --- /dev/null +++ b/libjava/gnu/javax/activation/viewers/TextEditor.h @@ -0,0 +1,59 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_activation_viewers_TextEditor__ +#define __gnu_javax_activation_viewers_TextEditor__ + +#pragma interface + +#include <java/awt/TextArea.h> +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace activation + { + namespace viewers + { + class TextEditor; + } + } + } + } + namespace java + { + namespace awt + { + class Dimension; + namespace event + { + class ActionEvent; + } + } + } + namespace javax + { + namespace activation + { + class DataHandler; + } + } +} + +class gnu::javax::activation::viewers::TextEditor : public ::java::awt::TextArea +{ + +public: + TextEditor(); + virtual ::java::awt::Dimension * getPreferredSize(); + virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *); + virtual void actionPerformed(::java::awt::event::ActionEvent *); +private: + ::javax::activation::DataHandler * __attribute__((aligned(__alignof__( ::java::awt::TextArea)))) dh; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_activation_viewers_TextEditor__ diff --git a/libjava/gnu/javax/activation/viewers/TextViewer.h b/libjava/gnu/javax/activation/viewers/TextViewer.h new file mode 100644 index 00000000000..56c5f795f49 --- /dev/null +++ b/libjava/gnu/javax/activation/viewers/TextViewer.h @@ -0,0 +1,51 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_activation_viewers_TextViewer__ +#define __gnu_javax_activation_viewers_TextViewer__ + +#pragma interface + +#include <java/awt/TextArea.h> +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace activation + { + namespace viewers + { + class TextViewer; + } + } + } + } + namespace java + { + namespace awt + { + class Dimension; + } + } + namespace javax + { + namespace activation + { + class DataHandler; + } + } +} + +class gnu::javax::activation::viewers::TextViewer : public ::java::awt::TextArea +{ + +public: + TextViewer(); + virtual ::java::awt::Dimension * getPreferredSize(); + virtual void setCommandContext(::java::lang::String *, ::javax::activation::DataHandler *); + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_activation_viewers_TextViewer__ diff --git a/libjava/gnu/javax/management/Server$LazyListenersHolder.h b/libjava/gnu/javax/management/Server$LazyListenersHolder.h new file mode 100644 index 00000000000..dfe86187b63 --- /dev/null +++ b/libjava/gnu/javax/management/Server$LazyListenersHolder.h @@ -0,0 +1,36 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_javax_management_Server$LazyListenersHolder__ +#define __gnu_javax_management_Server$LazyListenersHolder__ + +#pragma interface + +#include <java/lang/Object.h> +extern "Java" +{ + namespace gnu + { + namespace javax + { + namespace management + { + class Server$LazyListenersHolder; + } + } + } +} + +class gnu::javax::management::Server$LazyListenersHolder : public ::java::lang::Object +{ + + Server$LazyListenersHolder(); +public: // actually package-private + static ::java::util::Map * access$0(); +private: + static ::java::util::Map * listeners; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_javax_management_Server$LazyListenersHolder__ diff --git a/libjava/gnu/javax/management/Server.h b/libjava/gnu/javax/management/Server.h index 2d9495630a5..e23fe021653 100644 --- a/libjava/gnu/javax/management/Server.h +++ b/libjava/gnu/javax/management/Server.h @@ -91,11 +91,10 @@ public: private: void notify(::javax::management::ObjectName *, ::java::lang::String *); static ::javax::management::ObjectName * DELEGATE_NAME; - ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) beans; + ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) beans; ::java::lang::String * defaultDomain; ::javax::management::MBeanServer * outer; ::javax::management::loading::ClassLoaderRepository * repository; - ::java::util::Map * listeners; ::javax::management::MBeanServerDelegate * delegate; static ::java::util::concurrent::atomic::AtomicLong * sequenceNumber; public: diff --git a/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h b/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h index 56bd3954b64..28ac90d31b3 100644 --- a/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h +++ b/libjava/gnu/javax/security/auth/login/ConfigFileTokenizer.h @@ -11,6 +11,13 @@ extern "Java" { namespace gnu { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } namespace javax { namespace security @@ -53,7 +60,7 @@ private: public: // actually package-private jboolean initialised; private: - ::java::lang::StringBuffer * sb; + ::gnu::java::lang::CPStringBuilder * sb; jint sbNdx; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/dom/DomAttr.h b/libjava/gnu/xml/dom/DomAttr.h index e14ac0f9529..db0e57d92db 100644 --- a/libjava/gnu/xml/dom/DomAttr.h +++ b/libjava/gnu/xml/dom/DomAttr.h @@ -39,6 +39,7 @@ class gnu::xml::dom::DomAttr : public ::gnu::xml::dom::DomNsNode public: // actually protected DomAttr(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *); + DomAttr(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *); public: virtual ::java::lang::String * getName(); virtual jboolean getSpecified(); diff --git a/libjava/gnu/xml/dom/DomElement.h b/libjava/gnu/xml/dom/DomElement.h index 35ed33eaaa6..32698e51bbf 100644 --- a/libjava/gnu/xml/dom/DomElement.h +++ b/libjava/gnu/xml/dom/DomElement.h @@ -41,6 +41,7 @@ class gnu::xml::dom::DomElement : public ::gnu::xml::dom::DomNsNode public: // actually protected DomElement(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *); + DomElement(::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *); public: virtual ::org::w3c::dom::NamedNodeMap * getAttributes(); virtual jboolean hasAttributes(); diff --git a/libjava/gnu/xml/dom/DomNsNode.h b/libjava/gnu/xml/dom/DomNsNode.h index 13dc4940fc5..bd75d27d578 100644 --- a/libjava/gnu/xml/dom/DomNsNode.h +++ b/libjava/gnu/xml/dom/DomNsNode.h @@ -27,6 +27,7 @@ class gnu::xml::dom::DomNsNode : public ::gnu::xml::dom::DomNode public: // actually package-private DomNsNode(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *); + DomNsNode(jshort, ::gnu::xml::dom::DomDocument *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *); public: virtual ::java::lang::String * getNodeName(); public: // actually package-private @@ -43,7 +44,6 @@ private: ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::xml::dom::DomNode)))) name; ::java::lang::String * namespace$; ::java::lang::String * prefix; -public: // actually package-private ::java::lang::String * localName; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.h b/libjava/gnu/xml/dom/ls/SAXEventSink.h index 54f4e5f1596..fc726b78800 100644 --- a/libjava/gnu/xml/dom/ls/SAXEventSink.h +++ b/libjava/gnu/xml/dom/ls/SAXEventSink.h @@ -61,6 +61,7 @@ public: virtual ::org::w3c::dom::Document * getDocument(); virtual void setReader(::org::xml::sax::XMLReader *); virtual void setDocumentLocator(::org::xml::sax::Locator *); + virtual void setNamespaceAware(jboolean); virtual void startDocument(); virtual void endDocument(); virtual void startPrefixMapping(::java::lang::String *, ::java::lang::String *); @@ -104,8 +105,8 @@ private: static ::java::lang::String * XMLNS_URI; static ::java::lang::String * XMLNS_PREFIX; static ::java::util::HashSet * PREDEFINED_ENTITIES; -public: // actually package-private jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceAware; +public: // actually package-private jboolean ignoreWhitespace; jboolean expandEntityReferences; jboolean ignoreComments; diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h index 3136a60e591..0fb26669387 100644 --- a/libjava/gnu/xml/stream/XMLParser.h +++ b/libjava/gnu/xml/stream/XMLParser.h @@ -13,6 +13,13 @@ extern "Java" { namespace gnu { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } namespace xml { namespace stream @@ -145,13 +152,13 @@ private: void readMarkupdecl(jboolean); void readElementDecl(); void readContentspec(::java::lang::String *); - ::gnu::xml::stream::XMLParser$ElementContentModel * readElements(::java::lang::StringBuffer *); - ::gnu::xml::stream::XMLParser$ContentParticle * readContentParticle(::java::lang::StringBuffer *); + ::gnu::xml::stream::XMLParser$ElementContentModel * readElements(::gnu::java::lang::CPStringBuilder *); + ::gnu::xml::stream::XMLParser$ContentParticle * readContentParticle(::gnu::java::lang::CPStringBuilder *); void readAttlistDecl(); void readAttDef(::java::lang::String *); - ::java::lang::String * readAttType(::java::lang::StringBuffer *, ::java::util::HashSet *); - void readEnumeration(jboolean, ::java::lang::StringBuffer *, ::java::util::HashSet *); - void readNotationType(::java::lang::StringBuffer *, ::java::util::HashSet *); + ::java::lang::String * readAttType(::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *); + void readEnumeration(jboolean, ::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *); + void readNotationType(::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *); void readDefault(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::HashSet *); void readEntityDecl(jboolean); void readNotationDecl(jboolean); diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.h b/libjava/gnu/xml/transform/AbstractNumberNode.h index d8c2740809d..20dadf66a6a 100644 --- a/libjava/gnu/xml/transform/AbstractNumberNode.h +++ b/libjava/gnu/xml/transform/AbstractNumberNode.h @@ -13,6 +13,13 @@ extern "Java" { namespace gnu { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } namespace xml { namespace transform @@ -52,7 +59,7 @@ public: // actually package-private AbstractNumberNode(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint); virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); virtual ::java::lang::String * format(::java::lang::String *, JArray< jint > *); - virtual void format(::java::lang::StringBuffer *, jint, ::java::lang::String *); + virtual void format(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *); static jboolean isAlphanumeric(jchar); static ::java::lang::String * alphabetic(jchar, jint); static ::java::lang::String * roman(jboolean, jint); diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h index 6a815cfafd8..aebd3e05054 100644 --- a/libjava/gnu/xml/transform/ParameterNode.h +++ b/libjava/gnu/xml/transform/ParameterNode.h @@ -52,14 +52,18 @@ class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::Templat public: // actually package-private ParameterNode(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *, jint); - ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); + ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *); void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint); public: jboolean references(::javax::xml::namespace::QName *); - jint compareTo(::java::lang::Object *); + jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *); ::java::lang::String * toString(); public: // actually package-private + ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); +public: + jint compareTo(::java::lang::Object *); +public: // actually package-private ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; ::gnu::xml::xpath::Expr * select; jint type; diff --git a/libjava/gnu/xml/transform/SortKey.h b/libjava/gnu/xml/transform/SortKey.h index f433dc39668..b35aa5b12c9 100644 --- a/libjava/gnu/xml/transform/SortKey.h +++ b/libjava/gnu/xml/transform/SortKey.h @@ -55,6 +55,10 @@ public: // actually package-private ::java::lang::String * key(::org::w3c::dom::Node *); void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); jboolean references(::javax::xml::namespace::QName *); + ::gnu::xml::transform::SortKey * clone(::gnu::xml::transform::Stylesheet *); +private: + ::gnu::xml::transform::TemplateNode * cloneAttributeValueTemplate(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::Stylesheet *); +public: // actually package-private static const jint DEFAULT = 0; static const jint UPPER_FIRST = 1; static const jint LOWER_FIRST = 2; diff --git a/libjava/gnu/xml/transform/Stylesheet.h b/libjava/gnu/xml/transform/Stylesheet.h index c2a3f20d6db..8bfebcc05c9 100644 --- a/libjava/gnu/xml/transform/Stylesheet.h +++ b/libjava/gnu/xml/transform/Stylesheet.h @@ -120,6 +120,7 @@ public: // actually package-private static ::java::lang::String * getRequiredAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *, ::org::w3c::dom::Node *); public: virtual void handle(jshort, ::java::lang::String *, ::java::lang::Object *, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + virtual ::java::lang::String * toString(); public: // actually package-private static ::java::lang::String * XSL_NS; private: diff --git a/libjava/gnu/xml/transform/TemplatesImpl.h b/libjava/gnu/xml/transform/TemplatesImpl.h index d79409b3df8..d9cc67bb5be 100644 --- a/libjava/gnu/xml/transform/TemplatesImpl.h +++ b/libjava/gnu/xml/transform/TemplatesImpl.h @@ -41,6 +41,7 @@ public: // actually package-private public: virtual ::javax::xml::transform::Transformer * newTransformer(); virtual ::java::util::Properties * getOutputProperties(); + virtual ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) factory; ::gnu::xml::transform::Stylesheet * stylesheet; diff --git a/libjava/gnu/xml/transform/XSLComparator.h b/libjava/gnu/xml/transform/XSLComparator.h index 0f99c57c86d..0bde3e80a4b 100644 --- a/libjava/gnu/xml/transform/XSLComparator.h +++ b/libjava/gnu/xml/transform/XSLComparator.h @@ -19,6 +19,16 @@ extern "Java" } } } + namespace org + { + namespace w3c + { + namespace dom + { + class Node; + } + } + } } class gnu::xml::transform::XSLComparator : public ::java::lang::Object @@ -27,6 +37,7 @@ class gnu::xml::transform::XSLComparator : public ::java::lang::Object public: // actually package-private XSLComparator(::java::util::List *); public: + virtual jint XSLComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *); virtual jint compare(::java::lang::Object *, ::java::lang::Object *); public: // actually package-private ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sortKeys; diff --git a/libjava/gnu/xml/util/XMLWriter.h b/libjava/gnu/xml/util/XMLWriter.h index ea354b999f3..56252a5c199 100644 --- a/libjava/gnu/xml/util/XMLWriter.h +++ b/libjava/gnu/xml/util/XMLWriter.h @@ -13,6 +13,13 @@ extern "Java" { namespace gnu { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } namespace xml { namespace util @@ -118,7 +125,7 @@ private: jint elementNestLevel; ::java::lang::String * eol; jshort dangerMask; - ::java::lang::StringBuffer * stringBuf; + ::gnu::java::lang::CPStringBuilder * stringBuf; ::org::xml::sax::Locator * locator; ::org::xml::sax::ErrorHandler * errHandler; jboolean expandingEntities; diff --git a/libjava/gnu/xml/xpath/DocumentOrderComparator.h b/libjava/gnu/xml/xpath/DocumentOrderComparator.h index f34cb311a47..26abc2cff3e 100644 --- a/libjava/gnu/xml/xpath/DocumentOrderComparator.h +++ b/libjava/gnu/xml/xpath/DocumentOrderComparator.h @@ -19,6 +19,16 @@ extern "Java" } } } + namespace org + { + namespace w3c + { + namespace dom + { + class Node; + } + } + } } class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object @@ -26,6 +36,7 @@ class gnu::xml::xpath::DocumentOrderComparator : public ::java::lang::Object public: DocumentOrderComparator(); + virtual jint DocumentOrderComparator$compare(::org::w3c::dom::Node *, ::org::w3c::dom::Node *); virtual jint compare(::java::lang::Object *, ::java::lang::Object *); static ::java::lang::Class class$; }; |