Use new TextDiff2Tool for comparing two methods jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 14 Jul 2016 10:22:10 +0100
branchjv
changeset 16733 4a33c1b47bc3
parent 16731 31c8c2a31669
child 16734 8b6e7ef9a974
Use new TextDiff2Tool for comparing two methods ...instead of (old) DiffCodeView. The former uses pure smalltalk diff implementation and this is undependent of tools installed on target machine (and known to NOT work with diff.exe shipped with SVN)
Tools__NewSystemBrowser.st
Tools__TextDiff2Tool.st
--- a/Tools__NewSystemBrowser.st	Thu Jul 14 06:48:50 2016 +0200
+++ b/Tools__NewSystemBrowser.st	Thu Jul 14 10:22:10 2016 +0100
@@ -45911,7 +45911,7 @@
     m1Class := m1 mclass.
     m2Class := m2 mclass.
 
-    v := DiffCodeView
+    v := TextDiff2Tool
             openOn:source1
             label:(m1Class name , ' ' , (m1 printStringForBrowserWithSelector:m1 selector inClass:m1Class))
             and:source2
@@ -45919,6 +45919,8 @@
     v label:label.
     v waitUntilVisible.
     ^ self
+
+    "Modified: / 14-07-2016 / 10:05:25 / jv"
 !
 
 doCompareMethodsWithRepository:methods usingManager: manager
--- a/Tools__TextDiff2Tool.st	Thu Jul 14 06:48:50 2016 +0200
+++ b/Tools__TextDiff2Tool.st	Thu Jul 14 10:22:10 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -90,9 +88,11 @@
     app := self new.
     app labelA: labelA; textA: textA.
     app labelB: labelB; textB: textB.
-    app open
+    app open.
+    ^ app window
 
     "Created: / 16-03-2012 / 13:15:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 14-07-2016 / 10:06:46 / jv"
 ! !
 
 !TextDiff2Tool class methodsFor:'interface specs'!