Squeak-dev August 2010

squeak-dev@lists.squeakfoundation.org

100 participants
325 discussions

The Trunk: NetworkTests-ar.16.mcz
by commits＠source.squeak.org 03 Aug '10

03 Aug '10

Andreas Raab uploaded a new version of NetworkTests to project The Trunk: http://source.squeak.org/trunk/NetworkTests-ar.16.mcz ==================== Summary ==================== Name: NetworkTests-ar.16 Author: ar Time: 2 August 2010, 7:05:25.718 pm UUID: 533aff87-dfb6-f648-9a3a-6ca6065deff1 Ancestors: NetworkTests-topa.15 Add tests for SocketStream #upTo: and #upToAll:. =============== Diff against NetworkTests-topa.15 =============== Item was added: + ----- Method: SocketStreamTest>>testUpToAllAfterCloseSignaling (in category 'stream protocol') ----- + testUpToAllAfterCloseSignaling + "Tests correct behavior of #upToAll" + + clientStream nextPutAll:'A line of text'. + clientStream close. + self should: [serverStream upToAll: String crlf] raise: ConnectionClosed. + ! Item was added: + ----- Method: SocketStreamTest>>testUpToAllLimit (in category 'stream protocol') ----- + testUpToAllLimit + "Tests correct behavior of #upToAll:limit:" + + clientStream nextPutAll:'A line of text'; flush. + self assert: (serverStream upToAll: String crlf limit: 5) = 'A line of text'.! Item was added: + ----- Method: SocketStreamTest>>tearDown (in category 'setup') ----- + tearDown + clientStream ifNotNil:[clientStream destroy]. + serverStream ifNotNil:[serverStream destroy].! Item was added: + ----- Method: SocketStreamTest>>testUpToAllTimeout (in category 'stream protocol') ----- + testUpToAllTimeout + "Tests correct behavior of #upToAll" + + clientStream nextPutAll: 'A line of text'. + serverStream timeout: 1. + self should: [serverStream upToAll: String crlf] raise: ConnectionTimedOut. + ! Item was added: + ----- Method: SocketStreamTest>>testUpToTimeout (in category 'stream protocol') ----- + testUpToTimeout + "Tests correct behavior of #upToAll" + + clientStream nextPutAll: 'A line of text'. + serverStream timeout: 1. + self should: [serverStream upTo: Character cr] raise: ConnectionTimedOut. + ! Item was added: + ----- Method: SocketStreamTest>>setUp (in category 'setup') ----- + setUp + | listener clientSocket serverSocket | + listener := Socket newTCP. + [listener listenOn: 0 backlogSize: 4. + + clientSocket := Socket newTCP. + clientSocket connectTo: #[127 0 0 1] port: listener localPort. + clientSocket waitForConnectionFor: 1. + self assert: clientSocket isConnected. + + serverSocket := listener waitForAcceptFor: 1. + self assert: serverSocket isConnected. + ] ensure:[listener destroy]. + + clientStream := SocketStream on: clientSocket. + serverStream := SocketStream on: serverSocket. + ! Item was added: + ----- Method: SocketStreamTest>>testUpToAfterCloseNonSignaling (in category 'stream protocol') ----- + testUpToAfterCloseNonSignaling + "Tests correct behavior of #upToAll" + + | resp | + clientStream nextPutAll: 'A line of text'. + clientStream close. + serverStream shouldSignal: false. + self shouldnt: [resp := serverStream upTo: Character cr] raise: ConnectionClosed. + self assert: resp = 'A line of text'.! Item was added: + ----- Method: SocketStreamTest>>testUpToAfterCloseSignaling (in category 'stream protocol') ----- + testUpToAfterCloseSignaling + "Tests correct behavior of #upToAll" + + clientStream nextPutAll:'A line of text'. + clientStream close. + self should: [serverStream upTo: Character cr] raise: ConnectionClosed. + ! Item was added: + ClassTestCase subclass: #SocketStreamTest + instanceVariableNames: 'clientStream serverStream' + classVariableNames: '' + poolDictionaries: '' + category: 'NetworkTests-Kernel'! Item was added: + ----- Method: SocketStreamTest>>testUpToMax (in category 'stream protocol') ----- + testUpToMax + "Tests correct behavior of #upToAll:max:" + + clientStream nextPutAll:'A line of text'; flush. + self assert: (serverStream upTo: Character cr limit: 5) = 'A line of text'.! Item was added: + ----- Method: SocketStreamTest>>testUpToAll (in category 'stream protocol') ----- + testUpToAll + "Tests correct behavior of #upToAll" + + clientStream nextPutAll:'A line of text', String crlf, 'with more text'; flush. + self assert: (serverStream upToAll: String crlf) = 'A line of text'. + [(Delay forSeconds: 1) wait. + clientStream nextPutAll: String crlf; flush] fork. + self assert: (serverStream upToAll: String crlf) = 'with more text'. + ! Item was added: + ----- Method: SocketStreamTest>>testUpToAllAfterCloseNonSignaling (in category 'stream protocol') ----- + testUpToAllAfterCloseNonSignaling + "Tests correct behavior of #upToAll" + + | resp | + clientStream nextPutAll: 'A line of text'. + clientStream close. + serverStream shouldSignal: false. + self shouldnt: [resp := serverStream upToAll: String crlf] raise: ConnectionClosed. + self assert: resp = 'A line of text'.! Item was added: + ----- Method: SocketStreamTest>>testUpTo (in category 'stream protocol') ----- + testUpTo + "Tests correct behavior of #upTo:" + + clientStream nextPutAll:'A line of text', String cr, 'with more text'; flush. + self assert: (serverStream upTo: Character cr) = 'A line of text'. + [(Delay forSeconds: 1) wait. + clientStream nextPutAll: String cr; flush] fork. + self assert: (serverStream upTo: Character cr) = 'with more text'. + !

