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
735 lines
21 KiB
Java
735 lines
21 KiB
Java
/* Inflater.java - Decompress a data stream
|
|
Copyright (C) 1999, 2000, 2001, 2003, 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.util.zip;
|
|
|
|
/* Written using on-line Java Platform 1.2 API Specification
|
|
* and JCL book.
|
|
* Believed complete and correct.
|
|
*/
|
|
|
|
/**
|
|
* Inflater is used to decompress data that has been compressed according
|
|
* to the "deflate" standard described in rfc1950.
|
|
*
|
|
* The usage is as following. First you have to set some input with
|
|
* <code>setInput()</code>, then inflate() it. If inflate doesn't
|
|
* inflate any bytes there may be three reasons:
|
|
* <ul>
|
|
* <li>needsInput() returns true because the input buffer is empty.
|
|
* You have to provide more input with <code>setInput()</code>.
|
|
* NOTE: needsInput() also returns true when, the stream is finished.
|
|
* </li>
|
|
* <li>needsDictionary() returns true, you have to provide a preset
|
|
* dictionary with <code>setDictionary()</code>.</li>
|
|
* <li>finished() returns true, the inflater has finished.</li>
|
|
* </ul>
|
|
* Once the first output byte is produced, a dictionary will not be
|
|
* needed at a later stage.
|
|
*
|
|
* @author John Leuner, Jochen Hoenicke
|
|
* @author Tom Tromey
|
|
* @date May 17, 1999
|
|
* @since JDK 1.1
|
|
*/
|
|
public class Inflater
|
|
{
|
|
/* Copy lengths for literal codes 257..285 */
|
|
private static final int CPLENS[] =
|
|
{
|
|
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
|
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258
|
|
};
|
|
|
|
/* Extra bits for literal codes 257..285 */
|
|
private static final int CPLEXT[] =
|
|
{
|
|
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
|
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0
|
|
};
|
|
|
|
/* Copy offsets for distance codes 0..29 */
|
|
private static final int CPDIST[] = {
|
|
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
|
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
|
8193, 12289, 16385, 24577
|
|
};
|
|
|
|
/* Extra bits for distance codes */
|
|
private static final int CPDEXT[] = {
|
|
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
|
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
|
12, 12, 13, 13
|
|
};
|
|
|
|
/* This are the state in which the inflater can be. */
|
|
private static final int DECODE_HEADER = 0;
|
|
private static final int DECODE_DICT = 1;
|
|
private static final int DECODE_BLOCKS = 2;
|
|
private static final int DECODE_STORED_LEN1 = 3;
|
|
private static final int DECODE_STORED_LEN2 = 4;
|
|
private static final int DECODE_STORED = 5;
|
|
private static final int DECODE_DYN_HEADER = 6;
|
|
private static final int DECODE_HUFFMAN = 7;
|
|
private static final int DECODE_HUFFMAN_LENBITS = 8;
|
|
private static final int DECODE_HUFFMAN_DIST = 9;
|
|
private static final int DECODE_HUFFMAN_DISTBITS = 10;
|
|
private static final int DECODE_CHKSUM = 11;
|
|
private static final int FINISHED = 12;
|
|
|
|
/** This variable contains the current state. */
|
|
private int mode;
|
|
|
|
/**
|
|
* The adler checksum of the dictionary or of the decompressed
|
|
* stream, as it is written in the header resp. footer of the
|
|
* compressed stream. <br>
|
|
*
|
|
* Only valid if mode is DECODE_DICT or DECODE_CHKSUM.
|
|
*/
|
|
private int readAdler;
|
|
/**
|
|
* The number of bits needed to complete the current state. This
|
|
* is valid, if mode is DECODE_DICT, DECODE_CHKSUM,
|
|
* DECODE_HUFFMAN_LENBITS or DECODE_HUFFMAN_DISTBITS.
|
|
*/
|
|
private int neededBits;
|
|
private int repLength, repDist;
|
|
private int uncomprLen;
|
|
/**
|
|
* True, if the last block flag was set in the last block of the
|
|
* inflated stream. This means that the stream ends after the
|
|
* current block.
|
|
*/
|
|
private boolean isLastBlock;
|
|
|
|
/**
|
|
* The total number of inflated bytes.
|
|
*/
|
|
private long totalOut;
|
|
/**
|
|
* The total number of bytes set with setInput(). This is not the
|
|
* value returned by getTotalIn(), since this also includes the
|
|
* unprocessed input.
|
|
*/
|
|
private long totalIn;
|
|
/**
|
|
* This variable stores the nowrap flag that was given to the constructor.
|
|
* True means, that the inflated stream doesn't contain a header nor the
|
|
* checksum in the footer.
|
|
*/
|
|
private boolean nowrap;
|
|
|
|
private StreamManipulator input;
|
|
private OutputWindow outputWindow;
|
|
private InflaterDynHeader dynHeader;
|
|
private InflaterHuffmanTree litlenTree, distTree;
|
|
private Adler32 adler;
|
|
|
|
/**
|
|
* Creates a new inflater.
|
|
*/
|
|
public Inflater ()
|
|
{
|
|
this (false);
|
|
}
|
|
|
|
/**
|
|
* Creates a new inflater.
|
|
* @param nowrap true if no header and checksum field appears in the
|
|
* stream. This is used for GZIPed input. For compatibility with
|
|
* Sun JDK you should provide one byte of input more than needed in
|
|
* this case.
|
|
*/
|
|
public Inflater (boolean nowrap)
|
|
{
|
|
this.nowrap = nowrap;
|
|
this.adler = new Adler32();
|
|
input = new StreamManipulator();
|
|
outputWindow = new OutputWindow();
|
|
mode = nowrap ? DECODE_BLOCKS : DECODE_HEADER;
|
|
}
|
|
|
|
/**
|
|
* Finalizes this object.
|
|
*/
|
|
protected void finalize ()
|
|
{
|
|
/* Exists only for compatibility */
|
|
}
|
|
|
|
/**
|
|
* Frees all objects allocated by the inflater. There's no reason
|
|
* to call this, since you can just rely on garbage collection (even
|
|
* for the Sun implementation). Exists only for compatibility
|
|
* with Sun's JDK, where the compressor allocates native memory.
|
|
* If you call any method (even reset) afterwards the behaviour is
|
|
* <i>undefined</i>.
|
|
*/
|
|
public void end ()
|
|
{
|
|
outputWindow = null;
|
|
input = null;
|
|
dynHeader = null;
|
|
litlenTree = null;
|
|
distTree = null;
|
|
adler = null;
|
|
}
|
|
|
|
/**
|
|
* Returns true, if the inflater has finished. This means, that no
|
|
* input is needed and no output can be produced.
|
|
*/
|
|
public boolean finished()
|
|
{
|
|
return mode == FINISHED && outputWindow.getAvailable() == 0;
|
|
}
|
|
|
|
/**
|
|
* Gets the adler checksum. This is either the checksum of all
|
|
* uncompressed bytes returned by inflate(), or if needsDictionary()
|
|
* returns true (and thus no output was yet produced) this is the
|
|
* adler checksum of the expected dictionary.
|
|
* @returns the adler checksum.
|
|
*/
|
|
public int getAdler()
|
|
{
|
|
return needsDictionary() ? readAdler : (int) adler.getValue();
|
|
}
|
|
|
|
/**
|
|
* Gets the number of unprocessed input. Useful, if the end of the
|
|
* stream is reached and you want to further process the bytes after
|
|
* the deflate stream.
|
|
* @return the number of bytes of the input which were not processed.
|
|
*/
|
|
public int getRemaining()
|
|
{
|
|
return input.getAvailableBytes();
|
|
}
|
|
|
|
/**
|
|
* Gets the total number of processed compressed input bytes.
|
|
* @return the total number of bytes of processed input bytes.
|
|
*/
|
|
public int getTotalIn()
|
|
{
|
|
return (int) (totalIn - getRemaining());
|
|
}
|
|
|
|
/**
|
|
* Gets the total number of processed compressed input bytes.
|
|
* @return the total number of bytes of processed input bytes.
|
|
* @since 1.5
|
|
*/
|
|
public long getBytesRead()
|
|
{
|
|
return totalIn - getRemaining();
|
|
}
|
|
|
|
/**
|
|
* Gets the total number of output bytes returned by inflate().
|
|
* @return the total number of output bytes.
|
|
*/
|
|
public int getTotalOut()
|
|
{
|
|
return (int) totalOut;
|
|
}
|
|
|
|
/**
|
|
* Gets the total number of output bytes returned by inflate().
|
|
* @return the total number of output bytes.
|
|
* @since 1.5
|
|
*/
|
|
public long getBytesWritten()
|
|
{
|
|
return totalOut;
|
|
}
|
|
|
|
/**
|
|
* Inflates the compressed stream to the output buffer. If this
|
|
* returns 0, you should check, whether needsDictionary(),
|
|
* needsInput() or finished() returns true, to determine why no
|
|
* further output is produced.
|
|
* @param buf the output buffer.
|
|
* @return the number of bytes written to the buffer, 0 if no further
|
|
* output can be produced.
|
|
* @exception DataFormatException if deflated stream is invalid.
|
|
* @exception IllegalArgumentException if buf has length 0.
|
|
*/
|
|
public int inflate (byte[] buf) throws DataFormatException
|
|
{
|
|
return inflate (buf, 0, buf.length);
|
|
}
|
|
|
|
/**
|
|
* Inflates the compressed stream to the output buffer. If this
|
|
* returns 0, you should check, whether needsDictionary(),
|
|
* needsInput() or finished() returns true, to determine why no
|
|
* further output is produced.
|
|
* @param buf the output buffer.
|
|
* @param off the offset into buffer where the output should start.
|
|
* @param len the maximum length of the output.
|
|
* @return the number of bytes written to the buffer, 0 if no further
|
|
* output can be produced.
|
|
* @exception DataFormatException if deflated stream is invalid.
|
|
* @exception IndexOutOfBoundsException if the off and/or len are wrong.
|
|
*/
|
|
public int inflate (byte[] buf, int off, int len) throws DataFormatException
|
|
{
|
|
/* Special case: len may be zero */
|
|
if (len == 0)
|
|
return 0;
|
|
/* Check for correct buff, off, len triple */
|
|
if (0 > off || off > off + len || off + len > buf.length)
|
|
throw new ArrayIndexOutOfBoundsException();
|
|
int count = 0;
|
|
int more;
|
|
do
|
|
{
|
|
if (mode != DECODE_CHKSUM)
|
|
{
|
|
/* Don't give away any output, if we are waiting for the
|
|
* checksum in the input stream.
|
|
*
|
|
* With this trick we have always:
|
|
* needsInput() and not finished()
|
|
* implies more output can be produced.
|
|
*/
|
|
more = outputWindow.copyOutput(buf, off, len);
|
|
adler.update(buf, off, more);
|
|
off += more;
|
|
count += more;
|
|
totalOut += more;
|
|
len -= more;
|
|
if (len == 0)
|
|
return count;
|
|
}
|
|
}
|
|
while (decode() || (outputWindow.getAvailable() > 0
|
|
&& mode != DECODE_CHKSUM));
|
|
return count;
|
|
}
|
|
|
|
/**
|
|
* Returns true, if a preset dictionary is needed to inflate the input.
|
|
*/
|
|
public boolean needsDictionary ()
|
|
{
|
|
return mode == DECODE_DICT && neededBits == 0;
|
|
}
|
|
|
|
/**
|
|
* Returns true, if the input buffer is empty.
|
|
* You should then call setInput(). <br>
|
|
*
|
|
* <em>NOTE</em>: This method also returns true when the stream is finished.
|
|
*/
|
|
public boolean needsInput ()
|
|
{
|
|
return input.needsInput ();
|
|
}
|
|
|
|
/**
|
|
* Resets the inflater so that a new stream can be decompressed. All
|
|
* pending input and output will be discarded.
|
|
*/
|
|
public void reset ()
|
|
{
|
|
mode = nowrap ? DECODE_BLOCKS : DECODE_HEADER;
|
|
totalIn = totalOut = 0;
|
|
input.reset();
|
|
outputWindow.reset();
|
|
dynHeader = null;
|
|
litlenTree = null;
|
|
distTree = null;
|
|
isLastBlock = false;
|
|
adler.reset();
|
|
}
|
|
|
|
/**
|
|
* Sets the preset dictionary. This should only be called, if
|
|
* needsDictionary() returns true and it should set the same
|
|
* dictionary, that was used for deflating. The getAdler()
|
|
* function returns the checksum of the dictionary needed.
|
|
* @param buffer the dictionary.
|
|
* @exception IllegalStateException if no dictionary is needed.
|
|
* @exception IllegalArgumentException if the dictionary checksum is
|
|
* wrong.
|
|
*/
|
|
public void setDictionary (byte[] buffer)
|
|
{
|
|
setDictionary(buffer, 0, buffer.length);
|
|
}
|
|
|
|
/**
|
|
* Sets the preset dictionary. This should only be called, if
|
|
* needsDictionary() returns true and it should set the same
|
|
* dictionary, that was used for deflating. The getAdler()
|
|
* function returns the checksum of the dictionary needed.
|
|
* @param buffer the dictionary.
|
|
* @param off the offset into buffer where the dictionary starts.
|
|
* @param len the length of the dictionary.
|
|
* @exception IllegalStateException if no dictionary is needed.
|
|
* @exception IllegalArgumentException if the dictionary checksum is
|
|
* wrong.
|
|
* @exception IndexOutOfBoundsException if the off and/or len are wrong.
|
|
*/
|
|
public void setDictionary (byte[] buffer, int off, int len)
|
|
{
|
|
if (!needsDictionary())
|
|
throw new IllegalStateException();
|
|
|
|
adler.update(buffer, off, len);
|
|
if ((int) adler.getValue() != readAdler)
|
|
throw new IllegalArgumentException("Wrong adler checksum");
|
|
adler.reset();
|
|
outputWindow.copyDict(buffer, off, len);
|
|
mode = DECODE_BLOCKS;
|
|
}
|
|
|
|
/**
|
|
* Sets the input. This should only be called, if needsInput()
|
|
* returns true.
|
|
* @param buf the input.
|
|
* @exception IllegalStateException if no input is needed.
|
|
*/
|
|
public void setInput (byte[] buf)
|
|
{
|
|
setInput (buf, 0, buf.length);
|
|
}
|
|
|
|
/**
|
|
* Sets the input. This should only be called, if needsInput()
|
|
* returns true.
|
|
* @param buf the input.
|
|
* @param off the offset into buffer where the input starts.
|
|
* @param len the length of the input.
|
|
* @exception IllegalStateException if no input is needed.
|
|
* @exception IndexOutOfBoundsException if the off and/or len are wrong.
|
|
*/
|
|
public void setInput (byte[] buf, int off, int len)
|
|
{
|
|
input.setInput (buf, off, len);
|
|
totalIn += len;
|
|
}
|
|
|
|
/**
|
|
* Decodes the deflate header.
|
|
* @return false if more input is needed.
|
|
* @exception DataFormatException if header is invalid.
|
|
*/
|
|
private boolean decodeHeader () throws DataFormatException
|
|
{
|
|
int header = input.peekBits(16);
|
|
if (header < 0)
|
|
return false;
|
|
input.dropBits(16);
|
|
|
|
/* The header is written in "wrong" byte order */
|
|
header = ((header << 8) | (header >> 8)) & 0xffff;
|
|
if (header % 31 != 0)
|
|
throw new DataFormatException("Header checksum illegal");
|
|
|
|
if ((header & 0x0f00) != (Deflater.DEFLATED << 8))
|
|
throw new DataFormatException("Compression Method unknown");
|
|
|
|
/* Maximum size of the backwards window in bits.
|
|
* We currently ignore this, but we could use it to make the
|
|
* inflater window more space efficient. On the other hand the
|
|
* full window (15 bits) is needed most times, anyway.
|
|
int max_wbits = ((header & 0x7000) >> 12) + 8;
|
|
*/
|
|
|
|
if ((header & 0x0020) == 0) // Dictionary flag?
|
|
{
|
|
mode = DECODE_BLOCKS;
|
|
}
|
|
else
|
|
{
|
|
mode = DECODE_DICT;
|
|
neededBits = 32;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Decodes the dictionary checksum after the deflate header.
|
|
* @return false if more input is needed.
|
|
*/
|
|
private boolean decodeDict ()
|
|
{
|
|
while (neededBits > 0)
|
|
{
|
|
int dictByte = input.peekBits(8);
|
|
if (dictByte < 0)
|
|
return false;
|
|
input.dropBits(8);
|
|
readAdler = (readAdler << 8) | dictByte;
|
|
neededBits -= 8;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Decodes the huffman encoded symbols in the input stream.
|
|
* @return false if more input is needed, true if output window is
|
|
* full or the current block ends.
|
|
* @exception DataFormatException if deflated stream is invalid.
|
|
*/
|
|
private boolean decodeHuffman () throws DataFormatException
|
|
{
|
|
int free = outputWindow.getFreeSpace();
|
|
while (free >= 258)
|
|
{
|
|
int symbol;
|
|
switch (mode)
|
|
{
|
|
case DECODE_HUFFMAN:
|
|
/* This is the inner loop so it is optimized a bit */
|
|
while (((symbol = litlenTree.getSymbol(input)) & ~0xff) == 0)
|
|
{
|
|
outputWindow.write(symbol);
|
|
if (--free < 258)
|
|
return true;
|
|
}
|
|
if (symbol < 257)
|
|
{
|
|
if (symbol < 0)
|
|
return false;
|
|
else
|
|
{
|
|
/* symbol == 256: end of block */
|
|
distTree = null;
|
|
litlenTree = null;
|
|
mode = DECODE_BLOCKS;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
try
|
|
{
|
|
repLength = CPLENS[symbol - 257];
|
|
neededBits = CPLEXT[symbol - 257];
|
|
}
|
|
catch (ArrayIndexOutOfBoundsException ex)
|
|
{
|
|
throw new DataFormatException("Illegal rep length code");
|
|
}
|
|
/* fall through */
|
|
case DECODE_HUFFMAN_LENBITS:
|
|
if (neededBits > 0)
|
|
{
|
|
mode = DECODE_HUFFMAN_LENBITS;
|
|
int i = input.peekBits(neededBits);
|
|
if (i < 0)
|
|
return false;
|
|
input.dropBits(neededBits);
|
|
repLength += i;
|
|
}
|
|
mode = DECODE_HUFFMAN_DIST;
|
|
/* fall through */
|
|
case DECODE_HUFFMAN_DIST:
|
|
symbol = distTree.getSymbol(input);
|
|
if (symbol < 0)
|
|
return false;
|
|
try
|
|
{
|
|
repDist = CPDIST[symbol];
|
|
neededBits = CPDEXT[symbol];
|
|
}
|
|
catch (ArrayIndexOutOfBoundsException ex)
|
|
{
|
|
throw new DataFormatException("Illegal rep dist code");
|
|
}
|
|
/* fall through */
|
|
case DECODE_HUFFMAN_DISTBITS:
|
|
if (neededBits > 0)
|
|
{
|
|
mode = DECODE_HUFFMAN_DISTBITS;
|
|
int i = input.peekBits(neededBits);
|
|
if (i < 0)
|
|
return false;
|
|
input.dropBits(neededBits);
|
|
repDist += i;
|
|
}
|
|
outputWindow.repeat(repLength, repDist);
|
|
free -= repLength;
|
|
mode = DECODE_HUFFMAN;
|
|
break;
|
|
default:
|
|
throw new IllegalStateException();
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Decodes the adler checksum after the deflate stream.
|
|
* @return false if more input is needed.
|
|
* @exception DataFormatException if checksum doesn't match.
|
|
*/
|
|
private boolean decodeChksum () throws DataFormatException
|
|
{
|
|
while (neededBits > 0)
|
|
{
|
|
int chkByte = input.peekBits(8);
|
|
if (chkByte < 0)
|
|
return false;
|
|
input.dropBits(8);
|
|
readAdler = (readAdler << 8) | chkByte;
|
|
neededBits -= 8;
|
|
}
|
|
if ((int) adler.getValue() != readAdler)
|
|
throw new DataFormatException("Adler chksum doesn't match: "
|
|
+Integer.toHexString((int)adler.getValue())
|
|
+" vs. "+Integer.toHexString(readAdler));
|
|
mode = FINISHED;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Decodes the deflated stream.
|
|
* @return false if more input is needed, or if finished.
|
|
* @exception DataFormatException if deflated stream is invalid.
|
|
*/
|
|
private boolean decode () throws DataFormatException
|
|
{
|
|
switch (mode)
|
|
{
|
|
case DECODE_HEADER:
|
|
return decodeHeader();
|
|
case DECODE_DICT:
|
|
return decodeDict();
|
|
case DECODE_CHKSUM:
|
|
return decodeChksum();
|
|
|
|
case DECODE_BLOCKS:
|
|
if (isLastBlock)
|
|
{
|
|
if (nowrap)
|
|
{
|
|
mode = FINISHED;
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
input.skipToByteBoundary();
|
|
neededBits = 32;
|
|
mode = DECODE_CHKSUM;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
int type = input.peekBits(3);
|
|
if (type < 0)
|
|
return false;
|
|
input.dropBits(3);
|
|
|
|
if ((type & 1) != 0)
|
|
isLastBlock = true;
|
|
switch (type >> 1)
|
|
{
|
|
case DeflaterConstants.STORED_BLOCK:
|
|
input.skipToByteBoundary();
|
|
mode = DECODE_STORED_LEN1;
|
|
break;
|
|
case DeflaterConstants.STATIC_TREES:
|
|
litlenTree = InflaterHuffmanTree.defLitLenTree;
|
|
distTree = InflaterHuffmanTree.defDistTree;
|
|
mode = DECODE_HUFFMAN;
|
|
break;
|
|
case DeflaterConstants.DYN_TREES:
|
|
dynHeader = new InflaterDynHeader();
|
|
mode = DECODE_DYN_HEADER;
|
|
break;
|
|
default:
|
|
throw new DataFormatException("Unknown block type "+type);
|
|
}
|
|
return true;
|
|
|
|
case DECODE_STORED_LEN1:
|
|
{
|
|
if ((uncomprLen = input.peekBits(16)) < 0)
|
|
return false;
|
|
input.dropBits(16);
|
|
mode = DECODE_STORED_LEN2;
|
|
}
|
|
/* fall through */
|
|
case DECODE_STORED_LEN2:
|
|
{
|
|
int nlen = input.peekBits(16);
|
|
if (nlen < 0)
|
|
return false;
|
|
input.dropBits(16);
|
|
if (nlen != (uncomprLen ^ 0xffff))
|
|
throw new DataFormatException("broken uncompressed block");
|
|
mode = DECODE_STORED;
|
|
}
|
|
/* fall through */
|
|
case DECODE_STORED:
|
|
{
|
|
int more = outputWindow.copyStored(input, uncomprLen);
|
|
uncomprLen -= more;
|
|
if (uncomprLen == 0)
|
|
{
|
|
mode = DECODE_BLOCKS;
|
|
return true;
|
|
}
|
|
return !input.needsInput();
|
|
}
|
|
|
|
case DECODE_DYN_HEADER:
|
|
if (!dynHeader.decode(input))
|
|
return false;
|
|
litlenTree = dynHeader.buildLitLenTree();
|
|
distTree = dynHeader.buildDistTree();
|
|
mode = DECODE_HUFFMAN;
|
|
/* fall through */
|
|
case DECODE_HUFFMAN:
|
|
case DECODE_HUFFMAN_LENBITS:
|
|
case DECODE_HUFFMAN_DIST:
|
|
case DECODE_HUFFMAN_DISTBITS:
|
|
return decodeHuffman();
|
|
case FINISHED:
|
|
return false;
|
|
default:
|
|
throw new IllegalStateException();
|
|
}
|
|
}
|
|
}
|