Squeak-dev June 2013

squeak-dev@lists.squeakfoundation.org

45 participants
215 discussions

The Trunk: System-nice.543.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-nice.543.mcz ==================== Summary ==================== Name: System-nice.543 Author: nice Time: 2 June 2013, 10:44:36.921 pm UUID: 19ac715d-ab64-4efb-8b9c-7c3937ead6f0 Ancestors: System-fbs.542 Correct utf8 everywhere bug: MczInstaller does not understand zip =============== Diff against System-fbs.542 =============== Item was changed: ----- Method: MczInstaller>>parseMember: (in category 'utilities') ----- parseMember: memberOrName | member contents tokens | + member := zip member: memberOrName. - member := self zip member: memberOrName. contents := self contentsForMember: member. tokens := (self scanner scanTokens: contents) first. ^ self associate: tokens!

1 0

The Trunk: Monticello-fbs.548.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Frank Shearar uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-fbs.548.mcz ==================== Summary ==================== Name: Monticello-fbs.548 Author: fbs Time: 2 June 2013, 9:09:15.167 pm UUID: 9a114330-ef7e-456a-a513-023ff2bb9554 Ancestors: Monticello-nice.547 Rip out the Morphic UI building logic: it's no longer needed. #workingCopy(List|Tree)Morph have no senders, so they go too. =============== Diff against Monticello-nice.547 =============== Item was changed: + ----- Method: MCTool>>buildWindow (in category 'toolbuilder') ----- - ----- Method: MCTool>>buildWindow (in category 'morphic ui') ----- buildWindow + ^ ToolBuilder build: self! - | window | - Smalltalk at: #ToolBuilder ifPresent: [:tb | ^tb build: self]. - window := SystemWindow labelled: self label. - window model: self. - self widgetSpecs do: [:spec | - | send fractions offsets | - send := spec first. - fractions := spec at: 2 ifAbsent: [#(0 0 1 1)]. - offsets := spec at: 3 ifAbsent: [#(0 0 0 0)]. - window - addMorph: (self perform: send first withArguments: send allButFirst) - fullFrame: - (LayoutFrame - fractions: - ((fractions first)@(fractions second) corner: - (fractions third)@(fractions fourth)) - offsets: - ((offsets first)@(offsets second) corner: - (offsets third)@(offsets fourth)))]. - ^ window! Item was changed: + ----- Method: MCTool>>buildWith: (in category 'toolbuilder') ----- - ----- Method: MCTool>>buildWith: (in category 'morphic ui') ----- buildWith: builder | windowBuilder | windowBuilder := MCToolWindowBuilder builder: builder tool: self. self widgetSpecs do: [:spec | | send fractions offsets | send := spec first. fractions := spec at: 2 ifAbsent: [#(0 0 1 1)]. offsets := spec at: 3 ifAbsent: [#(0 0 0 0)]. windowBuilder frame: (LayoutFrame fractions: (fractions first @ fractions second corner: fractions third @ fractions fourth) offsets: (offsets first @ offsets second corner: offsets third @ offsets fourth)). windowBuilder perform: send first withArguments: send allButFirst]. ^ windowBuilder build ! Item was removed: - ----- Method: MCTool>>buttonRow (in category 'morphic ui') ----- - buttonRow - ^ self buttonRow: self buttonSpecs! Item was removed: - ----- Method: MCTool>>buttonRow: (in category 'morphic ui') ----- - buttonRow: specArray - | aRow | - aRow := AlignmentMorph newRow. - aRow - color: (Display depth <= 8 ifTrue: [Color transparent] ifFalse: [Color gray alpha: 0.2]); - borderWidth: 0. - - aRow hResizing: #spaceFill; vResizing: #spaceFill; rubberBandCells: true. - aRow clipSubmorphs: true. - aRow layoutInset:2@2; cellInset: 1; color: Color white. - aRow wrapCentering: #center; cellPositioning: #leftCenter. - specArray do: - [:triplet | | aButton state | - state := triplet at: 4 ifAbsent: [#buttonState]. - aButton := PluggableButtonMorph - on: self - getState: state - action: #performButtonAction:enabled:. - aButton - hResizing: #spaceFill; - vResizing: #spaceFill; - label: triplet first asString; - arguments: (Array with: triplet second with: state); - onColor: Color white offColor: Color white. - aRow addMorphBack: aButton. - aButton setBalloonText: triplet third]. - - ^ aRow! Item was removed: - ----- Method: MCTool>>codePane: (in category 'morphic ui') ----- - codePane: aSymbol - - | textMorph | - textMorph := PluggableTextMorphPlus - on: self - text: aSymbol - accept: (aSymbol, ':') asSymbol. - textMorph useDefaultStyler. - ^textMorph! Item was removed: - ----- Method: MCTool>>listMorph: (in category 'morphic ui') ----- - listMorph: listSymbol - ^ self - listMorph: (listSymbol, 'List') asSymbol - selection: (listSymbol, 'Selection') asSymbol - menu: (listSymbol, 'ListMenu:') asSymbol! Item was removed: - ----- Method: MCTool>>listMorph:keystroke: (in category 'morphic ui') ----- - listMorph: listSymbol keystroke: keystrokeSymbol - ^ (self - listMorph: (listSymbol, 'List') asSymbol - selection: (listSymbol, 'Selection') asSymbol - menu: (listSymbol, 'ListMenu:') asSymbol) - keystrokeActionSelector: keystrokeSymbol; - yourself! Item was removed: - ----- Method: MCTool>>listMorph:selection: (in category 'morphic ui') ----- - listMorph: listSymbol selection: selectionSymbol - ^ PluggableListMorph - on: self - list: listSymbol - selected: selectionSymbol - changeSelected: (selectionSymbol, ':') asSymbol! Item was removed: - ----- Method: MCTool>>listMorph:selection:menu: (in category 'morphic ui') ----- - listMorph: listSymbol selection: selectionSymbol menu: menuSymbol - ^ PluggableListMorph - on: self - list: listSymbol - selected: selectionSymbol - changeSelected: (selectionSymbol, ':') asSymbol - menu: menuSymbol! Item was removed: - ----- Method: MCTool>>listMorph:selection:menu:keystroke: (in category 'morphic ui') ----- - listMorph: listSymbol selection: selectionSymbol menu: menuSymbol keystroke: keystrokeSymbol - ^ (PluggableListMorph - on: self - list: listSymbol - selected: selectionSymbol - changeSelected: (selectionSymbol, ':') asSymbol - menu: menuSymbol) - keystrokeActionSelector: keystrokeSymbol; - yourself! Item was removed: - ----- Method: MCTool>>multiListMorph:selection:listSelection:menu: (in category 'morphic ui') ----- - multiListMorph: listSymbol selection: selectionSymbol listSelection: listSelectionSymbol menu: menuSymbol - ^ PluggableListMorphOfMany - on: self - list: listSymbol - primarySelection: selectionSymbol - changePrimarySelection: (selectionSymbol, ':') asSymbol - listSelection: listSelectionSymbol - changeListSelection: (listSelectionSymbol, 'put:') asSymbol - menu: menuSymbol! Item was removed: - ----- Method: MCTool>>textMorph: (in category 'morphic ui') ----- - textMorph: aSymbol - ^ PluggableTextMorph on: self text: aSymbol accept: (aSymbol, ':') asSymbol! Item was removed: - ----- Method: MCTool>>treeMorph: (in category 'morphic ui') ----- - treeMorph: listSymbol - ^ self - treeMorph: (listSymbol, 'Tree') asSymbol - selection: (listSymbol, 'SelectionWrapper') asSymbol - menu: (listSymbol, 'TreeMenu:') asSymbol! Item was removed: - ----- Method: MCTool>>treeMorph:selection:menu: (in category 'morphic ui') ----- - treeMorph: listSymbol selection: selectionSymbol menu: menuSymbol - ^ SimpleHierarchicalListMorph - on: self - list: listSymbol - selected: selectionSymbol - changeSelected: (selectionSymbol, ':') asSymbol - menu: menuSymbol - keystroke: nil! Item was removed: - ----- Method: MCTool>>treeOrListMorph: (in category 'morphic ui') ----- - treeOrListMorph: aSymbol - ^ self treeMorph: aSymbol! Item was removed: - ----- Method: MCWorkingCopyBrowser>>workingCopyListMorph (in category 'morphic ui') ----- - workingCopyListMorph - ^ PluggableMultiColumnListMorph - on: self - list: #workingCopyList - selected: #workingCopySelection - changeSelected: #workingCopySelection: - menu: #workingCopyListMenu:! Item was removed: - ----- Method: MCWorkingCopyBrowser>>workingCopyTreeMorph (in category 'morphic ui') ----- - workingCopyTreeMorph - ^ SimpleHierarchicalListMorph - on: self - list: #workingCopyTree - selected: #workingCopyWrapper - changeSelected: #workingCopyWrapper: - menu: #workingCopyListMenu:!