1 0

The Trunk: Network-ar.77.mcz
by commits＠source.squeak.org 03 Aug '10

03 Aug '10

Andreas Raab uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-ar.77.mcz ==================== Summary ==================== Name: Network-ar.77 Author: ar Time: 2 August 2010, 7:01:43.782 pm UUID: 188c5481-3b63-9b44-b341-1c4683784f9b Ancestors: Network-ar.76 Rewrite SocketStream>>upTo: and #upToAll: to fix a VBB (Very Bad Bug) which would cause it to go into an infinite loop if the remote closed the connection before the entity was found and also make the limit argument explicit since it can often be used more effectively (i.e., a 100k limit for reading an HTTP header is probably unnecessary). =============== Diff against Network-ar.76 =============== Item was changed: ----- Method: SocketStream>>upTo: (in category 'stream in') ----- upTo: aCharacterOrByte + "Answer a subcollection from the current access position to the occurrence (if any, but not inclusive) of anObject in the receiver. If anObject is not in the collection, answer the entire rest of the receiver." - "Return data up to, but not including given character or byte. - - NOTE: Does not honour timeouts if shouldSignal is false!! - - This method looks a bit complicated, and this is mainly because there is no fast search method - in String that takes a stoppingAt: argument. This means we need to ignore getting hits in the - dead buffer area above inNextToWrite. - Another measure is that this implementation is greedy and will load data into the buffer - until there is nothing more available, or it has loaded 100kb - and not until then we search the buffer. + "Note: The 100k limit below is compatible with the previous version though arguably incorrect. If you need unbounded behavior either up the argument or provide nil in which case we'll read until we get it or run out of memory" - A totally non greedy variant would search on every loop." + ^self upTo: aCharacterOrByte limit: 100000! - | index result lastRecentlyRead searchedSoFar | - searchedSoFar := 0. - lastRecentlyRead := 0. - index := 0. - [self atEnd not and: [ - ((lastRecentlyRead = 0 and: [self isInBufferEmpty not]) or: [self inBufferSize > 100000]) ifTrue: [ - "Data begins at lastRead + 1, we add searchedSoFar as offset." - index := inBuffer indexOf: aCharacterOrByte startingAt: lastRead + searchedSoFar + 1. - searchedSoFar := self inBufferSize. - (index > 0 and: [(index + 1) > inNextToWrite]) ifTrue: [ - "Oops, hit in dead buffer area. - This is probably due to old data, so we ignore it. - No point in cleaning the dead area to avoid hits - it will still search it." - index := 0]]. - index = 0]] - whileTrue: [ - recentlyRead = 0 - ifTrue: ["blocking call for now, we don't want to poll" - self receiveData] - ifFalse: [ - self receiveAvailableData]. - lastRecentlyRead := recentlyRead]. - index > 0 - ifTrue: ["found it" - result := self nextInBuffer: index - lastRead - 1. - self skip: 1. - ^ result] - ifFalse: ["atEnd" - ^ self nextAllInBuffer]! Item was added: + ----- Method: SocketStream>>upToAll:limit: (in category 'stream in') ----- + upToAll: aStringOrByteArray limit: nBytes + "Answer a subcollection from the current access position to the occurrence (if any, but not inclusive) of aStringOrByteArray. If aCollection is not in the stream, or not found within nBytes answer the available contents of the stream" + + | index sz result searchedSoFar | + sz := aStringOrByteArray size. + "Look in the current inBuffer first" + index := inBuffer indexOfSubCollection: aStringOrByteArray + startingAt: lastRead - sz + 2. + (index > 0 and: [(index + sz) <= inNextToWrite]) ifTrue: ["found it" + result := self nextInBuffer: index - lastRead - 1. + self skip: sz. + ^ result + ]. + + [searchedSoFar := self inBufferSize. + "Receive more data" + self receiveData. + recentlyRead > 0] whileTrue:[ + + "Data begins at lastRead + 1, we add searchedSoFar as offset and + backs up sz - 1 so that we can catch any borderline hits." + + index := inBuffer indexOfSubCollection: aStringOrByteArray + startingAt: (lastRead + searchedSoFar - sz + 2 max: 1). + (index > 0 and: [(index + sz) <= inNextToWrite]) ifTrue: ["found it" + result := self nextInBuffer: index - lastRead - 1. + self skip: sz. + ^ result + ]. + "Check if we've exceeded the max. amount" + (nBytes notNil and:[inNextToWrite - lastRead > nBytes]) + ifTrue:[^self nextAllInBuffer]. + ]. + + "not found and (non-signaling) connection was closed" + ^self nextAllInBuffer! Item was changed: ----- Method: SocketStream>>upToAll: (in category 'stream in') ----- upToAll: aStringOrByteArray + "Answer a subcollection from the current access position to the occurrence (if any, but not inclusive) of aCollection. If aCollection is not in the stream, answer the entire rest of the stream." - "Answer a subcollection from the current access position to the occurrence (if any, but not - inclusive) of aStringOrByteArray. If aCollection is not in the stream, answer the entire rest of - the stream. - - NOTE: Does not honour timeouts if shouldSignal is false!! - - This method looks a bit complicated, and this is mainly because there is no fast search method - in String that takes a stoppingAt: argument. This means we need to ignore getting hits in the - dead buffer area above inNextToWrite. - Another measure is that this implementation is greedy and will load data into the buffer - until there is nothing more available, or it has loaded 100kb - and not until then we search the buffer. + "Note: The 100k limit below is compatible with the previous version though arguably incorrect. If you need unbounded behavior either up the argument or provide nil in which case we'll read until we get it or run out of memory" - A totally non greedy variant would search on every loop." + ^self upToAll: aStringOrByteArray limit: 100000! - | index sz result lastRecentlyRead searchedSoFar | - sz := aStringOrByteArray size. - searchedSoFar := 0. - lastRecentlyRead := 0. - index := 0. - [self atEnd not and: [ - ((lastRecentlyRead = 0 and: [self isInBufferEmpty not]) or: [self inBufferSize > 100000]) ifTrue: [ - "Data begins at lastRead + 1, we add searchedSoFar as offset and backs up sz - 1 - so that we can catch any borderline hits." - index := inBuffer indexOfSubCollection: aStringOrByteArray - startingAt: lastRead + searchedSoFar - sz + 2. - searchedSoFar := self inBufferSize. - (index > 0 and: [(index + sz) > inNextToWrite]) ifTrue: [ - "Oops, hit partially or completely in dead buffer area. - This is probably due to old data, so we ignore it. - No point in cleaning the dead area to avoid hits - it will still search it." - index := 0]]. - index = 0]] - whileTrue: [ - recentlyRead = 0 - ifTrue: ["blocking call for now, we don't want to poll" - self receiveData] - ifFalse: [ - self receiveAvailableData]. - lastRecentlyRead := recentlyRead]. - index > 0 - ifTrue: ["found it" - result := self nextInBuffer: index - lastRead - 1. - self skip: sz. - ^ result] - ifFalse: ["atEnd" - ^ self nextAllInBuffer]! Item was added: + ----- Method: SocketStream>>upTo:limit: (in category 'stream in') ----- + upTo: aCharacterOrByte limit: nBytes + "Return data up to, but not including given character or byte. If the character is not in the stream, or not found within nBytes answer the available contents of the stream" + + | index result searchedSoFar | + "Look in the current inBuffer first" + index := inBuffer indexOf: aCharacterOrByte startingAt: lastRead + 1. + + (index > 0 and: [(index + 1) <= inNextToWrite]) ifTrue: ["found it" + result := self nextInBuffer: index - lastRead - 1. + self skip: 1. + ^ result + ]. + + [searchedSoFar := self inBufferSize. + "Receive more data" + self receiveData. + "We only get recentlyRead = 0 in the case of a non-signaling socket close." + recentlyRead > 0] whileTrue:[ + "Data begins at lastRead + 1, we add searchedSoFar as offset." + + index := inBuffer indexOf: aCharacterOrByte + startingAt: (lastRead + searchedSoFar + 1). + (index > 0 and: [(index + 1) <= inNextToWrite]) ifTrue: ["found it" + result := self nextInBuffer: index - lastRead - 1. + self skip: 1. + ^ result + ]. + + "Check if we've exceeded the max. amount" + (nBytes notNil and:[inNextToWrite - lastRead > nBytes]) + ifTrue:[^self nextAllInBuffer]. + ]. + + "not found and (non-signaling) connection was closed" + ^self nextAllInBuffer!

