equal
deleted
inserted
replaced
100 |
100 |
101 "Do not manually edit this!! If it is corrupted, |
101 "Do not manually edit this!! If it is corrupted, |
102 the UIPainter may not be able to read the specification." |
102 the UIPainter may not be able to read the specification." |
103 |
103 |
104 " |
104 " |
105 UIPainter new openOnClass:Tools::TextDiffTool andSelector:#diffSpec |
105 UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#diffSpec |
106 Tools::TextDiffTool new openInterface:#diffSpec |
106 Tools::TextDiff2Tool new openInterface:#diffSpec |
107 " |
107 " |
108 |
108 |
109 <resource: #canvas> |
109 <resource: #canvas> |
110 |
110 |
111 ^ |
111 ^ |
146 layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
146 layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
147 hasHorizontalScrollBar: false |
147 hasHorizontalScrollBar: false |
148 hasVerticalScrollBar: false |
148 hasVerticalScrollBar: false |
149 autoHideScrollBars: false |
149 autoHideScrollBars: false |
150 hasBorder: false |
150 hasBorder: false |
151 component: #'Tools::Diff2CodeView2' |
151 component: diffView |
152 postBuildCallback: postBuildDiffView: |
152 postBuildCallback: postBuildDiffView: |
153 ) |
153 ) |
154 ) |
154 ) |
155 |
155 |
156 ) |
156 ) |
157 ) |
157 ) |
158 |
|
159 "Modified: / 16-03-2012 / 13:16:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
160 ! |
158 ! |
161 |
159 |
162 nothingSpec |
160 nothingSpec |
163 "This resource specification was automatically generated |
161 "This resource specification was automatically generated |
164 by the UIPainter of ST/X." |
162 by the UIPainter of ST/X." |
534 ]. |
532 ]. |
535 |
533 |
536 "Created: / 16-03-2012 / 13:30:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
534 "Created: / 16-03-2012 / 13:30:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
537 ! ! |
535 ! ! |
538 |
536 |
|
537 !TextDiff2Tool methodsFor:'initialization'! |
|
538 |
|
539 initializeDiffView |
|
540 "superclass Tools::TextDiffTool says that I am responsible to implement this method" |
|
541 |
|
542 ^ Tools::Diff3CodeView2 new |
|
543 |
|
544 "Modified: / 16-01-2013 / 09:52:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
545 ! ! |
|
546 |
539 !TextDiff2Tool methodsFor:'private'! |
547 !TextDiff2Tool methodsFor:'private'! |
540 |
548 |
541 showDiff |
549 showDiff |
542 |scrolledView| |
550 |scrolledView| |
543 |
551 |
591 ! ! |
599 ! ! |
592 |
600 |
593 !TextDiff2Tool class methodsFor:'documentation'! |
601 !TextDiff2Tool class methodsFor:'documentation'! |
594 |
602 |
595 version |
603 version |
596 ^ '$Id: Tools__TextDiff2Tool.st 7981 2012-04-18 20:29:40Z vranyj1 $' |
604 ^ '$Id: Tools__TextDiff2Tool.st 8087 2013-01-16 11:53:38Z vranyj1 $' |
597 ! |
605 ! |
598 |
606 |
599 version_CVS |
607 version_CVS |
600 ^ '§Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.6 2011/11/18 14:05:39 cg Exp §' |
608 ^ '§Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.6 2011/11/18 14:05:39 cg Exp §' |
601 ! |
609 ! |
602 |
610 |
603 version_SVN |
611 version_SVN |
604 ^ '$Id: Tools__TextDiff2Tool.st 7981 2012-04-18 20:29:40Z vranyj1 $' |
612 ^ '$Id: Tools__TextDiff2Tool.st 8087 2013-01-16 11:53:38Z vranyj1 $' |
605 ! ! |
613 ! ! |