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