1 0

The Trunk: Network-ar.77.mcz
by commits＠source.squeak.org 03 Aug '10

03 Aug '10

1 0

The Inbox: Morphic-cbr.458.mcz
by commits＠source.squeak.org 03 Aug '10

03 Aug '10

A new version of Morphic was added to project The Inbox: http://source.squeak.org/inbox/Morphic-cbr.458.mcz ==================== Summary ==================== Name: Morphic-cbr.458 Author: cbr Time: 2 August 2010, 6:44:06.4 pm UUID: 5e9ae9d1-f50d-4ab6-907c-51a1a5e4debe Ancestors: Morphic-cmm.457 Added a menu item each to the world menu and the docking bar which refer to SystemNavigation>>browseMyChanges. =============== Diff against Morphic-cmm.457 =============== Item was changed: ----- Method: TheWorldMainDockingBar>>extrasMenuOn: (in category 'construction') ----- extrasMenuOn: aDockingBar aDockingBar addItem: [ :it| it contents: 'Extras' translated; addSubMenu: [:menu| menu addItem:[:item| item contents: 'Recover Changes' translated; help: 'Recover changes after a crash' translated; icon: MenuIcons smallHelpIcon; target: ChangeList; selector: #browseRecentLog]. menu addLine. menu addItem:[:item| item contents: 'Window Colors' translated; help: 'Changes the window color scheme' translated; addSubMenu:[:submenu| self windowColorsOn: submenu]]. menu addItem:[:item| item contents: 'Set Author Initials' translated; help: 'Sets the author initials' translated; target: Utilities; selector: #setAuthorInitials]. menu addItem:[:item| item contents: 'Restore Display (r)' translated; help: 'Redraws the entire display' translated; target: World; selector: #restoreMorphicDisplay]. menu addItem:[:item| item contents: 'Rebuild Menus' translated; help: 'Rebuilds the menu bar' translated; target: TheWorldMainDockingBar; selector: #updateInstances]. menu addLine. menu addItem:[:item| item contents: 'Start Profiler' translated; help: 'Starts the profiler' translated; target: self; selector: #startMessageTally]. menu addItem:[:item| item contents: 'Collect Garbage' translated; help: 'Run the garbage collector and report space usage' translated; target: Utilities; selector: #garbageCollectAndReport]. menu addItem:[:item| item contents: 'Purge Undo Records' translated; help: 'Save space by removing all the undo information remembered in all projects' translated; target: CommandHistory; selector: #resetAllHistory]. menu addItem:[:item| item contents: 'VM statistics' translated; help: 'Virtual Machine information' translated; target: self; selector: #vmStatistics]. menu addLine. menu addItem:[:item| item contents: 'Graphical Imports' translated; help: 'View the global repository called ImageImports; you can easily import external graphics into ImageImports via the FileList' translated; target: (Imports default); selector: #viewImages]. menu addItem:[:item| item contents: 'Standard Graphics Library' translated; help: 'Lets you view and change the system''s standard library of graphics' translated; target: ScriptingSystem; selector: #inspectFormDictionary]. menu addItem:[:item| item contents: 'Annotation Setup' translated; help: 'Click here to get a little window that will allow you to specify which types of annotations, in which order, you wish to see in the annotation panes of browsers and other tools' translated; target: Preferences; selector: #editAnnotations]. + menu addItem:[:item| + item + contents: 'Browse My Changes' translated; + help: 'Browse all of my changes since the last time #condenseSources was run.' translated; + target: SystemNavigation new; + selector: #browseMyChanges]. ] ]! Item was changed: ----- Method: TheWorldMenu>>changesMenu (in category 'construction') ----- changesMenu "Build the changes menu for the world." | menu | menu := self menu: 'changes...'. self fillIn: menu from: { { 'file out current change set' . { ChangeSet current . #verboseFileOut}. 'Write the current change set out to a file whose name reflects the change set name and the current date & time.'}. { 'create new change set...' . { ChangeSet . #newChangeSet}. 'Create a new change set and make it the current one.'}. { 'browse changed methods' . { ChangeSet . #browseChangedMessages}. 'Open a message-list browser showing all methods in the current change set'}. { 'check change set for slips' . { self . #lookForSlips}. 'Check the current change set for halts, references to the Transcript, etc., and if any such thing is found, open up a message-list browser detailing all possible slips.'}. nil. { 'simple change sorter' . {self. #openChangeSorter1}. 'Open a 3-paned changed-set viewing tool'}. { 'dual change sorter' . {self. #openChangeSorter2}. 'Open a change sorter that shows you two change sets at a time, making it easy to copy and move methods and classes between them.'}. { 'find a change sorter (C)' . { #myWorld . #findAChangeSorter: }. 'Brings an open change sorter to the front, creating one if necessary, and makes it the active window'}. nil. { 'browse recent submissions (R)' . { Utilities . #browseRecentSubmissions}. 'Open a new recent-submissions browser. A recent-submissions browser is a message-list browser that shows the most recent methods that have been submitted. If you submit changes within that browser, it will keep up-to-date, always showing the most recent submissions.'}. + { 'browse my changes' . { SystemNavigation new . #browseMyChanges }. + 'Browse all of my changes since the last time #condenseSources was run.'}. - nil. { 'recently logged changes...' . { self . #browseRecentLog}.'Open a change-list browser on the latter part of the changes log. You can use this browser to recover logged changes which were not saved in your image, in the event of a crash or other interruption.'}. { 'recent log file...' . { Smalltalk . #writeRecentToFile}. 'Create a file holding the logged changes (going as far back as you wish), and open a window on that file.'}. nil. { 'save world as morph file' . {self. #saveWorldInFile}. 'Save a file that, when reloaded, reconstitutes the current World.'}. nil. }. ^ menu!

