The Trunk: EToys-fbs.113.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: EToys-fbs.113.mcz

commits-2
Frank Shearar uploaded a new version of EToys to project The Trunk:
http://source.squeak.org/trunk/EToys-fbs.113.mcz

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

Name: EToys-fbs.113
Author: fbs
Time: 29 November 2013, 8:28:12.521 am
UUID: facaa4cf-13f4-ac4e-87cc-fc064735a534
Ancestors: EToys-fbs.112

In order to break the Graphics -> System dependency a bit more, change FontSubstitution to MissingFont to indicate what when wrong, not when it went wrong, and move the notification to Graphics.

=============== Diff against EToys-fbs.112 ===============

Item was changed:
  ----- Method: ProjectLoading class>>fileInName:archive:morphOrList: (in category '*etoys') -----
  fileInName: aFileName archive: archive morphOrList: morphOrList  
  | baseChangeSet substituteFont numberOfFontSubstitutes exceptions anObject mgr |
  ResourceCollector current: ResourceCollector new.
  baseChangeSet := ChangeSet current.
  self useTempChangeSet. "named zzTemp"
  "The actual reading happens here"
  substituteFont := Preferences standardEToysFont copy.
  numberOfFontSubstitutes := 0.
  exceptions := Set new.
  [[anObject := morphOrList fileInObjectAndCodeForProject]
+ on: MissingFont do: [ :ex |
- on: FontSubstitutionDuringLoading do: [ :ex |
  exceptions add: ex.
  numberOfFontSubstitutes := numberOfFontSubstitutes + 1.
  ex resume: substituteFont ]]
  ensure: [ ChangeSet  newChanges: baseChangeSet].
  mgr := ResourceManager new initializeFrom: ResourceCollector current.
  mgr fixJISX0208Resource.
  mgr registerUnloadedResources.
  archive ifNotNil:[mgr preLoadFromArchive: archive cacheName: aFileName].
  ResourceCollector current: nil.
  ^ {anObject. numberOfFontSubstitutes. substituteFont. mgr}!