equal
deleted
inserted
replaced
383 file := entry first. |
383 file := entry first. |
384 |
384 |
385 fn1 := self directory1Holder value asFilename construct:file. |
385 fn1 := self directory1Holder value asFilename construct:file. |
386 fn2 := self directory2Holder value asFilename construct:file. |
386 fn2 := self directory2Holder value asFilename construct:file. |
387 fn1 exists ifTrue:[ |
387 fn1 exists ifTrue:[ |
388 text1 := fn1 contentsOfEntireFile. |
388 text1 := fn1 contentsAsString. |
389 ]. |
389 ]. |
390 fn2 exists ifTrue:[ |
390 fn2 exists ifTrue:[ |
391 text2 := fn2 contentsOfEntireFile. |
391 text2 := fn2 contentsAsString. |
392 ]. |
392 ]. |
393 differ := builder componentAt:'DiffTextView'. |
393 differ := builder componentAt:'DiffTextView'. |
394 differ text1:(text1 ? '') text2:(text2 ? ''). |
394 differ text1:(text1 ? '') text2:(text2 ? ''). |
395 |
395 |
396 "Created: / 12-01-2012 / 03:21:52 / cg" |
396 "Created: / 12-01-2012 / 03:21:52 / cg" |
538 ! ! |
538 ! ! |
539 |
539 |
540 !DirectoryDifferenceViewApplication class methodsFor:'documentation'! |
540 !DirectoryDifferenceViewApplication class methodsFor:'documentation'! |
541 |
541 |
542 version |
542 version |
543 ^ '$Header: /cvs/stx/stx/libtool/DirectoryDifferenceViewApplication.st,v 1.6 2014-02-05 18:57:07 cg Exp $' |
543 ^ '$Header: /cvs/stx/stx/libtool/DirectoryDifferenceViewApplication.st,v 1.7 2014-06-14 09:30:58 cg Exp $' |
544 ! |
544 ! |
545 |
545 |
546 version_CVS |
546 version_CVS |
547 ^ '$Header: /cvs/stx/stx/libtool/DirectoryDifferenceViewApplication.st,v 1.6 2014-02-05 18:57:07 cg Exp $' |
547 ^ '$Header: /cvs/stx/stx/libtool/DirectoryDifferenceViewApplication.st,v 1.7 2014-06-14 09:30:58 cg Exp $' |
548 ! ! |
548 ! ! |
549 |
549 |