The Trunk: Monticello-bf.500.mcz

Bert Freudenberg uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-bf.500.mcz

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

Name: Monticello-bf.500
Author: bf
Time: 11 April 2012, 11:17:21.633 am
UUID: 42a95a6c-2492-4e00-8ec8-04c68282a9a9
Ancestors: Monticello-eem.499

Fix 2 DNUs with MCOrganizationDefinitions

=============== Diff against Monticello-eem.499 ===============

Item was changed:
  ----- Method: MCOrganizationDefinition>>reorderCategories:original: (in category 'actions') -----
  reorderCategories: allCategories original: oldCategories
+ | first locallyAddedCategories |
- | first |
  first := allCategories detect: [:ea | categories includes: ea]
  ifNone: [^ allCategories, categories].
+ locallyAddedCategories := (oldCategories copyWithoutAll: categories) select: [:cat |
+ (SystemOrganization listAtCategoryNamed: cat) notEmpty].
  ^ ((allCategories copyUpTo: first) copyWithoutAll: oldCategories, categories),
  categories,
+ locallyAddedCategories,
  ((allCategories copyAfter: first) copyWithoutAll: oldCategories, categories)
  !

Item was changed:
  ----- Method: MCOrganizationDefinition>>unload (in category 'actions') -----
  unload
+ | empty |
+ empty := categories select: [:ea |
+ (SystemOrganization listAtCategoryNamed: ea) isEmpty].
  SystemOrganization categories:
+ (SystemOrganization categories copyWithoutAll: empty)!
- (SystemOrganization categories copyWithoutAll: categories)!