mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-07 07:57:30 +02:00
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
630 lines
19 KiB
Java
630 lines
19 KiB
Java
/* Util.java -- various utility routines.
|
|
Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
|
|
|
|
This file is a 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 of the License, 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; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
|
USA
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.security.util;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.math.BigInteger;
|
|
|
|
/**
|
|
* A collection of utility methods used throughout this project.
|
|
*/
|
|
public class Util
|
|
{
|
|
// Hex charset
|
|
private static final char[] HEX_DIGITS = "0123456789ABCDEF".toCharArray();
|
|
|
|
// Base-64 charset
|
|
private static final String BASE64_CHARS =
|
|
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./";
|
|
|
|
private static final char[] BASE64_CHARSET = BASE64_CHARS.toCharArray();
|
|
|
|
/** Trivial constructor to enforce Singleton pattern. */
|
|
private Util()
|
|
{
|
|
super();
|
|
}
|
|
|
|
/**
|
|
* Returns a string of hexadecimal digits from a byte array. Each byte is
|
|
* converted to 2 hex symbols; zero(es) included.
|
|
* <p>
|
|
* This method calls the method with same name and three arguments as:
|
|
* <pre>
|
|
* toString(ba, 0, ba.length);
|
|
* </pre>
|
|
*
|
|
* @param ba the byte array to convert.
|
|
* @return a string of hexadecimal characters (two for each byte) representing
|
|
* the designated input byte array.
|
|
*/
|
|
public static String toString(byte[] ba)
|
|
{
|
|
return toString(ba, 0, ba.length);
|
|
}
|
|
|
|
/**
|
|
* Returns a string of hexadecimal digits from a byte array, starting at
|
|
* <code>offset</code> and consisting of <code>length</code> bytes. Each
|
|
* byte is converted to 2 hex symbols; zero(es) included.
|
|
*
|
|
* @param ba the byte array to convert.
|
|
* @param offset the index from which to start considering the bytes to
|
|
* convert.
|
|
* @param length the count of bytes, starting from the designated offset to
|
|
* convert.
|
|
* @return a string of hexadecimal characters (two for each byte) representing
|
|
* the designated input byte sub-array.
|
|
*/
|
|
public static final String toString(byte[] ba, int offset, int length)
|
|
{
|
|
char[] buf = new char[length * 2];
|
|
for (int i = 0, j = 0, k; i < length;)
|
|
{
|
|
k = ba[offset + i++];
|
|
buf[j++] = HEX_DIGITS[(k >>> 4) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[ k & 0x0F];
|
|
}
|
|
return new String(buf);
|
|
}
|
|
|
|
/**
|
|
* Returns a string of hexadecimal digits from a byte array. Each byte is
|
|
* converted to 2 hex symbols; zero(es) included. The argument is treated as a
|
|
* large little-endian integer and is returned as a large big-endian integer.
|
|
* <p>
|
|
* This method calls the method with same name and three arguments as:
|
|
* <pre>
|
|
* toReversedString(ba, 0, ba.length);
|
|
* </pre>
|
|
*
|
|
* @param ba the byte array to convert.
|
|
* @return a string of hexadecimal characters (two for each byte) representing
|
|
* the designated input byte array.
|
|
*/
|
|
public static String toReversedString(byte[] ba)
|
|
{
|
|
return toReversedString(ba, 0, ba.length);
|
|
}
|
|
|
|
/**
|
|
* Returns a string of hexadecimal digits from a byte array, starting at
|
|
* <code>offset</code> and consisting of <code>length</code> bytes. Each
|
|
* byte is converted to 2 hex symbols; zero(es) included.
|
|
* <p>
|
|
* The byte array is treated as a large little-endian integer, and is returned
|
|
* as a large big-endian integer.
|
|
*
|
|
* @param ba the byte array to convert.
|
|
* @param offset the index from which to start considering the bytes to
|
|
* convert.
|
|
* @param length the count of bytes, starting from the designated offset to
|
|
* convert.
|
|
* @return a string of hexadecimal characters (two for each byte) representing
|
|
* the designated input byte sub-array.
|
|
*/
|
|
public static final String toReversedString(byte[] ba, int offset, int length)
|
|
{
|
|
char[] buf = new char[length * 2];
|
|
for (int i = offset + length - 1, j = 0, k; i >= offset;)
|
|
{
|
|
k = ba[offset + i--];
|
|
buf[j++] = HEX_DIGITS[(k >>> 4) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[ k & 0x0F];
|
|
}
|
|
return new String(buf);
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns a byte array from a string of hexadecimal digits.
|
|
* </p>
|
|
*
|
|
* @param s a string of hexadecimal ASCII characters
|
|
* @return the decoded byte array from the input hexadecimal string.
|
|
*/
|
|
public static byte[] toBytesFromString(String s)
|
|
{
|
|
int limit = s.length();
|
|
byte[] result = new byte[((limit + 1) / 2)];
|
|
int i = 0, j = 0;
|
|
if ((limit % 2) == 1)
|
|
result[j++] = (byte) fromDigit(s.charAt(i++));
|
|
while (i < limit)
|
|
{
|
|
result[j ] = (byte) (fromDigit(s.charAt(i++)) << 4);
|
|
result[j++] |= (byte) fromDigit(s.charAt(i++));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns a byte array from a string of hexadecimal digits, interpreting them
|
|
* as a large big-endian integer and returning it as a large little-endian
|
|
* integer.
|
|
*
|
|
* @param s a string of hexadecimal ASCII characters
|
|
* @return the decoded byte array from the input hexadecimal string.
|
|
*/
|
|
public static byte[] toReversedBytesFromString(String s)
|
|
{
|
|
int limit = s.length();
|
|
byte[] result = new byte[((limit + 1) / 2)];
|
|
int i = 0;
|
|
if ((limit % 2) == 1)
|
|
result[i++] = (byte) fromDigit(s.charAt(--limit));
|
|
while (limit > 0)
|
|
{
|
|
result[i ] = (byte) fromDigit(s.charAt(--limit));
|
|
result[i++] |= (byte) (fromDigit(s.charAt(--limit)) << 4);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns a number from <code>0</code> to <code>15</code> corresponding
|
|
* to the designated hexadecimal digit.
|
|
*
|
|
* @param c a hexadecimal ASCII symbol.
|
|
*/
|
|
public static int fromDigit(char c)
|
|
{
|
|
if (c >= '0' && c <= '9')
|
|
return c - '0';
|
|
else if (c >= 'A' && c <= 'F')
|
|
return c - 'A' + 10;
|
|
else if (c >= 'a' && c <= 'f')
|
|
return c - 'a' + 10;
|
|
else
|
|
throw new IllegalArgumentException("Invalid hexadecimal digit: " + c);
|
|
}
|
|
|
|
/**
|
|
* Returns a string of 8 hexadecimal digits (most significant digit first)
|
|
* corresponding to the unsigned integer <code>n</code>.
|
|
*
|
|
* @param n the unsigned integer to convert.
|
|
* @return a hexadecimal string 8-character long.
|
|
*/
|
|
public static String toString(int n)
|
|
{
|
|
char[] buf = new char[8];
|
|
for (int i = 7; i >= 0; i--)
|
|
{
|
|
buf[i] = HEX_DIGITS[n & 0x0F];
|
|
n >>>= 4;
|
|
}
|
|
return new String(buf);
|
|
}
|
|
|
|
/**
|
|
* Returns a string of hexadecimal digits from an integer array. Each int is
|
|
* converted to 4 hex symbols.
|
|
*/
|
|
public static String toString(int[] ia)
|
|
{
|
|
int length = ia.length;
|
|
char[] buf = new char[length * 8];
|
|
for (int i = 0, j = 0, k; i < length; i++)
|
|
{
|
|
k = ia[i];
|
|
buf[j++] = HEX_DIGITS[(k >>> 28) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[(k >>> 24) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[(k >>> 20) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[(k >>> 16) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[(k >>> 12) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[(k >>> 8) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[(k >>> 4) & 0x0F];
|
|
buf[j++] = HEX_DIGITS[ k & 0x0F];
|
|
}
|
|
return new String(buf);
|
|
}
|
|
|
|
/**
|
|
* Returns a string of 16 hexadecimal digits (most significant digit first)
|
|
* corresponding to the unsigned long <code>n</code>.
|
|
*
|
|
* @param n the unsigned long to convert.
|
|
* @return a hexadecimal string 16-character long.
|
|
*/
|
|
public static String toString(long n)
|
|
{
|
|
char[] b = new char[16];
|
|
for (int i = 15; i >= 0; i--)
|
|
{
|
|
b[i] = HEX_DIGITS[(int)(n & 0x0FL)];
|
|
n >>>= 4;
|
|
}
|
|
return new String(b);
|
|
}
|
|
|
|
/**
|
|
* Similar to the <code>toString()</code> method except that the Unicode
|
|
* escape character is inserted before every pair of bytes. Useful to
|
|
* externalise byte arrays that will be constructed later from such strings;
|
|
* eg. s-box values.
|
|
*
|
|
* @throws ArrayIndexOutOfBoundsException if the length is odd.
|
|
*/
|
|
public static String toUnicodeString(byte[] ba)
|
|
{
|
|
return toUnicodeString(ba, 0, ba.length);
|
|
}
|
|
|
|
/**
|
|
* Similar to the <code>toString()</code> method except that the Unicode
|
|
* escape character is inserted before every pair of bytes. Useful to
|
|
* externalise byte arrays that will be constructed later from such strings;
|
|
* eg. s-box values.
|
|
*
|
|
* @throws ArrayIndexOutOfBoundsException if the length is odd.
|
|
*/
|
|
public static final String toUnicodeString(byte[] ba, int offset, int length)
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
int i = 0;
|
|
int j = 0;
|
|
int k;
|
|
sb.append('\n').append("\"");
|
|
while (i < length)
|
|
{
|
|
sb.append("\\u");
|
|
k = ba[offset + i++];
|
|
sb.append(HEX_DIGITS[(k >>> 4) & 0x0F]);
|
|
sb.append(HEX_DIGITS[ k & 0x0F]);
|
|
k = ba[offset + i++];
|
|
sb.append(HEX_DIGITS[(k >>> 4) & 0x0F]);
|
|
sb.append(HEX_DIGITS[ k & 0x0F]);
|
|
if ((++j % 8) == 0)
|
|
sb.append("\"+").append('\n').append("\"");
|
|
}
|
|
sb.append("\"").append('\n');
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Similar to the <code>toString()</code> method except that the Unicode
|
|
* escape character is inserted before every pair of bytes. Useful to
|
|
* externalise integer arrays that will be constructed later from such
|
|
* strings; eg. s-box values.
|
|
*
|
|
* @throws ArrayIndexOutOfBoundsException if the length is not a multiple of
|
|
* 4.
|
|
*/
|
|
public static String toUnicodeString(int[] ia)
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
int i = 0;
|
|
int j = 0;
|
|
int k;
|
|
sb.append('\n').append("\"");
|
|
while (i < ia.length)
|
|
{
|
|
k = ia[i++];
|
|
sb.append("\\u");
|
|
sb.append(HEX_DIGITS[(k >>> 28) & 0x0F]);
|
|
sb.append(HEX_DIGITS[(k >>> 24) & 0x0F]);
|
|
sb.append(HEX_DIGITS[(k >>> 20) & 0x0F]);
|
|
sb.append(HEX_DIGITS[(k >>> 16) & 0x0F]);
|
|
sb.append("\\u");
|
|
sb.append(HEX_DIGITS[(k >>> 12) & 0x0F]);
|
|
sb.append(HEX_DIGITS[(k >>> 8) & 0x0F]);
|
|
sb.append(HEX_DIGITS[(k >>> 4) & 0x0F]);
|
|
sb.append(HEX_DIGITS[ k & 0x0F]);
|
|
if ((++j % 4) == 0)
|
|
sb.append("\"+").append('\n').append("\"");
|
|
}
|
|
sb.append("\"").append('\n');
|
|
return sb.toString();
|
|
}
|
|
|
|
public static byte[] toBytesFromUnicode(String s)
|
|
{
|
|
int limit = s.length() * 2;
|
|
byte[] result = new byte[limit];
|
|
char c;
|
|
for (int i = 0; i < limit; i++)
|
|
{
|
|
c = s.charAt(i >>> 1);
|
|
result[i] = (byte)(((i & 1) == 0) ? c >>> 8 : c);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Dumps a byte array as a string, in a format that is easy to read for
|
|
* debugging. The string <code>m</code> is prepended to the start of each
|
|
* line.
|
|
* <p>
|
|
* If <code>offset</code> and <code>length</code> are omitted, the whole
|
|
* array is used. If <code>m</code> is omitted, nothing is prepended to each
|
|
* line.
|
|
*
|
|
* @param data the byte array to be dumped.
|
|
* @param offset the offset within <i>data</i> to start from.
|
|
* @param length the number of bytes to dump.
|
|
* @param m a string to be prepended to each line.
|
|
* @return a string containing the result.
|
|
*/
|
|
public static String dumpString(byte[] data, int offset, int length, String m)
|
|
{
|
|
if (data == null)
|
|
return m + "null\n";
|
|
CPStringBuilder sb = new CPStringBuilder(length * 3);
|
|
if (length > 32)
|
|
sb.append(m).append("Hexadecimal dump of ")
|
|
.append(length).append(" bytes...\n");
|
|
// each line will list 32 bytes in 4 groups of 8 each
|
|
int end = offset + length;
|
|
String s;
|
|
int l = Integer.toString(length).length();
|
|
if (l < 4)
|
|
l = 4;
|
|
for (; offset < end; offset += 32)
|
|
{
|
|
if (length > 32)
|
|
{
|
|
s = " " + offset;
|
|
sb.append(m).append(s.substring(s.length() - l)).append(": ");
|
|
}
|
|
int i = 0;
|
|
for (; i < 32 && offset + i + 7 < end; i += 8)
|
|
sb.append(toString(data, offset + i, 8)).append(' ');
|
|
if (i < 32)
|
|
for (; i < 32 && offset + i < end; i++)
|
|
sb.append(byteToString(data[offset + i]));
|
|
sb.append('\n');
|
|
}
|
|
return sb.toString();
|
|
}
|
|
|
|
public static String dumpString(byte[] data)
|
|
{
|
|
return (data == null) ? "null\n" : dumpString(data, 0, data.length, "");
|
|
}
|
|
|
|
public static String dumpString(byte[] data, String m)
|
|
{
|
|
return (data == null) ? "null\n" : dumpString(data, 0, data.length, m);
|
|
}
|
|
|
|
public static String dumpString(byte[] data, int offset, int length)
|
|
{
|
|
return dumpString(data, offset, length, "");
|
|
}
|
|
|
|
/**
|
|
* Returns a string of 2 hexadecimal digits (most significant digit first)
|
|
* corresponding to the lowest 8 bits of <code>n</code>.
|
|
*
|
|
* @param n the byte value to convert.
|
|
* @return a string of 2 hex characters representing the input.
|
|
*/
|
|
public static String byteToString(int n)
|
|
{
|
|
char[] buf = { HEX_DIGITS[(n >>> 4) & 0x0F], HEX_DIGITS[n & 0x0F] };
|
|
return new String(buf);
|
|
}
|
|
|
|
/**
|
|
* Converts a designated byte array to a Base-64 representation, with the
|
|
* exceptions that (a) leading 0-byte(s) are ignored, and (b) the character
|
|
* '.' (dot) shall be used instead of "+' (plus).
|
|
* <p>
|
|
* Used by SASL password file manipulation primitives.
|
|
*
|
|
* @param buffer an arbitrary sequence of bytes to represent in Base-64.
|
|
* @return unpadded (without the '=' character(s)) Base-64 representation of
|
|
* the input.
|
|
*/
|
|
public static final String toBase64(byte[] buffer)
|
|
{
|
|
int len = buffer.length, pos = len % 3;
|
|
byte b0 = 0, b1 = 0, b2 = 0;
|
|
switch (pos)
|
|
{
|
|
case 1:
|
|
b2 = buffer[0];
|
|
break;
|
|
case 2:
|
|
b1 = buffer[0];
|
|
b2 = buffer[1];
|
|
break;
|
|
}
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
int c;
|
|
boolean notleading = false;
|
|
do
|
|
{
|
|
c = (b0 & 0xFC) >>> 2;
|
|
if (notleading || c != 0)
|
|
{
|
|
sb.append(BASE64_CHARSET[c]);
|
|
notleading = true;
|
|
}
|
|
c = ((b0 & 0x03) << 4) | ((b1 & 0xF0) >>> 4);
|
|
if (notleading || c != 0)
|
|
{
|
|
sb.append(BASE64_CHARSET[c]);
|
|
notleading = true;
|
|
}
|
|
c = ((b1 & 0x0F) << 2) | ((b2 & 0xC0) >>> 6);
|
|
if (notleading || c != 0)
|
|
{
|
|
sb.append(BASE64_CHARSET[c]);
|
|
notleading = true;
|
|
}
|
|
c = b2 & 0x3F;
|
|
if (notleading || c != 0)
|
|
{
|
|
sb.append(BASE64_CHARSET[c]);
|
|
notleading = true;
|
|
}
|
|
if (pos >= len)
|
|
break;
|
|
else
|
|
{
|
|
try
|
|
{
|
|
b0 = buffer[pos++];
|
|
b1 = buffer[pos++];
|
|
b2 = buffer[pos++];
|
|
}
|
|
catch (ArrayIndexOutOfBoundsException x)
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
while (true);
|
|
|
|
if (notleading)
|
|
return sb.toString();
|
|
return "0";
|
|
}
|
|
|
|
/**
|
|
* The inverse function of the above.
|
|
* <p>
|
|
* Converts a string representing the encoding of some bytes in Base-64 to
|
|
* their original form.
|
|
*
|
|
* @param str the Base-64 encoded representation of some byte(s).
|
|
* @return the bytes represented by the <code>str</code>.
|
|
* @throws NumberFormatException if <code>str</code> is <code>null</code>,
|
|
* or <code>str</code> contains an illegal Base-64 character.
|
|
* @see #toBase64(byte[])
|
|
*/
|
|
public static final byte[] fromBase64(String str)
|
|
{
|
|
int len = str.length();
|
|
if (len == 0)
|
|
throw new NumberFormatException("Empty string");
|
|
byte[] a = new byte[len + 1];
|
|
int i, j;
|
|
for (i = 0; i < len; i++)
|
|
try
|
|
{
|
|
a[i] = (byte) BASE64_CHARS.indexOf(str.charAt(i));
|
|
}
|
|
catch (ArrayIndexOutOfBoundsException x)
|
|
{
|
|
throw new NumberFormatException("Illegal character at #" + i);
|
|
}
|
|
i = len - 1;
|
|
j = len;
|
|
try
|
|
{
|
|
while (true)
|
|
{
|
|
a[j] = a[i];
|
|
if (--i < 0)
|
|
break;
|
|
a[j] |= (a[i] & 0x03) << 6;
|
|
j--;
|
|
a[j] = (byte)((a[i] & 0x3C) >>> 2);
|
|
if (--i < 0)
|
|
break;
|
|
a[j] |= (a[i] & 0x0F) << 4;
|
|
j--;
|
|
a[j] = (byte)((a[i] & 0x30) >>> 4);
|
|
if (--i < 0)
|
|
break;
|
|
a[j] |= (a[i] << 2);
|
|
j--;
|
|
a[j] = 0;
|
|
if (--i < 0)
|
|
break;
|
|
}
|
|
}
|
|
catch (Exception ignored)
|
|
{
|
|
}
|
|
try
|
|
{ // ignore leading 0-bytes
|
|
while (a[j] == 0)
|
|
j++;
|
|
}
|
|
catch (Exception x)
|
|
{
|
|
return new byte[1]; // one 0-byte
|
|
}
|
|
byte[] result = new byte[len - j + 1];
|
|
System.arraycopy(a, j, result, 0, len - j + 1);
|
|
return result;
|
|
}
|
|
|
|
// BigInteger utilities ----------------------------------------------------
|
|
|
|
/**
|
|
* Treats the input as the MSB representation of a number, and discards
|
|
* leading zero elements. For efficiency, the input is simply returned if no
|
|
* leading zeroes are found.
|
|
*
|
|
* @param n the {@link BigInteger} to trim.
|
|
* @return the byte array representation of the designated {@link BigInteger}
|
|
* with no leading 0-bytes.
|
|
*/
|
|
public static final byte[] trim(BigInteger n)
|
|
{
|
|
byte[] in = n.toByteArray();
|
|
if (in.length == 0 || in[0] != 0)
|
|
return in;
|
|
int len = in.length;
|
|
int i = 1;
|
|
while (in[i] == 0 && i < len)
|
|
++i;
|
|
byte[] result = new byte[len - i];
|
|
System.arraycopy(in, i, result, 0, len - i);
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns a hexadecimal dump of the trimmed bytes of a {@link BigInteger}.
|
|
*
|
|
* @param x the {@link BigInteger} to display.
|
|
* @return the string representation of the designated {@link BigInteger}.
|
|
*/
|
|
public static final String dump(BigInteger x)
|
|
{
|
|
return dumpString(trim(x));
|
|
}
|
|
}
|