1 0

The Trunk: EToys-fbs.98.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Frank Shearar uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-fbs.98.mcz ==================== Summary ==================== Name: EToys-fbs.98 Author: fbs Time: 2 June 2013, 7:06:04.768 pm UUID: ebccf095-beeb-4f50-9f23-b6615cf30393 Ancestors: EToys-fbs.97 Form >> #stencil and Pen >> #putDotOfDiameter:at: are only called from EToys code, so they belong in EToys. =============== Diff against EToys-fbs.97 =============== Item was added: + ----- Method: Form>>stencil (in category '*EToys-Scripting') ----- + stencil + "return a 1-bit deep, black-and-white stencil of myself" + + | canvas | + canvas := FormCanvas extent: self extent depth: 1. + canvas fillColor: (Color white). + + canvas stencil: self at: 0@0 + sourceRect: (Rectangle origin: 0@0 corner: self extent) color: Color black. + + ^ canvas form + ! Item was added: + ----- Method: Pen>>putDotOfDiameter:at: (in category '*EToys-operations') ----- + putDotOfDiameter: aDiameter at: aPoint + "Put a dot of the given size at the given point, using my colot" + + (FormCanvas on: destForm) + fillOval: (Rectangle center: aPoint extent: (aDiameter @ aDiameter)) + color: self color!

