The Trunk: Morphic-eem.1189.mcz

Eliot Miranda uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-eem.1189.mcz

==================== Summary ====================

Name: Morphic-eem.1189
Author: eem
Time: 7 July 2016, 11:39:54.334537 am
UUID: 0aaf4adb-3407-4afb-b0c5-d8275daaa0db
Ancestors: Morphic-cmm.1188

Tiny cleanup.

=============== Diff against Morphic-cmm.1188 ===============

Item was changed:
  ----- Method: MorphicProject>>exportSegmentWithChangeSet:fileName:directory: (in category 'file in/out') -----
  exportSegmentWithChangeSet: aChangeSetOrNil fileName: aFileName
  directory: aDirectory
  "Store my project out on the disk as an *exported*
  ImageSegment.  All outPointers will be in a form that can be resolved
  in the target image.  Name it <project name>.extSeg.  Whatdo we do
  about subProjects, especially if they are out as local image
  segments?  Force them to come in?
  Player classes are included automatically."
 
  | is str ans revertSeg roots holder collector fd mgr stacks |
 
  "Files out a changeSet first, so that a project can contain
  its own classes"
+ world ifNil: [^ false].
+ world presenter ifNil: [^ false].
- world ifNil: [^ false].  world presenter ifNil: [^ false].
 
  ScrapBook default emptyScrapBook.
  world currentHand pasteBuffer: nil.  "don't write the paste buffer."
  world currentHand mouseOverHandler initialize.  "forget about any
  references here"
  "Display checkCurrentHandForObjectToPaste."
  Command initialize.
  world clearCommandHistory.
  world fullReleaseCachedState; releaseViewers.
  world cleanseStepList.
  world localFlapTabs size = world flapTabs size ifFalse: [
  self error: 'Still holding onto Global flaps'].
  world releaseSqueakPages.
  holder := Project allProjects. "force them in to outPointers, where
  DiskProxys are made"
 
  "Just export me, not my previous version"
  revertSeg := self parameterAt: #revertToMe.
  self removeParameter: #revertToMe.
 
  roots := OrderedCollection new.
+ roots add: self; add: world; add: transcript; add: aChangeSetOrNil; add: thumbnail; add: world activeHand.
- roots add: self; add: world; add: transcript; add: changeSet; add: thumbnail.
- roots add: world activeHand.
 
  "; addAll: classList; addAll: (classList collect: [:cls | cls class])"
 
  roots := roots reject: [ :x | x isNil]. "early saves may not have
  active hand or thumbnail"
 
+ fd := aDirectory directoryNamed: self resourceDirectoryName.
+ fd assureExistence.
+ "Clean up resource references before writing out"
+ mgr := self resourceManager.
+ self resourceManager: nil.
+ ResourceCollector current: ResourceCollector new.
+ ResourceCollector current localDirectory: fd.
+ ResourceCollector current baseUrl: self resourceUrl.
+ ResourceCollector current initializeFrom: mgr.
+ ProgressNotification signal: '2:findingResources' extra:
+ '(collecting resources...)' translated.
+ "Must activate old world because this is run at #armsLength.
+ Otherwise references to ActiveWorld, ActiveHand, or ActiveEvent
+ will not be captured correctly if referenced from blocks or user code."
+ world becomeActiveDuring:[
+ is := ImageSegment new copySmartRootsExport: roots asArray.
+ "old way was (is := ImageSegment new
+ copyFromRootsForExport: roots asArray)"
+ ].
+ self resourceManager: mgr.
+ collector := ResourceCollector current.
+ ResourceCollector current: nil.
+ ProgressNotification signal: '2:foundResources' extra: ''.
+ is state = #tooBig ifTrue: [
+ collector replaceAll.
+ ^ false].
- fd := aDirectory directoryNamed: self resourceDirectoryName.
- fd assureExistence.
- "Clean up resource references before writing out"
- mgr := self resourceManager.
- self resourceManager: nil.
- ResourceCollector current: ResourceCollector new.
- ResourceCollector current localDirectory: fd.
- ResourceCollector current baseUrl: self resourceUrl.
- ResourceCollector current initializeFrom: mgr.
- ProgressNotification signal: '2:findingResources' extra:
- '(collecting resources...)' translated.
- "Must activate old world because this is run at #armsLength.
- Otherwise references to ActiveWorld, ActiveHand, or ActiveEvent
- will not be captured correctly if referenced from blocks or user code."
- world becomeActiveDuring:[
- is := ImageSegment new copySmartRootsExport: roots asArray.
- "old way was (is := ImageSegment new
- copyFromRootsForExport: roots asArray)"
- ].
- self resourceManager: mgr.
- collector := ResourceCollector current.
- ResourceCollector current: nil.
- ProgressNotification signal: '2:foundResources' extra: ''.
- is state = #tooBig ifTrue: [
- collector replaceAll.
- ^ false].
 
  str := ''.
  "considered legal to save a project that has never been entered"
  (is outPointers includes: world) ifTrue: [
  str := str, '\Project''s own world is not in the segment.' translated withCRs].
  str isEmpty ifFalse: [
  ans := UIManager default chooseFrom: {
  'Do not write file' translated.
  'Write file anyway' translated.
  'Debug' translated.
  } title: str.
  ans = 1 ifTrue: [
  revertSeg ifNotNil: [projectParameters at:
  #revertToMe put: revertSeg].
  collector replaceAll.
  ^ false].
  ans = 3 ifTrue: [
  collector replaceAll.
  self halt: 'Segment not written' translated]].
  stacks := is findStacks.
 
  is
  writeForExportWithSources: aFileName
  inDirectory: fd
  changeSet: aChangeSetOrNil.
  SecurityManager default signFile: aFileName directory: fd.
  "Compress all files and update check sums"
  collector forgetObsolete.
  self storeResourceList: collector in: fd.
  self storeHtmlPageIn: fd.
  self storeManifestFileIn: fd.
  self writeStackText: stacks in: fd registerIn: collector.
  "local proj.005.myStack.t"
  self compressFilesIn: fd to: aFileName in: aDirectory
  resources: collector.
  "also deletes the resource directory"
  "Now update everything that we know about"
  mgr updateResourcesFrom: collector.
 
  revertSeg ifNotNil: [projectParameters at: #revertToMe put: revertSeg].
  holder.
 
  collector replaceAll.
 
  world flapTabs do: [:ft |
  (ft respondsTo: #unhibernate) ifTrue: [ft unhibernate]].
  is arrayOfRoots do: [:obj |
  obj isScriptEditorMorph ifTrue: [obj unhibernate]].
  ^ true
  !