The Trunk: Monticello-ul.406.mcz

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

The Trunk: Monticello-ul.406.mcz

commits-2
Levente Uzonyi uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-ul.406.mcz

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

Name: Monticello-ul.406
Author: ul
Time: 6 November 2010, 6:00:42.206 am
UUID: 6fc058be-ae06-b742-950b-7ddeed597ed5
Ancestors: Monticello-nice.405

- show the class side definition in MCPatchBrowser
- use ClassDiffBuilder in MCPatchBrowser for diffing classes

=============== Diff against Monticello-nice.405 ===============

Item was changed:
  ----- Method: MCClassDefinition>>definitionAndCommentString (in category 'printing') -----
  definitionAndCommentString
  ^ String streamContents: [:stream |
  self printDefinitionOn: stream.
  stream cr; cr.
+ self printClassSideDefinitionOn: stream.    
+ stream cr; cr.
  self printCommentOn: stream]!

Item was added:
+ ----- Method: MCClassDefinition>>printClassSideDefinitionOn: (in category 'printing') -----
+ printClassSideDefinitionOn: stream
+
+ stream
+ nextPutAll: self className;
+ nextPutAll: ' class ';
+ cr; tab;
+ nextPutAll: 'instanceVariableNames: ';
+ store: self classInstanceVariablesString!

Item was changed:
  ----- Method: MCPatchOperation>>sourceText (in category 'accessing') -----
  sourceText
+
+ ^(self isClassPatch
+ ifFalse: [ TextDiffBuilder ]
+ ifTrue: [ ClassDiffBuilder ])
+ buildDisplayPatchFrom: self fromSource
+ to: self toSource
+ inClass: self targetClass
+ prettyDiffs: (
+ Preferences diffsWithPrettyPrint and: [
+ self targetClass notNil and: [
+ self isClassPatch not ] ])!
- | builder |
- builder := (Preferences diffsWithPrettyPrint and: [ self targetClass notNil and: [ self isClassPatch not ] ])
- ifTrue:
- [PrettyTextDiffBuilder
- from: self fromSource
- to: self toSource
- inClass: self targetClass]
- ifFalse: [TextDiffBuilder from: self fromSource to: self toSource].
- ^builder buildDisplayPatch.!