|
13794
|
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' }"
|
|
|
13 |
|
|
|
14 |
"{ NameSpace: Tools }"
|
|
|
15 |
|
|
|
16 |
TextDiffTool subclass:#TextDiff3Tool
|
|
|
17 |
instanceVariableNames:'labelMergedHolder textMergedHolder mergeHolder mergeDataHolder
|
|
|
18 |
mergeIntervalHolder mergeView mergeService'
|
|
|
19 |
classVariableNames:''
|
|
|
20 |
poolDictionaries:''
|
|
|
21 |
category:'Interface-Diff'
|
|
|
22 |
!
|
|
|
23 |
|
|
|
24 |
CodeViewService subclass:#MergeService
|
|
|
25 |
instanceVariableNames:'dataHolder data sectionIntervalHolder'
|
|
|
26 |
classVariableNames:''
|
|
|
27 |
poolDictionaries:''
|
|
|
28 |
privateIn:TextDiff3Tool
|
|
|
29 |
!
|
|
|
30 |
|
|
|
31 |
!TextDiff3Tool 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 |
!
|
|
|
46 |
|
|
|
47 |
documentation
|
|
|
48 |
"
|
|
|
49 |
documentation to be added.
|
|
|
50 |
|
|
|
51 |
[author:]
|
|
|
52 |
Jan Vrany <jan.vrany@fit.cvut.cz>
|
|
|
53 |
|
|
|
54 |
[instance variables:]
|
|
|
55 |
|
|
|
56 |
[class variables:]
|
|
|
57 |
|
|
|
58 |
[see also:]
|
|
|
59 |
|
|
|
60 |
"
|
|
|
61 |
!
|
|
|
62 |
|
|
|
63 |
examples
|
|
|
64 |
"
|
|
|
65 |
Starting the application:
|
|
|
66 |
[exBegin]
|
|
|
67 |
Tools::TextDiff3Tool open
|
|
|
68 |
|
|
|
69 |
[exEnd]
|
|
|
70 |
|
|
|
71 |
more examples to be added:
|
|
|
72 |
[exBegin]
|
|
|
73 |
... add code fragment for
|
|
|
74 |
... executable example here ...
|
|
|
75 |
[exEnd]
|
|
|
76 |
"
|
|
|
77 |
! !
|
|
|
78 |
|
|
|
79 |
!TextDiff3Tool class methodsFor:'defaults - colors'!
|
|
|
80 |
|
|
|
81 |
colorA
|
|
|
82 |
|
|
|
83 |
^(Color red:54.1176470588235 green:75.2941176470588 blue:28.6274509803922) lighter
|
|
|
84 |
|
|
|
85 |
"Created: / 19-03-2012 / 13:11:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
86 |
!
|
|
|
87 |
|
|
|
88 |
colorB
|
|
|
89 |
|
|
|
90 |
^(Color red:96.078431372549 green:73.7254901960784 blue:0.0) lighter
|
|
|
91 |
|
|
|
92 |
"Created: / 19-03-2012 / 13:11:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
93 |
!
|
|
|
94 |
|
|
|
95 |
colorBase
|
|
|
96 |
|
|
|
97 |
^(Color red:5.88235294117647 green:58.8235294117647 blue:80.3921568627451) lighter
|
|
|
98 |
|
|
|
99 |
"Created: / 19-03-2012 / 13:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
100 |
!
|
|
|
101 |
|
|
|
102 |
colorConflict
|
|
|
103 |
|
|
|
104 |
^Color red
|
|
|
105 |
|
|
|
106 |
"Created: / 19-03-2012 / 13:12:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
107 |
!
|
|
|
108 |
|
|
|
109 |
colorMerged
|
|
|
110 |
|
|
|
111 |
^(Color red:83.921568627451 green:17.2549019607843 blue:85.0980392156863) lighter
|
|
|
112 |
|
|
|
113 |
"Created: / 19-03-2012 / 13:11:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
114 |
! !
|
|
|
115 |
|
|
|
116 |
!TextDiff3Tool class methodsFor:'interface specs'!
|
|
|
117 |
|
|
|
118 |
diff3Spec
|
|
|
119 |
"This resource specification was automatically generated
|
|
|
120 |
by the UIPainter of ST/X."
|
|
|
121 |
|
|
|
122 |
"Do not manually edit this!! If it is corrupted,
|
|
|
123 |
the UIPainter may not be able to read the specification."
|
|
|
124 |
|
|
|
125 |
"
|
|
|
126 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#diff3Spec
|
|
|
127 |
Tools::TextDiff3Tool new openInterface:#diff3Spec
|
|
|
128 |
"
|
|
|
129 |
|
|
|
130 |
<resource: #canvas>
|
|
|
131 |
|
|
|
132 |
^
|
|
|
133 |
#(FullSpec
|
|
|
134 |
name: diff3Spec
|
|
|
135 |
window:
|
|
|
136 |
(WindowSpec
|
|
|
137 |
label: 'Text Diff Tool (for embedding)'
|
|
|
138 |
name: 'Text Diff Tool (for embedding)'
|
|
|
139 |
min: (Point 10 10)
|
|
|
140 |
bounds: (Rectangle 0 0 782 506)
|
|
|
141 |
)
|
|
|
142 |
component:
|
|
|
143 |
(SpecCollection
|
|
|
144 |
collection: (
|
|
|
145 |
(ViewSpec
|
|
|
146 |
name: '3Labels'
|
|
|
147 |
layout: (LayoutFrame 0 0 0 0 -16 1 30 0)
|
|
|
148 |
component:
|
|
|
149 |
(SpecCollection
|
|
|
150 |
collection: (
|
|
|
151 |
(UISubSpecification
|
|
|
152 |
name: 'VersionC'
|
|
|
153 |
layout: (LayoutFrame 0 0 0 0 0 0.33333 30 0)
|
|
|
154 |
minorKey: versionCLabelSpec
|
|
|
155 |
)
|
|
|
156 |
(UISubSpecification
|
|
|
157 |
name: 'VersionA'
|
|
|
158 |
layout: (LayoutFrame 5 0.3333 0 0 0 0.67 30 0)
|
|
|
159 |
minorKey: versionALabelSpec
|
|
|
160 |
)
|
|
|
161 |
(UISubSpecification
|
|
|
162 |
name: 'VersionB'
|
|
|
163 |
layout: (LayoutFrame 5 0.67 0 0 0 1 30 0)
|
|
|
164 |
minorKey: versionBLabelSpec
|
|
|
165 |
)
|
|
|
166 |
)
|
|
|
167 |
|
|
|
168 |
)
|
|
|
169 |
)
|
|
|
170 |
(ArbitraryComponentSpec
|
|
|
171 |
name: 'Diff3TextView'
|
|
|
172 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
|
|
|
173 |
hasHorizontalScrollBar: false
|
|
|
174 |
hasVerticalScrollBar: false
|
|
|
175 |
autoHideScrollBars: false
|
|
|
176 |
hasBorder: false
|
|
|
177 |
component: diffView
|
|
|
178 |
postBuildCallback: postBuildDiffView:
|
|
|
179 |
)
|
|
|
180 |
)
|
|
|
181 |
|
|
|
182 |
)
|
|
|
183 |
)
|
|
|
184 |
!
|
|
|
185 |
|
|
|
186 |
mergeSpec
|
|
|
187 |
"This resource specification was automatically generated
|
|
|
188 |
by the UIPainter of ST/X."
|
|
|
189 |
|
|
|
190 |
"Do not manually edit this!! If it is corrupted,
|
|
|
191 |
the UIPainter may not be able to read the specification."
|
|
|
192 |
|
|
|
193 |
"
|
|
|
194 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#mergeSpec
|
|
|
195 |
Tools::TextDiff3Tool new openInterface:#mergeSpec
|
|
|
196 |
"
|
|
|
197 |
|
|
|
198 |
<resource: #canvas>
|
|
|
199 |
|
|
|
200 |
^
|
|
|
201 |
#(FullSpec
|
|
|
202 |
name: mergeSpec
|
|
|
203 |
window:
|
|
|
204 |
(WindowSpec
|
|
|
205 |
label: 'Merge view'
|
|
|
206 |
name: 'Merge view'
|
|
|
207 |
min: (Point 10 10)
|
|
|
208 |
bounds: (Rectangle 0 0 782 506)
|
|
|
209 |
)
|
|
|
210 |
component:
|
|
|
211 |
(SpecCollection
|
|
|
212 |
collection: (
|
|
|
213 |
(VariableVerticalPanelSpec
|
|
|
214 |
name: 'DiffAndMergePanel'
|
|
|
215 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
|
|
|
216 |
component:
|
|
|
217 |
(SpecCollection
|
|
|
218 |
collection: (
|
|
|
219 |
(ViewSpec
|
|
|
220 |
name: 'Box1'
|
|
|
221 |
component:
|
|
|
222 |
(SpecCollection
|
|
|
223 |
collection: (
|
|
|
224 |
(ViewSpec
|
|
|
225 |
name: '3Labels'
|
|
|
226 |
layout: (LayoutFrame 0 0 0 0 -16 1 30 0)
|
|
|
227 |
component:
|
|
|
228 |
(SpecCollection
|
|
|
229 |
collection: (
|
|
|
230 |
(UISubSpecification
|
|
|
231 |
name: 'VersionC'
|
|
|
232 |
layout: (LayoutFrame 0 0 0 0 0 0.33333 30 0)
|
|
|
233 |
minorKey: versionCLabelSpec
|
|
|
234 |
)
|
|
|
235 |
(UISubSpecification
|
|
|
236 |
name: 'VersionA'
|
|
|
237 |
layout: (LayoutFrame 5 0.3333 0 0 0 0.67 30 0)
|
|
|
238 |
minorKey: versionALabelSpec
|
|
|
239 |
)
|
|
|
240 |
(UISubSpecification
|
|
|
241 |
name: 'VersionB'
|
|
|
242 |
layout: (LayoutFrame 5 0.67 0 0 0 1 30 0)
|
|
|
243 |
minorKey: versionBLabelSpec
|
|
|
244 |
)
|
|
|
245 |
)
|
|
|
246 |
|
|
|
247 |
)
|
|
|
248 |
)
|
|
|
249 |
(ArbitraryComponentSpec
|
|
|
250 |
name: 'Diff3TextView'
|
|
|
251 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
|
|
|
252 |
hasHorizontalScrollBar: false
|
|
|
253 |
hasVerticalScrollBar: false
|
|
|
254 |
autoHideScrollBars: false
|
|
|
255 |
hasBorder: false
|
|
|
256 |
component: diffView
|
|
|
257 |
postBuildCallback: postBuildDiffView:
|
|
|
258 |
)
|
|
|
259 |
)
|
|
|
260 |
|
|
|
261 |
)
|
|
|
262 |
)
|
|
|
263 |
(TransparentBoxSpec
|
|
|
264 |
name: 'MergeView'
|
|
|
265 |
component:
|
|
|
266 |
(SpecCollection
|
|
|
267 |
collection: (
|
|
|
268 |
(UISubSpecification
|
|
|
269 |
name: 'MergeLabel'
|
|
|
270 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0)
|
|
|
271 |
minorKey: versionMergedLabelSpec
|
|
|
272 |
)
|
|
|
273 |
(TextEditorSpec
|
|
|
274 |
name: 'MergeCode'
|
|
|
275 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
|
|
|
276 |
model: textMergedHolder
|
|
|
277 |
hasHorizontalScrollBar: true
|
|
|
278 |
hasVerticalScrollBar: true
|
|
|
279 |
hasKeyboardFocusInitially: false
|
|
|
280 |
viewClassName: 'Tools::CodeView2'
|
|
|
281 |
postBuildCallback: postBuildMergeView:
|
|
|
282 |
)
|
|
|
283 |
)
|
|
|
284 |
|
|
|
285 |
)
|
|
|
286 |
)
|
|
|
287 |
)
|
|
|
288 |
|
|
|
289 |
)
|
|
|
290 |
handles: (Any 0.5 1.0)
|
|
|
291 |
)
|
|
|
292 |
(MenuPanelSpec
|
|
|
293 |
name: 'ToolBar'
|
|
|
294 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0)
|
|
|
295 |
menu: toolbarMenuMerge
|
|
|
296 |
textDefault: true
|
|
|
297 |
)
|
|
|
298 |
)
|
|
|
299 |
|
|
|
300 |
)
|
|
|
301 |
)
|
|
|
302 |
|
|
|
303 |
"Modified: / 17-01-2013 / 20:32:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
304 |
! !
|
|
|
305 |
|
|
|
306 |
!TextDiff3Tool class methodsFor:'interface specs - labels'!
|
|
|
307 |
|
|
|
308 |
versionMergedLabelSpec
|
|
|
309 |
"This resource specification was automatically generated
|
|
|
310 |
by the UIPainter of ST/X."
|
|
|
311 |
|
|
|
312 |
"Do not manually edit this!! If it is corrupted,
|
|
|
313 |
the UIPainter may not be able to read the specification."
|
|
|
314 |
|
|
|
315 |
"
|
|
|
316 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#versionMergedLabelSpec
|
|
|
317 |
Tools::TextDiff3Tool new openInterface:#versionMergedLabelSpec
|
|
|
318 |
"
|
|
|
319 |
|
|
|
320 |
<resource: #canvas>
|
|
|
321 |
|
|
|
322 |
^
|
|
|
323 |
#(FullSpec
|
|
|
324 |
name: versionMergedLabelSpec
|
|
|
325 |
window:
|
|
|
326 |
(WindowSpec
|
|
|
327 |
label: 'Merge'
|
|
|
328 |
name: 'Merge'
|
|
|
329 |
min: (Point 10 10)
|
|
|
330 |
bounds: (Rectangle 0 0 774 30)
|
|
|
331 |
)
|
|
|
332 |
component:
|
|
|
333 |
(SpecCollection
|
|
|
334 |
collection: (
|
|
|
335 |
(LabelSpec
|
|
|
336 |
label: 'versionMerged24x24'
|
|
|
337 |
name: 'VersionMergedIcon'
|
|
|
338 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
|
|
|
339 |
hasCharacterOrientedLabel: false
|
|
|
340 |
translateLabel: true
|
|
|
341 |
)
|
|
|
342 |
(LabelSpec
|
|
|
343 |
label: 'Merge'
|
|
|
344 |
name: 'VersionMergeLabel'
|
|
|
345 |
layout: (LayoutFrame 30 0 5 0 157 0 0 1)
|
|
|
346 |
translateLabel: true
|
|
|
347 |
labelChannel: labelMergedHolder
|
|
|
348 |
resizeForLabel: true
|
|
|
349 |
adjust: left
|
|
|
350 |
useDynamicPreferredWidth: true
|
|
|
351 |
usePreferredWidth: true
|
|
|
352 |
)
|
|
|
353 |
)
|
|
|
354 |
|
|
|
355 |
)
|
|
|
356 |
)
|
|
|
357 |
! !
|
|
|
358 |
|
|
|
359 |
!TextDiff3Tool class methodsFor:'menu specs'!
|
|
|
360 |
|
|
|
361 |
toolbarMenuMerge
|
|
|
362 |
"This resource specification was automatically generated
|
|
|
363 |
by the MenuEditor of ST/X."
|
|
|
364 |
|
|
|
365 |
"Do not manually edit this!! If it is corrupted,
|
|
|
366 |
the MenuEditor may not be able to read the specification."
|
|
|
367 |
|
|
|
368 |
|
|
|
369 |
"
|
|
|
370 |
MenuEditor new openOnClass:Tools::TextDiff3Tool andSelector:#toolbarMenuMerge
|
|
|
371 |
(Menu new fromLiteralArrayEncoding:(Tools::TextDiff3Tool toolbarMenuMerge)) startUp
|
|
|
372 |
"
|
|
|
373 |
|
|
|
374 |
<resource: #menu>
|
|
|
375 |
|
|
|
376 |
^
|
|
|
377 |
#(Menu
|
|
|
378 |
(
|
|
|
379 |
(MenuItem
|
|
|
380 |
enabled: canMergeCurrentHolder
|
|
|
381 |
label: 'Use Base for Current Delta'
|
|
|
382 |
itemValue: doMergeCurrentUsingBase
|
|
|
383 |
isButton: true
|
|
|
384 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBase24x24)
|
|
|
385 |
)
|
|
|
386 |
(MenuItem
|
|
|
387 |
enabled: canMergeCurrentHolder
|
|
|
388 |
label: 'Use A for Current '
|
|
|
389 |
itemValue: doMergeCurrentUsingA
|
|
|
390 |
isButton: true
|
|
|
391 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingA24x24)
|
|
|
392 |
)
|
|
|
393 |
(MenuItem
|
|
|
394 |
enabled: canMergeCurrentHolder
|
|
|
395 |
label: 'Use B for Current '
|
|
|
396 |
itemValue: doMergeCurrentUsingB
|
|
|
397 |
isButton: true
|
|
|
398 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingB24x24)
|
|
|
399 |
)
|
|
|
400 |
(MenuItem
|
|
|
401 |
label: 'Use Base Everywhere'
|
|
|
402 |
itemValue: doMergeAllUsingBase
|
|
|
403 |
isButton: true
|
|
|
404 |
startGroup: right
|
|
|
405 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)
|
|
|
406 |
)
|
|
|
407 |
(MenuItem
|
|
|
408 |
label: 'Use A Everywhere'
|
|
|
409 |
itemValue: doMergeAllUsingA
|
|
|
410 |
isButton: true
|
|
|
411 |
startGroup: right
|
|
|
412 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)
|
|
|
413 |
)
|
|
|
414 |
(MenuItem
|
|
|
415 |
label: 'Use Be Everywhere '
|
|
|
416 |
itemValue: doMergeAllUsingB
|
|
|
417 |
isButton: true
|
|
|
418 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)
|
|
|
419 |
)
|
|
|
420 |
(MenuItem
|
|
|
421 |
label: 'Auto Merge'
|
|
|
422 |
itemValue: doMergeAllAuto
|
|
|
423 |
isButton: true
|
|
|
424 |
startGroup: right
|
|
|
425 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeMerge24x24)
|
|
|
426 |
)
|
|
|
427 |
(MenuItem
|
|
|
428 |
label: 'External Merge'
|
|
|
429 |
itemValue: doMergeAllExternal
|
|
|
430 |
isButton: true
|
|
|
431 |
startGroup: right
|
|
|
432 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeMergeExternal24x24)
|
|
|
433 |
)
|
|
|
434 |
)
|
|
|
435 |
nil
|
|
|
436 |
nil
|
|
|
437 |
)
|
|
|
438 |
|
|
|
439 |
"Modified: / 17-01-2013 / 22:31:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
440 |
! !
|
|
|
441 |
|
|
|
442 |
!TextDiff3Tool class methodsFor:'plugIn spec'!
|
|
|
443 |
|
|
|
444 |
aspectSelectors
|
|
|
445 |
"This resource specification was automatically generated
|
|
|
446 |
by the UIPainter of ST/X."
|
|
|
447 |
|
|
|
448 |
"Do not manually edit this. If it is corrupted,
|
|
|
449 |
the UIPainter may not be able to read the specification."
|
|
|
450 |
|
|
|
451 |
"Return a description of exported aspects;
|
|
|
452 |
these can be connected to aspects of an embedding application
|
|
|
453 |
(if this app is embedded in a subCanvas)."
|
|
|
454 |
|
|
|
455 |
^ #(
|
|
|
456 |
#codeAspectHolder
|
|
|
457 |
#labelAHolder
|
|
|
458 |
#labelBHolde
|
|
|
459 |
#labelCHolder
|
|
|
460 |
#labelHolder
|
|
|
461 |
#languageHolder
|
|
|
462 |
#mergeDataHolder
|
|
|
463 |
#mergeHolder
|
|
|
464 |
#textAHolder
|
|
|
465 |
#textBHolder
|
|
|
466 |
#textCHolder
|
|
|
467 |
).
|
|
|
468 |
|
|
|
469 |
! !
|
|
|
470 |
|
|
|
471 |
!TextDiff3Tool methodsFor:'accessing'!
|
|
|
472 |
|
|
|
473 |
beDiff3Tool
|
|
|
474 |
|
|
|
475 |
self mergeHolder value: false
|
|
|
476 |
|
|
|
477 |
"Created: / 17-03-2012 / 12:23:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
478 |
!
|
|
|
479 |
|
|
|
480 |
beMergeTool
|
|
|
481 |
|
|
|
482 |
self mergeHolder value: true
|
|
|
483 |
|
|
|
484 |
"Created: / 17-03-2012 / 12:23:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
485 |
!
|
|
|
486 |
|
|
|
487 |
mergeData
|
|
|
488 |
|
|
|
489 |
^self mergeDataHolder value
|
|
|
490 |
|
|
|
491 |
"Created: / 20-03-2012 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
492 |
! !
|
|
|
493 |
|
|
|
494 |
!TextDiff3Tool methodsFor:'aspects'!
|
|
|
495 |
|
|
|
496 |
contentSpecHolder
|
|
|
497 |
"return/create the 'contentSpecHolder' value holder (automatically generated)"
|
|
|
498 |
|
|
|
499 |
contentSpecHolder isNil ifTrue:[
|
|
|
500 |
contentSpecHolder := ValueHolder new.
|
|
|
501 |
self mergeHolder value
|
|
|
502 |
ifTrue:[contentSpecHolder setValue: #mergeSpec]
|
|
|
503 |
ifFalse:[contentSpecHolder setValue: #diff3Spec].
|
|
|
504 |
contentSpecHolder addDependent:self.
|
|
|
505 |
].
|
|
|
506 |
^ contentSpecHolder
|
|
|
507 |
|
|
|
508 |
"Created: / 17-01-2013 / 20:20:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
509 |
!
|
|
|
510 |
|
|
|
511 |
diffView
|
|
|
512 |
diffView notNil ifTrue:[
|
|
|
513 |
self breakPoint: #jv.
|
|
|
514 |
].
|
|
|
515 |
diffView := self initializeDiffView.
|
|
|
516 |
^diffView
|
|
|
517 |
|
|
|
518 |
"Created: / 17-01-2013 / 20:24:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
519 |
!
|
|
|
520 |
|
|
|
521 |
mergeDataHolder
|
|
|
522 |
"return/create the 'mergeDataHolder' value holder (automatically generated)"
|
|
|
523 |
|
|
|
524 |
mergeDataHolder isNil ifTrue:[
|
|
|
525 |
mergeDataHolder := ValueHolder new.
|
|
|
526 |
mergeDataHolder addDependent:self.
|
|
|
527 |
].
|
|
|
528 |
^ mergeDataHolder
|
|
|
529 |
!
|
|
|
530 |
|
|
|
531 |
mergeDataHolder:something
|
|
|
532 |
"set the 'mergeDataHolder' value holder (automatically generated)"
|
|
|
533 |
|
|
|
534 |
|oldValue newValue|
|
|
|
535 |
|
|
|
536 |
mergeDataHolder notNil ifTrue:[
|
|
|
537 |
oldValue := mergeDataHolder value.
|
|
|
538 |
mergeDataHolder removeDependent:self.
|
|
|
539 |
].
|
|
|
540 |
mergeDataHolder := something.
|
|
|
541 |
mergeDataHolder notNil ifTrue:[
|
|
|
542 |
mergeDataHolder addDependent:self.
|
|
|
543 |
].
|
|
|
544 |
newValue := mergeDataHolder value.
|
|
|
545 |
oldValue ~~ newValue ifTrue:[
|
|
|
546 |
self update:#value with:newValue from:mergeDataHolder.
|
|
|
547 |
].
|
|
|
548 |
!
|
|
|
549 |
|
|
|
550 |
mergeHolder
|
|
|
551 |
"return/create the 'mergeHolder' value holder (automatically generated)"
|
|
|
552 |
|
|
|
553 |
mergeHolder isNil ifTrue:[
|
|
|
554 |
mergeHolder := ValueHolder with: false.
|
|
|
555 |
mergeHolder addDependent:self.
|
|
|
556 |
].
|
|
|
557 |
^ mergeHolder
|
|
|
558 |
|
|
|
559 |
"Modified: / 16-03-2012 / 13:24:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
560 |
!
|
|
|
561 |
|
|
|
562 |
mergeHolder:something
|
|
|
563 |
"set the 'mergeHolder' value holder (automatically generated)"
|
|
|
564 |
|
|
|
565 |
|oldValue newValue|
|
|
|
566 |
|
|
|
567 |
mergeHolder notNil ifTrue:[
|
|
|
568 |
oldValue := mergeHolder value.
|
|
|
569 |
mergeHolder removeDependent:self.
|
|
|
570 |
].
|
|
|
571 |
mergeHolder := something.
|
|
|
572 |
mergeHolder notNil ifTrue:[
|
|
|
573 |
mergeHolder addDependent:self.
|
|
|
574 |
].
|
|
|
575 |
newValue := mergeHolder value.
|
|
|
576 |
oldValue ~~ newValue ifTrue:[
|
|
|
577 |
self update:#value with:newValue from:mergeHolder.
|
|
|
578 |
].
|
|
|
579 |
!
|
|
|
580 |
|
|
|
581 |
mergeIntervalHolder
|
|
|
582 |
"return/create the 'mergeIntervalHolder' value holder (automatically generated)"
|
|
|
583 |
|
|
|
584 |
mergeIntervalHolder isNil ifTrue:[
|
|
|
585 |
mergeIntervalHolder := ValueHolder new.
|
|
|
586 |
mergeIntervalHolder addDependent:self.
|
|
|
587 |
].
|
|
|
588 |
^ mergeIntervalHolder
|
|
|
589 |
!
|
|
|
590 |
|
|
|
591 |
mergeIntervalHolder:something
|
|
|
592 |
"set the 'mergeIntervalHolder' value holder (automatically generated)"
|
|
|
593 |
|
|
|
594 |
|oldValue newValue|
|
|
|
595 |
|
|
|
596 |
mergeIntervalHolder notNil ifTrue:[
|
|
|
597 |
oldValue := mergeIntervalHolder value.
|
|
|
598 |
mergeIntervalHolder removeDependent:self.
|
|
|
599 |
].
|
|
|
600 |
mergeIntervalHolder := something.
|
|
|
601 |
mergeIntervalHolder notNil ifTrue:[
|
|
|
602 |
mergeIntervalHolder addDependent:self.
|
|
|
603 |
].
|
|
|
604 |
newValue := mergeIntervalHolder value.
|
|
|
605 |
oldValue ~~ newValue ifTrue:[
|
|
|
606 |
self update:#value with:newValue from:mergeIntervalHolder.
|
|
|
607 |
].
|
|
|
608 |
! !
|
|
|
609 |
|
|
|
610 |
!TextDiff3Tool methodsFor:'aspects - queries'!
|
|
|
611 |
|
|
|
612 |
canMergeCurrentHolder
|
|
|
613 |
^self builder bindings at:#canMergeCurrentHolder ifAbsentPut:[
|
|
|
614 |
BlockValue
|
|
|
615 |
with:[:model|model value notNil]
|
|
|
616 |
argument: self mergeIntervalHolder
|
|
|
617 |
]
|
|
|
618 |
|
|
|
619 |
"Created: / 30-11-2012 / 13:49:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
620 |
! !
|
|
|
621 |
|
|
|
622 |
!TextDiff3Tool methodsFor:'aspects-versions'!
|
|
|
623 |
|
|
|
624 |
labelMergedHolder
|
|
|
625 |
"return/create the 'labelMergedHolder' value holder (automatically generated)"
|
|
|
626 |
|
|
|
627 |
labelMergedHolder isNil ifTrue:[
|
|
|
628 |
labelMergedHolder := ValueHolder with:'Merge'.
|
|
|
629 |
].
|
|
|
630 |
^ labelMergedHolder
|
|
|
631 |
|
|
|
632 |
"Modified: / 17-03-2012 / 12:36:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
633 |
!
|
|
|
634 |
|
|
|
635 |
labelMergedHolder:something
|
|
|
636 |
"set the 'labelMergedHolder' value holder (automatically generated)"
|
|
|
637 |
|
|
|
638 |
labelMergedHolder := something.
|
|
|
639 |
!
|
|
|
640 |
|
|
|
641 |
textMergedHolder
|
|
|
642 |
"return/create the 'textMergedHolder' value holder (automatically generated)"
|
|
|
643 |
|
|
|
644 |
textMergedHolder isNil ifTrue:[
|
|
|
645 |
textMergedHolder := ValueHolder new.
|
|
|
646 |
].
|
|
|
647 |
^ textMergedHolder
|
|
|
648 |
!
|
|
|
649 |
|
|
|
650 |
textMergedHolder:something
|
|
|
651 |
"set the 'textMergedHolder' value holder (automatically generated)"
|
|
|
652 |
|
|
|
653 |
textMergedHolder := something.
|
|
|
654 |
! !
|
|
|
655 |
|
|
|
656 |
!TextDiff3Tool methodsFor:'change & update'!
|
|
|
657 |
|
|
|
658 |
update:something with:aParameter from:changedObject
|
|
|
659 |
"Invoked when an object that I depend upon sends a change notification."
|
|
|
660 |
|
|
|
661 |
"stub code automatically generated - please change as required"
|
|
|
662 |
|
|
|
663 |
changedObject == mergeHolder ifTrue:[
|
|
|
664 |
self updateViews.
|
|
|
665 |
self updateMergeData.
|
|
|
666 |
self updateCodeViewSynchronization.
|
|
|
667 |
^ self.
|
|
|
668 |
].
|
|
|
669 |
super update:something with:aParameter from:changedObject
|
|
|
670 |
|
|
|
671 |
"Modified: / 19-03-2012 / 14:29:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
672 |
!
|
|
|
673 |
|
|
|
674 |
updateAfterAorBorCChanged
|
|
|
675 |
|
|
|
676 |
(textAChanged & textBChanged & textCChanged) ifTrue:[
|
|
|
677 |
textAChanged := textBChanged := textCChanged := false.
|
|
|
678 |
self updateViews.
|
|
|
679 |
self isMerge ifTrue:[
|
|
|
680 |
self updateMergeData.
|
|
|
681 |
].
|
|
|
682 |
].
|
|
|
683 |
|
|
|
684 |
"Created: / 16-03-2012 / 15:26:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
685 |
!
|
|
|
686 |
|
|
|
687 |
updateCodeViewSynchronization
|
|
|
688 |
|
|
|
689 |
diffView isNil ifTrue:[ ^ self ].
|
|
|
690 |
mergeView isNil ifTrue:[ ^ self ].
|
|
|
691 |
self isMerge ifTrue:[
|
|
|
692 |
"/ diffView synchronizeWith: mergeView.
|
|
|
693 |
diffView textViews do:[:e|
|
|
|
694 |
mergeView synchronizeWith: e.
|
|
|
695 |
]
|
|
|
696 |
] ifFalse:[
|
|
|
697 |
"/ diffView unsynchronizeWith: mergeView.
|
|
|
698 |
diffView textViews do:[:e|
|
|
|
699 |
mergeView unsynchronizeWith: e.
|
|
|
700 |
]
|
|
|
701 |
|
|
|
702 |
]
|
|
|
703 |
|
|
|
704 |
"Created: / 19-03-2012 / 14:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
705 |
!
|
|
|
706 |
|
|
|
707 |
updateMergeData
|
|
|
708 |
| data |
|
|
|
709 |
|
|
|
710 |
(data := self mergeDataHolder value) isNil ifTrue:[
|
|
|
711 |
data := TextMergeInfo new.
|
|
|
712 |
data text1: self textC text2: self textA text3: self textB.
|
|
|
713 |
self mergeDataHolder value: data.
|
|
|
714 |
].
|
|
|
715 |
|
|
|
716 |
"Created: / 19-03-2012 / 11:52:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
717 |
!
|
|
|
718 |
|
|
|
719 |
updateViews
|
|
|
720 |
|
|
|
721 |
self mergeHolder value ifTrue:[
|
|
|
722 |
self contentSpecHolder value: #mergeSpec
|
|
|
723 |
] ifFalse:[
|
|
|
724 |
self contentSpecHolder value: #diff3Spec
|
|
|
725 |
].
|
|
|
726 |
|
|
|
727 |
diffView notNil ifTrue:[
|
|
|
728 |
diffView
|
|
|
729 |
text1: self textCHolder value
|
|
|
730 |
text2: self textAHolder value
|
|
|
731 |
text3: self textBHolder value.
|
|
|
732 |
]
|
|
|
733 |
|
|
|
734 |
"Created: / 16-03-2012 / 13:24:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
735 |
! !
|
|
|
736 |
|
|
|
737 |
!TextDiff3Tool methodsFor:'hooks'!
|
|
|
738 |
|
|
|
739 |
commonPostBuild
|
|
|
740 |
self updateViews
|
|
|
741 |
|
|
|
742 |
"Created: / 16-03-2012 / 13:25:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
743 |
!
|
|
|
744 |
|
|
|
745 |
postBuildDiffView:aScrollableView
|
|
|
746 |
|
|
|
747 |
super postBuildDiffView:aScrollableView.
|
|
|
748 |
diffView := aScrollableView scrolledView.
|
|
|
749 |
diffView notNil ifTrue:[
|
|
|
750 |
(self textAHolder value notNil and:[self textBHolder value notNil and:[self textCHolder value notNil]]) ifTrue:[
|
|
|
751 |
diffView scrolledView
|
|
|
752 |
text1: self textCHolder value
|
|
|
753 |
text2: self textAHolder value
|
|
|
754 |
text3: self textBHolder value
|
|
|
755 |
|
|
|
756 |
].
|
|
|
757 |
self updateCodeViewSynchronization.
|
|
|
758 |
].
|
|
|
759 |
|
|
|
760 |
"Created: / 16-03-2012 / 13:31:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
761 |
"Modified: / 17-01-2013 / 20:31:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
762 |
!
|
|
|
763 |
|
|
|
764 |
postBuildMergeView:aCodeView2
|
|
|
765 |
|
|
|
766 |
mergeView := aCodeView2.
|
|
|
767 |
self setupCodeView: aCodeView2.
|
|
|
768 |
mergeView registerService:
|
|
|
769 |
((mergeService := MergeService new)
|
|
|
770 |
dataHolder: self mergeDataHolder;
|
|
|
771 |
sectionIntervalHolder: self mergeIntervalHolder;
|
|
|
772 |
yourself).
|
|
|
773 |
self updateCodeViewSynchronization.
|
|
|
774 |
|
|
|
775 |
"Created: / 19-03-2012 / 11:47:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
776 |
"Modified: / 30-11-2012 / 13:47:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
777 |
! !
|
|
|
778 |
|
|
|
779 |
!TextDiff3Tool methodsFor:'initialization'!
|
|
|
780 |
|
|
|
781 |
initializeDiffView
|
|
|
782 |
"superclass Tools::TextDiffTool says that I am responsible to implement this method"
|
|
|
783 |
|
|
|
784 |
^ Tools::Diff3CodeView2 new
|
|
|
785 |
|
|
|
786 |
"Modified: / 16-01-2013 / 09:52:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
787 |
! !
|
|
|
788 |
|
|
|
789 |
!TextDiff3Tool methodsFor:'menu actions'!
|
|
|
790 |
|
|
|
791 |
doMergeAllAuto
|
|
|
792 |
self mergeDataHolder value
|
|
|
793 |
text1:self textC
|
|
|
794 |
text2:self textA
|
|
|
795 |
text3:self textB.
|
|
|
796 |
|
|
|
797 |
"Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
798 |
!
|
|
|
799 |
|
|
|
800 |
doMergeAllExternal
|
|
|
801 |
| left wc right merge |
|
|
|
802 |
|
|
|
803 |
left := Filename newTemporary.
|
|
|
804 |
left writingFileDo:[:s|s nextPutAll: self textC ? ''].
|
|
|
805 |
|
|
|
806 |
wc := Filename newTemporary.
|
|
|
807 |
wc writingFileDo:[:s|s nextPutAll: self textA ? ''].
|
|
|
808 |
|
|
|
809 |
right := Filename newTemporary.
|
|
|
810 |
right writingFileDo:[:s|s nextPutAll: self textB ? ''].
|
|
|
811 |
|
|
|
812 |
merge := Filename newTemporary.
|
|
|
813 |
|
|
|
814 |
[
|
|
|
815 |
(OperatingSystem executeCommand:
|
|
|
816 |
('%1 %2 %3 %4 -o %5'
|
|
|
817 |
bindWith: 'kdiff3'
|
|
|
818 |
with: left pathName
|
|
|
819 |
with: wc pathName
|
|
|
820 |
with: right pathName
|
|
|
821 |
with: merge pathName)) ifTrue:[
|
|
|
822 |
merge exists ifTrue:[
|
|
|
823 |
self mergeData mergeUsing: merge contents asString
|
|
|
824 |
].
|
|
|
825 |
]
|
|
|
826 |
] ensure:[
|
|
|
827 |
left remove.
|
|
|
828 |
wc remove.
|
|
|
829 |
right remove.
|
|
|
830 |
merge exists ifTrue:[merge remove].
|
|
|
831 |
]
|
|
|
832 |
|
|
|
833 |
"Modified: / 16-01-2013 / 10:02:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
834 |
!
|
|
|
835 |
|
|
|
836 |
doMergeAllUsingA
|
|
|
837 |
self mergeData mergeUsingA: self textA
|
|
|
838 |
|
|
|
839 |
"Created: / 30-11-2012 / 13:33:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
840 |
!
|
|
|
841 |
|
|
|
842 |
doMergeAllUsingB
|
|
|
843 |
|
|
|
844 |
self mergeData mergeUsingB: self textB
|
|
|
845 |
|
|
|
846 |
"Created: / 30-11-2012 / 13:33:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
847 |
!
|
|
|
848 |
|
|
|
849 |
doMergeAllUsingBase
|
|
|
850 |
self mergeData mergeUsingBase: self textC
|
|
|
851 |
|
|
|
852 |
"Created: / 30-11-2012 / 13:33:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
853 |
!
|
|
|
854 |
|
|
|
855 |
doMergeCurrentUsingA
|
|
|
856 |
|
|
|
857 |
| interval |
|
|
|
858 |
interval := mergeService sectionInterval.
|
|
|
859 |
interval notNil ifTrue:[
|
|
|
860 |
self mergeData mergeUsingA: self textA interval: interval
|
|
|
861 |
]
|
|
|
862 |
|
|
|
863 |
"Created: / 30-11-2012 / 13:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
864 |
!
|
|
|
865 |
|
|
|
866 |
doMergeCurrentUsingB
|
|
|
867 |
|
|
|
868 |
| interval |
|
|
|
869 |
interval := mergeService sectionInterval.
|
|
|
870 |
interval notNil ifTrue:[
|
|
|
871 |
self mergeData mergeUsingB: self textB interval: interval
|
|
|
872 |
]
|
|
|
873 |
|
|
|
874 |
"Created: / 30-11-2012 / 13:33:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
875 |
!
|
|
|
876 |
|
|
|
877 |
doMergeCurrentUsingBase
|
|
|
878 |
|
|
|
879 |
| interval |
|
|
|
880 |
interval := mergeService sectionInterval.
|
|
|
881 |
interval notNil ifTrue:[
|
|
|
882 |
self mergeData mergeUsingBase: self textC interval: interval
|
|
|
883 |
]
|
|
|
884 |
|
|
|
885 |
"Created: / 30-11-2012 / 13:34:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
886 |
! !
|
|
|
887 |
|
|
|
888 |
!TextDiff3Tool methodsFor:'testing'!
|
|
|
889 |
|
|
|
890 |
isDiff3
|
|
|
891 |
^true
|
|
|
892 |
|
|
|
893 |
"Created: / 16-03-2012 / 15:21:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
894 |
!
|
|
|
895 |
|
|
|
896 |
isMerge
|
|
|
897 |
|
|
|
898 |
^self mergeHolder value
|
|
|
899 |
|
|
|
900 |
"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
901 |
! !
|
|
|
902 |
|
|
|
903 |
!TextDiff3Tool::MergeService class methodsFor:'accessing'!
|
|
|
904 |
|
|
|
905 |
label
|
|
|
906 |
"Answers short label - for UI"
|
|
|
907 |
|
|
|
908 |
^'Merge Support Service'
|
|
|
909 |
|
|
|
910 |
"Created: / 19-03-2012 / 11:48:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
911 |
! !
|
|
|
912 |
|
|
|
913 |
!TextDiff3Tool::MergeService class methodsFor:'queries'!
|
|
|
914 |
|
|
|
915 |
isUsefulFor:aCodeView
|
|
|
916 |
"this filters useful services.
|
|
|
917 |
must be redefined to return true in subclasses (but each class must do it only
|
|
|
918 |
for itself - not for subclasses"
|
|
|
919 |
|
|
|
920 |
^ self == Tools::TextDiff3Tool::MergeService
|
|
|
921 |
|
|
|
922 |
"Created: / 23-08-2013 / 10:56:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
923 |
! !
|
|
|
924 |
|
|
|
925 |
!TextDiff3Tool::MergeService class methodsFor:'testing'!
|
|
|
926 |
|
|
|
927 |
isAvailable
|
|
|
928 |
|
|
|
929 |
^false "/Should be installed explicitly"
|
|
|
930 |
|
|
|
931 |
"Created: / 19-03-2012 / 11:45:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
932 |
! !
|
|
|
933 |
|
|
|
934 |
!TextDiff3Tool::MergeService methodsFor:'accessing'!
|
|
|
935 |
|
|
|
936 |
infoAtLine: lineNr
|
|
|
937 |
|
|
|
938 |
data isNil ifTrue:[ ^ nil ].
|
|
|
939 |
^(lineNr between: 1 and: data listInfos size) ifTrue:[
|
|
|
940 |
data listInfos at: lineNr
|
|
|
941 |
] ifFalse:[
|
|
|
942 |
nil
|
|
|
943 |
]
|
|
|
944 |
|
|
|
945 |
"Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
946 |
"Modified: / 23-08-2013 / 11:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
947 |
!
|
|
|
948 |
|
|
|
949 |
sectionInterval
|
|
|
950 |
^ sectionIntervalHolder value
|
|
|
951 |
|
|
|
952 |
"Modified: / 30-11-2012 / 13:45:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
953 |
!
|
|
|
954 |
|
|
|
955 |
sectionInterval: anObject
|
|
|
956 |
^ self sectionIntervalHolder value: anObject
|
|
|
957 |
|
|
|
958 |
"Created: / 30-11-2012 / 13:45:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
959 |
"Modified: / 15-01-2013 / 11:50:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
960 |
! !
|
|
|
961 |
|
|
|
962 |
!TextDiff3Tool::MergeService methodsFor:'aspects'!
|
|
|
963 |
|
|
|
964 |
dataHolder
|
|
|
965 |
"return/create the 'dataHolder' value holder (automatically generated)"
|
|
|
966 |
|
|
|
967 |
dataHolder isNil ifTrue:[
|
|
|
968 |
dataHolder := ValueHolder new.
|
|
|
969 |
dataHolder addDependent:self.
|
|
|
970 |
].
|
|
|
971 |
^ dataHolder
|
|
|
972 |
!
|
|
|
973 |
|
|
|
974 |
dataHolder:something
|
|
|
975 |
"set the 'dataHolder' value holder (automatically generated)"
|
|
|
976 |
|
|
|
977 |
|oldValue newValue|
|
|
|
978 |
|
|
|
979 |
dataHolder notNil ifTrue:[
|
|
|
980 |
oldValue := dataHolder value.
|
|
|
981 |
dataHolder removeDependent:self.
|
|
|
982 |
].
|
|
|
983 |
dataHolder := something.
|
|
|
984 |
dataHolder notNil ifTrue:[
|
|
|
985 |
dataHolder addDependent:self.
|
|
|
986 |
].
|
|
|
987 |
newValue := dataHolder value.
|
|
|
988 |
oldValue ~~ newValue ifTrue:[
|
|
|
989 |
self update:#value with:newValue from:dataHolder.
|
|
|
990 |
].
|
|
|
991 |
!
|
|
|
992 |
|
|
|
993 |
sectionIntervalHolder
|
|
|
994 |
"return/create the 'sectionIntervalHolder' value holder (automatically generated)"
|
|
|
995 |
|
|
|
996 |
sectionIntervalHolder isNil ifTrue:[
|
|
|
997 |
sectionIntervalHolder := ValueHolder new.
|
|
|
998 |
sectionIntervalHolder addDependent:self.
|
|
|
999 |
].
|
|
|
1000 |
^ sectionIntervalHolder
|
|
|
1001 |
!
|
|
|
1002 |
|
|
|
1003 |
sectionIntervalHolder:something
|
|
|
1004 |
"set the 'sectionIntervalHolder' value holder (automatically generated)"
|
|
|
1005 |
|
|
|
1006 |
|oldValue newValue|
|
|
|
1007 |
|
|
|
1008 |
sectionIntervalHolder notNil ifTrue:[
|
|
|
1009 |
oldValue := sectionIntervalHolder value.
|
|
|
1010 |
sectionIntervalHolder removeDependent:self.
|
|
|
1011 |
].
|
|
|
1012 |
sectionIntervalHolder := something.
|
|
|
1013 |
sectionIntervalHolder notNil ifTrue:[
|
|
|
1014 |
sectionIntervalHolder addDependent:self.
|
|
|
1015 |
].
|
|
|
1016 |
newValue := sectionIntervalHolder value.
|
|
|
1017 |
oldValue ~~ newValue ifTrue:[
|
|
|
1018 |
self update:#value with:newValue from:sectionIntervalHolder.
|
|
|
1019 |
].
|
|
|
1020 |
! !
|
|
|
1021 |
|
|
|
1022 |
!TextDiff3Tool::MergeService methodsFor:'change & update'!
|
|
|
1023 |
|
|
|
1024 |
dataChanged
|
|
|
1025 |
"Merge data has changes, update text view"
|
|
|
1026 |
| changed |
|
|
|
1027 |
|
|
|
1028 |
textView isNil ifTrue:[
|
|
|
1029 |
^ self "/not yet registered
|
|
|
1030 |
].
|
|
|
1031 |
data isNil ifTrue:[
|
|
|
1032 |
textView list: #().
|
|
|
1033 |
^self.
|
|
|
1034 |
].
|
|
|
1035 |
|
|
|
1036 |
"/Collect conflicted lines"
|
|
|
1037 |
changed := data listInfos
|
|
|
1038 |
select:[:info|info isConflict]
|
|
|
1039 |
thenCollect:[:info|info line].
|
|
|
1040 |
|
|
|
1041 |
textView changedLines: changed.
|
|
|
1042 |
textView diffMode: true.
|
|
|
1043 |
textView list: data list.
|
|
|
1044 |
textView invalidate.
|
|
|
1045 |
gutterView invalidate.
|
|
|
1046 |
|
|
|
1047 |
"Created: / 19-03-2012 / 12:41:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1048 |
!
|
|
|
1049 |
|
|
|
1050 |
dataHolderChanged
|
|
|
1051 |
|
|
|
1052 |
data notNil ifTrue:[
|
|
|
1053 |
data removeDependent: self.
|
|
|
1054 |
].
|
|
|
1055 |
data := dataHolder value.
|
|
|
1056 |
data notNil ifTrue:[
|
|
|
1057 |
data addDependent: self.
|
|
|
1058 |
].
|
|
|
1059 |
self sectionInterval: nil.
|
|
|
1060 |
self dataChanged
|
|
|
1061 |
|
|
|
1062 |
"Created: / 19-03-2012 / 11:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1063 |
"Modified: / 30-11-2012 / 13:46:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1064 |
!
|
|
|
1065 |
|
|
|
1066 |
update:something with:aParameter from:changedObject
|
|
|
1067 |
"Invoked when an object that I depend upon sends a change notification."
|
|
|
1068 |
|
|
|
1069 |
"stub code automatically generated - please change as required"
|
|
|
1070 |
|
|
|
1071 |
changedObject == dataHolder ifTrue:[
|
|
|
1072 |
self dataHolderChanged.
|
|
|
1073 |
^ self.
|
|
|
1074 |
].
|
|
|
1075 |
changedObject == data ifTrue:[
|
|
|
1076 |
self dataChanged.
|
|
|
1077 |
^ self.
|
|
|
1078 |
].
|
|
|
1079 |
|
|
|
1080 |
changedObject == sectionIntervalHolder ifTrue:[
|
|
|
1081 |
gutterView invalidate.
|
|
|
1082 |
^self
|
|
|
1083 |
].
|
|
|
1084 |
super update:something with:aParameter from:changedObject
|
|
|
1085 |
|
|
|
1086 |
"Modified: / 30-11-2012 / 13:45:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1087 |
!
|
|
|
1088 |
|
|
|
1089 |
updateSelection: lineNr
|
|
|
1090 |
"For given number, update sectionInterval"
|
|
|
1091 |
|
|
|
1092 |
| conflict |
|
|
|
1093 |
lineNr notNil ifTrue:[
|
|
|
1094 |
conflict := (self infoAtLine: lineNr) conflict.
|
|
|
1095 |
].
|
|
|
1096 |
lineNr isNil"conflict isNil" ifTrue:[
|
|
|
1097 |
self sectionInterval: nil
|
|
|
1098 |
] ifFalse:[
|
|
|
1099 |
| start stop i |
|
|
|
1100 |
i := lineNr - 1.
|
|
|
1101 |
[ i > 0 and:[ (self infoAtLine: i) conflict == conflict ]]
|
|
|
1102 |
whileTrue:[ i := i - 1 ].
|
|
|
1103 |
start := i + 1.
|
|
|
1104 |
i := lineNr + 1.
|
|
|
1105 |
[ i < (data listInfos size) and:[ (self infoAtLine: i) conflict == conflict ]]
|
|
|
1106 |
whileTrue:[ i := i + 1 ].
|
|
|
1107 |
stop := i - 1.
|
|
|
1108 |
self sectionInterval: (start to: stop).
|
|
|
1109 |
].
|
|
|
1110 |
gutterView invalidate.
|
|
|
1111 |
|
|
|
1112 |
"Created: / 03-04-2012 / 19:29:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1113 |
"Modified: / 30-11-2012 / 13:45:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1114 |
! !
|
|
|
1115 |
|
|
|
1116 |
!TextDiff3Tool::MergeService methodsFor:'drawing'!
|
|
|
1117 |
|
|
|
1118 |
drawLine:lineNo in:view atX:x y:y width:w height:h from:startCol to:endColOrNil with:fg and:bg
|
|
|
1119 |
"Called by both gutterView and textView (well, not yet) to
|
|
|
1120 |
allow services to draw custom things on text view.
|
|
|
1121 |
Ask JV what the args means if unsure (I'm lazy to document
|
|
|
1122 |
them, now it is just an experiment...)"
|
|
|
1123 |
|
|
|
1124 |
| info color sectionInterval |
|
|
|
1125 |
|
|
|
1126 |
sectionInterval := self sectionInterval.
|
|
|
1127 |
view == gutterView ifFalse:[ ^ self ].
|
|
|
1128 |
info := self infoAtLine: lineNo.
|
|
|
1129 |
info notNil ifTrue:[
|
|
|
1130 |
color := info color.
|
|
|
1131 |
color notNil ifTrue:[
|
|
|
1132 |
view fillRectangleX: x y:y - h
|
|
|
1133 |
width: 8
|
|
|
1134 |
height:h + textView lineSpacing + 5"Magic constant to make it look nicer"
|
|
|
1135 |
color: color.
|
|
|
1136 |
].
|
|
|
1137 |
].
|
|
|
1138 |
|
|
|
1139 |
(sectionInterval notNil and:[sectionInterval includes: lineNo]) ifTrue:[
|
|
|
1140 |
"Drawing outside annotation area is not nice, but..."
|
|
|
1141 |
view fillRectangleX:view width - 7 y:y - h
|
|
|
1142 |
width:4
|
|
|
1143 |
height:h + textView lineSpacing + 5"Magic constant to make it look nicer"
|
|
|
1144 |
color: Color gray.
|
|
|
1145 |
]
|
|
|
1146 |
|
|
|
1147 |
"Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1148 |
"Modified: / 30-11-2012 / 13:46:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1149 |
! !
|
|
|
1150 |
|
|
|
1151 |
!TextDiff3Tool::MergeService methodsFor:'event handling'!
|
|
|
1152 |
|
|
|
1153 |
buttonPress: button x:x y:y in: view
|
|
|
1154 |
|
|
|
1155 |
"Handles an event in given view (a subview of codeView).
|
|
|
1156 |
If the method returns true, it has eaten the event and it will not be processed
|
|
|
1157 |
by the view."
|
|
|
1158 |
|
|
|
1159 |
|lineNr|
|
|
|
1160 |
|
|
|
1161 |
view == gutterView ifFalse:[ ^ false ].
|
|
|
1162 |
button == 1 ifFalse:[ ^ false ].
|
|
|
1163 |
|
|
|
1164 |
self updateSelection: (textView yVisibleToLineNr:y).
|
|
|
1165 |
|
|
|
1166 |
|
|
|
1167 |
^false
|
|
|
1168 |
|
|
|
1169 |
"Created: / 03-04-2012 / 19:23:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1170 |
!
|
|
|
1171 |
|
|
|
1172 |
linesModifiedFrom: start to: end
|
|
|
1173 |
|
|
|
1174 |
start to: end do:[:i|
|
|
|
1175 |
(data listInfos at:i) resolution: #Merged.
|
|
|
1176 |
].
|
|
|
1177 |
gutterView invalidate.
|
|
|
1178 |
|
|
|
1179 |
"Created: / 06-07-2011 / 17:14:36 / jv"
|
|
|
1180 |
"Created: / 20-03-2012 / 22:57:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1181 |
! !
|
|
|
1182 |
|
|
|
1183 |
!TextDiff3Tool::MergeService methodsFor:'registering'!
|
|
|
1184 |
|
|
|
1185 |
registerIn: aCodeView
|
|
|
1186 |
|
|
|
1187 |
"Installs myself in aCodeView"
|
|
|
1188 |
|
|
|
1189 |
super registerIn: aCodeView.
|
|
|
1190 |
self dataChanged.
|
|
|
1191 |
|
|
|
1192 |
"Modified: / 17-06-2011 / 13:07:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1193 |
"Created: / 19-03-2012 / 12:52:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
1194 |
! !
|
|
|
1195 |
|
|
|
1196 |
!TextDiff3Tool class methodsFor:'documentation'!
|
|
|
1197 |
|
|
|
1198 |
version_HG
|
|
|
1199 |
|
|
|
1200 |
^ '$Changeset: <not expanded> $'
|
|
|
1201 |
!
|
|
|
1202 |
|
|
|
1203 |
version_SVN
|
|
|
1204 |
^ '$Id: Tools__TextDiff3Tool.st,v 1.1 2014-02-05 18:39:57 vrany Exp $'
|
|
|
1205 |
! !
|
|
|
1206 |
|