Nicolas Cellier uploaded a new version of Graphics to project The Trunk:
http://source.squeak.org/trunk/Graphics-nice.87.mcz
==================== Summary ====================
Name: Graphics-nice.87
Author: nice
Time: 1 November 2009, 8:47:55 am
UUID: d4ecc98b-609a-4d0f-8fe1-8503c85b258d
Ancestors: Graphics-nice.86
Rectangle storeOn: needs parenthesis
=============== Diff against Graphics-nice.86 ===============
Item was changed:
----- Method: Rectangle>>storeOn: (in category 'printing') -----
storeOn: aStream
"printed form is good for storing too"
+
+ aStream nextPut: $(.
+ self printOn: aStream.
+ aStream nextPut: $).!
- self printOn: aStream!
David T. Lewis uploaded a new version of SMBase to project The Trunk:
http://source.squeak.org/trunk/SMBase-dtl.92.mcz
==================== Summary ====================
Name: SMBase-dtl.92
Author: dtl
Time: 1 November 2009, 12:52:35 pm
UUID: 0d33d7d8-5c7a-44d7-a795-3d9d13cf9974
Ancestors: SMBase-nice.91
Fix spelling error in error message
=============== Diff against SMBase-nice.91 ===============
Item was changed:
----- Method: SMFileCache>>getStream: (in category 'private') -----
getStream: aDownloadable
"Get the stream, either from the original url
or if that fails, from the server cache - unless
this is the actual server of course. :)
We also verify that the sha1sum is correct."
| stream |
[stream := aDownloadable downloadUrl asUrl retrieveContents contentStream binary.
(aDownloadable correctSha1sum: stream contents)
+ ifFalse: [self error: 'Incorrect SHA checksum of file from original URL']]
- ifFalse: [self error: 'Incorrect SHA checksum of file from orginal URL']]
on: Exception do: [:ex |
Transcript show: 'Download from original url (', aDownloadable downloadUrl, ') failed with this exception: ', ex messageText;cr.
SMUtilities isServer
ifTrue: [^nil]
ifFalse: [
Transcript show: 'Trying server cache instead.'; cr.
[stream := (self cacheUrlFor: aDownloadable) asUrl retrieveContents contentStream binary.
(stream contents size = 21 and: [stream contents asString = 'SMFILEMISSINGONSERVER'])
ifTrue: [self error: 'File missing in server cache'].
(stream contents size = 24 and: [stream contents asString = 'SMRELEASENOTDOWNLOADABLE'])
ifTrue: [self error: 'Release not downloadable'].
(aDownloadable correctSha1sum: stream contents)
ifFalse: [self error: 'Incorrect SHA checksum of file from server']]
on: Exception do: [:ex2 | | msg |
msg := 'Download from server cache of ', aDownloadable printName, ' failed with this exception: ', ex2 messageText.
Transcript show: msg; cr.
self error: msg]]].
^ stream!
David T. Lewis uploaded a new version of SMBase to project The Trunk:
http://source.squeak.org/trunk/SMBase-dtl.92.mcz
==================== Summary ====================
Name: SMBase-dtl.92
Author: dtl
Time: 1 November 2009, 12:52:35 pm
UUID: 0d33d7d8-5c7a-44d7-a795-3d9d13cf9974
Ancestors: SMBase-nice.91
Fix spelling error in error message
=============== Diff against SMBase-nice.91 ===============
Item was changed:
----- Method: SMFileCache>>getStream: (in category 'private') -----
getStream: aDownloadable
"Get the stream, either from the original url
or if that fails, from the server cache - unless
this is the actual server of course. :)
We also verify that the sha1sum is correct."
| stream |
[stream := aDownloadable downloadUrl asUrl retrieveContents contentStream binary.
(aDownloadable correctSha1sum: stream contents)
+ ifFalse: [self error: 'Incorrect SHA checksum of file from original URL']]
- ifFalse: [self error: 'Incorrect SHA checksum of file from orginal URL']]
on: Exception do: [:ex |
Transcript show: 'Download from original url (', aDownloadable downloadUrl, ') failed with this exception: ', ex messageText;cr.
SMUtilities isServer
ifTrue: [^nil]
ifFalse: [
Transcript show: 'Trying server cache instead.'; cr.
[stream := (self cacheUrlFor: aDownloadable) asUrl retrieveContents contentStream binary.
(stream contents size = 21 and: [stream contents asString = 'SMFILEMISSINGONSERVER'])
ifTrue: [self error: 'File missing in server cache'].
(stream contents size = 24 and: [stream contents asString = 'SMRELEASENOTDOWNLOADABLE'])
ifTrue: [self error: 'Release not downloadable'].
(aDownloadable correctSha1sum: stream contents)
ifFalse: [self error: 'Incorrect SHA checksum of file from server']]
on: Exception do: [:ex2 | | msg |
msg := 'Download from server cache of ', aDownloadable printName, ' failed with this exception: ', ex2 messageText.
Transcript show: msg; cr.
self error: msg]]].
^ stream!
David T. Lewis uploaded a new version of SMBase to project The Trunk:
http://source.squeak.org/trunk/SMBase-dtl.92.mcz
==================== Summary ====================
Name: SMBase-dtl.92
Author: dtl
Time: 1 November 2009, 12:52:35 pm
UUID: 0d33d7d8-5c7a-44d7-a795-3d9d13cf9974
Ancestors: SMBase-nice.91
Fix spelling error in error message
=============== Diff against SMBase-nice.91 ===============
Item was changed:
----- Method: SMFileCache>>getStream: (in category 'private') -----
getStream: aDownloadable
"Get the stream, either from the original url
or if that fails, from the server cache - unless
this is the actual server of course. :)
We also verify that the sha1sum is correct."
| stream |
[stream := aDownloadable downloadUrl asUrl retrieveContents contentStream binary.
(aDownloadable correctSha1sum: stream contents)
+ ifFalse: [self error: 'Incorrect SHA checksum of file from original URL']]
- ifFalse: [self error: 'Incorrect SHA checksum of file from orginal URL']]
on: Exception do: [:ex |
Transcript show: 'Download from original url (', aDownloadable downloadUrl, ') failed with this exception: ', ex messageText;cr.
SMUtilities isServer
ifTrue: [^nil]
ifFalse: [
Transcript show: 'Trying server cache instead.'; cr.
[stream := (self cacheUrlFor: aDownloadable) asUrl retrieveContents contentStream binary.
(stream contents size = 21 and: [stream contents asString = 'SMFILEMISSINGONSERVER'])
ifTrue: [self error: 'File missing in server cache'].
(stream contents size = 24 and: [stream contents asString = 'SMRELEASENOTDOWNLOADABLE'])
ifTrue: [self error: 'Release not downloadable'].
(aDownloadable correctSha1sum: stream contents)
ifFalse: [self error: 'Incorrect SHA checksum of file from server']]
on: Exception do: [:ex2 | | msg |
msg := 'Download from server cache of ', aDownloadable printName, ' failed with this exception: ', ex2 messageText.
Transcript show: msg; cr.
self error: msg]]].
^ stream!
David T. Lewis uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-dtl.62.mcz
==================== Summary ====================
Name: ST80-dtl.62
Author: dtl
Time: 31 October 2009, 10:43:54 am
UUID: 580d55e7-ffc5-48ff-9294-eb73be6d861b
Ancestors: ST80-dtl.61
Fix ScreenController>>openMenu which had menu separator lines in the wrong position, and which opened a Morphic project in response to "open... ->mvc project". This change restores the original menu structure, except that "open... ->morphic project" and "open... ->morphic world" are now displayed only if Morphic is present in the image, as per presumed intent of the prior change to #openMenu.
Open concerns: The "open... -> keep this menu up" option, restored to the menu by this change, and "open... ->mvc project" options, which now attempts to open an mvc (not morphic) project, are both badly broken and will cause image freeze. The "open... ->file list" and "open... ->morphic world" selections (not related to this menu change) are also broken, probably for the same reason.
=============== Diff against ST80-dtl.61 ===============
Item was added:
+ ----- Method: ScreenController>>openMenuWithMorphicOptions (in category 'nested menus') -----
+ openMenuWithMorphicOptions
+ "Include 'morphic world' and 'morphic project' selections"
+ ^ SelectionMenu labelList:
+ #( 'keep this menu up'
+
+ 'browser'
+ 'package browser'
+ 'method finder'
+ 'workspace'
+ 'file list'
+ 'file...'
+ 'transcript'
+ 'morphic world'
+
+ 'simple change sorter'
+ 'dual change sorter'
+
+ 'mvc project'
+ 'morphic project'
+ )
+ lines: #(1 9 11)
+ selections: #(durableOpenMenu
+ openBrowser openPackageBrowser openSelectorBrowser openWorkspace openFileList openFile openTranscript openMorphicWorld
+ openSimpleChangeSorter openChangeManager
+ openProject openMorphicProject )
+ "
+ ScreenController new openMenuWithMorphicOptions startUp
+ "!
Item was changed:
----- Method: ScreenController>>openMenu (in category 'nested menus') -----
openMenu
+ "Smalltalk hasMorphic ifTrue: [^self openMenuWithMorphicOptions]."
^ SelectionMenu labelList:
+ #( 'keep this menu up'
- #(
'browser'
'package browser'
'method finder'
'workspace'
'file list'
'file...'
'transcript'
- 'morphic world'
'simple change sorter'
'dual change sorter'
+ 'new project'
- 'mvc project'
)
+ lines: #(1 8 10)
+ selections: #(durableOpenMenu
- lines: #(1 9 11)
- selections: #(
openBrowser openPackageBrowser openSelectorBrowser openWorkspace openFileList openFile openTranscript
openSimpleChangeSorter openChangeManager
+ openProject )
- openProject openMorphicProject )
"
ScreenController new openMenu startUp
"!
David T. Lewis uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-dtl.62.mcz
==================== Summary ====================
Name: ST80-dtl.62
Author: dtl
Time: 31 October 2009, 10:43:54 am
UUID: 580d55e7-ffc5-48ff-9294-eb73be6d861b
Ancestors: ST80-dtl.61
Fix ScreenController>>openMenu which had menu separator lines in the wrong position, and which opened a Morphic project in response to "open... ->mvc project". This change restores the original menu structure, except that "open... ->morphic project" and "open... ->morphic world" are now displayed only if Morphic is present in the image, as per presumed intent of the prior change to #openMenu.
Open concerns: The "open... -> keep this menu up" option, restored to the menu by this change, and "open... ->mvc project" options, which now attempts to open an mvc (not morphic) project, are both badly broken and will cause image freeze. The "open... ->file list" and "open... ->morphic world" selections (not related to this menu change) are also broken, probably for the same reason.
=============== Diff against ST80-dtl.61 ===============
Item was added:
+ ----- Method: ScreenController>>openMenuWithMorphicOptions (in category 'nested menus') -----
+ openMenuWithMorphicOptions
+ "Include 'morphic world' and 'morphic project' selections"
+ ^ SelectionMenu labelList:
+ #( 'keep this menu up'
+
+ 'browser'
+ 'package browser'
+ 'method finder'
+ 'workspace'
+ 'file list'
+ 'file...'
+ 'transcript'
+ 'morphic world'
+
+ 'simple change sorter'
+ 'dual change sorter'
+
+ 'mvc project'
+ 'morphic project'
+ )
+ lines: #(1 9 11)
+ selections: #(durableOpenMenu
+ openBrowser openPackageBrowser openSelectorBrowser openWorkspace openFileList openFile openTranscript openMorphicWorld
+ openSimpleChangeSorter openChangeManager
+ openProject openMorphicProject )
+ "
+ ScreenController new openMenuWithMorphicOptions startUp
+ "!
Item was changed:
----- Method: ScreenController>>openMenu (in category 'nested menus') -----
openMenu
+ "Smalltalk hasMorphic ifTrue: [^self openMenuWithMorphicOptions]."
^ SelectionMenu labelList:
+ #( 'keep this menu up'
- #(
'browser'
'package browser'
'method finder'
'workspace'
'file list'
'file...'
'transcript'
- 'morphic world'
'simple change sorter'
'dual change sorter'
+ 'new project'
- 'mvc project'
)
+ lines: #(1 8 10)
+ selections: #(durableOpenMenu
- lines: #(1 9 11)
- selections: #(
openBrowser openPackageBrowser openSelectorBrowser openWorkspace openFileList openFile openTranscript
openSimpleChangeSorter openChangeManager
+ openProject )
- openProject openMorphicProject )
"
ScreenController new openMenu startUp
"!
David T. Lewis uploaded a new version of ST80 to project The Trunk:
http://source.squeak.org/trunk/ST80-dtl.62.mcz
==================== Summary ====================
Name: ST80-dtl.62
Author: dtl
Time: 31 October 2009, 10:43:54 am
UUID: 580d55e7-ffc5-48ff-9294-eb73be6d861b
Ancestors: ST80-dtl.61
Fix ScreenController>>openMenu which had menu separator lines in the wrong position, and which opened a Morphic project in response to "open... ->mvc project". This change restores the original menu structure, except that "open... ->morphic project" and "open... ->morphic world" are now displayed only if Morphic is present in the image, as per presumed intent of the prior change to #openMenu.
Open concerns: The "open... -> keep this menu up" option, restored to the menu by this change, and "open... ->mvc project" options, which now attempts to open an mvc (not morphic) project, are both badly broken and will cause image freeze. The "open... ->file list" and "open... ->morphic world" selections (not related to this menu change) are also broken, probably for the same reason.
=============== Diff against ST80-dtl.61 ===============
Item was added:
+ ----- Method: ScreenController>>openMenuWithMorphicOptions (in category 'nested menus') -----
+ openMenuWithMorphicOptions
+ "Include 'morphic world' and 'morphic project' selections"
+ ^ SelectionMenu labelList:
+ #( 'keep this menu up'
+
+ 'browser'
+ 'package browser'
+ 'method finder'
+ 'workspace'
+ 'file list'
+ 'file...'
+ 'transcript'
+ 'morphic world'
+
+ 'simple change sorter'
+ 'dual change sorter'
+
+ 'mvc project'
+ 'morphic project'
+ )
+ lines: #(1 9 11)
+ selections: #(durableOpenMenu
+ openBrowser openPackageBrowser openSelectorBrowser openWorkspace openFileList openFile openTranscript openMorphicWorld
+ openSimpleChangeSorter openChangeManager
+ openProject openMorphicProject )
+ "
+ ScreenController new openMenuWithMorphicOptions startUp
+ "!
Item was changed:
----- Method: ScreenController>>openMenu (in category 'nested menus') -----
openMenu
+ "Smalltalk hasMorphic ifTrue: [^self openMenuWithMorphicOptions]."
^ SelectionMenu labelList:
+ #( 'keep this menu up'
- #(
'browser'
'package browser'
'method finder'
'workspace'
'file list'
'file...'
'transcript'
- 'morphic world'
'simple change sorter'
'dual change sorter'
+ 'new project'
- 'mvc project'
)
+ lines: #(1 8 10)
+ selections: #(durableOpenMenu
- lines: #(1 9 11)
- selections: #(
openBrowser openPackageBrowser openSelectorBrowser openWorkspace openFileList openFile openTranscript
openSimpleChangeSorter openChangeManager
+ openProject )
- openProject openMorphicProject )
"
ScreenController new openMenu startUp
"!