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
538 lines
16 KiB
Java
538 lines
16 KiB
Java
/* Deflater.java - Compress a data stream
|
|
Copyright (C) 1999, 2000, 2001, 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.util.zip;
|
|
|
|
/**
|
|
* This is the Deflater class. The deflater class compresses input
|
|
* with the deflate algorithm described in RFC 1951. It has several
|
|
* compression levels and three different strategies described below.
|
|
*
|
|
* This class is <i>not</i> thread safe. This is inherent in the API, due
|
|
* to the split of deflate and setInput.
|
|
*
|
|
* @author Jochen Hoenicke
|
|
* @author Tom Tromey
|
|
*/
|
|
public class Deflater
|
|
{
|
|
/**
|
|
* The best and slowest compression level. This tries to find very
|
|
* long and distant string repetitions.
|
|
*/
|
|
public static final int BEST_COMPRESSION = 9;
|
|
/**
|
|
* The worst but fastest compression level.
|
|
*/
|
|
public static final int BEST_SPEED = 1;
|
|
/**
|
|
* The default compression level.
|
|
*/
|
|
public static final int DEFAULT_COMPRESSION = -1;
|
|
/**
|
|
* This level won't compress at all but output uncompressed blocks.
|
|
*/
|
|
public static final int NO_COMPRESSION = 0;
|
|
|
|
/**
|
|
* The default strategy.
|
|
*/
|
|
public static final int DEFAULT_STRATEGY = 0;
|
|
/**
|
|
* This strategy will only allow longer string repetitions. It is
|
|
* useful for random data with a small character set.
|
|
*/
|
|
public static final int FILTERED = 1;
|
|
|
|
/**
|
|
* This strategy will not look for string repetitions at all. It
|
|
* only encodes with Huffman trees (which means, that more common
|
|
* characters get a smaller encoding.
|
|
*/
|
|
public static final int HUFFMAN_ONLY = 2;
|
|
|
|
/**
|
|
* The compression method. This is the only method supported so far.
|
|
* There is no need to use this constant at all.
|
|
*/
|
|
public static final int DEFLATED = 8;
|
|
|
|
/*
|
|
* The Deflater can do the following state transitions:
|
|
*
|
|
* (1) -> INIT_STATE ----> INIT_FINISHING_STATE ---.
|
|
* / | (2) (5) |
|
|
* / v (5) |
|
|
* (3)| SETDICT_STATE ---> SETDICT_FINISHING_STATE |(3)
|
|
* \ | (3) | ,-------'
|
|
* | | | (3) /
|
|
* v v (5) v v
|
|
* (1) -> BUSY_STATE ----> FINISHING_STATE
|
|
* | (6)
|
|
* v
|
|
* FINISHED_STATE
|
|
* \_____________________________________/
|
|
* | (7)
|
|
* v
|
|
* CLOSED_STATE
|
|
*
|
|
* (1) If we should produce a header we start in INIT_STATE, otherwise
|
|
* we start in BUSY_STATE.
|
|
* (2) A dictionary may be set only when we are in INIT_STATE, then
|
|
* we change the state as indicated.
|
|
* (3) Whether a dictionary is set or not, on the first call of deflate
|
|
* we change to BUSY_STATE.
|
|
* (4) -- intentionally left blank -- :)
|
|
* (5) FINISHING_STATE is entered, when flush() is called to indicate that
|
|
* there is no more INPUT. There are also states indicating, that
|
|
* the header wasn't written yet.
|
|
* (6) FINISHED_STATE is entered, when everything has been flushed to the
|
|
* internal pending output buffer.
|
|
* (7) At any time (7)
|
|
*
|
|
*/
|
|
|
|
private static final int IS_SETDICT = 0x01;
|
|
private static final int IS_FLUSHING = 0x04;
|
|
private static final int IS_FINISHING = 0x08;
|
|
|
|
private static final int INIT_STATE = 0x00;
|
|
private static final int SETDICT_STATE = 0x01;
|
|
private static final int INIT_FINISHING_STATE = 0x08;
|
|
private static final int SETDICT_FINISHING_STATE = 0x09;
|
|
private static final int BUSY_STATE = 0x10;
|
|
private static final int FLUSHING_STATE = 0x14;
|
|
private static final int FINISHING_STATE = 0x1c;
|
|
private static final int FINISHED_STATE = 0x1e;
|
|
private static final int CLOSED_STATE = 0x7f;
|
|
|
|
/** Compression level. */
|
|
private int level;
|
|
|
|
/** should we include a header. */
|
|
private boolean noHeader;
|
|
|
|
/** The current state. */
|
|
private int state;
|
|
|
|
/** The total bytes of output written. */
|
|
private long totalOut;
|
|
|
|
/** The pending output. */
|
|
private DeflaterPending pending;
|
|
|
|
/** The deflater engine. */
|
|
private DeflaterEngine engine;
|
|
|
|
/**
|
|
* Creates a new deflater with default compression level.
|
|
*/
|
|
public Deflater()
|
|
{
|
|
this(DEFAULT_COMPRESSION, false);
|
|
}
|
|
|
|
/**
|
|
* Creates a new deflater with given compression level.
|
|
* @param lvl the compression level, a value between NO_COMPRESSION
|
|
* and BEST_COMPRESSION, or DEFAULT_COMPRESSION.
|
|
* @exception IllegalArgumentException if lvl is out of range.
|
|
*/
|
|
public Deflater(int lvl)
|
|
{
|
|
this(lvl, false);
|
|
}
|
|
|
|
/**
|
|
* Creates a new deflater with given compression level.
|
|
* @param lvl the compression level, a value between NO_COMPRESSION
|
|
* and BEST_COMPRESSION.
|
|
* @param nowrap true, iff we should suppress the deflate header at the
|
|
* beginning and the adler checksum at the end of the output. This is
|
|
* useful for the GZIP format.
|
|
* @exception IllegalArgumentException if lvl is out of range.
|
|
*/
|
|
public Deflater(int lvl, boolean nowrap)
|
|
{
|
|
if (lvl == DEFAULT_COMPRESSION)
|
|
lvl = 6;
|
|
else if (lvl < NO_COMPRESSION || lvl > BEST_COMPRESSION)
|
|
throw new IllegalArgumentException();
|
|
|
|
pending = new DeflaterPending();
|
|
engine = new DeflaterEngine(pending);
|
|
this.noHeader = nowrap;
|
|
setStrategy(DEFAULT_STRATEGY);
|
|
setLevel(lvl);
|
|
reset();
|
|
}
|
|
|
|
/**
|
|
* Resets the deflater. The deflater acts afterwards as if it was
|
|
* just created with the same compression level and strategy as it
|
|
* had before.
|
|
*/
|
|
public void reset()
|
|
{
|
|
state = (noHeader ? BUSY_STATE : INIT_STATE);
|
|
totalOut = 0;
|
|
pending.reset();
|
|
engine.reset();
|
|
}
|
|
|
|
/**
|
|
* Frees all objects allocated by the compressor. There's no
|
|
* reason to call this, since you can just rely on garbage
|
|
* collection. Exists only for compatibility against 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()
|
|
{
|
|
engine = null;
|
|
pending = null;
|
|
state = CLOSED_STATE;
|
|
}
|
|
|
|
/**
|
|
* Gets the current adler checksum of the data that was processed so
|
|
* far.
|
|
*/
|
|
public int getAdler()
|
|
{
|
|
return engine.getAdler();
|
|
}
|
|
|
|
/**
|
|
* Gets the number of input bytes processed so far.
|
|
*/
|
|
public int getTotalIn()
|
|
{
|
|
return (int) engine.getTotalIn();
|
|
}
|
|
|
|
/**
|
|
* Gets the number of input bytes processed so far.
|
|
* @since 1.5
|
|
*/
|
|
public long getBytesRead()
|
|
{
|
|
return engine.getTotalIn();
|
|
}
|
|
|
|
/**
|
|
* Gets the number of output bytes so far.
|
|
*/
|
|
public int getTotalOut()
|
|
{
|
|
return (int) totalOut;
|
|
}
|
|
|
|
/**
|
|
* Gets the number of output bytes so far.
|
|
* @since 1.5
|
|
*/
|
|
public long getBytesWritten()
|
|
{
|
|
return totalOut;
|
|
}
|
|
|
|
/**
|
|
* Finalizes this object.
|
|
*/
|
|
protected void finalize()
|
|
{
|
|
/* Exists solely for compatibility. We don't have any native state. */
|
|
}
|
|
|
|
/**
|
|
* Flushes the current input block. Further calls to deflate() will
|
|
* produce enough output to inflate everything in the current input
|
|
* block. This is not part of Sun's JDK so I have made it package
|
|
* private. It is used by DeflaterOutputStream to implement
|
|
* flush().
|
|
*/
|
|
void flush() {
|
|
state |= IS_FLUSHING;
|
|
}
|
|
|
|
/**
|
|
* Finishes the deflater with the current input block. It is an error
|
|
* to give more input after this method was called. This method must
|
|
* be called to force all bytes to be flushed.
|
|
*/
|
|
public void finish() {
|
|
state |= IS_FLUSHING | IS_FINISHING;
|
|
}
|
|
|
|
/**
|
|
* Returns true iff the stream was finished and no more output bytes
|
|
* are available.
|
|
*/
|
|
public boolean finished()
|
|
{
|
|
return state == FINISHED_STATE && pending.isFlushed();
|
|
}
|
|
|
|
/**
|
|
* Returns true, if the input buffer is empty.
|
|
* You should then call setInput(). <br>
|
|
*
|
|
* <em>NOTE</em>: This method can also return true when the stream
|
|
* was finished.
|
|
*/
|
|
public boolean needsInput()
|
|
{
|
|
return engine.needsInput();
|
|
}
|
|
|
|
/**
|
|
* Sets the data which should be compressed next. This should be only
|
|
* called when needsInput indicates that more input is needed.
|
|
* If you call setInput when needsInput() returns false, the
|
|
* previous input that is still pending will be thrown away.
|
|
* The given byte array should not be changed, before needsInput() returns
|
|
* true again.
|
|
* This call is equivalent to <code>setInput(input, 0, input.length)</code>.
|
|
* @param input the buffer containing the input data.
|
|
* @exception IllegalStateException if the buffer was finished() or ended().
|
|
*/
|
|
public void setInput(byte[] input)
|
|
{
|
|
setInput(input, 0, input.length);
|
|
}
|
|
|
|
/**
|
|
* Sets the data which should be compressed next. This should be
|
|
* only called when needsInput indicates that more input is needed.
|
|
* The given byte array should not be changed, before needsInput() returns
|
|
* true again.
|
|
* @param input the buffer containing the input data.
|
|
* @param off the start of the data.
|
|
* @param len the length of the data.
|
|
* @exception IllegalStateException if the buffer was finished() or ended()
|
|
* or if previous input is still pending.
|
|
*/
|
|
public void setInput(byte[] input, int off, int len)
|
|
{
|
|
if ((state & IS_FINISHING) != 0)
|
|
throw new IllegalStateException("finish()/end() already called");
|
|
engine.setInput(input, off, len);
|
|
}
|
|
|
|
/**
|
|
* Sets the compression level. There is no guarantee of the exact
|
|
* position of the change, but if you call this when needsInput is
|
|
* true the change of compression level will occur somewhere near
|
|
* before the end of the so far given input.
|
|
* @param lvl the new compression level.
|
|
*/
|
|
public void setLevel(int lvl)
|
|
{
|
|
if (lvl == DEFAULT_COMPRESSION)
|
|
lvl = 6;
|
|
else if (lvl < NO_COMPRESSION || lvl > BEST_COMPRESSION)
|
|
throw new IllegalArgumentException();
|
|
|
|
|
|
if (level != lvl)
|
|
{
|
|
level = lvl;
|
|
engine.setLevel(lvl);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the compression strategy. Strategy is one of
|
|
* DEFAULT_STRATEGY, HUFFMAN_ONLY and FILTERED. For the exact
|
|
* position where the strategy is changed, the same as for
|
|
* setLevel() applies.
|
|
* @param stgy the new compression strategy.
|
|
*/
|
|
public void setStrategy(int stgy)
|
|
{
|
|
if (stgy != DEFAULT_STRATEGY && stgy != FILTERED
|
|
&& stgy != HUFFMAN_ONLY)
|
|
throw new IllegalArgumentException();
|
|
engine.setStrategy(stgy);
|
|
}
|
|
|
|
/**
|
|
* Deflates the current input block to the given array. It returns
|
|
* the number of bytes compressed, or 0 if either
|
|
* needsInput() or finished() returns true or length is zero.
|
|
* @param output the buffer where to write the compressed data.
|
|
*/
|
|
public int deflate(byte[] output)
|
|
{
|
|
return deflate(output, 0, output.length);
|
|
}
|
|
|
|
/**
|
|
* Deflates the current input block to the given array. It returns
|
|
* the number of bytes compressed, or 0 if either
|
|
* needsInput() or finished() returns true or length is zero.
|
|
* @param output the buffer where to write the compressed data.
|
|
* @param offset the offset into the output array.
|
|
* @param length the maximum number of bytes that may be written.
|
|
* @exception IllegalStateException if end() was called.
|
|
* @exception IndexOutOfBoundsException if offset and/or length
|
|
* don't match the array length.
|
|
*/
|
|
public int deflate(byte[] output, int offset, int length)
|
|
{
|
|
int origLength = length;
|
|
|
|
if (state == CLOSED_STATE)
|
|
throw new IllegalStateException("Deflater closed");
|
|
|
|
if (state < BUSY_STATE)
|
|
{
|
|
/* output header */
|
|
int header = (DEFLATED +
|
|
((DeflaterConstants.MAX_WBITS - 8) << 4)) << 8;
|
|
int level_flags = (level - 1) >> 1;
|
|
if (level_flags < 0 || level_flags > 3)
|
|
level_flags = 3;
|
|
header |= level_flags << 6;
|
|
if ((state & IS_SETDICT) != 0)
|
|
/* Dictionary was set */
|
|
header |= DeflaterConstants.PRESET_DICT;
|
|
header += 31 - (header % 31);
|
|
|
|
pending.writeShortMSB(header);
|
|
if ((state & IS_SETDICT) != 0)
|
|
{
|
|
int chksum = engine.getAdler();
|
|
engine.resetAdler();
|
|
pending.writeShortMSB(chksum >> 16);
|
|
pending.writeShortMSB(chksum & 0xffff);
|
|
}
|
|
|
|
state = BUSY_STATE | (state & (IS_FLUSHING | IS_FINISHING));
|
|
}
|
|
|
|
for (;;)
|
|
{
|
|
int count = pending.flush(output, offset, length);
|
|
offset += count;
|
|
totalOut += count;
|
|
length -= count;
|
|
if (length == 0 || state == FINISHED_STATE)
|
|
break;
|
|
|
|
if (!engine.deflate((state & IS_FLUSHING) != 0,
|
|
(state & IS_FINISHING) != 0))
|
|
{
|
|
if (state == BUSY_STATE)
|
|
/* We need more input now */
|
|
return origLength - length;
|
|
else if (state == FLUSHING_STATE)
|
|
{
|
|
if (level != NO_COMPRESSION)
|
|
{
|
|
/* We have to supply some lookahead. 8 bit lookahead
|
|
* are needed by the zlib inflater, and we must fill
|
|
* the next byte, so that all bits are flushed.
|
|
*/
|
|
int neededbits = 8 + ((-pending.getBitCount()) & 7);
|
|
while (neededbits > 0)
|
|
{
|
|
/* write a static tree block consisting solely of
|
|
* an EOF:
|
|
*/
|
|
pending.writeBits(2, 10);
|
|
neededbits -= 10;
|
|
}
|
|
}
|
|
state = BUSY_STATE;
|
|
}
|
|
else if (state == FINISHING_STATE)
|
|
{
|
|
pending.alignToByte();
|
|
/* We have completed the stream */
|
|
if (!noHeader)
|
|
{
|
|
int adler = engine.getAdler();
|
|
pending.writeShortMSB(adler >> 16);
|
|
pending.writeShortMSB(adler & 0xffff);
|
|
}
|
|
state = FINISHED_STATE;
|
|
}
|
|
}
|
|
}
|
|
|
|
return origLength - length;
|
|
}
|
|
|
|
/**
|
|
* Sets the dictionary which should be used in the deflate process.
|
|
* This call is equivalent to <code>setDictionary(dict, 0,
|
|
* dict.length)</code>.
|
|
* @param dict the dictionary.
|
|
* @exception IllegalStateException if setInput () or deflate ()
|
|
* were already called or another dictionary was already set.
|
|
*/
|
|
public void setDictionary(byte[] dict)
|
|
{
|
|
setDictionary(dict, 0, dict.length);
|
|
}
|
|
|
|
/**
|
|
* Sets the dictionary which should be used in the deflate process.
|
|
* The dictionary should be a byte array containing strings that are
|
|
* likely to occur in the data which should be compressed. The
|
|
* dictionary is not stored in the compressed output, only a
|
|
* checksum. To decompress the output you need to supply the same
|
|
* dictionary again.
|
|
* @param dict the dictionary.
|
|
* @param offset an offset into the dictionary.
|
|
* @param length the length of the dictionary.
|
|
* @exception IllegalStateException if setInput () or deflate () were
|
|
* already called or another dictionary was already set.
|
|
*/
|
|
public void setDictionary(byte[] dict, int offset, int length)
|
|
{
|
|
if (state != INIT_STATE)
|
|
throw new IllegalStateException();
|
|
|
|
state = SETDICT_STATE;
|
|
engine.setDictionary(dict, offset, length);
|
|
}
|
|
}
|