1 0

The Trunk: Graphics-fbs.211.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Frank Shearar uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-fbs.211.mcz ==================== Summary ==================== Name: Graphics-fbs.211 Author: fbs Time: 2 June 2013, 7:05:25.648 pm UUID: 65a2ecea-af2e-42cd-b61e-aece057c0e7b Ancestors: Graphics-fbs.210 Form >> #stencil and Pen >> #putDotOfDiameter:at: are only called from EToys code, so they belong in EToys. =============== Diff against Graphics-fbs.210 =============== Item was removed: - ----- Method: Form>>stencil (in category 'image manipulation') ----- - stencil - "return a 1-bit deep, black-and-white stencil of myself" - - | canvas | - canvas := FormCanvas extent: self extent depth: 1. - canvas fillColor: (Color white). - - canvas stencil: self at: 0@0 - sourceRect: (Rectangle origin: 0@0 corner: self extent) color: Color black. - - ^ canvas form - ! Item was removed: - ----- Method: Pen>>putDotOfDiameter:at: (in category 'operations') ----- - putDotOfDiameter: aDiameter at: aPoint - "Put a dot of the given size at the given point, using my colot" - - (FormCanvas on: destForm) - fillOval: (Rectangle center: aPoint extent: (aDiameter @ aDiameter)) - color: self color!

1 0

The Trunk: Tests-fbs.219.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Frank Shearar uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-fbs.219.mcz ==================== Summary ==================== Name: Tests-fbs.219 Author: fbs Time: 2 June 2013, 6:17:41.36 pm UUID: 9869cc39-2749-455b-b43a-fe3f6038cc41 Ancestors: Tests-fbs.218 Network no longer depends on Tools. =============== Diff against Tests-fbs.218 =============== Item was changed: ----- Method: PackageDependencyTest>>testNetwork (in category 'tests') ----- testNetwork self testPackage: 'Network' dependsExactlyOn: #( Collections Compiler Compression Exceptions Files Graphics Kernel Morphic System 'ToolBuilder-Kernel' - Tools ).!

