equal
deleted
inserted
replaced
61 - TextDiff2Tool examples |
61 - TextDiff2Tool examples |
62 - TextDiff3Tool examples |
62 - TextDiff3Tool examples |
63 " |
63 " |
64 ! ! |
64 ! ! |
65 |
65 |
66 |
|
67 !TextDiffTool class methodsFor:'image specs'! |
66 !TextDiffTool class methodsFor:'image specs'! |
68 |
67 |
69 versionA24x24 |
68 versionA24x24 |
70 |
69 |
71 ^ToolbarIconLibrary versionA24x24 |
70 ^ToolbarIconLibrary versionA24x24 |
92 ^ToolbarIconLibrary versionMerged24x24 |
91 ^ToolbarIconLibrary versionMerged24x24 |
93 |
92 |
94 "Created: / 17-03-2012 / 12:18:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
93 "Created: / 17-03-2012 / 12:18:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
95 ! ! |
94 ! ! |
96 |
95 |
97 |
|
98 !TextDiffTool class methodsFor:'interface specs'! |
96 !TextDiffTool class methodsFor:'interface specs'! |
99 |
|
100 |
|
101 |
|
102 |
|
103 |
|
104 |
|
105 |
|
106 |
|
107 |
|
108 |
|
109 |
97 |
110 windowSpec |
98 windowSpec |
111 "This resource specification was automatically generated |
99 "This resource specification was automatically generated |
112 by the UIPainter of ST/X." |
100 by the UIPainter of ST/X." |
113 |
101 |
192 ) |
180 ) |
193 |
181 |
194 ) |
182 ) |
195 ) |
183 ) |
196 ! ! |
184 ! ! |
197 |
|
198 |
185 |
199 !TextDiffTool class methodsFor:'interface specs - labels'! |
186 !TextDiffTool class methodsFor:'interface specs - labels'! |
200 |
187 |
201 versionALabelSpec |
188 versionALabelSpec |
202 "This resource specification was automatically generated |
189 "This resource specification was automatically generated |
300 ) |
287 ) |
301 |
288 |
302 "Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
289 "Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
303 ! |
290 ! |
304 |
291 |
305 |
|
306 |
|
307 versionCLabelSpec |
292 versionCLabelSpec |
308 "This resource specification was automatically generated |
293 "This resource specification was automatically generated |
309 by the UIPainter of ST/X." |
294 by the UIPainter of ST/X." |
310 |
295 |
311 "Do not manually edit this!! If it is corrupted, |
296 "Do not manually edit this!! If it is corrupted, |
355 ) |
340 ) |
356 |
341 |
357 "Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
342 "Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
358 ! ! |
343 ! ! |
359 |
344 |
360 |
|
361 !TextDiffTool class methodsFor:'plugIn spec'! |
345 !TextDiffTool class methodsFor:'plugIn spec'! |
362 |
346 |
363 aspectSelectors |
347 aspectSelectors |
364 |
348 |
365 ^#( |
349 ^#( |
378 ) |
362 ) |
379 |
363 |
380 "Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
364 "Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381 ! ! |
365 ! ! |
382 |
366 |
383 |
|
384 !TextDiffTool methodsFor:'accessing'! |
367 !TextDiffTool methodsFor:'accessing'! |
385 |
368 |
386 label: aString |
369 label: aString |
387 |
370 |
388 ^self labelHolder value: aString |
371 ^self labelHolder value: aString |
460 |
443 |
461 ^self label: aString |
444 ^self label: aString |
462 |
445 |
463 "Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
446 "Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
464 ! ! |
447 ! ! |
465 |
|
466 |
448 |
467 !TextDiffTool methodsFor:'aspects'! |
449 !TextDiffTool methodsFor:'aspects'! |
468 |
450 |
469 classHolder |
451 classHolder |
470 "return/create the 'classHolder' value holder (automatically generated)" |
452 "return/create the 'classHolder' value holder (automatically generated)" |
538 oldValue ~~ newValue ifTrue:[ |
520 oldValue ~~ newValue ifTrue:[ |
539 self update:#value with:newValue from:contentSpecHolder. |
521 self update:#value with:newValue from:contentSpecHolder. |
540 ]. |
522 ]. |
541 ! |
523 ! |
542 |
524 |
543 |
|
544 |
|
545 |
|
546 |
|
547 diffView |
525 diffView |
548 "/ diffView isNil ifTrue:[ |
526 "/ diffView isNil ifTrue:[ |
549 diffView := self initializeDiffView. |
527 diffView := self initializeDiffView. |
550 "/ ]. |
528 "/ ]. |
551 ^diffView |
529 ^diffView |
552 |
530 |
553 "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
531 "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
532 "Modified: / 02-03-2014 / 00:16:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
554 ! |
533 ! |
555 |
534 |
556 labelHolder |
535 labelHolder |
557 "return/create the 'labelAHolder' value holder (automatically generated)" |
536 "return/create the 'labelAHolder' value holder (automatically generated)" |
558 |
537 |
579 languageHolder := aValueHolder. |
558 languageHolder := aValueHolder. |
580 "codeView notNil ifTrue:[codeView languageHolder: aValueHolder]." |
559 "codeView notNil ifTrue:[codeView languageHolder: aValueHolder]." |
581 diffView notNil ifTrue:[diffView languageHolder: aValueHolder]. |
560 diffView notNil ifTrue:[diffView languageHolder: aValueHolder]. |
582 |
561 |
583 "Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
562 "Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
584 ! |
563 ! ! |
585 |
|
586 |
|
587 |
|
588 |
|
589 |
|
590 ! |
|
591 |
|
592 |
564 |
593 !TextDiffTool methodsFor:'aspects-versions'! |
565 !TextDiffTool methodsFor:'aspects-versions'! |
594 |
566 |
595 labelAHolder |
567 labelAHolder |
596 "return/create the 'labelAHolder' value holder (automatically generated)" |
568 "return/create the 'labelAHolder' value holder (automatically generated)" |
776 ]. |
748 ]. |
777 |
749 |
778 "Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
750 "Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
779 ! ! |
751 ! ! |
780 |
752 |
781 |
|
782 !TextDiffTool methodsFor:'change & update'! |
753 !TextDiffTool methodsFor:'change & update'! |
783 |
|
784 |
|
785 |
754 |
786 codeAspect:aSymbol |
755 codeAspect:aSymbol |
787 self codeAspectHolder value:aSymbol |
756 self codeAspectHolder value:aSymbol |
788 |
757 |
789 "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
758 "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
813 ^super update:something with:aParameter from:changedObject |
782 ^super update:something with:aParameter from:changedObject |
814 |
783 |
815 "Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
784 "Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
816 ! |
785 ! |
817 |
786 |
818 |
|
819 |
|
820 updateAfterAorBorCChanged |
787 updateAfterAorBorCChanged |
821 "Called whenever one of the texts changes" |
788 "Called whenever one of the texts changes" |
822 |
789 |
823 ^ self subclassResponsibility |
790 ^ self subclassResponsibility |
824 |
791 |
825 "Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
792 "Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
826 ! |
793 ! ! |
827 |
|
828 ! |
|
829 |
|
830 |
794 |
831 !TextDiffTool methodsFor:'hooks'! |
795 !TextDiffTool methodsFor:'hooks'! |
832 |
|
833 |
|
834 |
796 |
835 postBuildDiffView:aScrollableView |
797 postBuildDiffView:aScrollableView |
836 |
798 |
837 diffView := aScrollableView. |
799 diffView := aScrollableView. |
838 self setupCodeView: aScrollableView. |
800 self setupCodeView: aScrollableView. |
849 ]. |
811 ]. |
850 |
812 |
851 "Created: / 26-07-2012 / 19:13:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
813 "Created: / 26-07-2012 / 19:13:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
852 ! ! |
814 ! ! |
853 |
815 |
854 |
|
855 !TextDiffTool methodsFor:'initialization'! |
816 !TextDiffTool methodsFor:'initialization'! |
856 |
817 |
857 initialize |
818 initialize |
858 |
819 |
859 super initialize. |
820 super initialize. |
867 self subclassResponsibility |
828 self subclassResponsibility |
868 |
829 |
869 "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
830 "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
870 ! ! |
831 ! ! |
871 |
832 |
872 |
|
873 !TextDiffTool methodsFor:'private'! |
|
874 |
|
875 |
|
876 |
|
877 |
|
878 |
|
879 |
|
880 |
|
881 |
|
882 |
|
883 ! |
|
884 |
|
885 |
|
886 !TextDiffTool methodsFor:'testing'! |
833 !TextDiffTool methodsFor:'testing'! |
887 |
834 |
888 isDiff2 |
835 isDiff2 |
889 ^false |
836 ^false |
890 |
837 |
901 ^false |
848 ^false |
902 |
849 |
903 "Created: / 19-03-2012 / 11:53:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
850 "Created: / 19-03-2012 / 11:53:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
904 ! ! |
851 ! ! |
905 |
852 |
906 |
|
907 !TextDiffTool class methodsFor:'documentation'! |
853 !TextDiffTool class methodsFor:'documentation'! |
908 |
854 |
909 version |
855 version |
910 ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.9 2013-03-29 07:27:32 cg Exp $' |
856 ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.12 2014-03-02 00:17:39 vrany Exp $' |
911 ! |
857 ! |
912 |
858 |
913 version_CVS |
859 version_CVS |
914 ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.9 2013-03-29 07:27:32 cg Exp $' |
860 ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.12 2014-03-02 00:17:39 vrany Exp $' |
915 ! |
861 ! |
916 |
862 |
917 version_HG |
863 version_HG |
918 |
864 |
919 ^ '$Changeset: <not expanded> $' |
865 ^ '$Changeset: <not expanded> $' |
920 ! |
866 ! |
921 |
867 |
922 version_SVN |
868 version_SVN |
923 ^ '§Id§' |
869 ^ '$Id: Tools__TextDiffTool.st,v 1.12 2014-03-02 00:17:39 vrany Exp $' |
924 ! ! |
870 ! ! |
925 |
871 |