author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 30 Jan 2013 11:15:09 +0000 | |
branch | jv |
changeset 12401 | 4714b9640528 |
parent 12318 | 1dda95be3d40 |
parent 11703 | 100f3c5ed545 |
child 12406 | 1fbd331e4489 |
permissions | -rw-r--r-- |
10196 | 1 |
" |
2 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
3 |
All Rights Reserved |
|
4 |
||
5 |
This software is furnished under a license and may be used |
|
6 |
only in accordance with the terms of that license and with the |
|
7 |
inclusion of the above copyright notice. This software may not |
|
8 |
be provided or otherwise made available to, or used by, any |
|
9 |
other person. No title to or ownership of the software is |
|
10 |
hereby transferred. |
|
11 |
" |
|
10332 | 12 |
"{ Package: 'stx:libtool' }" |
10196 | 13 |
|
14 |
"{ NameSpace: Tools }" |
|
15 |
||
16 |
ApplicationModel subclass:#TextDiffTool |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
17 |
instanceVariableNames:'labelHolder labelAHolder textAHolder labelBHolder textBHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
18 |
labelCHolder textCHolder languageHolder codeAspectHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
19 |
textAChanged textBChanged textCChanged contentSpecHolder diffView |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
20 |
classHolder' |
10196 | 21 |
classVariableNames:'' |
22 |
poolDictionaries:'' |
|
23 |
category:'Interface-Diff' |
|
24 |
! |
|
25 |
||
26 |
!TextDiffTool class methodsFor:'documentation'! |
|
27 |
||
28 |
copyright |
|
29 |
" |
|
30 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
31 |
All Rights Reserved |
|
32 |
||
33 |
This software is furnished under a license and may be used |
|
34 |
only in accordance with the terms of that license and with the |
|
35 |
inclusion of the above copyright notice. This software may not |
|
36 |
be provided or otherwise made available to, or used by, any |
|
37 |
other person. No title to or ownership of the software is |
|
38 |
hereby transferred. |
|
39 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
40 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
41 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
42 |
documentation |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
43 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
44 |
documentation to be added. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
45 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
46 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
47 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
48 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
49 |
[instance variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
50 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
51 |
[class variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
52 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
53 |
[see also:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
54 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
55 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
56 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
57 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
58 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
59 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
60 |
See |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
61 |
- TextDiff2Tool examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
62 |
- TextDiff3Tool examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
63 |
" |
10196 | 64 |
! ! |
65 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
66 |
|
10196 | 67 |
!TextDiffTool class methodsFor:'image specs'! |
68 |
||
69 |
versionA24x24 |
|
70 |
||
71 |
^ToolbarIconLibrary versionA24x24 |
|
72 |
||
73 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
74 |
! |
|
75 |
||
76 |
versionB24x24 |
|
77 |
||
78 |
^ToolbarIconLibrary versionB24x24 |
|
79 |
||
80 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
81 |
! |
|
82 |
||
83 |
versionBase24x24 |
|
84 |
||
85 |
^ToolbarIconLibrary versionBase24x24 |
|
86 |
||
87 |
"Created: / 24-03-2010 / 20:50:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
88 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
89 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
90 |
versionMerged24x24 |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
91 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
92 |
^ToolbarIconLibrary versionMerged24x24 |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
93 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
94 |
"Created: / 17-03-2012 / 12:18:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 95 |
! ! |
96 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
97 |
|
10196 | 98 |
!TextDiffTool class methodsFor:'interface specs'! |
99 |
||
100 |
||
101 |
||
102 |
||
10344 | 103 |
|
10332 | 104 |
|
105 |
||
106 |
||
107 |
||
108 |
||
109 |
||
10196 | 110 |
windowSpec |
111 |
"This resource specification was automatically generated |
|
112 |
by the UIPainter of ST/X." |
|
113 |
||
114 |
"Do not manually edit this!! If it is corrupted, |
|
115 |
the UIPainter may not be able to read the specification." |
|
116 |
||
117 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
118 |
UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
119 |
Tools::TextDiff2Tool new openInterface:#windowSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
120 |
Tools::TextDiff2Tool open |
10196 | 121 |
" |
122 |
||
123 |
<resource: #canvas> |
|
124 |
||
125 |
^ |
|
126 |
#(FullSpec |
|
127 |
name: windowSpec |
|
128 |
window: |
|
129 |
(WindowSpec |
|
130 |
label: 'Text Diff Tool' |
|
131 |
name: 'Text Diff Tool' |
|
10654 | 132 |
labelChannel: titleHolder |
10196 | 133 |
min: (Point 10 10) |
134 |
bounds: (Rectangle 0 0 640 480) |
|
135 |
) |
|
136 |
component: |
|
137 |
(SpecCollection |
|
138 |
collection: ( |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
139 |
(LabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
140 |
label: 'Label' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
141 |
name: 'Label1' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
142 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
143 |
translateLabel: true |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
144 |
labelChannel: labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
145 |
) |
10196 | 146 |
(UISubSpecification |
147 |
name: 'Contents' |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
148 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
10196 | 149 |
minorKey: windowSpecForEmbedding |
150 |
) |
|
151 |
) |
|
152 |
||
153 |
) |
|
154 |
) |
|
155 |
! |
|
156 |
||
157 |
windowSpecForEmbedding |
|
158 |
"This resource specification was automatically generated |
|
159 |
by the UIPainter of ST/X." |
|
160 |
||
161 |
"Do not manually edit this!! If it is corrupted, |
|
162 |
the UIPainter may not be able to read the specification." |
|
163 |
||
164 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
165 |
UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpecForEmbedding |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
166 |
Tools::TextDiff2Tool new openInterface:#windowSpecForEmbedding |
10196 | 167 |
" |
168 |
||
169 |
<resource: #canvas> |
|
170 |
||
171 |
^ |
|
172 |
#(FullSpec |
|
173 |
name: windowSpecForEmbedding |
|
174 |
window: |
|
175 |
(WindowSpec |
|
176 |
label: 'Text Diff Tool (for embedding)' |
|
177 |
name: 'Text Diff Tool (for embedding)' |
|
178 |
min: (Point 10 10) |
|
179 |
bounds: (Rectangle 0 0 782 506) |
|
180 |
) |
|
181 |
component: |
|
182 |
(SpecCollection |
|
183 |
collection: ( |
|
184 |
(SubCanvasSpec |
|
185 |
name: 'Contents' |
|
186 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
187 |
hasHorizontalScrollBar: false |
|
188 |
hasVerticalScrollBar: false |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
189 |
specHolder: contentSpecHolder |
10196 | 190 |
createNewBuilder: false |
191 |
) |
|
192 |
) |
|
193 |
||
194 |
) |
|
195 |
) |
|
196 |
! ! |
|
197 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
198 |
|
10196 | 199 |
!TextDiffTool class methodsFor:'interface specs - labels'! |
200 |
||
201 |
versionALabelSpec |
|
202 |
"This resource specification was automatically generated |
|
203 |
by the UIPainter of ST/X." |
|
204 |
||
205 |
"Do not manually edit this!! If it is corrupted, |
|
206 |
the UIPainter may not be able to read the specification." |
|
207 |
||
208 |
" |
|
209 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionALabelSpec |
|
210 |
SVN::DiffViewApp new openInterface:#versionALabelSpec |
|
211 |
" |
|
212 |
||
213 |
<resource: #canvas> |
|
214 |
||
215 |
^ |
|
216 |
#(FullSpec |
|
217 |
name: versionALabelSpec |
|
218 |
window: |
|
219 |
(WindowSpec |
|
220 |
label: 'Version A' |
|
221 |
name: 'Version A' |
|
222 |
min: (Point 10 10) |
|
223 |
bounds: (Rectangle 0 0 300 30) |
|
224 |
) |
|
225 |
component: |
|
226 |
(SpecCollection |
|
227 |
collection: ( |
|
228 |
(LabelSpec |
|
229 |
label: 'versionA24x24' |
|
230 |
name: 'VersionAIcon' |
|
231 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
232 |
hasCharacterOrientedLabel: false |
|
233 |
translateLabel: true |
|
234 |
) |
|
235 |
(LabelSpec |
|
236 |
label: 'Version A' |
|
237 |
name: 'VersionALabel' |
|
238 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
239 |
translateLabel: true |
|
240 |
labelChannel: labelAHolder |
|
241 |
resizeForLabel: true |
|
242 |
adjust: left |
|
243 |
) |
|
244 |
) |
|
245 |
||
246 |
) |
|
247 |
) |
|
248 |
||
249 |
"Modified: / 30-06-2011 / 20:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
250 |
! |
|
251 |
||
252 |
versionBLabelSpec |
|
253 |
"This resource specification was automatically generated |
|
254 |
by the UIPainter of ST/X." |
|
255 |
||
256 |
"Do not manually edit this!! If it is corrupted, |
|
257 |
the UIPainter may not be able to read the specification." |
|
258 |
||
259 |
" |
|
260 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBLabelSpec |
|
261 |
SVN::DiffViewApp new openInterface:#versionBLabelSpec |
|
262 |
" |
|
263 |
||
264 |
<resource: #canvas> |
|
265 |
||
266 |
^ |
|
267 |
#(FullSpec |
|
268 |
name: versionBLabelSpec |
|
269 |
window: |
|
270 |
(WindowSpec |
|
271 |
label: 'Version B' |
|
272 |
name: 'Version B' |
|
273 |
min: (Point 10 10) |
|
274 |
bounds: (Rectangle 0 0 300 30) |
|
275 |
) |
|
276 |
component: |
|
277 |
(SpecCollection |
|
278 |
collection: ( |
|
279 |
(LabelSpec |
|
280 |
label: 'versionB24x24' |
|
281 |
name: 'VersionBIcon' |
|
282 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
283 |
hasCharacterOrientedLabel: false |
|
284 |
translateLabel: true |
|
285 |
) |
|
286 |
(LabelSpec |
|
287 |
label: 'Version B' |
|
288 |
name: 'VersionBLabel' |
|
289 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
290 |
translateLabel: true |
|
291 |
labelChannel: labelBHolder |
|
292 |
resizeForLabel: true |
|
293 |
adjust: left |
|
294 |
useDynamicPreferredWidth: true |
|
295 |
usePreferredWidth: true |
|
296 |
) |
|
297 |
) |
|
298 |
||
299 |
) |
|
300 |
) |
|
301 |
||
302 |
"Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
303 |
! |
|
304 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
305 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
306 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
307 |
versionCLabelSpec |
10196 | 308 |
"This resource specification was automatically generated |
309 |
by the UIPainter of ST/X." |
|
310 |
||
311 |
"Do not manually edit this!! If it is corrupted, |
|
312 |
the UIPainter may not be able to read the specification." |
|
313 |
||
314 |
" |
|
315 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBaseLabelSpec |
|
316 |
SVN::DiffViewApp new openInterface:#versionBaseLabelSpec |
|
317 |
" |
|
318 |
||
319 |
<resource: #canvas> |
|
320 |
||
321 |
^ |
|
322 |
#(FullSpec |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
323 |
name: versionCLabelSpec |
10196 | 324 |
window: |
325 |
(WindowSpec |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
326 |
label: 'Version C' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
327 |
name: 'Version C' |
10196 | 328 |
min: (Point 10 10) |
329 |
bounds: (Rectangle 0 0 300 30) |
|
330 |
) |
|
331 |
component: |
|
332 |
(SpecCollection |
|
333 |
collection: ( |
|
334 |
(LabelSpec |
|
335 |
label: 'versionBase24x24' |
|
336 |
name: 'VersionBaseIcon' |
|
337 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
338 |
hasCharacterOrientedLabel: false |
|
339 |
translateLabel: true |
|
340 |
) |
|
341 |
(LabelSpec |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
342 |
label: 'Version C' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
343 |
name: 'VersionCLabel' |
10196 | 344 |
layout: (LayoutFrame 30 0 5 0 191 0 0 1) |
345 |
translateLabel: true |
|
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12180
diff
changeset
|
346 |
labelChannel: labelCHolder |
10196 | 347 |
resizeForLabel: true |
348 |
adjust: left |
|
349 |
useDynamicPreferredWidth: true |
|
350 |
usePreferredWidth: true |
|
351 |
) |
|
352 |
) |
|
353 |
||
354 |
) |
|
355 |
) |
|
356 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
357 |
"Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 358 |
! ! |
359 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
360 |
|
10196 | 361 |
!TextDiffTool class methodsFor:'plugIn spec'! |
362 |
||
363 |
aspectSelectors |
|
364 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
365 |
^#( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
366 |
#labelHolder |
10196 | 367 |
|
368 |
#labelAHolder |
|
369 |
#labelBHolder |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
370 |
#labelCHolder |
10196 | 371 |
|
372 |
#textAHolder |
|
373 |
#textBHolder |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
374 |
#textCHolder |
10196 | 375 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
376 |
#languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
377 |
#codeAspectHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
378 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
379 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
380 |
"Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10654 | 381 |
! ! |
382 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
383 |
|
10654 | 384 |
!TextDiffTool methodsFor:'accessing'! |
385 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
386 |
label: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
387 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
388 |
^self labelHolder value: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
389 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
390 |
"Created: / 16-03-2012 / 13:07:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
391 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
392 |
|
10654 | 393 |
labelA: aString |
394 |
^self labelAHolder value: aString |
|
395 |
||
396 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
397 |
"Created: / 30-08-2011 / 09:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 398 |
"Modified (format): / 27-07-2012 / 21:57:10 / cg" |
10654 | 399 |
! |
400 |
||
401 |
labelB: aString |
|
402 |
^self labelBHolder value: aString |
|
403 |
||
404 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
405 |
"Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 406 |
"Modified (format): / 27-07-2012 / 21:57:15 / cg" |
10654 | 407 |
! |
408 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
409 |
labelC: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
410 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
411 |
^self labelCHolder value: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
412 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
413 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
414 |
"Created: / 16-03-2012 / 13:05:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
415 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
416 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
417 |
textA |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
418 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
419 |
^self textAHolder value |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
420 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
421 |
"Created: / 19-03-2012 / 12:24:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
422 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
423 |
|
10654 | 424 |
textA: aString |
425 |
^self textAHolder value: aString |
|
426 |
||
427 |
"Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 428 |
"Modified (format): / 27-07-2012 / 21:57:37 / cg" |
10654 | 429 |
! |
430 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
431 |
textB |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
432 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
433 |
^self textBHolder value |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
434 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
435 |
"Created: / 19-03-2012 / 12:24:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
436 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
437 |
|
10654 | 438 |
textB: aString |
439 |
^self textBHolder value: aString |
|
440 |
||
441 |
"Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 442 |
"Modified (format): / 27-07-2012 / 21:57:41 / cg" |
10654 | 443 |
! |
444 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
445 |
textC |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
446 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
447 |
^self textCHolder value |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
448 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
449 |
"Created: / 19-03-2012 / 12:24:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
450 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
451 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
452 |
textC: aString |
10654 | 453 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
454 |
^self textCHolder value: aString |
12125 | 455 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
456 |
"Created: / 16-03-2012 / 13:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12209
44647f143fd0
Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
457 |
! |
10654 | 458 |
|
12209
44647f143fd0
Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
459 |
title: aString |
44647f143fd0
Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
460 |
<resource: #obsolete> |
44647f143fd0
Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
461 |
|
44647f143fd0
Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
462 |
^self label: aString |
44647f143fd0
Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
463 |
|
10654 | 464 |
"Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 465 |
! ! |
466 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
467 |
|
10196 | 468 |
!TextDiffTool methodsFor:'aspects'! |
469 |
||
10332 | 470 |
classHolder |
471 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
472 |
||
473 |
classHolder isNil ifTrue:[ |
|
474 |
classHolder := ValueHolder new. |
|
475 |
]. |
|
476 |
^ classHolder |
|
477 |
! |
|
478 |
||
479 |
classHolder: aValueHolder |
|
480 |
classHolder := aValueHolder. |
|
12180 | 481 |
"codeView notNil ifTrue:[codeView classHolder: aValueHolder]." |
10332 | 482 |
diffView notNil ifTrue:[diffView classHolder: aValueHolder]. |
483 |
||
484 |
"Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 485 |
"Modified (format): / 27-07-2012 / 21:57:00 / cg" |
10332 | 486 |
! |
487 |
||
10344 | 488 |
codeAspectHolder |
489 |
"return/create the 'codeAspectHolder' value holder (automatically generated)" |
|
490 |
||
491 |
codeAspectHolder isNil ifTrue:[ |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
492 |
codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression). |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
493 |
codeAspectHolder addDependent:self |
10344 | 494 |
]. |
495 |
^ codeAspectHolder |
|
496 |
||
497 |
"Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
498 |
"Modified: / 27-07-2012 / 23:46:11 / cg" |
10344 | 499 |
! |
500 |
||
501 |
codeAspectHolder:something |
|
502 |
"set the 'codeAspectHolder' value holder (automatically generated)" |
|
503 |
||
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
504 |
codeAspectHolder notNil ifTrue:[ |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
505 |
codeAspectHolder removeDependent:self |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
506 |
]. |
10344 | 507 |
codeAspectHolder := something. |
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
508 |
codeAspectHolder notNil ifTrue:[ |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
509 |
codeAspectHolder addDependent:self |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
510 |
]. |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
511 |
|
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
512 |
"Modified: / 27-07-2012 / 22:55:42 / cg" |
10344 | 513 |
! |
514 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
515 |
contentSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
516 |
"return/create the 'contentSpecHolder' value holder (automatically generated)" |
10196 | 517 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
518 |
contentSpecHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
519 |
contentSpecHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
520 |
contentSpecHolder addDependent:self. |
10196 | 521 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
522 |
^ contentSpecHolder |
10196 | 523 |
! |
524 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
525 |
contentSpecHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
526 |
"set the 'contentSpecHolder' value holder (automatically generated)" |
10196 | 527 |
|
528 |
|oldValue newValue| |
|
529 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
530 |
contentSpecHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
531 |
oldValue := contentSpecHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
532 |
contentSpecHolder removeDependent:self. |
10196 | 533 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
534 |
contentSpecHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
535 |
contentSpecHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
536 |
contentSpecHolder addDependent:self. |
10196 | 537 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
538 |
newValue := contentSpecHolder value. |
10196 | 539 |
oldValue ~~ newValue ifTrue:[ |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
540 |
self update:#value with:newValue from:contentSpecHolder. |
10196 | 541 |
]. |
542 |
! |
|
543 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
544 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
545 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
546 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
547 |
|
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
548 |
diffView |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
549 |
"/ diffView isNil ifTrue:[ |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
550 |
diffView := self initializeDiffView. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
551 |
"/ ]. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
552 |
^diffView |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
553 |
|
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
554 |
"Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
555 |
! |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
556 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
557 |
labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
558 |
"return/create the 'labelAHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
559 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
560 |
labelHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
561 |
labelHolder := ValueHolder with:'Text diff'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
562 |
"/titleHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
563 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
564 |
^ labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
565 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
566 |
"Created: / 16-03-2012 / 13:06:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
567 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
568 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
569 |
languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
570 |
"return/create the 'languageHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
571 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
572 |
languageHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
573 |
languageHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
574 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
575 |
^ languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
576 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
577 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
578 |
languageHolder:aValueHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
579 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
580 |
languageHolder := aValueHolder. |
12180 | 581 |
"codeView notNil ifTrue:[codeView languageHolder: aValueHolder]." |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
582 |
diffView notNil ifTrue:[diffView languageHolder: aValueHolder]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
583 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
584 |
"Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
585 |
! |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
586 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
587 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
588 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
589 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
590 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
591 |
! |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
592 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
593 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
594 |
!TextDiffTool methodsFor:'aspects-versions'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
595 |
|
10196 | 596 |
labelAHolder |
597 |
"return/create the 'labelAHolder' value holder (automatically generated)" |
|
598 |
||
599 |
labelAHolder isNil ifTrue:[ |
|
10332 | 600 |
labelAHolder := ValueHolder with:'Version A'. |
10196 | 601 |
labelAHolder addDependent:self. |
602 |
]. |
|
603 |
^ labelAHolder |
|
10332 | 604 |
|
605 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 606 |
! |
607 |
||
608 |
labelAHolder:something |
|
609 |
"set the 'labelAHolder' value holder (automatically generated)" |
|
610 |
||
611 |
|oldValue newValue| |
|
612 |
||
613 |
labelAHolder notNil ifTrue:[ |
|
614 |
oldValue := labelAHolder value. |
|
615 |
labelAHolder removeDependent:self. |
|
616 |
]. |
|
617 |
labelAHolder := something. |
|
618 |
labelAHolder notNil ifTrue:[ |
|
619 |
labelAHolder addDependent:self. |
|
620 |
]. |
|
621 |
newValue := labelAHolder value. |
|
622 |
oldValue ~~ newValue ifTrue:[ |
|
623 |
self update:#value with:newValue from:labelAHolder. |
|
624 |
]. |
|
625 |
! |
|
626 |
||
627 |
labelBHolder |
|
628 |
"return/create the 'labelBHolder' value holder (automatically generated)" |
|
629 |
||
630 |
labelBHolder isNil ifTrue:[ |
|
10332 | 631 |
labelBHolder := ValueHolder with:'Version B'. |
10196 | 632 |
labelBHolder addDependent:self. |
633 |
]. |
|
634 |
^ labelBHolder |
|
10332 | 635 |
|
636 |
"Modified: / 19-07-2011 / 11:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 637 |
! |
638 |
||
639 |
labelBHolder:something |
|
640 |
"set the 'labelBHolder' value holder (automatically generated)" |
|
641 |
||
642 |
|oldValue newValue| |
|
643 |
||
644 |
labelBHolder notNil ifTrue:[ |
|
645 |
oldValue := labelBHolder value. |
|
646 |
labelBHolder removeDependent:self. |
|
647 |
]. |
|
648 |
labelBHolder := something. |
|
649 |
labelBHolder notNil ifTrue:[ |
|
650 |
labelBHolder addDependent:self. |
|
651 |
]. |
|
652 |
newValue := labelBHolder value. |
|
653 |
oldValue ~~ newValue ifTrue:[ |
|
654 |
self update:#value with:newValue from:labelBHolder. |
|
655 |
]. |
|
656 |
! |
|
657 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
658 |
labelCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
659 |
"return/create the 'labelBHolder' value holder (automatically generated)" |
10332 | 660 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
661 |
labelCHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
662 |
labelCHolder := ValueHolder with:'Version Base'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
663 |
labelCHolder addDependent:self. |
10332 | 664 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
665 |
^ labelCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
666 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
667 |
"Created: / 16-03-2012 / 12:14:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 668 |
! |
669 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
670 |
labelCHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
671 |
"set the 'labelBHolder' value holder (automatically generated)" |
10196 | 672 |
|
673 |
|oldValue newValue| |
|
674 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
675 |
labelCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
676 |
oldValue := labelCHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
677 |
labelCHolder removeDependent:self. |
10196 | 678 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
679 |
labelCHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
680 |
labelCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
681 |
labelCHolder addDependent:self. |
10196 | 682 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
683 |
newValue := labelCHolder value. |
10196 | 684 |
oldValue ~~ newValue ifTrue:[ |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
685 |
self update:#value with:newValue from:labelCHolder. |
10196 | 686 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
687 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
688 |
"Created: / 16-03-2012 / 12:15:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 689 |
! |
690 |
||
691 |
textAHolder |
|
692 |
"return/create the 'textAHolder' value holder (automatically generated)" |
|
693 |
||
694 |
textAHolder isNil ifTrue:[ |
|
695 |
textAHolder := ValueHolder new. |
|
696 |
textAHolder addDependent:self. |
|
697 |
]. |
|
698 |
^ textAHolder |
|
699 |
! |
|
700 |
||
701 |
textAHolder:something |
|
702 |
"set the 'textAHolder' value holder (automatically generated)" |
|
703 |
||
704 |
|oldValue newValue| |
|
705 |
||
706 |
textAHolder notNil ifTrue:[ |
|
707 |
oldValue := textAHolder value. |
|
708 |
textAHolder removeDependent:self. |
|
709 |
]. |
|
710 |
textAHolder := something. |
|
711 |
textAHolder notNil ifTrue:[ |
|
712 |
textAHolder addDependent:self. |
|
713 |
]. |
|
714 |
newValue := textAHolder value. |
|
715 |
oldValue ~~ newValue ifTrue:[ |
|
716 |
self update:#value with:newValue from:textAHolder. |
|
717 |
]. |
|
718 |
! |
|
719 |
||
720 |
textBHolder |
|
721 |
"return/create the 'textBHolder' value holder (automatically generated)" |
|
722 |
||
723 |
textBHolder isNil ifTrue:[ |
|
724 |
textBHolder := ValueHolder new. |
|
725 |
textBHolder addDependent:self. |
|
726 |
]. |
|
727 |
^ textBHolder |
|
728 |
! |
|
729 |
||
730 |
textBHolder:something |
|
731 |
"set the 'textBHolder' value holder (automatically generated)" |
|
732 |
||
733 |
|oldValue newValue| |
|
734 |
||
735 |
textBHolder notNil ifTrue:[ |
|
736 |
oldValue := textBHolder value. |
|
737 |
textBHolder removeDependent:self. |
|
738 |
]. |
|
739 |
textBHolder := something. |
|
740 |
textBHolder notNil ifTrue:[ |
|
741 |
textBHolder addDependent:self. |
|
742 |
]. |
|
743 |
newValue := textBHolder value. |
|
744 |
oldValue ~~ newValue ifTrue:[ |
|
745 |
self update:#value with:newValue from:textBHolder. |
|
746 |
]. |
|
10654 | 747 |
! |
748 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
749 |
textCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
750 |
"return/create the 'textBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
751 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
752 |
textCHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
753 |
textCHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
754 |
textCHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
755 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
756 |
^ textCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
757 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
758 |
"Created: / 16-03-2012 / 12:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
759 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
760 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
761 |
textCHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
762 |
"set the 'textBHolder' value holder (automatically generated)" |
12125 | 763 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
764 |
|oldValue newValue| |
10654 | 765 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
766 |
textCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
767 |
oldValue := textCHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
768 |
textCHolder removeDependent:self. |
12125 | 769 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
770 |
textCHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
771 |
textCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
772 |
textCHolder addDependent:self. |
10654 | 773 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
774 |
newValue := textCHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
775 |
oldValue ~~ newValue ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
776 |
self update:#value with:newValue from:textCHolder. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
777 |
]. |
10654 | 778 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
779 |
"Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 780 |
! ! |
781 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
782 |
|
10196 | 783 |
!TextDiffTool methodsFor:'change & update'! |
784 |
||
10344 | 785 |
codeAspect |
786 |
^self codeAspectHolder value |
|
787 |
||
788 |
"Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 789 |
"Modified (format): / 27-07-2012 / 21:56:52 / cg" |
790 |
! |
|
791 |
||
792 |
codeAspect:aSymbol |
|
793 |
self codeAspectHolder value:aSymbol |
|
794 |
||
795 |
"Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
796 |
"Created: / 27-07-2012 / 21:56:48 / cg" |
|
10344 | 797 |
! |
798 |
||
10196 | 799 |
update:something with:aParameter from:changedObject |
800 |
"Invoked when an object that I depend upon sends a change notification." |
|
801 |
||
802 |
||
10344 | 803 |
changedObject == textAHolder ifTrue:[ |
804 |
textAChanged := true. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
805 |
self updateAfterAorBorCChanged. |
10332 | 806 |
^ self. |
807 |
]. |
|
10344 | 808 |
changedObject == textBHolder ifTrue:[ |
809 |
textBChanged := true. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
810 |
self updateAfterAorBorCChanged. |
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
811 |
^ self. |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
812 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
813 |
changedObject == textCHolder ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
814 |
textCChanged := true. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
815 |
self updateAfterAorBorCChanged. |
10344 | 816 |
^ self. |
817 |
]. |
|
10196 | 818 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
819 |
^super update:something with:aParameter from:changedObject |
10196 | 820 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
821 |
"Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 822 |
! |
823 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
824 |
|
10332 | 825 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
826 |
updateAfterAorBorCChanged |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
827 |
"Called whenever one of the texts changes" |
10332 | 828 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
829 |
^ self subclassResponsibility |
10332 | 830 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
831 |
"Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
832 |
! |
10332 | 833 |
|
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
834 |
! |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
835 |
|
10196 | 836 |
|
837 |
!TextDiffTool methodsFor:'hooks'! |
|
838 |
||
10332 | 839 |
|
840 |
||
10196 | 841 |
postBuildDiffView:aScrollableView |
10344 | 842 |
diffView := aScrollableView. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
843 |
self setupCodeView: aScrollableView. |
10196 | 844 |
|
845 |
"Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 846 |
"Modified (format): / 27-07-2012 / 21:57:21 / cg" |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
847 |
! |
12125 | 848 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
849 |
setupCodeView: codeView2 |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
850 |
codeView2 notNil ifTrue:[ |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
851 |
codeView2 |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
852 |
languageHolder: self languageHolder; |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
853 |
classHolder: self classHolder; |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
854 |
modeHolder: self codeAspectHolder |
12125 | 855 |
]. |
10196 | 856 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12209
diff
changeset
|
857 |
"Created: / 26-07-2012 / 19:13:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 858 |
! ! |
859 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
860 |
|
10196 | 861 |
!TextDiffTool methodsFor:'initialization'! |
862 |
||
863 |
initialize |
|
864 |
super initialize. |
|
10344 | 865 |
textAChanged := textBChanged := false. |
10196 | 866 |
|
10344 | 867 |
"Modified: / 19-07-2011 / 19:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11700 | 868 |
"Modified (format): / 27-07-2012 / 21:57:08 / cg" |
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
869 |
! |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
870 |
|
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
871 |
initializeDiffView |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
872 |
|
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
873 |
self subclassResponsibility |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
874 |
|
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12269
diff
changeset
|
875 |
"Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 876 |
! ! |
877 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
878 |
|
10332 | 879 |
!TextDiffTool methodsFor:'private'! |
880 |
||
881 |
||
882 |
||
10344 | 883 |
showNothing |
884 |
self diffSpecHolder value: #nothingSpec |
|
885 |
||
886 |
"Created: / 19-07-2011 / 19:34:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 887 |
"Modified (format): / 27-07-2012 / 21:57:28 / cg" |
10344 | 888 |
! |
889 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
890 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
891 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
892 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
893 |
|
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
894 |
! |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
895 |
|
10332 | 896 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
897 |
!TextDiffTool methodsFor:'testing'! |
10332 | 898 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
899 |
isDiff2 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
900 |
^false |
10332 | 901 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
902 |
"Created: / 16-03-2012 / 15:21:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 903 |
! |
904 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
905 |
isDiff3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
906 |
^false |
10332 | 907 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
908 |
"Created: / 16-03-2012 / 15:21:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 909 |
! |
910 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
911 |
isMerge |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
912 |
^false |
10332 | 913 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
914 |
"Created: / 19-03-2012 / 11:53:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 915 |
! ! |
916 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
917 |
|
10196 | 918 |
!TextDiffTool class methodsFor:'documentation'! |
919 |
||
10870 | 920 |
version |
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
921 |
^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $' |
10870 | 922 |
! |
923 |
||
10196 | 924 |
version_CVS |
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
925 |
^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $' |
10196 | 926 |
! |
927 |
||
928 |
version_SVN |
|
929 |
^ '§Id§' |
|
930 |
! ! |
|
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
931 |