equal
deleted
inserted
replaced
414 "Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414 "Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
415 ! |
415 ! |
416 |
416 |
417 doMergeUsingA |
417 doMergeUsingA |
418 |
418 |
419 self mergeData mergeUsingA |
419 self mergeData mergeUsingA: self textA |
420 |
420 |
421 "Created: / 17-03-2012 / 12:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
421 "Created: / 17-03-2012 / 12:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
422 ! |
422 ! |
423 |
423 |
424 doMergeUsingB |
424 doMergeUsingB |
425 |
425 |
426 self mergeData mergeUsingB |
426 self mergeData mergeUsingB: self textB |
427 |
427 |
428 "Created: / 17-03-2012 / 12:55:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
428 "Created: / 17-03-2012 / 12:55:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
429 ! |
429 ! |
430 |
430 |
431 doMergeUsingBase |
431 doMergeUsingBase |
432 |
432 |
433 self mergeData mergeUsingBase |
433 self mergeData mergeUsingBase: self textC |
434 |
434 |
435 "Created: / 17-03-2012 / 12:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
435 "Created: / 17-03-2012 / 12:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
436 ! ! |
436 ! ! |
437 |
437 |
438 !TextDiff3Tool methodsFor:'aspects'! |
438 !TextDiff3Tool methodsFor:'aspects'! |
800 view == gutterView ifFalse:[ ^ self ]. |
800 view == gutterView ifFalse:[ ^ self ]. |
801 info := self infoAtLine: lineNo. |
801 info := self infoAtLine: lineNo. |
802 info isNil ifTrue:[ ^self ]. |
802 info isNil ifTrue:[ ^self ]. |
803 |
803 |
804 view fillRectangleX:x y:y - h |
804 view fillRectangleX:x y:y - h |
805 width:6 height:h + textView lineSpacing + 3"Magic constant to make it look nicer" |
805 width:6 height:h + textView lineSpacing + 5"Magic constant to make it look nicer" |
806 color: info color. |
806 color: info color. |
807 |
807 |
808 "Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
808 "Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
809 ! ! |
809 ! ! |
810 |
810 |
835 ! ! |
835 ! ! |
836 |
836 |
837 !TextDiff3Tool class methodsFor:'documentation'! |
837 !TextDiff3Tool class methodsFor:'documentation'! |
838 |
838 |
839 version_SVN |
839 version_SVN |
840 ^ '$Id: Tools__TextDiff3Tool.st 7948 2012-03-21 01:52:35Z vranyj1 $' |
840 ^ '$Id: Tools__TextDiff3Tool.st 7950 2012-03-21 12:48:24Z vranyj1 $' |
841 ! ! |
841 ! ! |