--- a/MCMczWriter.st Sat Aug 20 13:42:10 2011 +0200
+++ b/MCMczWriter.st Sat Aug 20 13:42:17 2011 +0200
@@ -8,18 +8,21 @@
!
+!MCMczWriter class methodsFor:'initialization'!
+
+new
+ ^self basicNew initialize
+! !
+
!MCMczWriter class methodsFor:'as yet unclassified'!
fileOut: aVersion on: aStream
- | inst |
+ | inst |
+ inst := self on: aStream.
+ inst writeVersion: aVersion.
+ inst flush.
+
- inst _ self on: aStream.
- inst writeVersion: aVersion.
- inst flush.
-!
-
-new
- ^ self basicNew initialize
!
readerClass
@@ -36,42 +39,52 @@
^ MCStWriter
!
+stream: aStream
+
+ super stream: aStream.
+ self zip.
+
+ "Created: / 11-09-2010 / 14:18:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
zip
- ^ zip
+
+ zip ifNil:[zip := ZipArchive writingTo: stream].
+ ^ zip
+
+ "Modified: / 11-09-2010 / 14:17:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MCMczWriter methodsFor:'initializing'!
initialize
- zip _ ZipArchive new.
+ super initialize.
+ "/zip := ZipArchive new.
+
+ "Modified: / 11-09-2010 / 14:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MCMczWriter methodsFor:'serializing'!
serializeDefinitions: aCollection
| writer s |
-
- Smalltalk isSmalltalkX ifTrue:[
- s _ WriteStream on: String new.
- ] ifFalse:[
- s _ RWBinaryOrTextStream on: String new.
- ].
- writer _ self snapshotWriterClass on: s.
+ s := WriteStream on: (String new: 64).
+ writer := self snapshotWriterClass on: s.
writer writeDefinitions: aCollection.
^ s contents
+
+ "Modified: / 11-09-2010 / 14:26:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-serializeInBinary: aSnapshot
- | writer s |
+serializeInBinary:aSnapshot
+ |writer s|
- Smalltalk isSmalltalkX ifTrue:[
- ^ aSnapshot binaryStoreBytes
- ].
+ s := ReadWriteStream on:ByteArray new.
+ writer := DataStream on:s.
+ writer nextPut:aSnapshot.
+ ^ s contents
- s _ RWBinaryOrTextStream on: String new.
- writer _ DataStream on: s.
- writer nextPut: aSnapshot.
- ^ s contents
+ "Modified: / 11-09-2010 / 19:24:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
serializePackage: aPackage
@@ -79,7 +92,7 @@
!
serializeVersionInfo: aVersionInfo
- infoWriter ifNil: [infoWriter _ MCVersionInfoWriter new].
+ infoWriter ifNil: [infoWriter := MCVersionInfoWriter new].
^ String streamContents:
[:s |
infoWriter stream: s.
@@ -115,46 +128,41 @@
writeVersionDependency: aVersionDependency
| string |
- string _ (self serializeVersionInfo: aVersionDependency versionInfo).
+ string := (self serializeVersionInfo: aVersionDependency versionInfo).
self addString: string at: 'dependencies/', aVersionDependency package name
!
writeVersionInfo: aVersionInfo
| string |
- string _ self serializeVersionInfo: aVersionInfo.
+ string := self serializeVersionInfo: aVersionInfo.
self addString: string at: 'version'.
+
! !
!MCMczWriter methodsFor:'writing'!
addString: string at: path
| member |
+ member := zip addString: string as: path.
+ "/member desiredCompressionMethod: ZipArchive compressionDeflated
- Smalltalk isSmalltalkX ifTrue:[
- zip addFile:path fromStream:(string readStream) compressMethod:(ZipArchive compressionDeflated)
- ] ifFalse:[
- member _ zip addString: string as: path.
- member desiredCompressionMethod: ZipArchive compressionDeflated
- ]
+ "Modified: / 11-09-2010 / 14:19:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
flush
- Smalltalk isSmalltalkX ifTrue:[
- zip close.
- stream close.
- ^ self.
- ].
+ "zip writeTo: stream."
+ zip closeFile.
+ stream close
- zip writeTo: stream.
- stream close
+ "Modified: / 11-09-2010 / 19:36:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MCMczWriter class methodsFor:'documentation'!
-version
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMczWriter.st,v 1.2 2009-10-26 15:25:10 cg Exp $'
+version_CVS
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMczWriter.st,v 1.3 2011-08-20 11:42:17 cg Exp $'
!
-version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMczWriter.st,v 1.2 2009-10-26 15:25:10 cg Exp $'
+version_SVN
+ ^ '§Id: MCMczWriter.st 7 2010-09-12 07:18:55Z vranyj1 §'
! !