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
626 lines
20 KiB
Java
626 lines
20 KiB
Java
/* Double.java -- object wrapper for double
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 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.java.lang.CPStringBuilder;
|
|
|
|
/**
|
|
* Instances of class <code>Double</code> represent primitive
|
|
* <code>double</code> values.
|
|
*
|
|
* Additionally, this class provides various helper functions and variables
|
|
* related to doubles.
|
|
*
|
|
* @author Paul Fisher
|
|
* @author Andrew Haley (aph@cygnus.com)
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @author Tom Tromey (tromey@redhat.com)
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @since 1.0
|
|
* @status partly updated to 1.5
|
|
*/
|
|
public final class Double extends Number implements Comparable<Double>
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.0+.
|
|
*/
|
|
private static final long serialVersionUID = -9172774392245257468L;
|
|
|
|
/**
|
|
* The maximum positive value a <code>double</code> may represent
|
|
* is 1.7976931348623157e+308.
|
|
*/
|
|
public static final double MAX_VALUE = 1.7976931348623157e+308;
|
|
|
|
/**
|
|
* The minimum positive value a <code>double</code> may represent
|
|
* is 5e-324.
|
|
*/
|
|
public static final double MIN_VALUE = 5e-324;
|
|
|
|
/**
|
|
* The value of a double representation -1.0/0.0, negative
|
|
* infinity.
|
|
*/
|
|
public static final double NEGATIVE_INFINITY = -1.0 / 0.0;
|
|
|
|
/**
|
|
* The value of a double representing 1.0/0.0, positive infinity.
|
|
*/
|
|
public static final double POSITIVE_INFINITY = 1.0 / 0.0;
|
|
|
|
/**
|
|
* All IEEE 754 values of NaN have the same value in Java.
|
|
*/
|
|
public static final double NaN = 0.0 / 0.0;
|
|
|
|
/**
|
|
* The number of bits needed to represent a <code>double</code>.
|
|
* @since 1.5
|
|
*/
|
|
public static final int SIZE = 64;
|
|
|
|
/**
|
|
* The primitive type <code>double</code> is represented by this
|
|
* <code>Class</code> object.
|
|
* @since 1.1
|
|
*/
|
|
public static final Class<Double> TYPE = (Class<Double>) VMClassLoader.getPrimitiveClass('D');
|
|
|
|
/**
|
|
* Cache representation of 0
|
|
*/
|
|
private static final Double ZERO = new Double(0.0d);
|
|
|
|
/**
|
|
* Cache representation of 1
|
|
*/
|
|
private static final Double ONE = new Double(1.0d);
|
|
|
|
/**
|
|
* The immutable value of this Double.
|
|
*
|
|
* @serial the wrapped double
|
|
*/
|
|
private final double value;
|
|
|
|
/**
|
|
* Create a <code>Double</code> from the primitive <code>double</code>
|
|
* specified.
|
|
*
|
|
* @param value the <code>double</code> argument
|
|
*/
|
|
public Double(double value)
|
|
{
|
|
this.value = value;
|
|
}
|
|
|
|
/**
|
|
* Create a <code>Double</code> from the specified <code>String</code>.
|
|
* This method calls <code>Double.parseDouble()</code>.
|
|
*
|
|
* @param s the <code>String</code> to convert
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>double</code>
|
|
* @throws NullPointerException if <code>s</code> is null
|
|
* @see #parseDouble(String)
|
|
*/
|
|
public Double(String s)
|
|
{
|
|
value = parseDouble(s);
|
|
}
|
|
|
|
/**
|
|
* Convert the <code>double</code> to a <code>String</code>.
|
|
* Floating-point string representation is fairly complex: here is a
|
|
* rundown of the possible values. "<code>[-]</code>" indicates that a
|
|
* negative sign will be printed if the value (or exponent) is negative.
|
|
* "<code><number></code>" means a string of digits ('0' to '9').
|
|
* "<code><digit></code>" means a single digit ('0' to '9').<br>
|
|
*
|
|
* <table border=1>
|
|
* <tr><th>Value of Double</th><th>String Representation</th></tr>
|
|
* <tr><td>[+-] 0</td> <td><code>[-]0.0</code></td></tr>
|
|
* <tr><td>Between [+-] 10<sup>-3</sup> and 10<sup>7</sup>, exclusive</td>
|
|
* <td><code>[-]number.number</code></td></tr>
|
|
* <tr><td>Other numeric value</td>
|
|
* <td><code>[-]<digit>.<number>
|
|
* E[-]<number></code></td></tr>
|
|
* <tr><td>[+-] infinity</td> <td><code>[-]Infinity</code></td></tr>
|
|
* <tr><td>NaN</td> <td><code>NaN</code></td></tr>
|
|
* </table>
|
|
*
|
|
* Yes, negative zero <em>is</em> a possible value. Note that there is
|
|
* <em>always</em> a <code>.</code> and at least one digit printed after
|
|
* it: even if the number is 3, it will be printed as <code>3.0</code>.
|
|
* After the ".", all digits will be printed except trailing zeros. The
|
|
* result is rounded to the shortest decimal number which will parse back
|
|
* to the same double.
|
|
*
|
|
* <p>To create other output formats, use {@link java.text.NumberFormat}.
|
|
*
|
|
* @XXX specify where we are not in accord with the spec.
|
|
*
|
|
* @param d the <code>double</code> to convert
|
|
* @return the <code>String</code> representing the <code>double</code>
|
|
*/
|
|
public static String toString(double d)
|
|
{
|
|
return VMDouble.toString(d, false);
|
|
}
|
|
|
|
/**
|
|
* Convert a double value to a hexadecimal string. This converts as
|
|
* follows:
|
|
* <ul>
|
|
* <li> A NaN value is converted to the string "NaN".
|
|
* <li> Positive infinity is converted to the string "Infinity".
|
|
* <li> Negative infinity is converted to the string "-Infinity".
|
|
* <li> For all other values, the first character of the result is '-'
|
|
* if the value is negative. This is followed by '0x1.' if the
|
|
* value is normal, and '0x0.' if the value is denormal. This is
|
|
* then followed by a (lower-case) hexadecimal representation of the
|
|
* mantissa, with leading zeros as required for denormal values.
|
|
* The next character is a 'p', and this is followed by a decimal
|
|
* representation of the unbiased exponent.
|
|
* </ul>
|
|
* @param d the double value
|
|
* @return the hexadecimal string representation
|
|
* @since 1.5
|
|
*/
|
|
public static String toHexString(double d)
|
|
{
|
|
if (isNaN(d))
|
|
return "NaN";
|
|
if (isInfinite(d))
|
|
return d < 0 ? "-Infinity" : "Infinity";
|
|
|
|
long bits = doubleToLongBits(d);
|
|
CPStringBuilder result = new CPStringBuilder();
|
|
|
|
if (bits < 0)
|
|
result.append('-');
|
|
result.append("0x");
|
|
|
|
final int mantissaBits = 52;
|
|
final int exponentBits = 11;
|
|
long mantMask = (1L << mantissaBits) - 1;
|
|
long mantissa = bits & mantMask;
|
|
long expMask = (1L << exponentBits) - 1;
|
|
long exponent = (bits >>> mantissaBits) & expMask;
|
|
|
|
result.append(exponent == 0 ? '0' : '1');
|
|
result.append('.');
|
|
result.append(Long.toHexString(mantissa));
|
|
if (exponent == 0 && mantissa != 0)
|
|
{
|
|
// Treat denormal specially by inserting '0's to make
|
|
// the length come out right. The constants here are
|
|
// to account for things like the '0x'.
|
|
int offset = 4 + ((bits < 0) ? 1 : 0);
|
|
// The silly +3 is here to keep the code the same between
|
|
// the Float and Double cases. In Float the value is
|
|
// not a multiple of 4.
|
|
int desiredLength = offset + (mantissaBits + 3) / 4;
|
|
while (result.length() < desiredLength)
|
|
result.insert(offset, '0');
|
|
}
|
|
result.append('p');
|
|
if (exponent == 0 && mantissa == 0)
|
|
{
|
|
// Zero, so do nothing special.
|
|
}
|
|
else
|
|
{
|
|
// Apply bias.
|
|
boolean denormal = exponent == 0;
|
|
exponent -= (1 << (exponentBits - 1)) - 1;
|
|
// Handle denormal.
|
|
if (denormal)
|
|
++exponent;
|
|
}
|
|
|
|
result.append(Long.toString(exponent));
|
|
return result.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns a <code>Double</code> object wrapping the value.
|
|
* In contrast to the <code>Double</code> constructor, this method
|
|
* may cache some values. It is used by boxing conversion.
|
|
*
|
|
* @param val the value to wrap
|
|
* @return the <code>Double</code>
|
|
* @since 1.5
|
|
*/
|
|
public static Double valueOf(double val)
|
|
{
|
|
if ((val == 0.0) && (doubleToRawLongBits(val) == 0L))
|
|
return ZERO;
|
|
else if (val == 1.0)
|
|
return ONE;
|
|
else
|
|
return new Double(val);
|
|
}
|
|
|
|
/**
|
|
* Create a new <code>Double</code> object using the <code>String</code>.
|
|
*
|
|
* @param s the <code>String</code> to convert
|
|
* @return the new <code>Double</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>double</code>
|
|
* @throws NullPointerException if <code>s</code> is null.
|
|
* @see #parseDouble(String)
|
|
*/
|
|
public static Double valueOf(String s)
|
|
{
|
|
return valueOf(parseDouble(s));
|
|
}
|
|
|
|
/**
|
|
* Parse the specified <code>String</code> as a <code>double</code>. The
|
|
* extended BNF grammar is as follows:<br>
|
|
* <pre>
|
|
* <em>DecodableString</em>:
|
|
* ( [ <code>-</code> | <code>+</code> ] <code>NaN</code> )
|
|
* | ( [ <code>-</code> | <code>+</code> ] <code>Infinity</code> )
|
|
* | ( [ <code>-</code> | <code>+</code> ] <em>FloatingPoint</em>
|
|
* [ <code>f</code> | <code>F</code> | <code>d</code>
|
|
* | <code>D</code>] )
|
|
* <em>FloatingPoint</em>:
|
|
* ( { <em>Digit</em> }+ [ <code>.</code> { <em>Digit</em> } ]
|
|
* [ <em>Exponent</em> ] )
|
|
* | ( <code>.</code> { <em>Digit</em> }+ [ <em>Exponent</em> ] )
|
|
* <em>Exponent</em>:
|
|
* ( ( <code>e</code> | <code>E</code> )
|
|
* [ <code>-</code> | <code>+</code> ] { <em>Digit</em> }+ )
|
|
* <em>Digit</em>: <em><code>'0'</code> through <code>'9'</code></em>
|
|
* </pre>
|
|
*
|
|
* <p>NaN and infinity are special cases, to allow parsing of the output
|
|
* of toString. Otherwise, the result is determined by calculating
|
|
* <em>n * 10<sup>exponent</sup></em> to infinite precision, then rounding
|
|
* to the nearest double. Remember that many numbers cannot be precisely
|
|
* represented in floating point. In case of overflow, infinity is used,
|
|
* and in case of underflow, signed zero is used. Unlike Integer.parseInt,
|
|
* this does not accept Unicode digits outside the ASCII range.
|
|
*
|
|
* <p>If an unexpected character is found in the <code>String</code>, a
|
|
* <code>NumberFormatException</code> will be thrown. Leading and trailing
|
|
* 'whitespace' is ignored via <code>String.trim()</code>, but spaces
|
|
* internal to the actual number are not allowed.
|
|
*
|
|
* <p>To parse numbers according to another format, consider using
|
|
* {@link java.text.NumberFormat}.
|
|
*
|
|
* @XXX specify where/how we are not in accord with the spec.
|
|
*
|
|
* @param str the <code>String</code> to convert
|
|
* @return the <code>double</code> value of <code>s</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>double</code>
|
|
* @throws NullPointerException if <code>s</code> is null
|
|
* @see #MIN_VALUE
|
|
* @see #MAX_VALUE
|
|
* @see #POSITIVE_INFINITY
|
|
* @see #NEGATIVE_INFINITY
|
|
* @since 1.2
|
|
*/
|
|
public static double parseDouble(String str)
|
|
{
|
|
return VMDouble.parseDouble(str);
|
|
}
|
|
|
|
/**
|
|
* Return <code>true</code> if the <code>double</code> has the same
|
|
* value as <code>NaN</code>, otherwise return <code>false</code>.
|
|
*
|
|
* @param v the <code>double</code> to compare
|
|
* @return whether the argument is <code>NaN</code>.
|
|
*/
|
|
public static boolean isNaN(double v)
|
|
{
|
|
// This works since NaN != NaN is the only reflexive inequality
|
|
// comparison which returns true.
|
|
return v != v;
|
|
}
|
|
|
|
/**
|
|
* Return <code>true</code> if the <code>double</code> has a value
|
|
* equal to either <code>NEGATIVE_INFINITY</code> or
|
|
* <code>POSITIVE_INFINITY</code>, otherwise return <code>false</code>.
|
|
*
|
|
* @param v the <code>double</code> to compare
|
|
* @return whether the argument is (-/+) infinity.
|
|
*/
|
|
public static boolean isInfinite(double v)
|
|
{
|
|
return v == POSITIVE_INFINITY || v == NEGATIVE_INFINITY;
|
|
}
|
|
|
|
/**
|
|
* Return <code>true</code> if the value of this <code>Double</code>
|
|
* is the same as <code>NaN</code>, otherwise return <code>false</code>.
|
|
*
|
|
* @return whether this <code>Double</code> is <code>NaN</code>
|
|
*/
|
|
public boolean isNaN()
|
|
{
|
|
return isNaN(value);
|
|
}
|
|
|
|
/**
|
|
* Return <code>true</code> if the value of this <code>Double</code>
|
|
* is the same as <code>NEGATIVE_INFINITY</code> or
|
|
* <code>POSITIVE_INFINITY</code>, otherwise return <code>false</code>.
|
|
*
|
|
* @return whether this <code>Double</code> is (-/+) infinity
|
|
*/
|
|
public boolean isInfinite()
|
|
{
|
|
return isInfinite(value);
|
|
}
|
|
|
|
/**
|
|
* Convert the <code>double</code> value of this <code>Double</code>
|
|
* to a <code>String</code>. This method calls
|
|
* <code>Double.toString(double)</code> to do its dirty work.
|
|
*
|
|
* @return the <code>String</code> representation
|
|
* @see #toString(double)
|
|
*/
|
|
public String toString()
|
|
{
|
|
return toString(value);
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Double</code> as a <code>byte</code>.
|
|
*
|
|
* @return the byte value
|
|
* @since 1.1
|
|
*/
|
|
public byte byteValue()
|
|
{
|
|
return (byte) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Double</code> as a <code>short</code>.
|
|
*
|
|
* @return the short value
|
|
* @since 1.1
|
|
*/
|
|
public short shortValue()
|
|
{
|
|
return (short) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Double</code> as an <code>int</code>.
|
|
*
|
|
* @return the int value
|
|
*/
|
|
public int intValue()
|
|
{
|
|
return (int) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Double</code> as a <code>long</code>.
|
|
*
|
|
* @return the long value
|
|
*/
|
|
public long longValue()
|
|
{
|
|
return (long) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Double</code> as a <code>float</code>.
|
|
*
|
|
* @return the float value
|
|
*/
|
|
public float floatValue()
|
|
{
|
|
return (float) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Double</code>.
|
|
*
|
|
* @return the double value
|
|
*/
|
|
public double doubleValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Return a hashcode representing this Object. <code>Double</code>'s hash
|
|
* code is calculated by:<br>
|
|
* <code>long v = Double.doubleToLongBits(doubleValue());<br>
|
|
* int hash = (int)(v^(v>>32))</code>.
|
|
*
|
|
* @return this Object's hash code
|
|
* @see #doubleToLongBits(double)
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
long v = doubleToLongBits(value);
|
|
return (int) (v ^ (v >>> 32));
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if <code>obj</code> is an instance of
|
|
* <code>Double</code> and represents the same double value. Unlike comparing
|
|
* two doubles with <code>==</code>, this treats two instances of
|
|
* <code>Double.NaN</code> as equal, but treats <code>0.0</code> and
|
|
* <code>-0.0</code> as unequal.
|
|
*
|
|
* <p>Note that <code>d1.equals(d2)</code> is identical to
|
|
* <code>doubleToLongBits(d1.doubleValue()) ==
|
|
* doubleToLongBits(d2.doubleValue())</code>.
|
|
*
|
|
* @param obj the object to compare
|
|
* @return whether the objects are semantically equal
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof Double)
|
|
{
|
|
double d = ((Double) obj).value;
|
|
return (doubleToRawLongBits(value) == doubleToRawLongBits(d)) ||
|
|
(isNaN(value) && isNaN(d));
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Convert the double to the IEEE 754 floating-point "double format" bit
|
|
* layout. Bit 63 (the most significant) is the sign bit, bits 62-52
|
|
* (masked by 0x7ff0000000000000L) represent the exponent, and bits 51-0
|
|
* (masked by 0x000fffffffffffffL) are the mantissa. This function
|
|
* collapses all versions of NaN to 0x7ff8000000000000L. The result of this
|
|
* function can be used as the argument to
|
|
* <code>Double.longBitsToDouble(long)</code> to obtain the original
|
|
* <code>double</code> value.
|
|
*
|
|
* @param value the <code>double</code> to convert
|
|
* @return the bits of the <code>double</code>
|
|
* @see #longBitsToDouble(long)
|
|
*/
|
|
public static long doubleToLongBits(double value)
|
|
{
|
|
if (isNaN(value))
|
|
return 0x7ff8000000000000L;
|
|
else
|
|
return VMDouble.doubleToRawLongBits(value);
|
|
}
|
|
|
|
/**
|
|
* Convert the double to the IEEE 754 floating-point "double format" bit
|
|
* layout. Bit 63 (the most significant) is the sign bit, bits 62-52
|
|
* (masked by 0x7ff0000000000000L) represent the exponent, and bits 51-0
|
|
* (masked by 0x000fffffffffffffL) are the mantissa. This function
|
|
* leaves NaN alone, rather than collapsing to a canonical value. The
|
|
* result of this function can be used as the argument to
|
|
* <code>Double.longBitsToDouble(long)</code> to obtain the original
|
|
* <code>double</code> value.
|
|
*
|
|
* @param value the <code>double</code> to convert
|
|
* @return the bits of the <code>double</code>
|
|
* @see #longBitsToDouble(long)
|
|
*/
|
|
public static long doubleToRawLongBits(double value)
|
|
{
|
|
return VMDouble.doubleToRawLongBits(value);
|
|
}
|
|
|
|
/**
|
|
* Convert the argument in IEEE 754 floating-point "double format" bit
|
|
* layout to the corresponding float. Bit 63 (the most significant) is the
|
|
* sign bit, bits 62-52 (masked by 0x7ff0000000000000L) represent the
|
|
* exponent, and bits 51-0 (masked by 0x000fffffffffffffL) are the mantissa.
|
|
* This function leaves NaN alone, so that you can recover the bit pattern
|
|
* with <code>Double.doubleToRawLongBits(double)</code>.
|
|
*
|
|
* @param bits the bits to convert
|
|
* @return the <code>double</code> represented by the bits
|
|
* @see #doubleToLongBits(double)
|
|
* @see #doubleToRawLongBits(double)
|
|
*/
|
|
public static double longBitsToDouble(long bits)
|
|
{
|
|
return VMDouble.longBitsToDouble(bits);
|
|
}
|
|
|
|
/**
|
|
* Compare two Doubles numerically by comparing their <code>double</code>
|
|
* values. The result is positive if the first is greater, negative if the
|
|
* second is greater, and 0 if the two are equal. However, this special
|
|
* cases NaN and signed zero as follows: NaN is considered greater than
|
|
* all other doubles, including <code>POSITIVE_INFINITY</code>, and positive
|
|
* zero is considered greater than negative zero.
|
|
*
|
|
* @param d the Double to compare
|
|
* @return the comparison
|
|
* @since 1.2
|
|
*/
|
|
public int compareTo(Double d)
|
|
{
|
|
return compare(value, d.value);
|
|
}
|
|
|
|
/**
|
|
* Behaves like <code>new Double(x).compareTo(new Double(y))</code>; in
|
|
* other words this compares two doubles, special casing NaN and zero,
|
|
* without the overhead of objects.
|
|
*
|
|
* @param x the first double to compare
|
|
* @param y the second double to compare
|
|
* @return the comparison
|
|
* @since 1.4
|
|
*/
|
|
public static int compare(double x, double y)
|
|
{
|
|
// handle the easy cases:
|
|
if (x < y)
|
|
return -1;
|
|
if (x > y)
|
|
return 1;
|
|
|
|
// handle equality respecting that 0.0 != -0.0 (hence not using x == y):
|
|
long lx = doubleToRawLongBits(x);
|
|
long ly = doubleToRawLongBits(y);
|
|
if (lx == ly)
|
|
return 0;
|
|
|
|
// handle NaNs:
|
|
if (x != x)
|
|
return (y != y) ? 0 : 1;
|
|
else if (y != y)
|
|
return -1;
|
|
|
|
// handle +/- 0.0
|
|
return (lx < ly) ? -1 : 1;
|
|
}
|
|
}
|