1 0

The Trunk: Kernel-fbs.763.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Frank Shearar uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-fbs.763.mcz ==================== Summary ==================== Name: Kernel-fbs.763 Author: fbs Time: 2 June 2013, 5:51:53.948 pm UUID: 9f65f6b7-a199-40f1-8334-3564bfe3b063 Ancestors: Kernel-fbs.762 Object >> #localeChanged moved to System-Localization because it's a localisation thing, and because I'd rather have System depend on Kernel than Kernel depend on System. =============== Diff against Kernel-fbs.762 =============== Item was removed: - ----- Method: Object>>localeChanged (in category 'locales') ----- - localeChanged - self shouldBeImplemented!

1 0

The Trunk: System-fbs.542.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Frank Shearar uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-fbs.542.mcz ==================== Summary ==================== Name: System-fbs.542 Author: fbs Time: 2 June 2013, 5:51:01.516 pm UUID: c48f768f-3538-4bd2-8589-017a8457aa72 Ancestors: System-nice.541 PartsBin and friends already have #localeChanged implementations. I don't know if "self class environment" is the right thing here. I don't want to use Smalltalk globals. Perhaps the right thing is to say "self environment" where #environment may be set, or defaults to Smalltalk globals. Object >> #localeChanged moved here because it's a localisation thing, and because I'd rather have System depend on Kernel than Kernel depend on System. =============== Diff against System-nice.541 =============== Item was changed: ----- Method: Locale class>>localeChanged (in category 'notification') ----- localeChanged + self class environment allBehaviorsDo: [:b | b localeChanged].! - - #(#ParagraphEditor #BitEditor #FormEditor #StandardSystemController ) - do: [:key | Smalltalk - at: key - ifPresent: [:class | class initialize]]. - PartsBin localeChanged. - Project localeChanged. - PaintBoxMorph localeChanged. - ColorPickerMorph localeChanged. - Preferences localeChanged! Item was changed: ----- Method: Locale class>>localeChangedGently (in category 'notification') ----- localeChangedGently + self class environment allBehaviorsDo: [:b | b localeChangedGently].! - - #(#ParagraphEditor #BitEditor #FormEditor #StandardSystemController ) - do: [:key | Smalltalk - at: key - ifPresent: [:class | class initialize]]. - PartsBin localeChangedGently. - Project localeChangedGently. - PaintBoxMorph localeChangedGently. - ColorPickerMorph localeChangedGently. - Preferences localeChangedGently. - ! Item was added: + ----- Method: Object>>localeChanged (in category '*System-Localization-locales') ----- + localeChanged + self shouldBeImplemented! Item was added: + ----- Method: Object>>localeChangedGently (in category '*System-Localization-locales') ----- + localeChangedGently + self localeChanged.!

1 0

The Trunk: System-nice.541.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-nice.541.mcz ==================== Summary ==================== Name: System-nice.541 Author: nice Time: 2 June 2013, 6:46:07.394 pm UUID: c37330b6-d436-4f84-880f-8b77f2c970e6 Ancestors: System-fbs.540 Let MczInstaller know that .mcz text files are encoded in utf8. =============== Diff against System-fbs.540 =============== Item was added: + ----- Method: MczInstaller>>contentsForMember: (in category 'private') ----- + contentsForMember: member + ^[(member contentStreamFromEncoding: 'utf8') text contents] on: InvalidUTF8 + do: [:exc | + "Case of legacy encoding, presumably it is latin-1. + But if contents starts with a null character, it might be a case of WideString encoded in UTF-32BE" + | str | + str := (member contentStreamFromEncoding: 'latin1') text.. + exc return: ((str peek = Character null and: [ str size \\ 4 = 0 ]) + ifTrue: [WideString fromByteArray: str contents asByteArray] + ifFalse: [str contents])]! Item was changed: ----- Method: MczInstaller>>installMember: (in category 'installation') ----- installMember: member self useNewChangeSetDuring: + [ | contents | + contents := self contentsForMember: member. + contents readStream fileInAnnouncing: 'loading ', member fileName. + ]! - [ | str | - str := member contentStream text readStream contents. - str := [str utf8ToSqueak] on: InvalidUTF8 do: [:exc | - "Case of legacy encoding, presumably it is latin-1 and we do not need to do anything - But if contents starts with a null character, it might be a case of WideString encoded in UTF-32BE" - exc return: (((str beginsWith: Character null asString) and: [ str size \\ 4 = 0 ]) - ifTrue: [WideString fromByteArray: str asByteArray] - ifFalse: [str])]. - str readStream fileInAnnouncing: 'loading ', member fileName ]! Item was changed: ----- Method: MczInstaller>>parseMember: (in category 'utilities') ----- + parseMember: memberOrName + | member contents tokens | + member := self zip member: memberOrName. + contents := self contentsForMember: member. + tokens := (self scanner scanTokens: contents) first. - parseMember: fileName - | tokens | - tokens := (self scanner scanTokens: (zip contentsOf: fileName)) first. ^ self associate: tokens!

