cd6d4007aa
libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
566 lines
18 KiB
Java
566 lines
18 KiB
Java
/* java.lang.Throwable -- Root class for all Exceptions and Errors
|
|
Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
package java.lang;
|
|
|
|
import gnu.classpath.SystemProperties;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.PrintStream;
|
|
import java.io.PrintWriter;
|
|
import java.io.Serializable;
|
|
|
|
/**
|
|
* Throwable is the superclass of all exceptions that can be raised.
|
|
*
|
|
* <p>There are two special cases: {@link Error} and {@link RuntimeException}:
|
|
* these two classes (and their subclasses) are considered unchecked
|
|
* exceptions, and are either frequent enough or catastrophic enough that you
|
|
* do not need to declare them in <code>throws</code> clauses. Everything
|
|
* else is a checked exception, and is ususally a subclass of
|
|
* {@link Exception}; these exceptions have to be handled or declared.
|
|
*
|
|
* <p>Instances of this class are usually created with knowledge of the
|
|
* execution context, so that you can get a stack trace of the problem spot
|
|
* in the code. Also, since JDK 1.4, Throwables participate in "exception
|
|
* chaining." This means that one exception can be caused by another, and
|
|
* preserve the information of the original.
|
|
*
|
|
* <p>One reason this is useful is to wrap exceptions to conform to an
|
|
* interface. For example, it would be bad design to require all levels
|
|
* of a program interface to be aware of the low-level exceptions thrown
|
|
* at one level of abstraction. Another example is wrapping a checked
|
|
* exception in an unchecked one, to communicate that failure occured
|
|
* while still obeying the method throws clause of a superclass.
|
|
*
|
|
* <p>A cause is assigned in one of two ways; but can only be assigned once
|
|
* in the lifetime of the Throwable. There are new constructors added to
|
|
* several classes in the exception hierarchy that directly initialize the
|
|
* cause, or you can use the <code>initCause</code> method. This second
|
|
* method is especially useful if the superclass has not been retrofitted
|
|
* with new constructors:<br>
|
|
* <pre>
|
|
* try
|
|
* {
|
|
* lowLevelOp();
|
|
* }
|
|
* catch (LowLevelException lle)
|
|
* {
|
|
* throw (HighLevelException) new HighLevelException().initCause(lle);
|
|
* }
|
|
* </pre>
|
|
* Notice the cast in the above example; without it, your method would need
|
|
* a throws clase that declared Throwable, defeating the purpose of chainig
|
|
* your exceptions.
|
|
*
|
|
* <p>By convention, exception classes have two constructors: one with no
|
|
* arguments, and one that takes a String for a detail message. Further,
|
|
* classes which are likely to be used in an exception chain also provide
|
|
* a constructor that takes a Throwable, with or without a detail message
|
|
* string.
|
|
*
|
|
* <p>Another 1.4 feature is the StackTrace, a means of reflection that
|
|
* allows the program to inspect the context of the exception, and which is
|
|
* serialized, so that remote procedure calls can correctly pass exceptions.
|
|
*
|
|
* @author Brian Jones
|
|
* @author John Keiser
|
|
* @author Mark Wielaard
|
|
* @author Tom Tromey
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @since 1.0
|
|
* @status updated to 1.4
|
|
*/
|
|
public class Throwable implements Serializable
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.0+.
|
|
*/
|
|
private static final long serialVersionUID = -3042686055658047285L;
|
|
|
|
/**
|
|
* The detail message.
|
|
*
|
|
* @serial specific details about the exception, may be null
|
|
*/
|
|
private final String detailMessage;
|
|
|
|
/**
|
|
* The cause of the throwable, including null for an unknown or non-chained
|
|
* cause. This may only be set once; so the field is set to
|
|
* <code>this</code> until initialized.
|
|
*
|
|
* @serial the cause, or null if unknown, or this if not yet set
|
|
* @since 1.4
|
|
*/
|
|
private Throwable cause = this;
|
|
|
|
/**
|
|
* The stack trace, in a serialized form.
|
|
*
|
|
* @serial the elements of the stack trace; this is non-null, and has
|
|
* no null entries
|
|
* @since 1.4
|
|
*/
|
|
private StackTraceElement[] stackTrace;
|
|
|
|
/**
|
|
* Instantiate this Throwable with an empty message. The cause remains
|
|
* uninitialized. {@link #fillInStackTrace()} will be called to set
|
|
* up the stack trace.
|
|
*/
|
|
public Throwable()
|
|
{
|
|
this((String) null);
|
|
}
|
|
|
|
/**
|
|
* Instantiate this Throwable with the given message. The cause remains
|
|
* uninitialized. {@link #fillInStackTrace()} will be called to set
|
|
* up the stack trace.
|
|
*
|
|
* @param message the message to associate with the Throwable
|
|
*/
|
|
public Throwable(String message)
|
|
{
|
|
fillInStackTrace();
|
|
detailMessage = message;
|
|
}
|
|
|
|
/**
|
|
* Instantiate this Throwable with the given message and cause. Note that
|
|
* the message is unrelated to the message of the cause.
|
|
* {@link #fillInStackTrace()} will be called to set up the stack trace.
|
|
*
|
|
* @param message the message to associate with the Throwable
|
|
* @param cause the cause, may be null
|
|
* @since 1.4
|
|
*/
|
|
public Throwable(String message, Throwable cause)
|
|
{
|
|
this(message);
|
|
this.cause = cause;
|
|
}
|
|
|
|
/**
|
|
* Instantiate this Throwable with the given cause. The message is then
|
|
* built as <code>cause == null ? null : cause.toString()</code>.
|
|
* {@link #fillInStackTrace()} will be called to set up the stack trace.
|
|
*
|
|
* @param cause the cause, may be null
|
|
* @since 1.4
|
|
*/
|
|
public Throwable(Throwable cause)
|
|
{
|
|
this(cause == null ? null : cause.toString(), cause);
|
|
}
|
|
|
|
/**
|
|
* Get the message associated with this Throwable.
|
|
*
|
|
* @return the error message associated with this Throwable, may be null
|
|
*/
|
|
public String getMessage()
|
|
{
|
|
return detailMessage;
|
|
}
|
|
|
|
/**
|
|
* Get a localized version of this Throwable's error message.
|
|
* This method must be overridden in a subclass of Throwable
|
|
* to actually produce locale-specific methods. The Throwable
|
|
* implementation just returns getMessage().
|
|
*
|
|
* @return a localized version of this error message
|
|
* @see #getMessage()
|
|
* @since 1.1
|
|
*/
|
|
public String getLocalizedMessage()
|
|
{
|
|
return getMessage();
|
|
}
|
|
|
|
/**
|
|
* Returns the cause of this exception, or null if the cause is not known
|
|
* or non-existant. This cause is initialized by the new constructors,
|
|
* or by calling initCause.
|
|
*
|
|
* @return the cause of this Throwable
|
|
* @since 1.4
|
|
*/
|
|
public Throwable getCause()
|
|
{
|
|
return cause == this ? null : cause;
|
|
}
|
|
|
|
/**
|
|
* Initialize the cause of this Throwable. This may only be called once
|
|
* during the object lifetime, including implicitly by chaining
|
|
* constructors.
|
|
*
|
|
* @param cause the cause of this Throwable, may be null
|
|
* @return this
|
|
* @throws IllegalArgumentException if cause is this (a Throwable can't be
|
|
* its own cause!)
|
|
* @throws IllegalStateException if the cause has already been set
|
|
* @since 1.4
|
|
*/
|
|
public Throwable initCause(Throwable cause)
|
|
{
|
|
if (cause == this)
|
|
throw new IllegalArgumentException();
|
|
if (this.cause != this)
|
|
throw new IllegalStateException();
|
|
this.cause = cause;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Get a human-readable representation of this Throwable. The detail message
|
|
* is retrieved by getLocalizedMessage(). Then, with a null detail
|
|
* message, this string is simply the object's class name; otherwise
|
|
* the string is <code>getClass().getName() + ": " + message</code>.
|
|
*
|
|
* @return a human-readable String represting this Throwable
|
|
*/
|
|
public String toString()
|
|
{
|
|
String msg = getLocalizedMessage();
|
|
return getClass().getName() + (msg == null ? "" : ": " + msg);
|
|
}
|
|
|
|
/**
|
|
* Print a stack trace to the standard error stream. This stream is the
|
|
* current contents of <code>System.err</code>. The first line of output
|
|
* is the result of {@link #toString()}, and the remaining lines represent
|
|
* the data created by {@link #fillInStackTrace()}. While the format is
|
|
* unspecified, this implementation uses the suggested format, demonstrated
|
|
* by this example:<br>
|
|
* <pre>
|
|
* public class Junk
|
|
* {
|
|
* public static void main(String args[])
|
|
* {
|
|
* try
|
|
* {
|
|
* a();
|
|
* }
|
|
* catch(HighLevelException e)
|
|
* {
|
|
* e.printStackTrace();
|
|
* }
|
|
* }
|
|
* static void a() throws HighLevelException
|
|
* {
|
|
* try
|
|
* {
|
|
* b();
|
|
* }
|
|
* catch(MidLevelException e)
|
|
* {
|
|
* throw new HighLevelException(e);
|
|
* }
|
|
* }
|
|
* static void b() throws MidLevelException
|
|
* {
|
|
* c();
|
|
* }
|
|
* static void c() throws MidLevelException
|
|
* {
|
|
* try
|
|
* {
|
|
* d();
|
|
* }
|
|
* catch(LowLevelException e)
|
|
* {
|
|
* throw new MidLevelException(e);
|
|
* }
|
|
* }
|
|
* static void d() throws LowLevelException
|
|
* {
|
|
* e();
|
|
* }
|
|
* static void e() throws LowLevelException
|
|
* {
|
|
* throw new LowLevelException();
|
|
* }
|
|
* }
|
|
* class HighLevelException extends Exception
|
|
* {
|
|
* HighLevelException(Throwable cause) { super(cause); }
|
|
* }
|
|
* class MidLevelException extends Exception
|
|
* {
|
|
* MidLevelException(Throwable cause) { super(cause); }
|
|
* }
|
|
* class LowLevelException extends Exception
|
|
* {
|
|
* }
|
|
* </pre>
|
|
* <p>
|
|
* <pre>
|
|
* HighLevelException: MidLevelException: LowLevelException
|
|
* at Junk.a(Junk.java:13)
|
|
* at Junk.main(Junk.java:4)
|
|
* Caused by: MidLevelException: LowLevelException
|
|
* at Junk.c(Junk.java:23)
|
|
* at Junk.b(Junk.java:17)
|
|
* at Junk.a(Junk.java:11)
|
|
* ... 1 more
|
|
* Caused by: LowLevelException
|
|
* at Junk.e(Junk.java:30)
|
|
* at Junk.d(Junk.java:27)
|
|
* at Junk.c(Junk.java:21)
|
|
* ... 3 more
|
|
* </pre>
|
|
*/
|
|
public void printStackTrace()
|
|
{
|
|
printStackTrace(System.err);
|
|
}
|
|
|
|
/**
|
|
* Print a stack trace to the specified PrintStream. See
|
|
* {@link #printStackTrace()} for the sample format.
|
|
*
|
|
* @param s the PrintStream to write the trace to
|
|
*/
|
|
public void printStackTrace(PrintStream s)
|
|
{
|
|
s.print(stackTraceString());
|
|
}
|
|
|
|
/**
|
|
* Prints the exception, the detailed message and the stack trace
|
|
* associated with this Throwable to the given <code>PrintWriter</code>.
|
|
* The actual output written is implemention specific. Use the result of
|
|
* <code>getStackTrace()</code> when more precise information is needed.
|
|
*
|
|
* <p>This implementation first prints a line with the result of this
|
|
* object's <code>toString()</code> method.
|
|
* <br>
|
|
* Then for all elements given by <code>getStackTrace</code> it prints
|
|
* a line containing three spaces, the string "at " and the result of calling
|
|
* the <code>toString()</code> method on the <code>StackTraceElement</code>
|
|
* object. If <code>getStackTrace()</code> returns an empty array it prints
|
|
* a line containing three spaces and the string
|
|
* "<<No stacktrace available>>".
|
|
* <br>
|
|
* Then if <code>getCause()</code> doesn't return null it adds a line
|
|
* starting with "Caused by: " and the result of calling
|
|
* <code>toString()</code> on the cause.
|
|
* <br>
|
|
* Then for every cause (of a cause, etc) the stacktrace is printed the
|
|
* same as for the top level <code>Throwable</code> except that as soon
|
|
* as all the remaining stack frames of the cause are the same as the
|
|
* the last stack frames of the throwable that the cause is wrapped in
|
|
* then a line starting with three spaces and the string "... X more" is
|
|
* printed, where X is the number of remaining stackframes.
|
|
*
|
|
* @param pw the PrintWriter to write the trace to
|
|
* @since 1.1
|
|
*/
|
|
public void printStackTrace (PrintWriter pw)
|
|
{
|
|
pw.print(stackTraceString());
|
|
}
|
|
|
|
/*
|
|
* We use inner class to avoid a static initializer in this basic class.
|
|
*/
|
|
private static class StaticData
|
|
{
|
|
static final String nl = SystemProperties.getProperty("line.separator");
|
|
}
|
|
|
|
// Create whole stack trace in a stringbuffer so we don't have to print
|
|
// it line by line. This prevents printing multiple stack traces from
|
|
// different threads to get mixed up when written to the same PrintWriter.
|
|
private String stackTraceString()
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
|
|
// Main stacktrace
|
|
StackTraceElement[] stack = getStackTrace();
|
|
stackTraceStringBuffer(sb, this.toString(), stack, 0);
|
|
|
|
// The cause(s)
|
|
Throwable cause = getCause();
|
|
while (cause != null)
|
|
{
|
|
// Cause start first line
|
|
sb.append("Caused by: ");
|
|
|
|
// Cause stacktrace
|
|
StackTraceElement[] parentStack = stack;
|
|
stack = cause.getStackTrace();
|
|
if (parentStack == null || parentStack.length == 0)
|
|
stackTraceStringBuffer(sb, cause.toString(), stack, 0);
|
|
else
|
|
{
|
|
int equal = 0; // Count how many of the last stack frames are equal
|
|
int frame = stack.length-1;
|
|
int parentFrame = parentStack.length-1;
|
|
while (frame > 0 && parentFrame > 0)
|
|
{
|
|
if (stack[frame].equals(parentStack[parentFrame]))
|
|
{
|
|
equal++;
|
|
frame--;
|
|
parentFrame--;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
stackTraceStringBuffer(sb, cause.toString(), stack, equal);
|
|
}
|
|
cause = cause.getCause();
|
|
}
|
|
|
|
return sb.toString();
|
|
}
|
|
|
|
// Adds to the given StringBuffer a line containing the name and
|
|
// all stacktrace elements minus the last equal ones.
|
|
private static void stackTraceStringBuffer(CPStringBuilder sb, String name,
|
|
StackTraceElement[] stack, int equal)
|
|
{
|
|
String nl = StaticData.nl;
|
|
// (finish) first line
|
|
sb.append(name);
|
|
sb.append(nl);
|
|
|
|
// The stacktrace
|
|
if (stack == null || stack.length == 0)
|
|
{
|
|
sb.append(" <<No stacktrace available>>");
|
|
sb.append(nl);
|
|
}
|
|
else
|
|
{
|
|
for (int i = 0; i < stack.length-equal; i++)
|
|
{
|
|
sb.append(" at ");
|
|
sb.append(stack[i] == null ? "<<Unknown>>" : stack[i].toString());
|
|
sb.append(nl);
|
|
}
|
|
if (equal > 0)
|
|
{
|
|
sb.append(" ...");
|
|
sb.append(equal);
|
|
sb.append(" more");
|
|
sb.append(nl);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Fill in the stack trace with the current execution stack.
|
|
*
|
|
* @return this same throwable
|
|
* @see #printStackTrace()
|
|
*/
|
|
public Throwable fillInStackTrace()
|
|
{
|
|
vmState = VMThrowable.fillInStackTrace(this);
|
|
stackTrace = null; // Should be regenerated when used.
|
|
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Provides access to the information printed in {@link #printStackTrace()}.
|
|
* The array is non-null, with no null entries, although the virtual
|
|
* machine is allowed to skip stack frames. If the array is not 0-length,
|
|
* then slot 0 holds the information on the stack frame where the Throwable
|
|
* was created (or at least where <code>fillInStackTrace()</code> was
|
|
* called).
|
|
*
|
|
* @return an array of stack trace information, as available from the VM
|
|
* @since 1.4
|
|
*/
|
|
public StackTraceElement[] getStackTrace()
|
|
{
|
|
if (stackTrace == null)
|
|
if (vmState == null)
|
|
stackTrace = new StackTraceElement[0];
|
|
else
|
|
{
|
|
stackTrace = vmState.getStackTrace(this);
|
|
vmState = null; // No longer needed
|
|
}
|
|
|
|
return stackTrace;
|
|
}
|
|
|
|
/**
|
|
* Change the stack trace manually. This method is designed for remote
|
|
* procedure calls, which intend to alter the stack trace before or after
|
|
* serialization according to the context of the remote call.
|
|
* <p>
|
|
* The contents of the given stacktrace is copied so changes to the
|
|
* original array do not change the stack trace elements of this
|
|
* throwable.
|
|
*
|
|
* @param stackTrace the new trace to use
|
|
* @throws NullPointerException if stackTrace is null or has null elements
|
|
* @since 1.4
|
|
*/
|
|
public void setStackTrace(StackTraceElement[] stackTrace)
|
|
{
|
|
int i = stackTrace.length;
|
|
StackTraceElement[] st = new StackTraceElement[i];
|
|
|
|
while (--i >= 0)
|
|
{
|
|
st[i] = stackTrace[i];
|
|
if (st[i] == null)
|
|
throw new NullPointerException("Element " + i + " null");
|
|
}
|
|
|
|
this.stackTrace = st;
|
|
}
|
|
|
|
/**
|
|
* VM state when fillInStackTrace was called.
|
|
* Used by getStackTrace() to get an array of StackTraceElements.
|
|
* Cleared when no longer needed.
|
|
*/
|
|
private transient VMThrowable vmState;
|
|
}
|