From 2bc043354c4edb1f5aad751285060fb722a63ea1 Mon Sep 17 00:00:00 2001 From: doko Date: Tue, 21 Oct 2008 17:55:01 +0000 Subject: libjava/ChangeLog: 2008-10-21 Andrew John Hughes * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose * 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 * 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 * 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 * 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 * 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 * 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 * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose * 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 * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose 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 * 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 * 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 * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes * 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 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 * 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 * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose * 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 * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose * 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 * 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 Revert: Daniel Frampton * 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 * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes * 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 * 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 * 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/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/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 * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes 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/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes * 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 * 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 * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes * 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 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 PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes * 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 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 * 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/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 * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali * 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 * 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 --- libjava/java/util/ArrayList.h | 1 + libjava/java/util/Arrays.h | 15 +- libjava/java/util/Calendar.h | 1 + libjava/java/util/Formatter.h | 16 ++- libjava/java/util/Properties.h | 16 ++- libjava/java/util/PropertyResourceBundle.h | 1 + libjava/java/util/ResourceBundle$BundleKey.h | 1 + libjava/java/util/ResourceBundle.h | 4 + libjava/java/util/Scanner.h | 178 ++++++++++++++++++++++++ libjava/java/util/Vector.h | 1 + libjava/java/util/logging/XMLFormatter.h | 14 +- libjava/java/util/prefs/AbstractPreferences$1.h | 2 +- libjava/java/util/prefs/AbstractPreferences$2.h | 2 +- libjava/java/util/regex/Matcher.h | 14 ++ libjava/java/util/zip/ZipEntry.h | 22 ++- 15 files changed, 267 insertions(+), 21 deletions(-) create mode 100644 libjava/java/util/Scanner.h (limited to 'libjava/java/util') diff --git a/libjava/java/util/ArrayList.h b/libjava/java/util/ArrayList.h index 755e7c5a98d..4bbdb1ae074 100644 --- a/libjava/java/util/ArrayList.h +++ b/libjava/java/util/ArrayList.h @@ -40,6 +40,7 @@ public: // actually protected private: void checkBoundInclusive(jint); void checkBoundExclusive(jint); + void raiseBoundsError(jint); public: // actually package-private virtual jboolean removeAllInternal(::java::util::Collection *); virtual jboolean retainAllInternal(::java::util::Collection *); diff --git a/libjava/java/util/Arrays.h b/libjava/java/util/Arrays.h index 4010f602cd1..8860ee35a69 100644 --- a/libjava/java/util/Arrays.h +++ b/libjava/java/util/Arrays.h @@ -9,6 +9,19 @@ #include #include +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } +} class java::util::Arrays : public ::java::lang::Object { @@ -144,7 +157,7 @@ public: static ::java::lang::String * toString(JArray< jdouble > *); static ::java::lang::String * toString(JArray< ::java::lang::Object * > *); private: - static void deepToString(JArray< ::java::lang::Object * > *, ::java::lang::StringBuilder *, ::java::util::HashSet *); + static void deepToString(JArray< ::java::lang::Object * > *, ::gnu::java::lang::CPStringBuilder *, ::java::util::HashSet *); public: static ::java::lang::String * deepToString(JArray< ::java::lang::Object * > *); static JArray< jboolean > * copyOf(JArray< jboolean > *, jint); diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h index b3878714807..9abfba539ad 100644 --- a/libjava/java/util/Calendar.h +++ b/libjava/java/util/Calendar.h @@ -138,6 +138,7 @@ public: // actually package-private static const jlong serialVersionUID = -1807547505821590642LL; private: static ::java::lang::String * bundleName; + static ::java::util::Properties * properties; static ::java::util::HashMap * cache; static JArray< ::java::lang::Class * > * ctorArgTypes; static JArray< ::java::lang::String * > * fieldNames; diff --git a/libjava/java/util/Formatter.h b/libjava/java/util/Formatter.h index 5d513ed786d..71a659f6632 100644 --- a/libjava/java/util/Formatter.h +++ b/libjava/java/util/Formatter.h @@ -11,6 +11,16 @@ extern "Java" { + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } namespace java { namespace text @@ -44,7 +54,7 @@ private: ::java::lang::String * getName(jint); void checkFlags(jint, jint, jchar); void noPrecision(jint); - void applyLocalization(::java::lang::StringBuilder *, jint, jint, jboolean); + void applyLocalization(::gnu::java::lang::CPStringBuilder *, jint, jint, jboolean); void genericFormat(::java::lang::String *, jint, jint, jint); void booleanFormat(::java::lang::Object *, jint, jint, jint, jchar); void hashCodeFormat(::java::lang::Object *, jint, jint, jint, jchar); @@ -52,10 +62,10 @@ private: void characterFormat(::java::lang::Object *, jint, jint, jint, jchar); void percentFormat(jint, jint, jint); void newLineFormat(jint, jint, jint); - ::java::lang::StringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); + ::gnu::java::lang::CPStringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); void hexOrOctalConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); void decimalConversion(::java::lang::Object *, jint, jint, jint, jchar); - void singleDateTimeConversion(::java::lang::StringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *); + void singleDateTimeConversion(::gnu::java::lang::CPStringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *); void dateTimeConversion(::java::lang::Object *, jint, jint, jint, jchar, jchar); void advance(); jint parseInt(); diff --git a/libjava/java/util/Properties.h b/libjava/java/util/Properties.h index 5075e347c80..ccb76b5a20b 100644 --- a/libjava/java/util/Properties.h +++ b/libjava/java/util/Properties.h @@ -7,6 +7,19 @@ #pragma interface #include +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } +} class java::util::Properties : public ::java::util::Hashtable { @@ -15,6 +28,7 @@ public: Properties(); Properties(::java::util::Properties *); virtual ::java::lang::Object * setProperty(::java::lang::String *, ::java::lang::String *); + virtual void load(::java::io::Reader *); virtual void load(::java::io::InputStream *); virtual void save(::java::io::OutputStream *, ::java::lang::String *); virtual void store(::java::io::OutputStream *, ::java::lang::String *); @@ -24,7 +38,7 @@ public: virtual void list(::java::io::PrintStream *); virtual void list(::java::io::PrintWriter *); private: - void formatForOutput(::java::lang::String *, ::java::lang::StringBuilder *, jboolean); + void formatForOutput(::java::lang::String *, ::gnu::java::lang::CPStringBuilder *, jboolean); public: virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *); virtual void storeToXML(::java::io::OutputStream *, ::java::lang::String *, ::java::lang::String *); diff --git a/libjava/java/util/PropertyResourceBundle.h b/libjava/java/util/PropertyResourceBundle.h index a0f0726be78..fa6528511a1 100644 --- a/libjava/java/util/PropertyResourceBundle.h +++ b/libjava/java/util/PropertyResourceBundle.h @@ -13,6 +13,7 @@ class java::util::PropertyResourceBundle : public ::java::util::ResourceBundle public: PropertyResourceBundle(::java::io::InputStream *); + PropertyResourceBundle(::java::io::Reader *); virtual ::java::lang::Object * handleGetObject(::java::lang::String *); virtual ::java::util::Enumeration * getKeys(); private: diff --git a/libjava/java/util/ResourceBundle$BundleKey.h b/libjava/java/util/ResourceBundle$BundleKey.h index 62c08b38f3c..49c051cfbd3 100644 --- a/libjava/java/util/ResourceBundle$BundleKey.h +++ b/libjava/java/util/ResourceBundle$BundleKey.h @@ -18,6 +18,7 @@ public: // actually package-private public: virtual jint hashCode(); virtual jboolean equals(::java::lang::Object *); + virtual ::java::lang::String * toString(); public: // actually package-private ::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) defaultLocale; ::java::lang::String * baseName; diff --git a/libjava/java/util/ResourceBundle.h b/libjava/java/util/ResourceBundle.h index 98a87e679fd..e14e4539fb0 100644 --- a/libjava/java/util/ResourceBundle.h +++ b/libjava/java/util/ResourceBundle.h @@ -32,6 +32,10 @@ public: private: static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::lang::ClassLoader *); static ::java::util::ResourceBundle * tryBundle(::java::lang::String *, ::java::util::Locale *, ::java::lang::ClassLoader *, jboolean); +public: + static void clearCache(); + static void clearCache(::java::lang::ClassLoader *); +private: static const jint CACHE_SIZE = 100; public: // actually protected ::java::util::ResourceBundle * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parent; diff --git a/libjava/java/util/Scanner.h b/libjava/java/util/Scanner.h new file mode 100644 index 00000000000..bca1ab77eff --- /dev/null +++ b/libjava/java/util/Scanner.h @@ -0,0 +1,178 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __java_util_Scanner__ +#define __java_util_Scanner__ + +#pragma interface + +#include +#include + +extern "Java" +{ + namespace java + { + namespace math + { + class BigDecimal; + class BigInteger; + } + namespace nio + { + namespace channels + { + class ReadableByteChannel; + } + } + namespace text + { + class DecimalFormat; + class DecimalFormatSymbols; + class NumberFormat; + } + } +} + +class java::util::Scanner : public ::java::lang::Object +{ + +public: + Scanner(::java::io::File *); + Scanner(::java::io::File *, ::java::lang::String *); + Scanner(::java::io::InputStream *); + Scanner(::java::io::InputStream *, ::java::lang::String *); + Scanner(::java::lang::Readable *); + Scanner(::java::nio::channels::ReadableByteChannel *); + Scanner(::java::nio::channels::ReadableByteChannel *, ::java::lang::String *); + Scanner(::java::lang::String *); + virtual void close(); + virtual ::java::util::regex::Pattern * delimiter(); + virtual ::java::lang::String * findInLine(::java::util::regex::Pattern *); + virtual ::java::lang::String * findInLine(::java::lang::String *); + virtual ::java::lang::String * findWithinHorizon(::java::util::regex::Pattern *, jint); + virtual ::java::lang::String * findWithinHorizon(::java::lang::String *, jint); + virtual jboolean hasNext(); + virtual jboolean hasNext(::java::util::regex::Pattern *); + virtual jboolean hasNext(::java::lang::String *); + virtual jboolean hasNextBigDecimal(); + virtual jboolean hasNextBigInteger(); + virtual jboolean hasNextBigInteger(jint); + virtual jboolean hasNextBoolean(); + virtual jboolean hasNextByte(); + virtual jboolean hasNextByte(jint); + virtual jboolean hasNextDouble(); + virtual jboolean hasNextFloat(); + virtual jboolean hasNextInt(); + virtual jboolean hasNextInt(jint); + virtual jboolean hasNextLine(); + virtual jboolean hasNextLong(); + virtual jboolean hasNextLong(jint); + virtual jboolean hasNextShort(); + virtual jboolean hasNextShort(jint); + virtual ::java::io::IOException * ioException(); + virtual jboolean isUseLocale(); + virtual ::java::util::Locale * locale(); + virtual ::java::util::regex::MatchResult * match(); + virtual ::java::lang::String * Scanner$next(); + virtual ::java::lang::String * next(::java::util::regex::Pattern *); + virtual ::java::lang::String * next(::java::lang::String *); + virtual ::java::math::BigDecimal * nextBigDecimal(); + virtual ::java::math::BigInteger * nextBigInteger(); + virtual ::java::math::BigInteger * nextBigInteger(jint); + virtual jboolean nextBoolean(); + virtual jbyte nextByte(); + virtual jbyte nextByte(jint); + virtual jdouble nextDouble(); + virtual jfloat nextFloat(); + virtual jint nextInt(); + virtual jint nextInt(jint); + virtual ::java::lang::String * nextLine(); + virtual jlong nextLong(); + virtual jlong nextLong(jint); + virtual jshort nextShort(); + virtual jshort nextShort(jint); + virtual jint radix(); + virtual void remove(); + virtual void setUseLocale(jboolean); + virtual ::java::util::Scanner * skip(::java::util::regex::Pattern *); + virtual ::java::util::Scanner * skip(::java::lang::String *); + virtual ::java::lang::String * toString(); + virtual ::java::util::Scanner * useDelimiter(::java::util::regex::Pattern *); + virtual ::java::util::Scanner * useDelimiter(::java::lang::String *); + virtual ::java::util::Scanner * useLocale(::java::util::Locale *); + virtual ::java::util::Scanner * useRadix(jint); +private: + ::java::lang::String * myApplyLocale(::java::lang::String *, jint); + ::java::lang::String * myApplyLocaleBD(::java::lang::String *); + ::java::math::BigDecimal * myBigDecimal(jboolean); + ::java::lang::String * myConvert(::java::lang::String *); + ::java::lang::String * myCoreNext(jboolean, ::java::util::regex::Pattern *); + void myFillBuffer(); + jboolean myFillBuffer_loop(::java::util::regex::Matcher *, jint, jboolean); + ::java::lang::String * myFindPInStr(::java::util::regex::Pattern *, ::java::lang::String *, jint); + ::java::lang::String * myNext(::java::util::regex::Pattern *, jboolean); + ::java::math::BigInteger * myNextBigInteger(jint, jboolean, ::java::lang::String *); + jboolean myNextBoolean(jboolean); + jbyte myNextByte(jint, jboolean); + jdouble myNextDouble(jboolean); + jint myNextInt(jint, jboolean); + ::java::lang::String * myNextLine(jboolean); + jlong myNextLong(jint, jboolean); + jshort myNextShort(jint, jboolean); + ::java::lang::String * myPrepareForNext(::java::util::regex::Pattern *, jboolean); + jboolean shallUseLastFound(::java::util::regex::Pattern *); +public: + virtual ::java::lang::Object * next(); +private: + static ::java::lang::String * NOT_LONG; + static ::java::lang::String * ERR_PREFIX; + static ::java::lang::String * NOT_INT; + static ::java::lang::String * NOT_DOUBLE; + static ::java::lang::String * NOT_BYTE; + static ::java::lang::String * NOT_BOOLEAN; + static ::java::lang::String * IS_NOT; + static ::java::lang::String * DEFAULT_PATTERN_S; + static ::java::util::regex::Pattern * DEFAULT_PATTERN; + static ::java::lang::String * BIG_INTEGER; + static ::java::lang::String * NEW_LINE; + ::java::io::IOException * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastIOException; + ::java::io::InputStream * bIS; + const jint MaxBufferLen; + const jint MIN_BUF_LEN; + const jint MAX_PREFIX; + ::java::lang::String * actBuffer; + jint currentRadix; + ::java::util::Locale * actLocale; + ::java::util::regex::Pattern * p; + jint actPos; + JArray< jbyte > * tmpBuffer; + ::java::lang::String * charsetName; + ::java::util::regex::Matcher * myMatcher; + ::java::util::regex::MatchResult * actResult; + ::java::lang::Readable * readableSource; + ::java::nio::channels::ReadableByteChannel * rbcSource; + jboolean isClosed; + ::java::lang::String * lastFound; + jboolean lastFoundPresent; + jint lastNextPos; + jint lastPatternHash; + jint last_RegionStart; + jint last_RegionEnd; + jboolean last_anchor; + jboolean last_transparent; + ::java::util::regex::MatchResult * lastResult; + jint procesedChars; + jboolean needInput; + jboolean skipped; + jboolean doSkipp; + jboolean matchValid; + ::java::text::NumberFormat * actFormat; + ::java::text::DecimalFormat * df; + jboolean useLocale__; + ::java::text::DecimalFormatSymbols * dfs; +public: + static ::java::lang::Class class$; +}; + +#endif // __java_util_Scanner__ diff --git a/libjava/java/util/Vector.h b/libjava/java/util/Vector.h index 8330b2a18ff..c903819c4b9 100644 --- a/libjava/java/util/Vector.h +++ b/libjava/java/util/Vector.h @@ -64,6 +64,7 @@ public: // actually protected private: void checkBoundInclusive(jint); void checkBoundExclusive(jint); + void raiseBoundsError(jint, ::java::lang::String *); void writeObject(::java::io::ObjectOutputStream *); static const jlong serialVersionUID = -2767605614048989439LL; public: // actually protected diff --git a/libjava/java/util/logging/XMLFormatter.h b/libjava/java/util/logging/XMLFormatter.h index 48a585de097..a5de3543541 100644 --- a/libjava/java/util/logging/XMLFormatter.h +++ b/libjava/java/util/logging/XMLFormatter.h @@ -9,6 +9,16 @@ #include extern "Java" { + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } namespace java { namespace text @@ -24,8 +34,8 @@ class java::util::logging::XMLFormatter : public ::java::util::logging::Formatte public: XMLFormatter(); private: - static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, ::java::lang::String *); - static void appendTag(::java::lang::StringBuffer *, jint, ::java::lang::String *, jlong); + static void appendTag(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *, ::java::lang::String *); + static void appendTag(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *, jlong); public: virtual ::java::lang::String * format(::java::util::logging::LogRecord *); virtual ::java::lang::String * getHead(::java::util::logging::Handler *); diff --git a/libjava/java/util/prefs/AbstractPreferences$1.h b/libjava/java/util/prefs/AbstractPreferences$1.h index 97c3f53c752..6e41aa3102e 100644 --- a/libjava/java/util/prefs/AbstractPreferences$1.h +++ b/libjava/java/util/prefs/AbstractPreferences$1.h @@ -18,7 +18,7 @@ public: public: // actually package-private ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0; private: - ::java::util::prefs::PreferenceChangeListener * val$l; + ::java::util::prefs::PreferenceChangeListener * val$listener; ::java::util::prefs::PreferenceChangeEvent * val$event; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/prefs/AbstractPreferences$2.h b/libjava/java/util/prefs/AbstractPreferences$2.h index 45378c56ad5..a96ebf139cb 100644 --- a/libjava/java/util/prefs/AbstractPreferences$2.h +++ b/libjava/java/util/prefs/AbstractPreferences$2.h @@ -19,7 +19,7 @@ public: // actually package-private ::java::util::prefs::AbstractPreferences * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0; private: jboolean val$added; - ::java::util::prefs::NodeChangeListener * val$l; + ::java::util::prefs::NodeChangeListener * val$listener; ::java::util::prefs::NodeChangeEvent * val$event; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/regex/Matcher.h b/libjava/java/util/regex/Matcher.h index 35cd1c1cab4..74230ef51b7 100644 --- a/libjava/java/util/regex/Matcher.h +++ b/libjava/java/util/regex/Matcher.h @@ -53,12 +53,26 @@ public: ::java::lang::String * toString(); private: void assertMatchOp(); +public: + ::java::util::regex::Matcher * region(jint, jint); + jint regionStart(); + jint regionEnd(); + jboolean hasTransparentBounds(); + ::java::util::regex::Matcher * useTransparentBounds(jboolean); + jboolean hasAnchoringBounds(); + ::java::util::regex::Matcher * useAnchoringBounds(jboolean); + ::java::util::regex::MatchResult * toMatchResult(); +private: ::java::util::regex::Pattern * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pattern__; ::java::lang::CharSequence * input; ::gnu::java::util::regex::CharIndexed * inputCharIndexed; jint position; jint appendPosition; ::gnu::java::util::regex::REMatch * match; + jint regionStart__; + jint regionEnd__; + jboolean transparentBounds; + jint anchoringBounds; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/zip/ZipEntry.h b/libjava/java/util/zip/ZipEntry.h index 7e1cc8f518f..47cb903a8d6 100644 --- a/libjava/java/util/zip/ZipEntry.h +++ b/libjava/java/util/zip/ZipEntry.h @@ -25,9 +25,6 @@ public: virtual ::java::lang::String * getName(); virtual void setTime(jlong); virtual jlong getTime(); -private: - static ::java::util::Calendar * getCalendar(); -public: virtual void setSize(jlong); virtual jlong getSize(); virtual void setCompressedSize(jlong); @@ -47,21 +44,22 @@ public: virtual ::java::lang::String * toString(); virtual jint hashCode(); private: - static const jint KNOWN_SIZE = 1; - static const jint KNOWN_CSIZE = 2; - static const jint KNOWN_CRC = 4; - static const jint KNOWN_TIME = 8; - static const jint KNOWN_EXTRA = 16; - static ::java::util::Calendar * cal; + static const jbyte KNOWN_SIZE = 1; + static const jbyte KNOWN_CSIZE = 2; + static const jbyte KNOWN_CRC = 4; + static const jbyte KNOWN_TIME = 8; + static const jbyte KNOWN_DOSTIME = 16; + static const jbyte KNOWN_EXTRA = 32; ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; jint size; jlong compressedSize; jint crc; + ::java::lang::String * comment; + jbyte method; + jbyte known; jint dostime; - jshort known; - jshort method; + jlong time; JArray< jbyte > * extra; - ::java::lang::String * comment; public: // actually package-private jint flags; jint offset; -- cgit v1.2.1