[Pkg] Monticello Public: Monticello.impl-mtf.590.mcz

[squeak-dev-noreply at lists.squeakfoundation.org]

A new version of Monticello.impl was added to project Monticello Public:
http://www.squeaksource.com/mc/Monticello.impl-mtf.590.mcz

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

Name: Monticello.impl-mtf.590
Author: mtf
Time: 24 October 2008, 10:57:12 pm
UUID: 19ccf505-e54b-45b3-9713-8c83aca99fdc
Ancestors: Monticello.impl-mtf.589, Monticello.impl-kph.587

merged matthew's and keith's branches

=============== Diff against Monticello.impl-mtf.589 ===============

Item was changed:
  ----- Method: MCOrganizationDefinition>>commonPrefix (in category 'as yet unclassified') -----
  commonPrefix
  	| stream |
  	categories isEmpty ifTrue: [^ ''].
  	
  	stream := String new writeStream.
+ 	categories first keysAndValuesDo:
+ 		[:i :c |
- 	categories first withIndexDo:
- 		[:c :i|
  		categories do:
  			[:ea |
  			(ea at: i ifAbsent: []) = c ifFalse: [^ stream contents]].
  		stream nextPut: c].
  	^ stream contents!

Item was changed:
  ----- Method: MCClassDefinition>>= (in category 'visiting') -----
  = aDefinition
+ 	super = aDefinition ifFalse: [ ^ false ].
+ 	superclassName = aDefinition superclassName ifFalse: [ ^ false ].
+ 	self traitCompositionString = aDefinition traitCompositionString ifFalse: [ ^ false ].
+ 	self classTraitCompositionString = aDefinition classTraitCompositionString ifFalse: [ ^ false ].
+ 	category = aDefinition category ifFalse: [ ^ false ].
+ 	type = aDefinition type ifFalse: [ ^false ].
+ 	(variables = aDefinition variables
+ 			or: [self sortedVariables = aDefinition sortedVariables]) ifFalse: [ ^false ].
+ 	comment = aDefinition comment ifFalse: [ ^ false ].
+ 	
+ 	^ true
- 	^((super = aDefinition)
- 		and: [superclassName = aDefinition superclassName]
- 		and: [self traitCompositionString = aDefinition traitCompositionString]
- 		and: [self classTraitCompositionString = aDefinition classTraitCompositionString])
- 		and: [category = aDefinition category]
- 		and: [type = aDefinition type]
- 		and: [variables = aDefinition variables
- 			or: [self sortedVariables = aDefinition sortedVariables]]
- 		and: [comment = aDefinition comment]
  		!

Item was changed:
  ----- Method: MCTraitDefinition>>= (in category 'visiting') -----
  = aDefinition
  	self flag: #traits. "Ugly we harcoded the super superclass method.  We will have to refactor the definition hierarchy"
  	
+ 	(self isRevisionOf: aDefinition) ifFalse: [ ^ false ].
+ 	self traitCompositionString = aDefinition traitCompositionString  ifFalse: [ ^ false ].
+ 	category = aDefinition category ifFalse: [ ^ false ].
+ 	comment = aDefinition comment ifFalse: [ ^ false ].
+ 	
+ 	^ true!
- 	^ (self isRevisionOf: aDefinition)
- 		and: [self traitCompositionString = aDefinition traitCompositionString]
- 		and: [category = aDefinition category]
- 		and: [comment = aDefinition comment]!

Item was changed:
  ----- Method: MCMethodDefinition>>isPartOfPackage:or: (in category 'testing') -----
  isPartOfPackage: aPackageInfo or: orphanage
  
  	| myOrphanedClassDefiniton |
  	 
  	(aPackageInfo isYourClassExtension: self category) ifTrue: [ ^ true ].
  	
+ 	myOrphanedClassDefiniton := orphanage orphans
+ 				detect: [ :c | c isClassDefinition and: [ c className = self className ] ] ifNone: [ ^ false ].
- 	myOrphanedClassDefiniton := orphanage orphanClasses 
- 				detect: [ :c | c className = self className ] ifNone: [ ^ false ].
  	
  	^ aPackageInfo includesSystemCategory: myOrphanedClassDefiniton category
  	
  	!

Item was changed:
  ----- Method: MCMethodDefinition>>= (in category 'comparing') -----
  = aDefinition
+ 	super = aDefinition ifFalse: [ ^ false ].
+ 	aDefinition source = self source ifFalse: [ ^ false ].
+ 	aDefinition category = self category ifFalse: [ ^ false ].
+ 	aDefinition timeStamp = self timeStamp ifFalse: [ ^ false ].
+ 	
+ 	^ true!
- 	^(super = aDefinition)
- 		and: [aDefinition source = self source]
- 		and: [aDefinition category = self category]
- 		and: [aDefinition timeStamp = self timeStamp]!

Item was changed:
  ----- Method: MCOrphanage>>orphanClasses (in category 'accessing') -----
  orphanClasses
  
+ 	^ self orphans asOrderedCollection select: [ :o | o isClassDefinition ].
+ 	
+  !
- 	^ self orphans select: [ :o | o isClassDefinition ].!