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