1 0

Daily Commit Log
by commits＠source.squeak.org 03 Aug '10

03 Aug '10

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2010-August/003580.html Name: Morphic-cmm.457 Ancestors: Morphic-ar.456 Refactor SketchMorph repainting items, separating the domain work from the user-interface. =============================================

1 0

The Trunk: Morphic-cmm.457.mcz
by commits＠source.squeak.org 03 Aug '10

03 Aug '10

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.457.mcz ==================== Summary ==================== Name: Morphic-cmm.457 Author: cmm Time: 2 August 2010, 6:31:17.394 pm UUID: 5d35793d-32ee-49cc-8a14-b4e2ef43db03 Ancestors: Morphic-ar.456 Refactor SketchMorph repainting items, separating the domain work from the user-interface. =============== Diff against Morphic-ar.456 =============== Item was changed: ----- Method: SketchMorph>>erasePixelsOfColor: (in category 'menu') ----- + erasePixelsOfColor: aColor - erasePixelsOfColor: evt "Let the user specifiy a color such that all pixels of that color should be erased; then do the erasure" + | newBounds | + originalForm + mapColor: aColor + to: Color transparent. + newBounds := originalForm rectangleEnclosingPixelsNotOfColor: Color transparent. + self form: (originalForm copy: newBounds)! - - | c r | - self changeColorTarget: self selector: #rememberedColor: originalColor: nil hand: evt hand. "color to erase" - c := self rememberedColor ifNil: [Color red]. - originalForm mapColor: c to: Color transparent. - r := originalForm rectangleEnclosingPixelsNotOfColor: Color transparent. - self form: (originalForm copy: r). - - ! Item was added: + ----- Method: SketchMorph>>erasePixelsUsing: (in category 'menu') ----- + erasePixelsUsing: evt + "Let the user specifiy a color such that all pixels of that color should be erased; then do the erasure" + self + changeColorTarget: self + selector: #rememberedColor: + originalColor: nil + hand: evt hand. + self rememberedColor "color to erase" + ifNil: [ ^ self ] + ifNotNilDo: + [ : chosenColor | self erasePixelsOfColor: chosenColor ]! Item was added: + ----- Method: SketchMorph>>recolorPixelsOfColor:with: (in category 'menu') ----- + recolorPixelsOfColor: originalColor with: newColor + "Let the user select a color to be remapped, and then a color to map that color to, then carry it out." + | d newForm map | + d := originalForm depth. + newForm := Form extent: originalForm extent depth: d. + map := (Color cachedColormapFrom: d to: d) copy. + map at: (originalColor indexInMap: map) put: (newColor pixelValueForDepth: d). + newForm copyBits: newForm boundingBox + from: originalForm at: 0@0 + colorMap: map. + self form: newForm. + ! Item was changed: ----- Method: Morph>>addPaintingItemsTo:hand: (in category 'menus') ----- addPaintingItemsTo: aMenu hand: aHandMorph | subMenu movies | subMenu := MenuMorph new defaultTarget: self. subMenu add: 'repaint' translated action: #editDrawing. subMenu add: 'set rotation center' translated action: #setRotationCenter. subMenu add: 'reset forward-direction' translated action: #resetForwardDirection. subMenu add: 'set rotation style' translated action: #setRotationStyle. subMenu add: 'erase pixels of color' translated + action: #erasePixelsUsing:. - action: #erasePixelsOfColor:. subMenu add: 'recolor pixels of color' translated + action: #recolorPixelsUsing:. - action: #recolorPixelsOfColor:. subMenu add: 'reduce color palette' translated action: #reduceColorPalette:. subMenu add: 'add a border around this shape...' translated action: #addBorderToShape:. movies := (self world rootMorphsAt: aHandMorph targetPoint) select: [:m | (m isKindOf: MovieMorph) or: [m isSketchMorph]]. movies size > 1 ifTrue: [subMenu add: 'insert into movie' translated action: #insertIntoMovie:]. aMenu add: 'painting...' translated subMenu: subMenu! Item was added: + ----- Method: SketchMorph>>recolorPixelsUsing: (in category 'menu') ----- + recolorPixelsUsing: evt + "Let the user select a color to be remapped, and then a color to map that color to, then carry it out." + | originalColor newColor | + self inform: 'choose the color you want to replace' translated. + self + changeColorTarget: self + selector: #rememberedColor: + originalColor: nil + hand: evt hand. + "color to replace" + originalColor := self rememberedColor ifNil: [ ^ self ]. + self inform: 'now choose the color you want to replace it with' translated. + self + changeColorTarget: self + selector: #rememberedColor: + originalColor: originalColor + hand: evt hand. + "new color" + newColor := self rememberedColor ifNil: [ ^ self ]. + self + recolorPixelsOfColor: originalColor + with: newColor! Item was removed: - ----- Method: SketchMorph>>recolorPixelsOfColor: (in category 'menu') ----- - recolorPixelsOfColor: evt - "Let the user select a color to be remapped, and then a color to map that color to, then carry it out." - - | c d newForm map newC | - self inform: 'choose the color you want to replace' translated. - self changeColorTarget: self selector: #rememberedColor: originalColor: nil hand: evt hand. "color to replace" - c := self rememberedColor ifNil: [Color red]. - self inform: 'now choose the color you want to replace it with' translated. - self changeColorTarget: self selector: #rememberedColor: originalColor: c hand: evt hand. "new color" - newC := self rememberedColor ifNil: [Color blue]. - d := originalForm depth. - newForm := Form extent: originalForm extent depth: d. - map := (Color cachedColormapFrom: d to: d) copy. - map at: (c indexInMap: map) put: (newC pixelValueForDepth: d). - newForm copyBits: newForm boundingBox - from: originalForm at: 0@0 - colorMap: map. - self form: newForm. - !

