UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 14 Nov 2013 15:42:14 +0000
branchjv
changeset 13676 b14ed2a36bae
parent 13675 36933883999a
child 13743 d789bfa8a626
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Tools__ChangeList.st
Tools__ChangeSetBrowser2.st
--- a/Tools__ChangeList.st	Wed Nov 13 21:29:44 2013 +0000
+++ b/Tools__ChangeList.st	Thu Nov 14 15:42:14 2013 +0000
@@ -29,7 +29,8 @@
 
 BrowserListWithFilter subclass:#ChangeList
 	instanceVariableNames:'listHolder showRemovedHolder showSameHolder showTimestampHolder
-                allowRemoveHolder allowAcceptHolder scrollToBottom applyAction showConflictsOnlyHolder'
+		allowRemoveHolder allowAcceptHolder scrollToBottom applyAction
+		showConflictsOnlyHolder'
 	classVariableNames:'LastSelectionConditionString'
 	poolDictionaries:''
 	category:'Interface-Browsers-ChangeSet'
@@ -815,10 +816,6 @@
 
 !ChangeList methodsFor:'event processing'!
 
-
-
-
-
 handlesKeyPress:key inView:aView
     <resource: #keyboard (#Accept #Ctrls)>
 
@@ -1308,10 +1305,17 @@
 changeSource
     "the changes source"
 
-    ^change changeSource
+    "/ Hack to make sure code is displayed in similar way
+    "/ (i.e., with no namespace pragma)
+    ^ (change isClassDefinitionChange and:[change isPrivateClassDefinitionChange]) ifTrue:[
+        change definitionStringInNamespace: nil.
+    ] ifFalse:[
+        change changeSource.
+    ].
 
     "Created: / 19-07-2011 / 12:03:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 25-07-2012 / 17:39:39 / cg"
+    "Modified: / 14-11-2013 / 14:55:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 children
--- a/Tools__ChangeSetBrowser2.st	Wed Nov 13 21:29:44 2013 +0000
+++ b/Tools__ChangeSetBrowser2.st	Thu Nov 14 15:42:14 2013 +0000
@@ -2493,9 +2493,17 @@
                         ifTrue:[SyntaxHighlighter codeAspectClassDefinition]   
                         ifFalse:[SyntaxHighlighter codeAspectExpression])]).
         self classHolder value: change changeClass.
-        changeSourceHolder setValue: change changeSource"; changed: #value".
         srcImage := change imageSource.
         srcChange := change changeSource.
+        "/ Hack to make sure code is displayed in similar way
+        "/ (i.e., with no namespace pragma)
+        (change isClassDefinitionChange and:[change isPrivateClassDefinitionChange]) ifTrue:[
+            srcChange := change definitionStringInNamespace: nil.
+        ].
+        srcImage := srcImage trimSeparators.
+        srcChange := srcChange trimSeparators.  
+
+        changeSourceHolder setValue: srcChange"; changed: #value".
         srcImage = srcChange ifTrue:[
             imageSourceHolder setValue: nil"; changed: #value".
         ] ifFalse:[
@@ -2531,6 +2539,7 @@
 
     "Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 27-07-2012 / 23:42:46 / cg"
+    "Modified: / 14-11-2013 / 15:01:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 showingRegularChangesetChanged