[Pkg] The Trunk: Monticello-ar.344.mcz

[commits at source.squeak.org]

Andreas Raab uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-ar.344.mcz

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

Name: Monticello-ar.344
Author: ar
Time: 29 December 2009, 8:31:54 am
UUID: 7050f3c7-9c03-4845-a6c4-0bb634449ff9
Ancestors: Monticello-ar.343

Fixes a bug preventing Monticello to load a class definition with traits removed over one containing traits.

=============== Diff against Monticello-ar.343 ===============

Item was changed:
  ----- Method: MCClassDefinition>>createClass (in category 'installing') -----
  createClass
  	| superClass class |
  	superClass := Smalltalk at: superclassName.
  	class := (ClassBuilder new)
  			name: name 
  			inEnvironment: superClass environment 
  			subclassOf: superClass
  			type: type 
  			instanceVariableNames: self instanceVariablesString 
  			classVariableNames: self classVariablesString 
  			poolDictionaries: self sharedPoolsString
  			category: category.
+ 
+ 	class setTraitComposition: (Compiler
+ 		evaluate: (self traitComposition ifNil:['{}'])) asTraitComposition.
+ 
+ 	class class setTraitComposition: (Compiler
+ 		evaluate: (self classTraitComposition ifNil:['{}'])) asTraitComposition.
+ 
+ 	^class
- 	self traitComposition ifNotNil: [
- 		class setTraitComposition: (Compiler
- 			evaluate: self traitComposition) asTraitComposition ].
- 	self classTraitComposition ifNotNil: [
- 		class class setTraitComposition: (Compiler
- 			evaluate: self classTraitComposition) asTraitComposition ].
- 	^class.
  !