aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/util/zip
AgeCommit message (Collapse)AuthorFilesLines
2005-11-16ZipEntry.java: Removed, fully merged now.Mark Wielaard2-959/+0
* java/util/zip/ZipEntry.java: Removed, fully merged now. * java/util/zip/ZipFile.java: Likewise. * sources.am: Regenerated. * Makefile.in: Regenerated. From-SVN: r107106
2005-07-16Major merge with Classpath.Tom Tromey10-1668/+0
Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. From-SVN: r102082
2005-06-30Update FSF addressKelley Cook18-36/+36
From-SVN: r101453
2005-02-10Connection.java (getJarFile): Open jar file with OPEN_DELETE.Tom Tromey1-7/+4
* gnu/java/net/protocol/jar/Connection.java (getJarFile): Open jar file with OPEN_DELETE. * java/util/zip/ZipFile.java (ZipFile): Call deleteOnExit when OPEN_DELETE is used. From-SVN: r94793
2005-02-10InflaterInputStream.java (markSupported): Override.Tom Tromey1-1/+15
* java/util/zip/InflaterInputStream.java (markSupported): Override. (mark, reset): Likewise. From-SVN: r94792
2005-01-05ZipEntry.java (setCompressedSize): Allow any argument.Tom Tromey2-10/+5
* java/util/zip/ZipEntry.java (setCompressedSize): Allow any argument. (compressedSize): Now 'long'. Default to -1. (getCompressedSize): Rewrote. * java/util/zip/DeflaterOutputStream.java (deflate): Don't deflate at all if we need input. From-SVN: r92969
2004-11-07[multiple changes]Mark Wielaard1-4/+4
2004-11-07 Michael Koch <konqueror@gmx.de> * java/lang/Process.java: Import cleanups. 2004-11-07 Jeroen Frijters <jeroen@frijters.net> * java/util/zip/ZipEntry.java (KNOWN_SIZE, KNOWN_CSIZE, KNOWN_CRC, KNOWN_TIME): Made final. From-SVN: r90231
2004-11-07CheckedInputStream.java, [...]: Import cleanups.Michael Koch4-9/+11
2004-11-06 Michael Koch <konqueror@gmx.de> * java/util/zip/CheckedInputStream.java, java/util/zip/InflaterInputStream.java, java/util/zip/ZipFile.java, java/util/zip/ZipInputStream.java: Import cleanups. From-SVN: r90220
2004-11-06StringBuffer.java, [...]: Removed redundant and reordered modifiers.Michael Koch4-20/+19
2004-11-06 Michael Koch <konqueror@gmx.de> * java/lang/StringBuffer.java, java/lang/Throwable.java, java/security/spec/DSAParameterSpec.java, java/util/zip/ZipEntry.java, java/util/zip/ZipFile.java, java/util/zip/ZipInputStream.java, java/util/zip/ZipOutputStream.java: Removed redundant and reordered modifiers. From-SVN: r90177
2004-10-21InflaterInputStream.java (fill): Don't throw an exception if we hit EOF of `in'.Tom Tromey1-8/+4
* java/util/zip/InflaterInputStream.java (fill): Don't throw an exception if we hit EOF of `in'. (read): Handle case where inflating returns -1. From-SVN: r89395
2004-10-20Timestamp.java, [...]: Reorganized imports and fixed copyright headers.Michael Koch3-4/+6
2004-10-20 Michael Koch <konqueror@gmx.de> * java/sql/Timestamp.java, java/text/AttributedCharacterIterator.java, java/text/AttributedString.java, java/util/zip/CheckedOutputStream.java, java/util/zip/DeflaterOutputStream.java, java/util/zip/ZipFile.java, javax/crypto/Cipher.java, javax/crypto/ExemptionMechanismException.java, javax/crypto/SecretKey.java, javax/crypto/SecretKeyFactory.java, javax/naming/directory/ModificationItem.java, javax/naming/directory/SearchControls.java, javax/naming/event/NamingListener.java, javax/naming/ldap/Control.java, javax/naming/ldap/ExtendedResponse.java, javax/net/ssl/SSLSocketFactory.java: Reorganized imports and fixed copyright headers. From-SVN: r89324
2004-09-22re PR java/14446 (GZIPInputStream: corrupted gzip file - crc mismatch)Tom Tromey2-1/+19
PR libgcj/14446: * java/util/zip/GZIPInputStream.java (read): Avoid sign extension when comparing CRCs. * java/util/zip/InflaterInputStream.java (onebytebuffer): New field. (read()): New overload. From-SVN: r87882
2004-07-302004-07-30 Michael Koch <konqueror@gmx.de>Michael Koch4-12/+16
* java/util/zip/GZIPInputStream.java (GZIPInputStream): Increase buffer size to 4k. * java/util/zip/GZIPOutputStream.java (GZIPOutputStream): Likewise. * java/util/zip/Inflater.java (setInput): Merged formating with GNU classpath. * java/util/zip/InflaterInputStream.java (InflaterInputStream): Increase buffer size to 4k. (fill): Throw exception if stream ends early. (read): Merged endless-loop with GNU classpath. (skip): Increase buffer size to 2k. From-SVN: r85340
2004-07-09DeflaterOutputStream.java, [...]: Reformatted.Michael Koch4-130/+198
2004-07-09 Michael Koch <konqueror@gmx.de> * java/util/zip/DeflaterOutputStream.java, java/util/zip/GZIPInputStream.java, java/util/zip/GZIPOutputStream.java, java/util/zip/InflaterInputStream.java: Reformatted. Added javadocs. Reordered all stuff. Renamed variables to be more clear. From-SVN: r84380
2004-06-17ZipFile.getInputStream returns null if entry not found.Anthony Green1-2/+12
From-SVN: r83293
2004-06-06ZipEntry.java (setTime): Remove scaling.Jerry Quinn1-3/+2
2004-06-06 Jerry Quinn <jlquinn@optonline.net> * java/util/zip/ZipEntry.java (setTime): Remove scaling. From-SVN: r82674
2004-05-31InflaterInputStream.java: Merged more with Classpath version.Michael Koch2-27/+65
2004-06-01 Michael Koch <konqueror@gmx.de> * java/util/zip/InflaterInputStream.java: Merged more with Classpath version. * java/util/zip/ZipOutputStream.java (): Renamed enum to e to removed Java 1.5 keyword usage. From-SVN: r82509
2004-05-03DERReader.java: Call static methods staticly.Mark Wielaard1-6/+6
2004-05-03 Mark Wielaard <mark@klomp.org> * gnu/java/security/der/DERReader.java: Call static methods staticly. * java/awt/TextComponent.java (select): Use selectionEnd parameter. * java/net/URL.java (set(String, String, int, String, String, String, String, String)): Assign this.file to path or path + "?" + query. * java/util/Arrays.java: Call static methods staticly. * java/util/zip/ZipEntry.java: Likewise. * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Assign dir to this.direction. * javax/swing/table/DefaultTableCellRenderer.java (noFocusBorder): Assign static field only once. (DefaultTableCellRenderer): Don't reassign noFocusBorder each time. From-SVN: r81453
2004-02-05Deflater.java, [...]: Reformated and javadoc comments merged from classpath.Michael Koch3-109/+292
2004-02-05 Michael Koch <konqueror@gmx.de> * java/util/zip/Deflater.java, java/util/zip/DeflaterOutputStream.java, java/util/zip/GZIPInputStream.java: Reformated and javadoc comments merged from classpath. From-SVN: r77319
2004-01-24InflaterInputStream.java: Merged class documentation with classpath.Michael Koch1-8/+11
2004-01-24 Michael Koch <konqueror@gmx.de> * java/util/zip/InflaterInputStream.java: Merged class documentation with classpath. From-SVN: r76519
2003-11-26ZipFile (Zipfile(File)): Set file path as name.David Belanger1-3/+3
2003-11-26 David Belanger <dbelan2@cs.mcgill.ca> * java/util/zip/ZipFile (Zipfile(File)): Set file path as name. (ZipFile(File,int)): Likewise. From-SVN: r73965
2003-10-27Reported by Helmer Kraemer <hkraemer@freenet.de>Mark Wielaard1-18/+12
Reported by Helmer Kraemer <hkraemer@freenet.de> * java/util/jar/JarInputStream.java (readManifest): Don't call closeEntry(). * java/util/zip/DeflaterOutputStream.java (inbufWrite): New method. (finish): Use inbufWrite(). (write(int)): Likewise. (write(byte[],int,int)): Likewise. From-SVN: r72976
2003-10-152003-10-15 Michael Koch <konqueror@gmx.de>Michael Koch1-4/+10
* java/util/zip/InflaterInputStream.java (InflaterInputStream): Renamed infl to inf and bufsize to size, added description to exception, check for inf == null and size < 0. From-SVN: r72519
2003-10-11Map.java, [...]: Removed redundant modifiers.Michael Koch2-58/+58
2003-10-11 Michael Koch <konqueror@gmx.de> * java/util/Map.java, java/util/Observer.java, java/util/zip/Checksum.java, java/util/zip/ZipConstants.java: Removed redundant modifiers. From-SVN: r72358
2003-07-14MemoryImageSource.java, [...]: New versions from classpath.Michael Koch1-1/+1
2003-07-14 Michael Koch <konqueror@gmx.de> * java/awt/image/MemoryImageSource.java, java/beans/PropertyEditorManager.java, javax/naming/CompoundName.java, javax/naming/spi/NamingManager.java, javax/swing/AbstractButton.java, javax/swing/ButtonModel.java, javax/swing/SwingUtilities.java, javax/swing/UIManager.java, javax/swing/colorchooser/DefaultColorSelectionModel.java, javax/swing/event/AncestorEvent.java, javax/swing/event/InternalFrameEvent.java, java/util/zip/ZipFile.java: New versions from classpath. From-SVN: r69321
2003-06-192003-06-19 Michael Koch <konqueror@gmx.de>Michael Koch1-0/+4
* java/util/zip/InflaterInputStream.java (InflaterInputStream): Throw NullPointerException if in is null (as JDK does). From-SVN: r68197
2003-06-17ZipEntry.java, [...]: Reworked imports, only import used classes.Michael Koch4-7/+8
2003-06-17 Michael Koch <konqueror@gmx.de> * java/util/zip/ZipEntry.java, java/util/zip/ZipFile.java, java/util/zip/ZipInputStream.java, java/util/zip/ZipOutputStream.java: Reworked imports, only import used classes. From-SVN: r68079
2003-05-272003-05-27 Michael Koch <konqueror@gmx.de>Michael Koch3-27/+206
* java/util/zip/Deflater.java (FILTERED): Merged documentation from classpath. * java/util/zip/DeflaterOutputStream.java (DeflaterOutputStream): Merged documentation and argument validity check from classpath. (deflate): Merged documentation from classpath. (finish): Likewise. * java/util/zip/Inflater.java (Inflater): Merged class documentation from classpath. (zstream): Reordered. (is_finished): Reordered. (dict_needed): Reordered. (Inflater): Reordered, merged documentation from classpath. (end): Likewise. (finalize): Merged documentation from classpath. (finished): Likewise. (getAdler): Likewise. (getRemaining): Likewise. (getTotalIn): Likewise. (getTotalOut): Likewise. (inflate): Likewise. (needsDictionary): Likewise. (needsInput): Likewise. (reset): Likewise. (setDictionary): Likewise. (setInput): Likewise. From-SVN: r67185
2003-04-29Deflater.java, [...]: Partly merged with classpath.Michael Koch2-7/+39
2003-04-29 Michael Koch <konqueror@gmx.de> * java/util/zip/Deflater.java, java/util/zip/DeflaterOutputStream.java: Partly merged with classpath. From-SVN: r66207
2003-02-21ZipEntry.java (setComment): Don't check length when argument is null.Mark Wielaard1-1/+1
* java/util/zip/ZipEntry.java (setComment): Don't check length when argument is null. From-SVN: r63227
2003-02-21ZipEntry.java (ZipEntry(String)): When name is bigger then 65535 chars throw ↵Mark Wielaard1-2/+6
IllegalArgumentException. * java/util/zip/ZipEntry.java (ZipEntry(String)): When name is bigger then 65535 chars throw IllegalArgumentException. From-SVN: r63222
2003-02-21* java/util/zip/ZipFile.java (finalize): New method.Mark Wielaard1-0/+9
From-SVN: r63218
2003-02-13InflaterInputStream.java (read): Return zero when len is zero.Mark Wielaard1-1/+3
* java/util/zip/InflaterInputStream.java (read): Return zero when len is zero. From-SVN: r62872
2003-02-12ZipInputStream.java: idemJohn Leuner1-1/+3
2003-02-11 John Leuner <jewel@debian.org> * java/util/zip/ZipInputStream.java: idem From-SVN: r62754
2003-01-02ZipFile.java (entries): Now HashMap.Artur Biesiadowski1-64/+113
* java/util/zip/ZipFile.java (entries): Now HashMap. (readLeShort(DataInput, byte[])): Read from given byte array. (readLeInt(DataInput, byte[]): Likewise. (readLeShort(byte[] b, int off)): New method. (readLeInt(byte[] b, int off)): Likewise. (readEntries): Use byte arrays to read info in bigger chunks. (getEntries): Return HashMap. (getEntry): Use HashMap. (locBuf): New private field. (checkLocalHeader): Use locBuf to read info in one chunk. (getInputStream): Use entries HashMap, wrap PartialInputStream in BufferedInputStream. (ZipEntryEnumeration): Use HashMap and Interator. Co-Authored-By: Mark Wielaard <mark@klomp.org> From-SVN: r60803
2002-12-03JarFile.java (manifest): Not final.Mark Wielaard3-106/+132
* java/util/jar/JarFile.java (manifest): Not final. (manifestRead): New field. (JarFile): Don't read Manifest in constructor. (getManifest): New method. (JarEnumeration.nextElement): Use new method. (getEntry): Likewise. * java/util/zip/ZipFile.java (name): Final. (raf): Likewsie. (entries): Change type to Hashtable. (closed): New field. (ZipFile): Don't read enties in constructor. (readEntries): Use Hashtable. (close): Set new close flag and set entries to null inside synchronized block. (entries): Contruct enumeration using new getEntries() method and entries Hashtable. (getEntryIndex): Removed. (getEntries): New method. (getEntry): Use new getEntries() method and entries Hastable. (getInputStream): Likewise. (size): Return getEntries().size(). (ZipEntryEnumeration): Wrap entries Hashtable elements. * java/util/zip/ZipEntry.java (cal): Don't initialize. (time): Removed (dostime): New field. (zipFileIndex): Removed. (ZipEntry(ZipEntry)): Copy dostime. (setDOSTime): Now final and doesn't convert dos time. (getDOSTime): Likewise. (setTime): Convert dos time. (getTime): Likewise. (getCalendar): New method. (setExtra): Use setTime(). * java/util/zip/ZipInputStream.java (getNextEntry): Format error msg. From-SVN: r59785
2002-11-16For PR libgcj/8593:Tom Tromey1-15/+21
* java/util/zip/GZIPInputStream.java (read): Check file size. Look in inflater for remaining input bytes. (read4): Added buf and offset arguments. From-SVN: r59145
2002-11-03GNU Classpath merge.Mark Wielaard2-9/+9
2002-10-31 Stephen Crawley <crawley@dstc.edu.au> * java/lang/Double.java (valueOf): Return new Double(parseDouble(s)). 2002-10-31 Wu Gansha <gansha.wu@intel.com>: * java/util/ArrayList.java (readObject, writeObject): Only read/write size items. 2002-10-31 Wu Gansha <gansha.wu@intel.com>: * java/io/DataInputStream.java (convertFromUTF): Give StringBuffer an initial estimated size to avoid enlarge buffer frequently. 2002-10-31 Wu Gansha <gansha.wu@intel.com>: * java/lang/reflect/Proxy.java (ProxyType): Set loader to System ClassLoader when null. (ProxyType.hashCode): Loader null check no longer needed. (ProxyType.sameTypes): New method. (ProxyType.equals): Use new method. 2002-10-31 Mark Wielaard <mark@klomp.org> * java/net/URLDecoder.java (decode): Initialize Stringbuffer size to length of String. * java/net/URLEncoder.java (encode): Likewise. 2002-10-31 Mark Wielaard <mark@klomp.org> * java/util/zip/ZipInputStream.java (getNextEntry): Throw IOException when stream is closed. (closeEntry): Likewise. (read): Likewise. * java/util/zip/ZipOutputStream.java (putNextEntry): Throw ZipException when no entry active. (closeEntry): Likewise. (write): Likewise. From-SVN: r58772
2002-10-31ZipFile.java (readLeShort): Take and use DataInput as argument.Mark Wielaard1-39/+58
* java/util/zip/ZipFile.java (readLeShort): Take and use DataInput as argument. (readLeShort): Likewise and use byte[]. (readLeInt): Likewise. (readEntries): Use new versions of methods and use byte[] for reading a complete zip entry. Add ZipFile name to exceptions. (entries): Add ZipFile name to exceptions. (getEntry): Likewise. (checkLocalHeader): Use new versions of methods and add ZipFile name to exceptions. From-SVN: r58697
2002-10-16re PR libgcj/8234 (ZipInputStream chokes when InputStream.read() returns ↵Tom Tromey2-0/+2
small chunks) Fix for PR libgcj/8234: * java/util/zip/natInflater.cc (reset): Reset avail_in. * java/util/zip/natDeflater.cc (reset): Reset avail_in. From-SVN: r58205
2002-09-25re PR libgcj/7766 (ZipInputStream.available returns 0 immediately after ↵Jesse Rosenstock1-2/+8
construction) 2002-09-25 Jesse Rosenstock <jmr@ugcs.caltech.edu> Fix for PR libgcj/7766: * java/util/zip/ZipInputStream.java (entryAtEOF): New field. (getNextEntry): Set it. (closeEntry): Likewise. (read): Likewise. (close): Likewise. (available): Use it. From-SVN: r57513
2002-06-16RuntimeException.java: Re-merge with Classpath.Tom Tromey2-20/+39
* java/lang/RuntimeException.java: Re-merge with Classpath. * java/util/ArrayList.java: Likewise. * java/util/Arrays.java: Likewise. * java/util/BitSet.java: Likewise. * java/util/Dictionary.java: Likewise. * java/util/IdentityHashMap.java: Likewise. * java/util/MissingResourceException.java: Likewise. * java/util/Observer.java: Likewise. * java/util/TooManyListenersException.java: Likewise. * java/util/zip/DataFormatException.java: Likewise. * java/util/zip/ZipException.java: Likewise. From-SVN: r54680
2002-06-15InflaterInputStream.java (read): Loop if data has been read but none output ↵Tom Tromey8-787/+1332
by inflater. * java/util/zip/InflaterInputStream.java (read): Loop if data has been read but none output by inflater. * java/util/zip/natDeflater.cc (reset): Set is_finished. * java/util/zip/natInflater.cc (reset): Set dist_needed and is_finished. * java/util/zip/ZipOutputStream.java: Replaced with Classpath version. * java/util/zip/ZipFile.java: Replaced with Classpath version. * java/util/zip/ZipEntry.java: Replaced with Classpath version. * java/util/zip/ZipInputStream.java: Replaced with Classpath version. * java/util/zip/ZipConstants.java: Replaced with Classpath version. From-SVN: r54653
2002-01-22Add license clarification.Mark Wielaard18-90/+288
From-SVN: r49104
2002-01-19ZipOutputStream.java (putNextEntry): Clear uncompressed_size in readiness ↵Per Bothner1-0/+1
for next entry. * java/util/zip/ZipOutputStream.java (putNextEntry): Clear uncompressed_size in readiness for next entry. From-SVN: r49014
2001-10-29re PR libgcj/4728 (java.util.zip.GZIPOutputStream.write(int) doesn't update CRC)Tom Tromey1-1/+7
* java/util/zip/GZIPOutputStream.java (write(int)): New method. Fixes PR libgcj/4728. From-SVN: r46618
2001-10-26Adler32.java: Use correct class name.Tom Tromey1-1/+1
* java/util/zip/Adler32.java: Use correct class name. (Re-merge from Classpath.) From-SVN: r46561
2001-10-05Adler32.java: Merge with ClasspathMark Wielaard5-52/+126
* java/util/zip/Adler32.java: Merge with Classpath * java/util/zip/CRC32.java: Ditto * java/util/zip/Checksum.java: Ditto * java/util/zip/DataFormatException.java: Ditto * java/util/zip/ZipException.java: Ditto From-SVN: r46035
2001-04-01DeflaterOutputStream.java (deflate): Loop while def.needsInput.Per Bothner2-51/+95
* DeflaterOutputStream.java (deflate): Loop while def.needsInput. (finish): def.deflate needs to be called in a loop. (inbuf, inbufLength): New private fields. (write(int)): Use inbuf. (write(byte[],int,int): Check if pending output in inbuf. * ZipOutputStream.java: Don't use Deflater if stored. Use a Checksum object directly, not via a CheckedOutputStream. (uncompressed_size): New field, (closeEntry): Only write data_directory if needed. (write): If STORED, write directly. Always update crc, and uncompressed_size. (write_entry): Fix lots of protocol erors. From-SVN: r40988
2001-03-25exception.cc (java_eh_info): Make value type jthrowable.Richard Henderson2-18/+18
* exception.cc (java_eh_info): Make value type jthrowable. (_Jv_type_matcher): Remove now unneeded cast. (_Jv_Throw): Make argument type jthrowable. Munge name for SJLJ_EXCEPTIONS here ... * gcj/cni.h: ... not here. (JvThrow): Remove. * gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations. * defineclass.cc, interpret.cc, jni.cc, posix-threads.cc, prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc, gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc, gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc, gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc, java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc, java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc, java/lang/natClass.cc, java/lang/natClassLoader.cc, java/lang/natDouble.cc, java/lang/natObject.cc, java/lang/natPosixProcess.cc, java/lang/natRuntime.cc, java/lang/natString.cc, java/lang/natSystem.cc, java/lang/natThread.cc, java/lang/reflect/natArray.cc, java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc, java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc, java/util/zip/natInflater.cc: Use throw, not JvThrow or _Jv_Throw. From-SVN: r40838