hg/stx-libbasic2: comparison ZipArchive.st

equal deleted inserted replaced

-:661f5e28cd6d
+:237dad762f68
 "
 "{ Package: 'stx:libbasic2' }"
 Object subclass:#ZipArchive
 	instanceVariableNames:'file mode archiveName firstEntry lastEntry centralDirectory
-		startOfArchive endOfArchive'
+		startOfArchive endOfArchive zipMembersByName'
-	classVariableNames:'Lobby RecentlyUsedZipArchives FlushBlock ECREC_SIZE LREC_SIZE
+	classVariableNames:'Lobby RecentlyUsedZipArchives FlushBlock ZipFileFormatErrorSignal
-		CREC_SIZE SIZE_CENTRAL_DIRECTORY TOTAL_ENTRIES_CENTRAL_DIR
+		UnsupportedZipFileFormatErrorSignal'
-		C_COMPRESSED_SIZE C_RELATIVE_OFFSET_LOCAL_HEADER
+	poolDictionaries:'ZipArchiveConstants'
-		C_FILENAME_LENGTH C_UNCOMPRESSED_SIZE C_CENTRALHEADERSIGNATURE
-		C_LOCALHEADERSIGNATURE C_CENTRALENDSIGNATURE
-		ZipFileFormatErrorSignal UnsupportedZipFileFormatErrorSignal
-		COMPR_STORED COMPR_SHRUNK COMPR_REDUCED1 COMPR_REDUCED2
-		COMPR_REDUCED3 COMPR_REDUCED4 COMPR_IMPLODED COMPR_TOKENIZED
-		COMPR_DEFLATED EXTERNALFILEATTRIBUTES_ISFILE
-		EXTERNALFILEATTRIBUTES_ISDIRECTORY'
-	poolDictionaries:''
 	category:'System-Support-FileFormats'
 !
 PeekableStream subclass:#AbstractZipStream
 	instanceVariableNames:'zipArchive zipEntry zipFileStream compressingStream crc32
 		compressedSize uncompressedSize fileNameLength extraFieldLength
 		fileCommentLength diskNumberStart internalFileAttributes
 		externalFileAttributes relativeLocalHeaderOffset fileName
 		extraField fileComment dataStart data'
 	classVariableNames:''
-	poolDictionaries:''
+	poolDictionaries:'ZipArchiveConstants'
 	privateIn:ZipArchive
 !
 ZipArchive::AbstractZipStream subclass:#ZipReadStream
 	instanceVariableNames:'readPosition peek'
 	classVariableNames:''
-	poolDictionaries:''
+	poolDictionaries:'ZipArchiveConstants'
 	privateIn:ZipArchive
 !
 ZipArchive::AbstractZipStream subclass:#ZipWriteStream
 	instanceVariableNames:''
 	classVariableNames:''
