class: Tools::TextDiff3Tool
authorClaus Gittinger <cg@exept.de>
Tue, 30 Jun 2015 08:21:08 +0200
changeset 15722 34b4f50c2083
parent 15721 eb434c1f91f4
child 15723 901522438802
class: Tools::TextDiff3Tool changed: #postBuildDiffView: #updateViews
Tools__TextDiff3Tool.st
--- a/Tools__TextDiff3Tool.st	Tue Jun 30 08:18:39 2015 +0200
+++ b/Tools__TextDiff3Tool.st	Tue Jun 30 08:21:08 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -726,9 +728,9 @@
 
     diffView notNil ifTrue:[
         diffView
-            text1: self textCHolder value
-            text2: self textAHolder value
-            text3: self textBHolder value.
+            text1: self textC
+            text2: self textA
+            text3: self textB.
     ]
 
     "Created: / 16-03-2012 / 13:24:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -743,15 +745,20 @@
 !
 
 postBuildDiffView:aScrollableView
+    |textA textB textC|
 
     super postBuildDiffView:aScrollableView.
+
     diffView := aScrollableView scrolledView.
     diffView notNil ifTrue:[
-       (self textAHolder value notNil and:[self textBHolder value notNil and:[self textCHolder value notNil]]) ifTrue:[
+        textA := self textA.
+        textB := self textB.
+        textC := self textC.
+        (textA notNil and:[textB notNil and:[textC notNil]]) ifTrue:[
             diffView scrolledView
-                text1: self textCHolder value
-                text2: self textAHolder value
-                text3: self textBHolder value
+                text1: textC
+                text2: textA
+                text3: textB
 
         ].
         self updateCodeViewSynchronization.
@@ -1196,11 +1203,11 @@
 !TextDiff3Tool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiff3Tool.st,v 1.2 2014-02-25 10:43:10 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiff3Tool.st,v 1.2 2014-02-25 10:43:10 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
@@ -1209,6 +1216,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__TextDiff3Tool.st,v 1.2 2014-02-25 10:43:10 vrany Exp $'
+    ^ '$Id$'
 ! !