1 0

Re: Bootstrap logic in recent Tweak-Core (?)
by David Faught 02 Aug '10

02 Aug '10

>On 7/29/2010 5:08 AM, David Faught wrote: >> On 7/29/2010, Andreas Raab wrote: >>> 1) Create a local proxy for the replicated object and have it control >>> the replicated target. This has the advantage that you don't need to >>> replicate the script but the disadvantage that the script is >>> disassociated from the object and won't persist if the local user drops out. >>> >>> 2) Replicate the script into the island and run it there. This is >>> obviously more in line with the ideas of Croquet but the thought of all >>> the things that could go wrong led me to never go down this path. >> Option number 2 is what I used in the MockTurtle demo. This project >> only used a code editor in the local proxy instead of tile scripting, >> and when the edit was accepted the script text was first locally >> syntax checked and then sent to the associated replicated object. >> This was actually lots of fun, but needed to have some "future"s >> handcoded in the edited source as I recall. Some keystrokes in the >> harness directed to the target replicated object caused editing or >> script execution to start. In my isolated testing, this worked just >> fine. >How did you deal with persistence and replication? One of the main >issues with the approach is having to include compiled methods in the >island snapshot. Or did you have an explicit "code sync" step before >replicating the island contents? I guess that I cheated by ignoring persistence and took a very simple minded approach. By choice there were no compiled methods. And yes, that limited its usefulness, but it was still lots of fun. The locally edited code was sent to the target replicated object as a text string and the replicated object saved it in a single instance variable, so each replicated object could have exactly one script. When the target object was triggered to run the code, it essentially did a "doIt" on the string. There wasn't anything more to it than that. Cheers, Dave