1 0

The Trunk: Monticello-nice.547.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Nicolas Cellier uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-nice.547.mcz ==================== Summary ==================== Name: Monticello-nice.547 Author: nice Time: 2 June 2013, 5:25:56.867 pm UUID: e362cb35-f4c1-447b-93f7-4360eb3ba26e Ancestors: Monticello-nice.546 Encode all .mcz and .mcd text files in UTF8, not only snaphot/source.st. =============== Diff against Monticello-nice.546 =============== Item was changed: + ----- Method: MCMcdWriter>>writeBaseInfo: (in category 'visiting') ----- - ----- Method: MCMcdWriter>>writeBaseInfo: (in category 'as yet unclassified') ----- writeBaseInfo: aVersionInfo | string | string := self serializeVersionInfo: aVersionInfo. + self addString: string at: 'base' encodedTo: 'utf8'. - self addString: string at: 'base'. ! Item was changed: + ----- Method: MCMcdWriter>>writeDefinitions: (in category 'visiting') ----- - ----- Method: MCMcdWriter>>writeDefinitions: (in category 'as yet unclassified') ----- writeDefinitions: aVersion self writeBaseInfo: aVersion baseInfo. self writePatch: aVersion patch.! Item was changed: + ----- Method: MCMcdWriter>>writeNewDefinitions: (in category 'visiting') ----- - ----- Method: MCMcdWriter>>writeNewDefinitions: (in category 'as yet unclassified') ----- writeNewDefinitions: aCollection + self addString: (self serializeDefinitions: aCollection) at: 'new/source.', self snapshotWriterClass extension encodedTo: 'utf8'.! - self addString: (self serializeDefinitions: aCollection) at: 'new/source.', self snapshotWriterClass extension.! Item was changed: + ----- Method: MCMcdWriter>>writeOldDefinitions: (in category 'visiting') ----- - ----- Method: MCMcdWriter>>writeOldDefinitions: (in category 'as yet unclassified') ----- writeOldDefinitions: aCollection + self addString: (self serializeDefinitions: aCollection) at: 'old/source.', self snapshotWriterClass extension encodedTo: 'utf8'.! - self addString: (self serializeDefinitions: aCollection) at: 'old/source.', self snapshotWriterClass extension.! Item was changed: + ----- Method: MCMcdWriter>>writePatch: (in category 'visiting') ----- - ----- Method: MCMcdWriter>>writePatch: (in category 'as yet unclassified') ----- writePatch: aPatch | old new | old := OrderedCollection new. new := OrderedCollection new. aPatch operations do: [:ea | ea isRemoval ifTrue: [old add: ea definition]. ea isAddition ifTrue: [new add: ea definition]. ea isModification ifTrue: [old add: ea baseDefinition. new add: ea definition]]. self writeOldDefinitions: old. self writeNewDefinitions: new. self addString: (self serializeInBinary: aPatch) at: 'patch.bin'.! Item was added: + ----- Method: MCMczReader>>contentsForMember: (in category 'private') ----- + contentsForMember: member + ^[(member contentStreamFromEncoding: 'utf8') text contents] on: InvalidUTF8 + do: [:exc | + "Case of legacy encoding, presumably it is latin-1. + But if contents starts with a null character, it might be a case of WideString encoded in UTF-32BE" + | str | + str := (member contentStreamFromEncoding: 'latin1') text. + exc return: ((str peek = Character null and: [ str size \\ 4 = 0 ]) + ifTrue: [WideString fromByteArray: str contents asByteArray] + ifFalse: [str contents])]! Item was changed: ----- Method: MCMczReader>>extractDefinitionsFrom: (in category 'as yet unclassified') ----- extractDefinitionsFrom: member | reader | (MCSnapshotReader readerClassForFileNamed: member fileName) + ifNotNil: [:rc | + reader := rc on: (self contentsForMember: member) readStream. + definitions addAll: reader definitions] - ifNotNil: [:rc | reader := rc on: member contentStream text. - definitions addAll: reader definitions] ! Item was changed: ----- Method: MCMczReader>>extractDependencyFrom: (in category 'as yet unclassified') ----- extractDependencyFrom: zipMember ^ MCVersionDependency package: (MCPackage named: (zipMember fileName copyAfterLast: $/)) + info: (self extractInfoFrom: (self parseMember: zipMember))! - info: (self extractInfoFrom: (self parseMember: zipMember fileName))! Item was changed: + ----- Method: MCMczReader>>loadDefinitions (in category 'loading') ----- - ----- Method: MCMczReader>>loadDefinitions (in category 'as yet unclassified') ----- loadDefinitions definitions := OrderedCollection new. (self zip memberNamed: 'snapshot.bin') ifNotNil: [:m | [^ definitions := (DataStream on: m contentStream) next definitions] on: Error do: [:fallThrough ]]. "otherwise" (self zip membersMatching: 'snapshot/*') do: [:m | self extractDefinitionsFrom: m]. ! Item was changed: + ----- Method: MCMczReader>>loadDependencies (in category 'loading') ----- - ----- Method: MCMczReader>>loadDependencies (in category 'as yet unclassified') ----- loadDependencies dependencies := (self zip membersMatching: 'dependencies/*') collect: [:m | self extractDependencyFrom: m]. dependencies := dependencies asArray. ! Item was changed: + ----- Method: MCMczReader>>loadPackage (in category 'loading') ----- - ----- Method: MCMczReader>>loadPackage (in category 'as yet unclassified') ----- loadPackage | dict | dict := self parseMember: 'package'. package := MCPackage named: (dict at: #name)! Item was changed: + ----- Method: MCMczReader>>loadVersionInfo (in category 'loading') ----- - ----- Method: MCMczReader>>loadVersionInfo (in category 'as yet unclassified') ----- loadVersionInfo info := self extractInfoFrom: (self parseMember: 'version')! Item was changed: ----- Method: MCMczReader>>parseMember: (in category 'as yet unclassified') ----- + parseMember: memberOrName + | member contents tokens | + member := self zip member: memberOrName. + contents := self contentsForMember: member. + tokens := (self scanner scanTokens: contents) first. - parseMember: fileName - | tokens | - tokens := (self scanner scanTokens: (self zip contentsOf: fileName)) first. ^ self associate: tokens! Item was added: + ----- Method: MCMczWriter>>addString:at:encodedTo: (in category 'writing') ----- + addString: string at: path encodedTo: encodingName + | member | + member := zip addString: (string convertToEncoding: encodingName) as: path. + member desiredCompressionMethod: ZipArchive compressionDeflated + ! Item was changed: ----- Method: MCMczWriter>>serializeDefinitions: (in category 'serializing') ----- serializeDefinitions: aCollection + ^String streamContents: [:aStream | - ^(String streamContents: [:aStream | | writer | writer := self snapshotWriterClass on: aStream. + writer writeDefinitions: aCollection]! - writer writeDefinitions: aCollection]) - squeakToUtf8! Item was changed: ----- Method: MCMczWriter>>writePackage: (in category 'visiting') ----- writePackage: aPackage + self addString: (self serializePackage: aPackage) at: 'package' encodedTo: 'utf8'! - self addString: (self serializePackage: aPackage) at: 'package'! Item was changed: ----- Method: MCMczWriter>>writeSnapshot: (in category 'visiting') ----- writeSnapshot: aSnapshot + self addString: (self serializeDefinitions: aSnapshot definitions) at: 'snapshot/source.', self snapshotWriterClass extension encodedTo: 'utf8'. - self addString: (self serializeDefinitions: aSnapshot definitions) at: 'snapshot/source.', self snapshotWriterClass extension. self addString: (self serializeInBinary: aSnapshot) at: 'snapshot.bin'! Item was changed: ----- Method: MCMczWriter>>writeVersionDependency: (in category 'visiting') ----- writeVersionDependency: aVersionDependency | string | string := (self serializeVersionInfo: aVersionDependency versionInfo). + self addString: string at: 'dependencies/', aVersionDependency package name encodedTo: 'utf8'! - self addString: string at: 'dependencies/', aVersionDependency package name! Item was changed: ----- Method: MCMczWriter>>writeVersionInfo: (in category 'visiting') ----- writeVersionInfo: aVersionInfo | string | string := self serializeVersionInfo: aVersionInfo. + self addString: string at: 'version' encodedTo: 'utf8'. - self addString: string at: 'version'. ! Item was changed: ----- Method: MCStReader>>readStream (in category 'evaluating') ----- readStream - | contents | - contents := stream contents. - contents := [contents utf8ToSqueak] on: InvalidUTF8 do: [:exc | - "Case of legacy encoding, presumably it is latin-1 and we do not need to do anything - But if contents starts with a null character, it might be a case of WideString encoded in UTF-32BE" - exc return: (((contents beginsWith: Character null asString) and: [ contents size \\ 4 = 0 ]) - ifTrue: [WideString fromByteArray: contents asByteArray] - ifFalse: [contents])]. ^ ('!!!! + ', stream contents) readStream! - ', contents) readStream! Item was changed: + ----- Method: MCWriter>>stream (in category 'accessing') ----- - ----- Method: MCWriter>>stream (in category 'as yet unclassified') ----- stream ^ stream! Item was changed: + ----- Method: MCWriter>>stream: (in category 'accessing') ----- - ----- Method: MCWriter>>stream: (in category 'as yet unclassified') ----- stream: aStream stream := aStream!

1 0

The Trunk: Compression-nice.32.mcz
by commits＠source.squeak.org 02 Jun '13

02 Jun '13

Nicolas Cellier uploaded a new version of Compression to project The Trunk: http://source.squeak.org/trunk/Compression-nice.32.mcz ==================== Summary ==================== Name: Compression-nice.32 Author: nice Time: 2 June 2013, 3:15:05.134 pm UUID: bce2a55c-891e-4fee-bce4-d8a12461b792 Ancestors: Compression-ul.31 Add a utility #contentStreamFromEncoding: to decode some ZipArchiveMember with prescribed encoding ('latin1', 'utf8' etc...) =============== Diff against Compression-ul.31 =============== Item was changed: ----- Method: ZipArchiveMember>>contentStream (in category 'accessing') ----- contentStream "Answer my contents as a text stream. Default is no conversion, since we don't know what the bytes mean." + ^self contentStreamFromEncoding: 'latin1' - | s | - s := MultiByteBinaryOrTextStream on: (String new: self uncompressedSize). - s converter: Latin1TextConverter new. - self extractTo: s. - s reset. - ^ s. ! Item was added: + ----- Method: ZipArchiveMember>>contentStreamFromEncoding: (in category 'accessing') ----- + contentStreamFromEncoding: encodingName + "Answer my contents as a text stream. + Interpret the raw bytes with given encodingName" + + | s | + s := MultiByteBinaryOrTextStream on: (String new: self uncompressedSize). + s converter: (TextConverter newForEncoding: encodingName). + self extractTo: s. + s reset. + ^ s + !

1 0

Jump to page: