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