author | Claus Gittinger <cg@exept.de> |
Tue, 14 Mar 2017 20:30:21 +0100 | |
changeset 17465 | 27a2e4012a0a |
parent 17430 | 3217799cb458 |
child 17702 | 1080c40947eb |
permissions | -rw-r--r-- |
10018 | 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 |
" |
|
12 |
"{ Package: 'stx:libtool' }" |
|
8774 | 13 |
|
14 |
"{ NameSpace: Tools }" |
|
15 |
||
16 |
ApplicationModel subclass:#SmalltalkDiffTool |
|
17 |
instanceVariableNames:'diffSetHolder changeSetA changeSetB selectionHolder titleHolder |
|
10690 | 18 |
showMergingChangeSetHolder versionsViewHolder ignoreExtensions' |
8774 | 19 |
classVariableNames:'' |
20 |
poolDictionaries:'' |
|
21 |
category:'Interface-Diff & Merge tool' |
|
22 |
! |
|
23 |
||
10018 | 24 |
Object subclass:#DiffItem |
25 |
instanceVariableNames:'versionA versionB' |
|
26 |
classVariableNames:'' |
|
27 |
poolDictionaries:'' |
|
28 |
privateIn:SmalltalkDiffTool |
|
29 |
! |
|
30 |
||
31 |
!SmalltalkDiffTool class methodsFor:'documentation'! |
|
32 |
||
33 |
copyright |
|
34 |
" |
|
35 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
36 |
All Rights Reserved |
|
37 |
||
38 |
This software is furnished under a license and may be used |
|
39 |
only in accordance with the terms of that license and with the |
|
40 |
inclusion of the above copyright notice. This software may not |
|
41 |
be provided or otherwise made available to, or used by, any |
|
42 |
other person. No title to or ownership of the software is |
|
43 |
hereby transferred. |
|
44 |
" |
|
45 |
! ! |
|
8774 | 46 |
|
47 |
!SmalltalkDiffTool class methodsFor:'interface opening'! |
|
48 |
||
49 |
openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title |
|
10690 | 50 |
^ self |
51 |
openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title |
|
52 |
ignoreExtensions:false |
|
53 |
||
54 |
"Created: / 19-04-2008 / 12:52:12 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
55 |
"Modified: / 12-09-2011 / 11:52:20 / cg" |
|
56 |
! |
|
57 |
||
58 |
openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title ignoreExtensions:aBoolean |
|
8774 | 59 |
|
60 |
^self new |
|
10690 | 61 |
ignoreExtensions:aBoolean; |
8774 | 62 |
diffSet: diffSet labelA: labelA labelB: labelB; |
63 |
title: title; |
|
64 |
open |
|
65 |
||
66 |
"Created: / 19-04-2008 / 12:52:12 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10690 | 67 |
"Created: / 12-09-2011 / 11:51:11 / cg" |
8774 | 68 |
! ! |
69 |
||
70 |
!SmalltalkDiffTool class methodsFor:'interface specs'! |
|
71 |
||
72 |
conflictsListSpec |
|
73 |
"This resource specification was automatically generated |
|
74 |
by the UIPainter of ST/X." |
|
75 |
||
76 |
"Do not manually edit this!! If it is corrupted, |
|
77 |
the UIPainter may not be able to read the specification." |
|
78 |
||
79 |
" |
|
80 |
UIPainter new openOnClass:Tools::DiffTool andSelector:#conflictsListSpec |
|
81 |
Tools::DiffTool new openInterface:#conflictsListSpec |
|
82 |
" |
|
83 |
||
84 |
<resource: #canvas> |
|
85 |
||
86 |
^ |
|
87 |
#(FullSpec |
|
88 |
name: conflictsListSpec |
|
89 |
window: |
|
90 |
(WindowSpec |
|
91 |
label: 'VersionBothListSpec' |
|
92 |
name: 'VersionBothListSpec' |
|
93 |
min: (Point 10 10) |
|
94 |
bounds: (Rectangle 0 0 306 406) |
|
95 |
) |
|
96 |
component: |
|
97 |
(SpecCollection |
|
98 |
collection: ( |
|
99 |
(LabelSpec |
|
100 |
label: 'Conflicts (present in both A and B)' |
|
101 |
name: 'VersionBothLabel' |
|
102 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
103 |
translateLabel: true |
|
104 |
labelChannel: conflictsLabelHolder |
|
105 |
) |
|
106 |
(SelectionInListModelViewSpec |
|
107 |
name: 'VersionBothList' |
|
108 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
109 |
model: selectionHolder |
|
110 |
hasHorizontalScrollBar: true |
|
111 |
hasVerticalScrollBar: true |
|
112 |
listModel: conflictsListHolder |
|
113 |
useIndex: false |
|
114 |
highlightMode: line |
|
115 |
) |
|
116 |
) |
|
117 |
||
118 |
) |
|
119 |
) |
|
120 |
||
121 |
"Modified: / 21-05-2008 / 14:20:31 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
122 |
! |
|
123 |
||
124 |
inAOnlyListSpec |
|
125 |
"This resource specification was automatically generated |
|
126 |
by the UIPainter of ST/X." |
|
127 |
||
128 |
"Do not manually edit this!! If it is corrupted, |
|
129 |
the UIPainter may not be able to read the specification." |
|
130 |
||
131 |
" |
|
132 |
UIPainter new openOnClass:MergeTool andSelector:#inAOnlyListSpec |
|
133 |
MergeTool new openInterface:#inAOnlyListSpec |
|
134 |
" |
|
135 |
||
136 |
<resource: #canvas> |
|
137 |
||
138 |
^ |
|
139 |
#(FullSpec |
|
140 |
name: inAOnlyListSpec |
|
141 |
window: |
|
142 |
(WindowSpec |
|
143 |
label: 'VersionAOnlyListSpec' |
|
144 |
name: 'VersionAOnlyListSpec' |
|
145 |
min: (Point 10 10) |
|
146 |
bounds: (Rectangle 0 0 306 406) |
|
147 |
) |
|
148 |
component: |
|
149 |
(SpecCollection |
|
150 |
collection: ( |
|
151 |
(LabelSpec |
|
152 |
label: 'In A only' |
|
153 |
name: 'VersionAOnlyLabel' |
|
154 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
155 |
translateLabel: true |
|
156 |
labelChannel: inAOnlyLabelHolder |
|
157 |
) |
|
158 |
(SelectionInListModelViewSpec |
|
159 |
name: 'VersionAOnlyList' |
|
160 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
161 |
model: selectionHolder |
|
162 |
hasHorizontalScrollBar: true |
|
163 |
hasVerticalScrollBar: true |
|
164 |
listModel: inAOnlyListHolder |
|
165 |
useIndex: false |
|
166 |
highlightMode: line |
|
167 |
postBuildCallback: postBuildVersionAListWidget: |
|
168 |
) |
|
169 |
) |
|
170 |
||
171 |
) |
|
172 |
) |
|
173 |
||
174 |
"Modified: / 11-12-2007 / 16:46:29 / janfrog" |
|
175 |
"Created: / 19-04-2008 / 12:52:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
176 |
"Modified: / 21-05-2008 / 14:20:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
177 |
! |
|
178 |
||
179 |
inBOnlyListSpec |
|
180 |
"This resource specification was automatically generated |
|
181 |
by the UIPainter of ST/X." |
|
182 |
||
183 |
"Do not manually edit this!! If it is corrupted, |
|
184 |
the UIPainter may not be able to read the specification." |
|
185 |
||
186 |
" |
|
187 |
UIPainter new openOnClass:MergeTool andSelector:#inBOnlyListSpec |
|
188 |
MergeTool new openInterface:#inBOnlyListSpec |
|
189 |
" |
|
190 |
||
191 |
<resource: #canvas> |
|
192 |
||
193 |
^ |
|
194 |
#(FullSpec |
|
195 |
name: inBOnlyListSpec |
|
196 |
window: |
|
197 |
(WindowSpec |
|
198 |
label: 'VersionBOnlyListSpec' |
|
199 |
name: 'VersionBOnlyListSpec' |
|
200 |
min: (Point 10 10) |
|
201 |
bounds: (Rectangle 0 0 306 406) |
|
202 |
) |
|
203 |
component: |
|
204 |
(SpecCollection |
|
205 |
collection: ( |
|
206 |
(LabelSpec |
|
207 |
label: 'In B only' |
|
208 |
name: 'VersionBOnlyLabel' |
|
209 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
210 |
translateLabel: true |
|
211 |
labelChannel: inBOnlyLabelHolder |
|
212 |
) |
|
213 |
(SelectionInListModelViewSpec |
|
214 |
name: 'VersionBOnlyList' |
|
215 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
216 |
model: selectionHolder |
|
217 |
hasHorizontalScrollBar: true |
|
218 |
hasVerticalScrollBar: true |
|
219 |
listModel: inBOnlyListHolder |
|
220 |
postBuildCallback: postBuildVersionBListWidget: |
|
221 |
useIndex: false |
|
222 |
highlightMode: line |
|
223 |
) |
|
224 |
) |
|
225 |
||
226 |
) |
|
227 |
) |
|
228 |
||
229 |
"Modified: / 11-12-2007 / 16:46:33 / janfrog" |
|
230 |
"Created: / 19-04-2008 / 12:52:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
231 |
"Modified: / 21-05-2008 / 14:20:56 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
232 |
! |
|
233 |
||
234 |
windowSpec |
|
235 |
"This resource specification was automatically generated |
|
236 |
by the UIPainter of ST/X." |
|
237 |
||
238 |
"Do not manually edit this!! If it is corrupted, |
|
239 |
the UIPainter may not be able to read the specification." |
|
240 |
||
241 |
" |
|
242 |
UIPainter new openOnClass:Tools::DiffTool andSelector:#windowSpec |
|
243 |
Tools::DiffTool new openInterface:#windowSpec |
|
244 |
Tools::DiffTool open |
|
245 |
" |
|
246 |
||
247 |
<resource: #canvas> |
|
248 |
||
249 |
^ |
|
250 |
#(FullSpec |
|
251 |
name: windowSpec |
|
252 |
window: |
|
253 |
(WindowSpec |
|
254 |
label: 'MergeTool' |
|
255 |
name: 'MergeTool' |
|
256 |
labelChannel: titleHolder |
|
257 |
min: (Point 10 10) |
|
258 |
max: (Point 1024 768) |
|
259 |
bounds: (Rectangle 0 0 602 508) |
|
260 |
menu: mainMenu |
|
261 |
) |
|
262 |
component: |
|
263 |
(SpecCollection |
|
264 |
collection: ( |
|
265 |
(VariableVerticalPanelSpec |
|
266 |
name: 'ContentPanel' |
|
267 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
268 |
showHandle: true |
|
269 |
snapMode: both |
|
270 |
component: |
|
271 |
(SpecCollection |
|
272 |
collection: ( |
|
273 |
(VariableHorizontalPanelSpec |
|
274 |
name: 'VersionListPanel' |
|
275 |
component: |
|
276 |
(SpecCollection |
|
277 |
collection: ( |
|
278 |
(UISubSpecification |
|
279 |
name: 'VersionAOnlyListSpec' |
|
280 |
minorKey: inAOnlyListSpec |
|
281 |
) |
|
282 |
(UISubSpecification |
|
283 |
name: 'VersionBothListSpec' |
|
284 |
minorKey: conflictsListSpec |
|
285 |
) |
|
286 |
(UISubSpecification |
|
287 |
name: 'VersionBOnlyListSpec' |
|
288 |
minorKey: inBOnlyListSpec |
|
289 |
) |
|
290 |
) |
|
291 |
||
292 |
) |
|
293 |
handles: (Any 0.33333333333333 0.66666666666667 1.0) |
|
294 |
) |
|
295 |
(ArbitraryComponentSpec |
|
296 |
name: 'ArbitraryComponent1' |
|
297 |
hasBorder: false |
|
298 |
viewChannel: versionsViewHolder |
|
299 |
) |
|
300 |
) |
|
301 |
||
302 |
) |
|
303 |
handles: (Any 0.5 1.0) |
|
304 |
) |
|
305 |
) |
|
306 |
||
307 |
) |
|
308 |
) |
|
309 |
||
310 |
"Modified: / 07-10-2008 / 11:03:45 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
311 |
! ! |
|
312 |
||
313 |
!SmalltalkDiffTool class methodsFor:'plugIn spec'! |
|
314 |
||
315 |
aspectSelectors |
|
316 |
||
317 |
^ #( |
|
318 |
#diffSetHolder |
|
319 |
#inAOnlyLabelHolder |
|
320 |
#inBOnlyLabelHolder |
|
321 |
). |
|
322 |
||
323 |
"Created: / 02-04-2009 / 16:07:55 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
324 |
"Modified: / 09-04-2009 / 09:19:57 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
325 |
! ! |
|
326 |
||
327 |
!SmalltalkDiffTool methodsFor:'accessing'! |
|
328 |
||
329 |
changeSetA |
|
330 |
^ changeSetA |
|
331 |
||
332 |
"Created: / 07-10-2008 / 10:38:54 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
333 |
! |
|
334 |
||
335 |
changeSetA:aChangeSet |
|
336 |
changeSetA := aChangeSet. |
|
337 |
||
338 |
"Created: / 07-10-2008 / 10:38:54 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
339 |
! |
|
340 |
||
341 |
changeSetB |
|
342 |
^ changeSetB |
|
343 |
||
344 |
"Created: / 07-10-2008 / 10:38:57 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
345 |
! |
|
346 |
||
347 |
changeSetB:aChangeSet |
|
348 |
changeSetB := aChangeSet. |
|
349 |
self changeSetsChanged. |
|
350 |
||
351 |
"Created: / 07-10-2008 / 10:38:57 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
352 |
! |
|
353 |
||
354 |
diffItemClass |
|
10018 | 355 |
^ SmalltalkDiffTool::DiffItem |
8774 | 356 |
|
357 |
"Created: / 21-05-2008 / 14:38:26 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
358 |
"Modified: / 09-08-2009 / 14:57:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
359 |
! |
|
360 |
||
361 |
diffSet |
|
362 |
^ diffSetHolder value |
|
363 |
||
364 |
"Created: / 07-10-2008 / 10:39:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
365 |
"Modified: / 02-04-2009 / 16:10:20 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
366 |
! |
|
367 |
||
368 |
diffSet:aDiffSet |
|
369 |
||
370 |
self diffSetHolder value: aDiffSet |
|
371 |
||
372 |
"Modified: / 07-12-2007 / 11:39:15 / janfrog" |
|
373 |
"Created: / 19-04-2008 / 12:58:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
374 |
"Modified: / 07-04-2009 / 23:45:48 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
375 |
! |
|
376 |
||
377 |
diffSet:aDiffSet labelA:labelA labelB:labelB |
|
378 |
self onlyInALabel:labelA. |
|
379 |
self onlyInBLabel:labelB. |
|
380 |
self diffSet:aDiffSet |
|
381 |
||
382 |
"Modified: / 11-12-2007 / 17:10:49 / janfrog" |
|
383 |
"Created: / 19-04-2008 / 12:58:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
384 |
"Modified: / 07-10-2008 / 10:24:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
385 |
! |
|
386 |
||
10690 | 387 |
ignoreExtensions:something |
388 |
ignoreExtensions := something. |
|
389 |
! |
|
390 |
||
8774 | 391 |
onlyInALabel:labelA |
392 |
self inAOnlyLabelHolder value:'Only in ', labelA |
|
393 |
||
394 |
"Created: / 07-10-2008 / 10:24:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
395 |
! |
|
396 |
||
397 |
onlyInBLabel:labelB |
|
398 |
self inBOnlyLabelHolder value:'Only in ', labelB |
|
399 |
||
400 |
"Created: / 07-10-2008 / 10:24:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
401 |
! |
|
402 |
||
403 |
selection |
|
404 |
||
405 |
^self selectionHolder value asCollection |
|
406 |
||
407 |
"Created: / 21-10-2008 / 09:32:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
408 |
! |
|
409 |
||
410 |
selectionIsNonEmpty |
|
411 |
||
10462 | 412 |
^[self selection notEmptyOrNil ] |
8774 | 413 |
|
414 |
"Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
415 |
"Modified: / 22-10-2008 / 13:14:47 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10462 | 416 |
"Modified: / 04-08-2011 / 21:31:28 / cg" |
8774 | 417 |
! |
418 |
||
419 |
selectionIsNonEmptyAndAllHasVersionA |
|
420 |
||
10462 | 421 |
^[self selection notEmptyOrNil |
8774 | 422 |
and:[self selection allSatisfy:[:mergeItem|mergeItem hasVersionA]]] |
423 |
||
424 |
"Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
425 |
"Modified: / 22-10-2008 / 13:14:32 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10462 | 426 |
"Modified: / 04-08-2011 / 21:31:24 / cg" |
8774 | 427 |
! |
428 |
||
429 |
selectionIsNonEmptyAndAllHasVersionB |
|
430 |
||
10462 | 431 |
^[self selection notEmptyOrNil |
8774 | 432 |
and:[self selection allSatisfy:[:mergeItem|mergeItem hasVersionB]]] |
433 |
||
434 |
"Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
435 |
"Modified: / 22-10-2008 / 13:14:42 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10462 | 436 |
"Modified: / 04-08-2011 / 21:31:19 / cg" |
8774 | 437 |
! |
438 |
||
439 |
title |
|
440 |
||
441 |
self titleHolder value |
|
442 |
||
443 |
"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
444 |
! |
|
445 |
||
446 |
title: aString |
|
447 |
||
448 |
self titleHolder value: aString |
|
449 |
||
450 |
"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
451 |
! |
|
452 |
||
453 |
versionAColor |
|
454 |
||
455 |
^Color green lightened lightened |
|
456 |
||
457 |
"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
458 |
! |
|
459 |
||
460 |
versionBColor |
|
461 |
||
462 |
^Color red lightened lightened |
|
463 |
||
464 |
"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
465 |
! ! |
|
466 |
||
467 |
!SmalltalkDiffTool methodsFor:'aspects'! |
|
468 |
||
469 |
conflictsLabelHolder |
|
470 |
||
471 |
|holder| |
|
472 |
||
473 |
(holder := builder bindingAt:#conflictsLabelHolder) isNil ifTrue:[ |
|
474 |
holder := 'Conflicts' asValue. |
|
475 |
builder aspectAt:#conflictsLabelHolder put:holder. |
|
476 |
]. |
|
477 |
^ holder. |
|
478 |
||
479 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
480 |
"Modified: / 07-10-2008 / 10:36:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
481 |
! |
|
482 |
||
483 |
conflictsListHolder |
|
484 |
||
485 |
|holder| |
|
486 |
||
487 |
(holder := builder bindingAt:#conflictsListHolder) isNil ifTrue:[ |
|
488 |
holder := #() asValue. |
|
489 |
builder aspectAt:#conflictsListHolder put:holder. |
|
490 |
]. |
|
491 |
^ holder. |
|
492 |
||
493 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
494 |
"Modified: / 07-10-2008 / 10:36:59 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
495 |
! |
|
496 |
||
497 |
diffSetHolder |
|
498 |
||
499 |
diffSetHolder ifNil: |
|
500 |
[self diffSetHolder: ChangeSet::DiffSet new asValue]. |
|
501 |
^diffSetHolder |
|
502 |
||
503 |
"Created: / 02-04-2009 / 16:09:30 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
504 |
"Modified: / 02-04-2009 / 18:01:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
505 |
! |
|
506 |
||
507 |
diffSetHolder:aValueHolder |
|
508 |
diffSetHolder := aValueHolder. |
|
509 |
diffSetHolder onChangeSend: #diffSetChanged to: self |
|
510 |
||
511 |
"Modified: / 02-04-2009 / 18:01:23 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
512 |
! |
|
513 |
||
514 |
inAOnlyLabelHolder |
|
515 |
||
516 |
|holder| |
|
517 |
||
518 |
(holder := builder bindingAt:#inAOnlyLabelHolder) isNil ifTrue:[ |
|
519 |
holder := 'Only in A' asValue. |
|
520 |
builder aspectAt:#inAOnlyLabelHolder put:holder. |
|
521 |
]. |
|
522 |
^ holder. |
|
523 |
||
524 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
525 |
"Modified: / 07-10-2008 / 10:48:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
526 |
! |
|
527 |
||
528 |
inAOnlyLabelHolder: anValueHolder |
|
529 |
||
530 |
builder aspectAt:#inAOnlyLabelHolder put:anValueHolder. |
|
531 |
||
532 |
"Created: / 09-04-2009 / 09:19:38 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
533 |
! |
|
534 |
||
535 |
inAOnlyListHolder |
|
536 |
||
537 |
|holder| |
|
538 |
||
539 |
(holder := builder bindingAt:#inAOnlyListHolder) isNil ifTrue:[ |
|
540 |
holder :=#() asValue. |
|
541 |
builder aspectAt:#inAOnlyListHolder put:holder. |
|
542 |
]. |
|
543 |
^ holder. |
|
544 |
||
545 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
546 |
"Modified: / 07-10-2008 / 10:48:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
547 |
! |
|
548 |
||
549 |
inBOnlyLabelHolder |
|
550 |
||
551 |
|holder| |
|
552 |
||
553 |
(holder := builder bindingAt:#inBOnlyLabelHolder) isNil ifTrue:[ |
|
554 |
holder := 'Only in B' asValue. |
|
555 |
builder aspectAt:#inBOnlyLabelHolder put:holder. |
|
556 |
]. |
|
557 |
^ holder. |
|
558 |
||
559 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
560 |
"Modified: / 07-10-2008 / 10:48:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
561 |
! |
|
562 |
||
563 |
inBOnlyLabelHolder: anValueHolder |
|
564 |
||
565 |
builder aspectAt:#inBOnlyLabelHolder put:anValueHolder. |
|
566 |
||
567 |
"Created: / 09-04-2009 / 09:19:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
568 |
! |
|
569 |
||
570 |
inBOnlyListHolder |
|
571 |
||
572 |
|holder| |
|
573 |
||
574 |
(holder := builder bindingAt:#inBOnlyListHolder) isNil ifTrue:[ |
|
575 |
holder :=#() asValue. |
|
576 |
builder aspectAt:#inBOnlyListHolder put:holder. |
|
577 |
]. |
|
578 |
^ holder. |
|
579 |
||
580 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
581 |
"Modified: / 07-10-2008 / 10:48:49 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
582 |
! |
|
583 |
||
584 |
selectionHolder |
|
585 |
||
586 |
selectionHolder ifNil: |
|
587 |
[selectionHolder := nil asValue. |
|
588 |
selectionHolder |
|
589 |
onChangeSend:#selectionChanged to: self]. |
|
590 |
^selectionHolder |
|
591 |
||
592 |
"Created: / 19-04-2008 / 12:57:04 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
593 |
"Modified: / 21-05-2008 / 19:30:49 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
594 |
! |
|
595 |
||
596 |
showMergingChangeSetHolder |
|
597 |
"return/create the 'showMergingChangeSetHolder' value holder (automatically generated)" |
|
598 |
||
599 |
showMergingChangeSetHolder isNil ifTrue:[ |
|
600 |
showMergingChangeSetHolder := false asValue |
|
601 |
]. |
|
602 |
^ showMergingChangeSetHolder |
|
603 |
||
604 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
605 |
! |
|
606 |
||
607 |
titleHolder |
|
608 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
609 |
||
610 |
titleHolder isNil ifTrue:[ |
|
611 |
titleHolder := 'Merge tool' asValue |
|
612 |
]. |
|
613 |
^ titleHolder |
|
614 |
||
615 |
"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
616 |
! |
|
617 |
||
618 |
versionsViewHolder |
|
619 |
"return/create the 'versionsViewHolder' value holder (automatically generated)" |
|
620 |
||
621 |
versionsViewHolder isNil ifTrue:[ |
|
622 |
versionsViewHolder := HVScrollableView new. |
|
623 |
]. |
|
624 |
^ versionsViewHolder |
|
625 |
||
626 |
"Created: / 07-10-2008 / 08:58:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
627 |
"Modified: / 06-11-2008 / 14:49:40 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
628 |
! ! |
|
629 |
||
630 |
!SmalltalkDiffTool methodsFor:'change & update'! |
|
631 |
||
632 |
changeSetsChanged |
|
633 |
||
634 |
self diffSet: |
|
635 |
((changeSetA notNil and:[changeSetB notNil]) |
|
636 |
ifTrue:[changeSetA diffSetsAgainst: changeSetB] |
|
637 |
ifFalse:[ChangeSet::DiffSet new]) |
|
638 |
||
639 |
"Created: / 07-10-2008 / 10:42:33 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
640 |
! |
|
641 |
||
642 |
diffSetChanged |
|
643 |
||
644 |
|onlyInA changed onlyInB| |
|
645 |
||
646 |
self builder ifNil:[^self]. |
|
647 |
self diffSet ifNil:[^self]. |
|
648 |
onlyInA := self diffSet onlyInReceiver ? #() |
|
649 |
collect:[:change | self diffItemClass versionA:change ]. |
|
650 |
changed := self diffSet changed ? #() |
|
651 |
collect:[:changes | self diffItemClass versionA:changes first versionB:changes second ]. |
|
652 |
onlyInB := self diffSet onlyInArg ? #() |
|
653 |
collect:[:change | self diffItemClass versionB:change ]. |
|
654 |
self inAOnlyListHolder value:onlyInA. |
|
655 |
self conflictsListHolder value:changed. |
|
656 |
self inBOnlyListHolder value:onlyInB. |
|
657 |
self resolutionChanged |
|
658 |
||
659 |
"Created: / 07-10-2008 / 10:42:45 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
660 |
"Modified: / 02-04-2009 / 16:43:52 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
661 |
! |
|
662 |
||
663 |
resolutionChanged |
|
664 |
||
665 |
self inAOnlyListHolder changed. |
|
666 |
self conflictsListHolder changed. |
|
667 |
self inBOnlyListHolder changed. |
|
668 |
||
669 |
"Created: / 19-04-2008 / 12:57:20 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
670 |
! |
|
671 |
||
672 |
selectionChanged |
|
673 |
||
674 |
self showVersionsFor: |
|
675 |
(self selection size = 1 ifTrue:[self selection anyOne] ifFalse:[nil]) |
|
676 |
||
677 |
"Created: / 19-04-2008 / 12:57:21 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
678 |
"Modified: / 21-10-2008 / 09:31:53 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
679 |
! ! |
|
680 |
||
681 |
!SmalltalkDiffTool methodsFor:'hooks'! |
|
682 |
||
683 |
commonPostBuild |
|
684 |
||
685 |
self diffSetChanged |
|
686 |
||
687 |
"Created: / 07-10-2008 / 10:47:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
688 |
! |
|
689 |
||
690 |
postBuildVersionAListWidget: widget |
|
691 |
||
692 |
widget scrolledView backgroundColor: self versionAColor |
|
693 |
||
694 |
"Created: / 19-04-2008 / 12:57:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
695 |
! |
|
696 |
||
697 |
postBuildVersionBListWidget: widget |
|
698 |
||
699 |
widget scrolledView backgroundColor: self versionBColor |
|
700 |
||
701 |
"Created: / 19-04-2008 / 12:57:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
702 |
! ! |
|
703 |
||
704 |
!SmalltalkDiffTool methodsFor:'initialization'! |
|
705 |
||
706 |
initialize |
|
707 |
||
708 |
super initialize. |
|
709 |
self createBuilder. |
|
710 |
||
711 |
"Created: / 07-10-2008 / 10:57:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
712 |
"Modified: / 02-04-2009 / 16:10:12 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
713 |
! ! |
|
714 |
||
715 |
!SmalltalkDiffTool methodsFor:'private'! |
|
716 |
||
717 |
showVersionAAndBAndMergedFor: mergeItem |
|
718 |
||
719 |
^self showVersionAAndBFor: mergeItem |
|
720 |
||
721 |
"Created: / 19-04-2008 / 12:56:09 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
722 |
! |
|
723 |
||
724 |
showVersionAAndBFor: mergeItem |
|
725 |
||
726 |
| diffView | |
|
727 |
||
728 |
diffView := (self versionsView isKindOf:DiffTextView) |
|
729 |
ifFalse:[DiffTextView new] |
|
730 |
ifTrue:[self versionsView]. |
|
731 |
||
732 |
"/self diff2TextView initialize. |
|
733 |
diffView |
|
734 |
text1: mergeItem versionASource |
|
735 |
text2: mergeItem versionBSource. |
|
736 |
diffView leftTextView backgroundColor: self versionAColor. |
|
737 |
diffView rightTextView backgroundColor: self versionBColor. |
|
738 |
self versionsView: diffView |
|
739 |
||
740 |
"Modified: / 07-12-2007 / 21:31:12 / janfrog" |
|
741 |
"Created: / 19-04-2008 / 12:56:07 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
742 |
"Modified: / 07-10-2008 / 10:28:40 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
743 |
! |
|
744 |
||
745 |
showVersionAAndMergedFor: mergeItem |
|
746 |
||
747 |
^self showVersionAFor: mergeItem |
|
748 |
||
749 |
"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
750 |
! |
|
751 |
||
752 |
showVersionAFor: aMergeItem |
|
753 |
||
754 |
| textView | |
|
755 |
||
756 |
textView := (self versionsView isKindOf:TextView) |
|
757 |
ifFalse:[TextView new] |
|
758 |
ifTrue:[self versionsView]. |
|
759 |
||
760 |
textView contents: aMergeItem versionASource. |
|
761 |
textView backgroundColor: self versionAColor. |
|
762 |
self versionsView: textView. |
|
763 |
||
764 |
"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
765 |
"Modified: / 07-10-2008 / 10:29:21 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
766 |
! |
|
767 |
||
768 |
showVersionBAndMergedFor: mergeItem |
|
769 |
||
770 |
^self showVersionBFor: mergeItem |
|
771 |
||
772 |
"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
773 |
! |
|
774 |
||
775 |
showVersionBFor: aMergeItem |
|
776 |
||
777 |
| textView | |
|
778 |
||
779 |
textView := (self versionsView isKindOf:TextView) |
|
780 |
ifFalse:[TextView new] |
|
781 |
ifTrue:[self versionsView]. |
|
782 |
||
783 |
textView contents: aMergeItem versionBSource. |
|
784 |
textView backgroundColor: self versionBColor. |
|
785 |
self versionsView: textView. |
|
786 |
||
787 |
"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
788 |
"Modified: / 07-10-2008 / 10:29:33 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
789 |
! |
|
790 |
||
791 |
showVersionsFor: mergeItem |
|
792 |
||
793 |
mergeItem ifNil:[^self versionsView: nil]. |
|
794 |
mergeItem showVersionsIn: self. |
|
795 |
||
796 |
"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
797 |
"Modified: / 07-10-2008 / 09:03:12 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
798 |
! |
|
799 |
||
800 |
versionsView |
|
801 |
||
802 |
^self versionsViewHolder value scrolledView |
|
803 |
||
804 |
"Created: / 07-10-2008 / 09:59:52 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
805 |
"Modified: / 07-10-2008 / 11:05:26 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
806 |
! |
|
807 |
||
808 |
versionsView: aView |
|
809 |
||
810 |
self versionsViewHolder value scrolledView:aView |
|
811 |
||
812 |
"Created: / 07-10-2008 / 08:58:48 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
813 |
"Modified: / 07-10-2008 / 11:05:42 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
814 |
! ! |
|
815 |
||
10018 | 816 |
!SmalltalkDiffTool::DiffItem class methodsFor:'documentation'! |
817 |
||
818 |
version |
|
17337 | 819 |
^'$Header$' |
10018 | 820 |
! ! |
821 |
||
822 |
!SmalltalkDiffTool::DiffItem class methodsFor:'instance creation'! |
|
823 |
||
824 |
versionA: changeA |
|
825 |
||
826 |
^self new |
|
827 |
versionA: changeA |
|
828 |
||
829 |
"Created: / 06-12-2007 / 17:51:17 / janfrog" |
|
830 |
"Modified: / 06-12-2007 / 21:26:59 / janfrog" |
|
831 |
"Modified: / 21-05-2008 / 14:15:04 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
832 |
! |
|
833 |
||
834 |
versionA: changeA versionB: changeB |
|
835 |
||
836 |
^self new |
|
837 |
versionA: changeA; |
|
838 |
versionB: changeB |
|
839 |
||
840 |
"Created: / 06-12-2007 / 17:51:31 / janfrog" |
|
841 |
! |
|
842 |
||
843 |
versionB: changeB |
|
844 |
||
845 |
^self new |
|
846 |
versionB: changeB |
|
847 |
||
848 |
"Created: / 06-12-2007 / 17:51:37 / janfrog" |
|
849 |
"Modified: / 06-12-2007 / 21:27:14 / janfrog" |
|
850 |
"Modified: / 21-05-2008 / 14:15:10 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
851 |
! ! |
|
852 |
||
853 |
!SmalltalkDiffTool::DiffItem methodsFor:'accessing'! |
|
8774 | 854 |
|
855 |
version |
|
10018 | 856 |
^ versionA ? versionB |
857 |
||
858 |
"Created: / 21-05-2008 / 11:54:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
859 |
! |
|
860 |
||
861 |
versionA |
|
862 |
^ versionA |
|
863 |
||
864 |
"Created: / 06-12-2007 / 17:36:51 / janfrog" |
|
865 |
! |
|
866 |
||
867 |
versionA:something |
|
868 |
versionA := something. |
|
869 |
||
870 |
"Created: / 06-12-2007 / 17:36:51 / janfrog" |
|
871 |
! |
|
872 |
||
873 |
versionASource |
|
874 |
^ versionA |
|
875 |
ifNil:[nil] |
|
876 |
ifNotNil:[versionA source] |
|
877 |
||
878 |
"Created: / 07-12-2007 / 12:16:49 / janfrog" |
|
879 |
! |
|
880 |
||
881 |
versionB |
|
882 |
^ versionB |
|
883 |
||
884 |
"Created: / 06-12-2007 / 17:36:51 / janfrog" |
|
885 |
! |
|
886 |
||
887 |
versionB:something |
|
888 |
versionB := something. |
|
889 |
||
890 |
"Created: / 06-12-2007 / 17:36:51 / janfrog" |
|
891 |
! |
|
892 |
||
893 |
versionBSource |
|
894 |
^ versionB |
|
895 |
ifNil:[nil] |
|
896 |
ifNotNil:[versionB source] |
|
897 |
||
898 |
"Created: / 07-12-2007 / 12:17:01 / janfrog" |
|
899 |
! ! |
|
900 |
||
901 |
!SmalltalkDiffTool::DiffItem methodsFor:'displaying'! |
|
902 |
||
903 |
displayChangeOn: aGC x:x y:y |
|
904 |
||
905 |
self displayString displayOn: aGC x:x y:y |
|
906 |
||
907 |
"Created: / 06-12-2007 / 21:06:18 / janfrog" |
|
908 |
! |
|
909 |
||
13321
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
910 |
displayOn:aGCOrStream |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
911 |
|
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
912 |
"/ what a kludge - Dolphin and Squeak mean: printOn: a stream; |
17430 | 913 |
"/ old ST80 means: draw-yourself on a GC. |
13321
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
914 |
(aGCOrStream isStream) ifFalse:[ |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
915 |
^ super displayOn:aGCOrStream |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
916 |
]. |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
917 |
|
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
918 |
^ self version printOn:aGCOrStream |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
919 |
|
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
920 |
"Created: / 06-12-2007 / 21:10:22 / janfrog" |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
921 |
"Modified: / 12-12-2007 / 15:14:31 / janfrog" |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
922 |
"Modified: / 08-11-2008 / 09:28:04 / Jan Vrany <vranyj1@fel.cvut.cz>" |
17430 | 923 |
"Modified (comment): / 22-02-2017 / 16:47:37 / cg" |
13321
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
924 |
! |
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
925 |
|
10018 | 926 |
displayOn: aGC x:x y:y |
927 |
||
928 |
self displayChangeOn: aGC x:x y:y. |
|
929 |
||
930 |
"Created: / 21-05-2008 / 11:55:22 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
931 |
! ! |
|
932 |
||
933 |
!SmalltalkDiffTool::DiffItem methodsFor:'queries'! |
|
934 |
||
935 |
hasVersionA |
|
936 |
||
937 |
^versionA notNil |
|
938 |
||
939 |
"Created: / 11-12-2007 / 16:42:22 / janfrog" |
|
940 |
! |
|
941 |
||
942 |
hasVersionB |
|
943 |
||
944 |
^versionB notNil |
|
945 |
||
946 |
"Created: / 11-12-2007 / 16:42:26 / janfrog" |
|
947 |
! ! |
|
948 |
||
949 |
!SmalltalkDiffTool::DiffItem methodsFor:'testing'! |
|
950 |
||
951 |
isMergedVersionDifferent |
|
952 |
||
953 |
^false |
|
954 |
||
955 |
"Created: / 21-05-2008 / 14:17:21 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
956 |
! |
|
957 |
||
958 |
isMethodChange |
|
17337 | 959 |
"/ cg: no idea what to return; the previous version returned self, |
960 |
"/ which is certainly wrong. |
|
961 |
||
962 |
^ true |
|
10018 | 963 |
|
964 |
"Created: / 11-12-2007 / 18:39:35 / janfrog" |
|
17337 | 965 |
"Modified (format): / 05-02-2017 / 03:58:45 / cg" |
10018 | 966 |
! ! |
967 |
||
968 |
!SmalltalkDiffTool::DiffItem methodsFor:'ui support'! |
|
969 |
||
970 |
showVersionAAndBAndMergedIn: aMergeTool |
|
971 |
||
972 |
self isMergedVersionDifferent |
|
973 |
ifTrue:[aMergeTool showVersionAAndBAndMergedFor: self] |
|
974 |
ifFalse:[aMergeTool showVersionAAndBFor: self] |
|
975 |
||
976 |
"Created: / 07-12-2007 / 13:05:45 / janfrog" |
|
977 |
! |
|
978 |
||
979 |
showVersionAAndMergedIn: aMergeTool |
|
980 |
||
981 |
self isMergedVersionDifferent |
|
982 |
ifTrue:[aMergeTool showVersionAAndMergedFor: self] |
|
983 |
ifFalse:[aMergeTool showVersionAFor: self] |
|
984 |
||
985 |
"Created: / 07-12-2007 / 13:03:05 / janfrog" |
|
986 |
! |
|
987 |
||
988 |
showVersionBAndMergedIn: aMergeTool |
|
989 |
||
990 |
self isMergedVersionDifferent |
|
991 |
ifTrue:[aMergeTool showVersionBAndMergedFor: self] |
|
992 |
ifFalse:[aMergeTool showVersionBFor: self] |
|
993 |
||
994 |
"Created: / 07-12-2007 / 13:03:05 / janfrog" |
|
995 |
! |
|
996 |
||
997 |
showVersionsIn: aMergeTool |
|
998 |
||
999 |
(versionA notNil and:[versionB isNil]) |
|
1000 |
ifTrue:[^self showVersionAAndMergedIn: aMergeTool]. |
|
1001 |
(versionA notNil and:[versionB notNil]) |
|
1002 |
ifTrue:[^self showVersionAAndBAndMergedIn: aMergeTool]. |
|
1003 |
(versionA isNil and:[versionB notNil]) |
|
1004 |
ifTrue:[^self showVersionBAndMergedIn: aMergeTool]. |
|
1005 |
||
1006 |
"Created: / 07-12-2007 / 12:57:39 / janfrog" |
|
1007 |
! ! |
|
1008 |
||
1009 |
!SmalltalkDiffTool class methodsFor:'documentation'! |
|
1010 |
||
8805 | 1011 |
version_CVS |
17337 | 1012 |
^ '$Header$' |
8805 | 1013 |
! |
1014 |
||
1015 |
version_SVN |
|
17337 | 1016 |
^ '$Id$' |
8774 | 1017 |
! ! |
13321
afe70d18cb89
Refactor to implement #displayOn:aGcOrStream instead of #displayString
Stefan Vogel <sv@exept.de>
parents:
10690
diff
changeset
|
1018 |