-	poolDictionaries:''
+	poolDictionaries:'ZipArchiveConstants'
 	privateIn:ZipArchive
 !
 !ZipArchive primitiveDefinitions!
 %{
 !
 documentation
 "
 provides access to a zip archive.
-Caveat: the only compression method (for now) is deflate.
+Caveat:
+the only compression methods (for now) are store and deflate.
 [author:]
 Claus Gittinger
 "
 !
 ! !
 !ZipArchive class methodsFor:'class initialization'!
 initialize
-ECREC_SIZE := 18.
-LREC_SIZE := 26.
-CREC_SIZE := 42.
-TOTAL_ENTRIES_CENTRAL_DIR := 10.
-SIZE_CENTRAL_DIRECTORY := 12.
-C_COMPRESSED_SIZE := 16.
-C_UNCOMPRESSED_SIZE := 20.
-C_FILENAME_LENGTH := 24.
-C_RELATIVE_OFFSET_LOCAL_HEADER := 38.
-C_LOCALHEADERSIGNATURE := 16r04034b50.
-C_CENTRALHEADERSIGNATURE := 16r02014b50.
-C_CENTRALENDSIGNATURE := 16r06054b50.
-EXTERNALFILEATTRIBUTES_ISFILE := 32.
-EXTERNALFILEATTRIBUTES_ISDIRECTORY := 16.
-"/ compression methods
-COMPR_STORED          :=  0.
-COMPR_SHRUNK          :=  1.
-COMPR_REDUCED1        :=  2.
-COMPR_REDUCED2        :=  3.
-COMPR_REDUCED3        :=  4.
-COMPR_REDUCED4        :=  5.
-COMPR_IMPLODED        :=  6.
-COMPR_TOKENIZED       :=  7.
-COMPR_DEFLATED        :=  8.
 ZipFileFormatErrorSignal isNil ifTrue:[
 ZipFileFormatErrorSignal := OpenError newSignalMayProceed:true.
 ZipFileFormatErrorSignal nameClass:self message:#zipFileFormatErrorSignal.
 ZipFileFormatErrorSignal notifierString:'unrecognized/bad zip file format'.
 "
 self initialize
 "
-"Modified: / 29.3.1998 / 20:17:18 / cg"
+"Modified: / 19-11-2010 / 15:44:28 / cg"
 ! !
 !ZipArchive class methodsFor:'cleanup'!
 flush
 "Modified: / 7.4.1998 / 17:58:57 / cg"
 ! !
 !ZipArchive class methodsFor:'constants'!
+COMPRESSION_DEFLATED
+<resource: #obsolete>
+"please use compressionDeflated instead (Squeak compat.)"
+self obsoleteMethodWarning.
+^ COMPRESSION_DEFLATED
+"Created: / 19-11-2010 / 15:40:38 / cg"
+!
 COMPR_DEFLATED
+<resource: #obsolete>
 "please use compressionDeflated instead (Squeak compat.)"
-^ COMPR_DEFLATED
+self obsoleteMethodWarning.
-!
+^ COMPRESSION_DEFLATED
-COMPR_STORED
+"Modified: / 19-11-2010 / 15:58:28 / cg"
-"please use compressionStored instead (Squeak compat.)"
-^ COMPR_DEFLATED
 !
 LREC_SIZE
 ^ LREC_SIZE
 "Created: / 29.3.1998 / 19:11:20 / cg"
 !
 compressionDeflated
-"same as COMPR_DEFLATED - squeak compatibility"
+"same as COMPRESSION_DEFLATED - squeak compatibility"
-^ COMPR_DEFLATED
+^ COMPRESSION_DEFLATED
+"Modified: / 19-11-2010 / 15:58:39 / cg"
 !
 compressionStored
-"same as COMPR_STORED - squeak compatibility"
+"same as COMPRESSION_STORED - squeak compatibility"
-^ COMPR_STORED
+^ COMPRESSION_STORED
+"Modified: / 19-11-2010 / 15:59:00 / cg"
 !
 streamBufferSize
 ^ 65536     "/ 1024 * 64
 !ZipArchive methodsFor:'private-decompression'!
 decode:rawBytes method:compressionMethod size:uncompressedSize
 |outBytes|
-compressionMethod == COMPR_STORED ifTrue:[
+compressionMethod == COMPRESSION_STORED ifTrue:[
 "/
 "/ uncompressed
 "/
 ^ rawBytes
 ].
-compressionMethod == COMPR_DEFLATED ifTrue:[
+compressionMethod == COMPRESSION_DEFLATED ifTrue:[
 "/
 "/ deflate/inflate algorithm
 "/
 outBytes := ByteArray new:uncompressedSize.
 ^ self inflate:rawBytes to:outBytes
 ].
 "/
 "/ the other algorithms are not (yet) supported
 "/
-compressionMethod == COMPR_SHRUNK ifTrue:[
+compressionMethod == COMPRESSION_SHRUNK ifTrue:[
 self error:'unsupported compression method: SHRUNK'.
 ^ nil
 ].
-compressionMethod == COMPR_REDUCED1 ifTrue:[
+compressionMethod == COMPRESSION_REDUCED1 ifTrue:[
 self error:'unsupported compression method: REDUCED1'.
 ^ nil
 ].
-compressionMethod == COMPR_REDUCED2 ifTrue:[
+compressionMethod == COMPRESSION_REDUCED2 ifTrue:[
 self error:'unsupported compression method: REDUCED2'.
 ^ nil
 ].
-compressionMethod == COMPR_REDUCED3 ifTrue:[
+compressionMethod == COMPRESSION_REDUCED3 ifTrue:[
 self error:'unsupported compression method: REDUCED3'.
 ^ nil
 ].
-compressionMethod == COMPR_REDUCED4 ifTrue:[
+compressionMethod == COMPRESSION_REDUCED4 ifTrue:[
 self error:'unsupported compression method: REDUCED4'.
 ^ nil
 ].
-compressionMethod == COMPR_IMPLODED ifTrue:[
+compressionMethod == COMPRESSION_IMPLODED ifTrue:[
 self error:'unsupported compression method: IMPLODED'.
 ^ nil
 ].
-compressionMethod == COMPR_TOKENIZED ifTrue:[
+compressionMethod == COMPRESSION_TOKENIZED ifTrue:[
 self error:'unsupported compression method: TOKENIZED'.
 ^ nil
 ].
 self error:'unsupported compression method'.
 ^ nil
-"Created: / 29.3.1998 / 20:14:45 / cg"
+"Created: / 29-03-1998 / 20:14:45 / cg"
-"Modified: / 8.4.1998 / 10:31:34 / cg"
+"Modified: / 19-11-2010 / 15:39:49 / cg"
 !
 inflate:inBytes to:outBytes
 |inflateReturnCode|
 centralDirectory centralDirectoryStartOffset: file position.
 [ zipEntry notNil ] whileTrue: [
 noEntries := noEntries + 1.
-file nextPutLong: C_CENTRALHEADERSIGNATURE MSB:false.
+file nextPutLong: C_CENTRAL_HEADER_SIGNATURE MSB:false.
 file nextPutShort:zipEntry versionMadeBy MSB:false.
 file nextPutShort:zipEntry versionNeedToExtract MSB:false.
 file nextPutShort:zipEntry generalPurposBitFlag MSB:false.
 file nextPutShort:zipEntry compressionMethod MSB:false.
 file nextPutShort:zipEntry lastModFileTime MSB:false.
 file nextPutShort:centralDirectory zipCommentLength MSB:false.
 centralDirectory zipCommentLength ~~ 0 ifTrue: [
 file nextPutAll: centralDirectory zipComment.
 ].
+"Modified: / 19-11-2010 / 15:43:15 / cg"
 !
 addMember
 "add a zipMember"
 !
 findMember:name
 "find a zipMember by name"
+"/    zipMembersByName isNil ifTrue:[
+"/        zipMembersByName := Dictionary new.
+"/        self zipMembersDo:[:zipd |
+"/            zipMembersByName at:(zipd fileName) put:zipd.
+"/        ].
+"/    ].
+"/    ^ zipMembersByName at:name ifAbsent:nil.
 self zipMembersDo:[:zipd |
 (zipd fileName = name) ifTrue:[^ zipd].
 ].
 ^ nil
-"Modified: / 30.3.1998 / 17:13:30 / cg"
+"Modified: / 18-11-2010 / 20:23:35 / cg"
 !
 readDirectory
 "read the zip directory into a linked-list of zipMembers"
 (file position + (self class centralDirectoryMinimumSize)) > endOfArchive ifTrue: [
 ^ ZipFileFormatErrorSignal raiseRequestErrorString:' - central directory entry out of archive bounds'.
 ].
 centralFileHeaderSignature := file nextLongMSB:false.
-centralFileHeaderSignature ~= C_CENTRALHEADERSIGNATURE ifTrue:[
+centralFileHeaderSignature ~= C_CENTRAL_HEADER_SIGNATURE ifTrue:[
 ZipFileFormatErrorSignal raiseRequestErrorString:' - file format error - bad centralHeaderSignature in: ' ,
 (file isFileStream ifTrue:[file pathName] ifFalse:['inStream']).
 ^ self.
 ].
 ZipArchive flush.
 ZipArchive oldFileNamed:'/usr/lib/jdk1.1.7/lib/classes.zip'
 ZipArchive oldFileNamed:'/usr/lib/jdk1.1.8/lib/classes.zip'
 "
-"Modified: / 19.10.1998 / 21:27:32 / cg"
+"Modified: / 19-11-2010 / 15:43:24 / cg"
 !
 searchForEndOfCentralDirectorySignature
 "read the zip directory into a linked-list of zipMembers"
 buffer := ByteArray new: nextBlockSize.
 ].
 ].
 nextBlockSize > 0 ifTrue: [
-zmemb compressionMethod == COMPR_DEFLATED ifTrue:[
+zmemb compressionMethod == COMPRESSION_DEFLATED ifTrue:[
 myZipStream isNil ifTrue: [
 file binary.
 myZipStream := ZipStream readOpenAsZipStreamOn: file.
 ].
 buffer := myZipStream next:nextBlockSize.
 ] ifFalse:[
-zmemb compressionMethod == COMPR_STORED ifTrue:[
+zmemb compressionMethod == COMPRESSION_STORED ifTrue:[
 file nextBytes:nextBlockSize into:buffer startingAt:1.
 ] ifFalse:[
 UnsupportedZipFileFormatErrorSignal raiseErrorString:'unsupported compressMethod'
 ].
 ].
 myZipStream close.
 ].
 ].
 ^ true.
+"Modified: / 19-11-2010 / 15:58:24 / cg"
 !
 restoreOsDirectory:osDirectoryName fromArchiveDirectory: archiveDirectoryName
 |osDirectory directoryAlreadyCreated archiveDirectoryNameSize|
 ].
 ].
 !
 addArchiveDirectoryCompressed: archiveDirectoryName fromOsDirectory: osDirectoryName
-^ self addArchiveDirectory: archiveDirectoryName fromOsDirectory: osDirectoryName compressMethod:COMPR_DEFLATED
+^ self addArchiveDirectory: archiveDirectoryName fromOsDirectory: osDirectoryName compressMethod:COMPRESSION_DEFLATED
+"Modified: / 19-11-2010 / 15:58:04 / cg"
 !
 addDirectory: aDirectoryName
 "do not create directories (isDirectory = true) - they are not compatible between operating systems"
 <resource: #obsolete>
-^ self addFile:aDirectoryName withContents:nil compressMethod:COMPR_STORED asDirectory:true.
+^ self addFile:aDirectoryName withContents:nil compressMethod:COMPRESSION_STORED asDirectory:true.
+"Modified: / 19-11-2010 / 15:38:59 / cg"
 !
 addFile: aFileName fromStream: aStream
-^ self addFile: aFileName fromStream: aStream compressMethod:COMPR_STORED asDirectory:false
+^ self addFile: aFileName fromStream: aStream compressMethod:COMPRESSION_STORED asDirectory:false
+"Modified: / 19-11-2010 / 15:39:02 / cg"
 !
 addFile:aFileName fromStream:aStream compressMethod: theCompressMethodArg
 ^ self addFile:aFileName fromStream:aStream compressMethod:theCompressMethodArg asDirectory:false
 !
 ^ self error: 'ZipArchive not open for writing ...'.
 ].
 theCompressMethod := theCompressMethodArg.
-((theCompressMethod == COMPR_DEFLATED)
+((theCompressMethod == COMPRESSION_DEFLATED)
-or:[ theCompressMethod == COMPR_STORED ]) ifFalse:[
+or:[ theCompressMethod == COMPRESSION_STORED ]) ifFalse:[
 UnsupportedZipFileFormatErrorSignal raiseRequestErrorString:'unsupported compressMethod'.
 "/ if proceeded, write as uncompressed
-theCompressMethod := COMPR_STORED
+theCompressMethod := COMPRESSION_STORED
 ].
 zipEntry := ZipMember new default.
 self addMember:zipEntry.
 zipEntry fileName: theZipFileName.
 zipEntry fileNameLength: theZipFileName size.
 zipEntry uncompressedSize: 0.
 isDirectory ifTrue: [
-theCompressMethod := COMPR_STORED.
+theCompressMethod := COMPRESSION_STORED.
 zipEntry externalFileAttributes: EXTERNALFILEATTRIBUTES_ISDIRECTORY.
 ] ifFalse: [
 zipEntry compressionMethod: theCompressMethod.
 zipEntry internalFileAttributes: 1.
 zipEntry externalFileAttributes: EXTERNALFILEATTRIBUTES_ISFILE.
 nextBlockSize := aStream nextBytes:streamBufferSize into:buffer startingAt:1.
 nextBlockSize > 0 ifTrue: [
 unCompressedDataSize := unCompressedDataSize + nextBlockSize.
 crc32 := ZipStream crc32BytesIn: buffer from:1 to:nextBlockSize crc:crc32.
-theCompressMethod == COMPR_DEFLATED ifTrue: [
+theCompressMethod == COMPRESSION_DEFLATED ifTrue: [
 myZipStream isNil ifTrue: [
 myZipStream := ZipStream writeOpenAsZipStreamOn:file.
 ].
 myZipStream nextPutBytes:nextBlockSize from:buffer startingAt:1.
-] ifFalse: [theCompressMethod == COMPR_STORED ifTrue: [
+] ifFalse: [theCompressMethod == COMPRESSION_STORED ifTrue: [
 file nextPutBytes:nextBlockSize from:buffer startingAt:1.
 ] ifFalse:[
 UnsupportedZipFileFormatErrorSignal raiseRequestErrorString:'unsupported compressMethod'.
 ]].
 ].
 zipEntry crc32:crc32.
 zipEntry uncompressedSize: unCompressedDataSize.
 zipEntry rewriteCrcAndSizeTo:file.
 file setToEnd.
+"Modified: / 19-11-2010 / 15:39:32 / cg"
 !
 addFile: aFileName withContents: data
-^ self addFile: aFileName withContents: data compressMethod:COMPR_STORED asDirectory: false.
+^ self addFile: aFileName withContents: data compressMethod:COMPRESSION_STORED asDirectory: false.
+"Modified: / 19-11-2010 / 15:39:13 / cg"
 !
 addFile:aFileName withContents:data compressMethod:theCompressMethodArg asDirectory:isDirectory
 "do not create directories (isDirectory = true) - they are not compatible between operating systems"
+^ self basicAddFile:aFileName withContents:data compressMethod:theCompressMethodArg asDirectory:isDirectory
+"Modified: / 18-11-2010 / 19:31:36 / cg"
+!
+addFileCompressed: aFileName fromStream: aStream
+^ self addFile: aFileName fromStream: aStream compressMethod: COMPRESSION_DEFLATED asDirectory:false
+"Modified: / 19-11-2010 / 15:58:07 / cg"
+!
+addFileCompressed: aFileName withContents: data
+^ self addFile: aFileName withContents: data compressMethod: COMPRESSION_DEFLATED asDirectory: false.
+"Modified: / 19-11-2010 / 15:58:10 / cg"
+!
+addString: aString as: path
+^ self
+addFile: path fromStream: (aString readStream)
+!
+basicAddFile:aFileName withContents:data compressMethod:theCompressMethodArg asDirectory:isDirectory
+"do not create directories (isDirectory = true) - they are not compatible between operating systems"
 |zipEntry theCompressedData curTime curDate theZipFileName theCompressMethod|
+(aFileName startsWith:'Project') ifFalse:[
+(aFileName startsWith:'Doc') ifFalse:[
+self halt
+].
+].
 (file isNil or: [mode ~~ #write]) ifTrue: [
 ^ self error: 'ZipArchive not open for writing ...'.
 ].
 theCompressMethod := theCompressMethodArg.
-((theCompressMethod == COMPR_DEFLATED)
+((theCompressMethod == COMPRESSION_DEFLATED)
-or:[ theCompressMethod == COMPR_STORED ]) ifFalse:[
+or:[ theCompressMethod == COMPRESSION_STORED ]) ifFalse:[
 UnsupportedZipFileFormatErrorSignal raiseRequestErrorString:'unsupported compressMethod'.
 "/ if proceeded, write as uncompressed
-theCompressMethod := COMPR_STORED
+theCompressMethod := COMPRESSION_STORED
 ].
 zipEntry := ZipMember new default.
 self addMember:zipEntry.
 data notEmptyOrNil ifTrue: [
 "/ crc32 is allways reqired (not as written in docu to be zero in case of uncompressed mode)
 zipEntry crc32: (ZipStream crc32BytesIn: data).
 ].
-(isDirectory not and: [theCompressMethod == COMPR_DEFLATED]) ifTrue: [
+(isDirectory not and: [theCompressMethod == COMPRESSION_DEFLATED]) ifTrue: [
 |tmpCompressedData tmpCompressedDataSize|
 tmpCompressedData := ByteArray new:(data size + 16). "/ if the compression is less then the additional overhead we need more space in buffer
 tmpCompressedDataSize := ZipStream compress:data into:tmpCompressedData.
 zipEntry compressedSize: (tmpCompressedDataSize - 6). "/6 = the zlib specific data 2 bytes in front and 4 bytes behind the real data
 theCompressedData := tmpCompressedData copyFrom: 3. "/ 2 bytes before the real data
 ] ifFalse: [
-theCompressMethod == COMPR_STORED ifTrue:[
+theCompressMethod == COMPRESSION_STORED ifTrue:[
 zipEntry compressedSize: zipEntry uncompressedSize.
 theCompressedData := data.
 ] ifFalse:[
 self error "/ cannot happen
 ].
 zipEntry writeTo:file.
 theCompressedData notNil ifTrue: [
 file nextPutBytes: zipEntry compressedSize from: theCompressedData.
 ].
-!
+"Created: / 18-11-2010 / 19:31:10 / cg"
-addFileCompressed: aFileName fromStream: aStream
+"Modified: / 19-11-2010 / 15:39:26 / cg"
-^ self addFile: aFileName fromStream: aStream compressMethod: COMPR_DEFLATED asDirectory:false
-!
-addFileCompressed: aFileName withContents: data
-^ self addFile: aFileName withContents: data compressMethod: COMPR_DEFLATED asDirectory: false.
-!
-addString: aString as: path
-^ self
-addFile: path fromStream: (aString readStream)
 ! !
 !ZipArchive methodsFor:'writing - stream'!
 compressedWriteStreamFor:nameOfFileInArchive
 "create new entry in central directory"
-^ self writeStreamFor:nameOfFileInArchive compressMethod:COMPR_DEFLATED
+^ self writeStreamFor:nameOfFileInArchive compressMethod:COMPRESSION_DEFLATED
+"Modified: / 19-11-2010 / 15:58:13 / cg"
 !
 writeStreamFor:nameOfFileInArchive compressMethod:theCompressMethodArg
 "create new entry in central directory"
 ^ self error: 'ZipArchive not open for writing ...'.
 ].
 theCompressMethod := theCompressMethodArg.
-((theCompressMethod == COMPR_DEFLATED)
+((theCompressMethod == COMPRESSION_DEFLATED)
-or:[ theCompressMethod == COMPR_STORED ]) ifFalse:[
+or:[ theCompressMethod == COMPRESSION_STORED ]) ifFalse:[
 UnsupportedZipFileFormatErrorSignal raiseRequestErrorString:'unsupported compressMethod'.
 "/ if proceeded, write as uncompressed
-theCompressMethod := COMPR_STORED
+theCompressMethod := COMPRESSION_STORED
 ].
 zipEntry := ZipMember new default.
 self addMember:zipEntry.
 zipEntry writeTo:file.
 ^ (ZipWriteStream zipFileStream:file zipEntry:zipEntry)
 zipArchive:self.
+"Modified: / 19-11-2010 / 15:38:54 / cg"
 ! !
 !ZipArchive::AbstractZipStream class methodsFor:'instance creation'!
 zipFileStream:something zipEntry:compressionMethodArg
 "represent myself on aStream"
 relativeLocalHeaderOffset := aStream position.
 aStream
-nextPutLong:16r04034b50  MSB:false;
+nextPutLong:C_LOCAL_HEADER_SIGNATURE  MSB:false;
 nextPutShort:versionNeedToExtract MSB:false;
 nextPutShort:generalPurposBitFlag MSB:false;
 nextPutShort:compressionMethod MSB:false;
 nextPutShort:lastModFileTime MSB:false;
 nextPutShort:lastModFileDate MSB:false;
 nextPutShort:fileNameLength MSB:false;
 nextPutShort:extraFieldLength MSB:false;
 nextPutAll:fileName.
 extraField notNil ifTrue: [
+self assert:(extraField size = extraFieldLength).
 aStream nextPutAll:extraField.
 ].
+"Modified: / 19-11-2010 / 15:45:38 / cg"
 ! !
 !ZipArchive::ZipReadStream methodsFor:'closing'!
 close
 startDataPosition := zipFileStream position0Based.
 crc32 := 0.
 uncompressedDataSize := zipEntry uncompressedSize.
 readPosition := 0.
-zipEntry compressionMethod == ZipArchive COMPR_DEFLATED ifTrue:[
+zipEntry compressionMethod == COMPRESSION_DEFLATED ifTrue:[
 compressingStream := ZipStream readOpenAsZipStreamOn:zipFileStream.
 ] ifFalse:[
 compressingStream := zipFileStream.
 compressingStream text.
 ].
+"Modified: / 19-11-2010 / 15:47:14 / cg"
 ! !
 !ZipArchive::ZipReadStream methodsFor:'queries'!
 atEnd
 zipFileStream := something.
 startDataPosition := zipFileStream position0Based.
 crc32 := 0.
 uncompressedDataSize := 0.
-zipEntry compressionMethod == ZipArchive COMPR_DEFLATED ifTrue:[
+zipEntry compressionMethod == COMPRESSION_DEFLATED ifTrue:[
 compressingStream := ZipStream writeOpenAsZipStreamOn:zipFileStream.
 ] ifFalse:[
 compressingStream := zipFileStream.
 ].
+"Modified: / 19-11-2010 / 15:46:57 / cg"
 ! !
 !ZipArchive::ZipWriteStream methodsFor:'queries'!
 isReadable
 ! !
 !ZipArchive class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.85 2010-09-08 11:06:19 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.86 2010-11-19 15:00:12 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.85 2010-09-08 11:06:19 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.86 2010-11-19 15:00:12 cg Exp $'
 ! !
 ZipArchive initialize!

changeset 2511	237dad762f68
parent 2492	128237b8b7b6
child 2512	f1f789f85b34