--- a/DiffTextView.st Thu Mar 07 11:10:05 2013 +0000
+++ b/DiffTextView.st Wed Mar 13 01:04:29 2013 +0000
@@ -100,6 +100,7 @@
"
! !
+
!DiffTextView class methodsFor:'instance creation'!
openOnClass:classA labelA:lblA andClass:classB labelB:lblB title:title ifSame:sameAction
@@ -160,6 +161,7 @@
^ v
! !
+
!DiffTextView class methodsFor:'defaults'!
diffCommand
@@ -176,6 +178,7 @@
DiffListUtility diffCommandTemplate:aCommandTemplateString
! !
+
!DiffTextView methodsFor:'accessing'!
text1:t1 text2:t2
@@ -226,6 +229,7 @@
"Modified: / 27-03-2007 / 12:06:46 / cg"
! !
+
!DiffTextView methodsFor:'initialization'!
addNextPreviousButtons
@@ -269,6 +273,7 @@
"Modified: 14.6.1996 / 16:14:39 / cg"
! !
+
!DiffTextView methodsFor:'private'!
diffListFor:text1 and:text2
@@ -420,10 +425,10 @@
useColors ifTrue:[
(l2 size >= idx1
and:[(s2 := line2 := l2 at:idx1) notNil
- and:[(s2 asString string withoutSeparators = (text1 at:idx1) string withoutSeparators)
+ and:[(line2 asString string withoutSeparators = (line1 := text1 at:idx1) asString string withoutSeparators)
"/ or:[(s2 asString withoutSeparators withTabsExpanded = (text1 at:idx1) withoutSeparators withTabsExpanded)]
]]) ifTrue:[
- line1 := Text string:(text1 at:idx1)
+ line1 := Text string:line1
foregroundColor:changedSpacesOnlyColor
backgroundColor:changedSpacesOnlyBgColor.
line2 := Text string:line2 asString
@@ -580,14 +585,15 @@
textView2 list:lists second.
! !
+
!DiffTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.57 2013-02-01 15:13:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.58 2013-03-11 11:51:45 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.57 2013-02-01 15:13:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.58 2013-03-11 11:51:45 cg Exp $'
!
version_HG