1 2

Daily Commit Log
by commits＠source.squeak.org 02 Aug '10

02 Aug '10

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2010-August/003579.html Name: System-dtl.354 Ancestors: System-eem.353 Merge changes from inbox System-cbr.354 and System-cbr.356 Name: System-cbr.354 Ancestors: System-eem.353 Removed cruft from Project class comment to do with project isolation, which is deprecated. Name: System-cbr.356 Ancestors: System-cbr.355 Method to find author's changes since last release (or last condenseSources, anyway.) Useful for rescuing unfinished experiments from trunk images, as it filters the noise of trunk changes. =============================================

1 0

The Trunk: System-dtl.354.mcz
by commits＠source.squeak.org 01 Aug '10

01 Aug '10

David T. Lewis uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-dtl.354.mcz ==================== Summary ==================== Name: System-dtl.354 Author: dtl Time: 1 August 2010, 2:14:56.824 pm UUID: f0fa50de-cf4b-4a06-99b7-eb37cdb1a6e5 Ancestors: System-eem.353 Merge changes from inbox System-cbr.354 and System-cbr.356 Name: System-cbr.354 Author: cbr Time: 27 July 2010, 9:40:25.256 pm UUID: f49d8aa0-ca22-47c9-880c-7713a9667439 Ancestors: System-eem.353 Removed cruft from Project class comment to do with project isolation, which is deprecated. Name: System-cbr.356 Author: cbr Time: 31 July 2010, 9:34:13.128 pm UUID: 30a3d62d-68f5-4f58-8a02-d5190ea0c2c8 Ancestors: System-cbr.355 Method to find author's changes since last release (or last condenseSources, anyway.) Useful for rescuing unfinished experiments from trunk images, as it filters the noise of trunk changes. =============== Diff against System-eem.353 =============== Item was added: + ----- Method: SystemNavigation>>browseMyChanges (in category 'browse') ----- + browseMyChanges + "Browse only the changes (in the changes file) by the current author." + + "SystemNavigation default browseMyChanges" + + self browseAllSelect: [ :method | + method fileIndex > 1 "only look at changes file" + and: [ method timeStamp beginsWith: Utilities authorInitials ]]! Item was changed: Model subclass: #Project instanceVariableNames: 'world uiManager changeSet transcript parentProject previousProject displayDepth viewSize thumbnail nextProject guards projectParameters version urlList environment lastDirectory lastSavedAtSeconds projectPreferenceFlagDictionary resourceManager' classVariableNames: 'AllProjects CurrentProject GoalFreePercent GoalNotMoreThan LastScreenModeSelected UIProcess' poolDictionaries: '' category: 'System-Support'! + !Project commentStamp: 'cbr 7/27/2010 21:36' prior: 0! - !Project commentStamp: 'tk 12/2/2004 12:38' prior: 0! A Project stores the state of a complete Squeak desktop, including the windows, and the currently active changeSet. A project knows who its parent project is. When you change projects, whether by entering or exiting, the screen state of the project being exited is saved in that project. A project is retained by its view in the parent world. It is effectively named by the name of its changeSet, which can be changed either by renaming in a changeSorter, or by editing the label of its view from the parent project. As the site of major context switch, Projects are the locus of swapping between the old MVC and the new Morphic worlds. The distinction is based on whether the variable 'world' contains a WorldMorph or a ControlManager. Saving and Loading Projects may be stored on the disk in external format. (Project named: 'xxx') exportSegment, or choose 'store project on file...'. Projects may be loaded from a server and stored back. Storing on a server never overwrites; it always makes a new version. A project remembers the url of where it lives in urlList. The list is length one, for now. The url may point to a local disk instead of a server. + All projects that the user looks at are cached in the Squeaklet - All projects that the user looks at, are cached in the Squeaklet folder. Sorted by server. The cache holds the most recent version only. When a project is loaded into Squeak, its objects are converted to the current version. There are three levels of conversion. First, each object is converted from raw bits to an object in its old format. Then it is sent some or all of these messages: comeFullyUpOnReload: smartRefStream Used to re-discover an object that already exists in this image, such as a resource, global variable, Character, or Symbol. (sent to objects in outPointers) convertToCurrentVersion: varDict refStream: smartRefStrm fill in fields that have been added to a class since the object was stored. Used to set the extra inst var to a default value. Or, return a new object of a different class. (sent to objects that changed instance variables) fixUponLoad: aProject refStream: smartRefStrm change the object due to conventions that have changed on the project level. (sent to all objects in the incoming project) Here is the calling sequence for storing out a Project: Project saveAs Project storeOnServer Project storeOnServerWithProgressInfo Project storeOnServerInnards Project exportSegmentFileName:directory: Project exportSegmentWithChangeSet:fileName:directory: ImageSegment writeForExportWithSources:inDirectory:changeSet: - --------- - Isolation (not used any more) - When you accept a method, the entire system feels the change, except - projects that are "isolated". In an isolated project, all new global - variables (including new classes) arestored in the project-local - environment, and all changes to preexisting classes are revoked when - you leave the project. When you enter another project, that - project's changes are invoked. Invocation and revocation are handled - efficiently by swapping pointers. To make a project be isolated, - choose 'isolate changes of this project' from the 'changes...' - section of the screen menu. You can use an isolated project for - making dangerous change to a system, and you can get out if it - crashes. A foreign application can have the separate environment it - wants. Also, you can freeze part of the system for a demo that you - don't want to disturb. An isolated project shares methods with all - subprojects inside it, unless they are isolated themselves. Each - isolated project is the head of a tree of projects with which it - shares all methods. - You may 'assert' all changes ever made in the current project to take - effect above this project. This amounts to exporting all the globals - in the current environment, and zapping the revocation lists to that - the current state of the world will remain in force upon exit from - this project. - - [Later: A project may be 'frozen'. Asserts do not apply to it after - that. (Great for demos.) You should be informed when an assert was - blocked in a frozen project.] - - Class definitions are layered by the isolation mechanism. You are - only allowed to change the shape of a class in projects that lie - within its isolation scope. All versions of the methods are - recompiled, in all projects. If you remove an inst var that is in - use in an isolated project, it will become an Undeclared global. It - is best not to remove an inst var when it is being used in another - isolated project. [If we recompile them all, why can't we diagnose - the problem before allowing the change??] - - Senders and Implementors do not see versions of a method in isolated - projects. [again, we might want to make this possible at a cost]. - When you ask for versions of a method, you will not get the history - in other isolated projects. - - Moving methods and classes between changeSets, and merging changeSets - has no effect on which methods are in force. But, when you look at a - changeSet from a different isolated project, the methods will contain - code that is not in force. A changeSet is just a list of method - names, and does not keep separate copies of any code. - - When finer grained assertion is needed, use the method (aProject - assertClass: aClass from: thisProject warn: warnConflicts). - - How isolated changes work: The first time a class changes, store its - MethodDictionary object. Keep parallel arrays of associations to - Classes and MethodDictionaries. Traverse these and install them when - you enter an "ioslated project". When you leave, store this - project's own MethodDictionaries there. - To do an assert, we must discover which methods changed here, - and which changed only in the project we are asserting into. There - is one copy of the 'virgin' method dictionaries in the system. It is - always being temporarily stored by the currently inForce isolated - project. - - isolatedHead - true for the top project, and for each isolated - project. false or nil for any subproject that shares all methods - with its parent project. - - inForce - true if my methods are installed now. false if I am - dormant. [is this equivalent to self == Project Current?] - - classArray - list of associations to classes - - methodDictArray - the method dictionaries of those classes before we - started changing methods. They hang onto the original - compiledMethods. (If this project is dormant, it contains the method - dictionaries of those classes as they will be here, in this project). - - orgArray - the class organizations of the classes in classArray. - - UsingIsolation (class variable) - No longer used. - - When you want to save a project in export format from within that - very project, it gets tricky. We set two flags in parentProject, - exit to it, and let parentProject write the project. - ProjectViewMorph in parentProject checks in its step method, does the - store, clears the flags, and reenters the subProject. - !

1 0

Re: SqueakSSL update
by Chris Cunnington 01 Aug '10

01 Aug '10

You're absolutely right. I took a fresh image and retried and it worked without asking for anything like I specified. Seemed to make sense at the time. Thanks for pointing that out. Chris

1 0

Jump to page: