author | Claus Gittinger <cg@exept.de> |
Mon, 15 Jul 2019 18:53:35 +0200 | |
changeset 18903 | b0d007a5e683 |
parent 18766 | e0a9a93a8edc |
child 18964 | 0ef8de554702 |
permissions | -rw-r--r-- |
18288 | 1 |
"{ Encoding: utf8 }" |
2 |
||
10194 | 3 |
" |
4 |
Copyright (c) 2007-2010 Jan Vrany |
|
5 |
Copyright (c) 2009-2010 eXept Software AG |
|
6 |
||
7 |
Permission is hereby granted, free of charge, to any person |
|
8 |
obtaining a copy of this software and associated documentation |
|
9 |
files (the 'Software'), to deal in the Software without |
|
10 |
restriction, including without limitation the rights to use, |
|
11 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
12 |
copies of the Software, and to permit persons to whom the |
|
13 |
Software is furnished to do so, subject to the following |
|
14 |
conditions: |
|
15 |
||
16 |
The above copyright notice and this permission notice shall be |
|
17 |
included in all copies or substantial portions of the Software. |
|
18 |
||
19 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
20 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
21 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
22 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
23 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
24 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
25 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
26 |
OTHER DEALINGS IN THE SOFTWARE. |
|
27 |
" |
|
10741
e4645cbb0958
Fix package def libbasic3->libtool
Stefan Vogel <sv@exept.de>
parents:
10194
diff
changeset
|
28 |
"{ Package: 'stx:libtool' }" |
10194 | 29 |
|
30 |
"{ NameSpace: Tools }" |
|
31 |
||
32 |
ApplicationModel subclass:#ChangeSetDiffTool |
|
13880 | 33 |
instanceVariableNames:'infoPanel diffInfoHolder listHolder singleSelectionHolder |
34 |
diffsetHolder titleHolder firstColSelectionHolder |
|
35 |
navigatorPanelSpecHolder diffMenuHolder diffsetHolderPrivate |
|
36 |
selectionHolder versionATextHolder versionBTextHolder |
|
37 |
versionBaseTextHolder textDiffToolHolder |
|
38 |
textDiffToolWindowSpecHolder mergeHolder mergeData |
|
39 |
mergeDataHolder showVersionMethodDiffsHolder |
|
40 |
showCopyrightMethodDiffsHolder highlightConflictsHolder |
|
41 |
hasDiffsetHolder mergeSavedHolder canSaveHolder |
|
42 |
autoMoveToNextConflictHolder textDiff2App textDiff3App list1App |
|
43 |
list2App alreadyWarnedAboutUnsavedMerge labelSpecHolder |
|
44 |
labelsView navigatorAndDiffPanelView codeAspectHolder' |
|
45 |
classVariableNames:'LastDiffInfo AutoMoveToNextConflict' |
|
10194 | 46 |
poolDictionaries:'' |
47 |
category:'Interface-Diff' |
|
48 |
! |
|
49 |
||
50 |
SimpleDialog subclass:#OpenDialog |
|
13880 | 51 |
instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder |
52 |
changesetSpecBaseHolder changesetSpecBaseEnabledHolder |
|
53 |
changesetSpecMergedHolder changesetSpecMergedEnabledHolder' |
|
10194 | 54 |
classVariableNames:'LastDirectory' |
55 |
poolDictionaries:'' |
|
56 |
privateIn:ChangeSetDiffTool |
|
57 |
! |
|
58 |
||
59 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
60 |
||
61 |
copyright |
|
62 |
" |
|
63 |
Copyright (c) 2007-2010 Jan Vrany |
|
64 |
Copyright (c) 2009-2010 eXept Software AG |
|
65 |
||
66 |
Permission is hereby granted, free of charge, to any person |
|
67 |
obtaining a copy of this software and associated documentation |
|
68 |
files (the 'Software'), to deal in the Software without |
|
69 |
restriction, including without limitation the rights to use, |
|
70 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
71 |
copies of the Software, and to permit persons to whom the |
|
72 |
Software is furnished to do so, subject to the following |
|
73 |
conditions: |
|
74 |
||
75 |
The above copyright notice and this permission notice shall be |
|
76 |
included in all copies or substantial portions of the Software. |
|
77 |
||
78 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
79 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
80 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
81 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
82 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
83 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
84 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
85 |
OTHER DEALINGS IN THE SOFTWARE. |
|
86 |
||
87 |
" |
|
13880 | 88 |
! |
89 |
||
90 |
documentation |
|
91 |
" |
|
92 |
Tool for viewing/merging differences between two change sets |
|
93 |
||
94 |
[author:] |
|
95 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
|
96 |
||
97 |
[instance variables:] |
|
98 |
||
99 |
[class variables:] |
|
100 |
||
101 |
[see also:] |
|
102 |
||
103 |
" |
|
104 |
! |
|
105 |
||
106 |
examples |
|
107 |
" |
|
108 |
Starting the application: |
|
109 |
[exBegin] |
|
110 |
Tools::ChangeSetDiffTool open |
|
111 |
||
112 |
[exEnd] |
|
113 |
||
114 |
Show differences between CVS HEAD and SVN jv-branch |
|
115 |
NewSystemBrowser: |
|
116 |
[exBegin] |
|
117 |
| cvsCs svnCs | |
|
118 |
||
119 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
|
120 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
|
121 |
||
122 |
Tools::ChangeSetDiffTool new |
|
123 |
open; |
|
124 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs. |
|
125 |
||
126 |
[exEnd] |
|
127 |
||
128 |
Show differences between CVS HEAD and SVN jv-branch and |
|
129 |
base version of NewSystemBrowser: |
|
130 |
||
131 |
[exBegin] |
|
132 |
| cvsBaseCs cvsCs svnCs | |
|
133 |
||
134 |
cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'. |
|
135 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
|
136 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
|
137 |
||
138 |
Tools::ChangeSetDiffTool new |
|
139 |
open; |
|
140 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs |
|
141 |
||
142 |
[exEnd] |
|
143 |
||
144 |
||
145 |
||
146 |
" |
|
147 |
! ! |
|
148 |
||
149 |
!ChangeSetDiffTool class methodsFor:'accessing'! |
|
150 |
||
151 |
autoMoveToNextConflict |
|
152 |
^AutoMoveToNextConflict == true |
|
153 |
||
154 |
"Created: / 17-01-2013 / 19:49:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
155 |
! |
|
156 |
||
157 |
autoMoveToNextConflict: aBoolean |
|
158 |
AutoMoveToNextConflict := aBoolean |
|
159 |
||
160 |
"Created: / 17-01-2013 / 19:49:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 161 |
! ! |
162 |
||
163 |
!ChangeSetDiffTool class methodsFor:'accessing - defaults'! |
|
164 |
||
165 |
versionAColor |
|
166 |
||
167 |
^Color green lightened lightened |
|
168 |
||
169 |
"Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
170 |
! |
|
171 |
||
172 |
versionBColor |
|
173 |
||
174 |
^Color blue lightened lightened |
|
175 |
||
176 |
"Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
177 |
! |
|
178 |
||
179 |
versionBaseColor |
|
180 |
||
181 |
^Color yellow lightened lightened |
|
182 |
||
183 |
"Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
184 |
! |
|
185 |
||
186 |
versionNotPresentText |
|
16502 | 187 |
^ 'Not present' allItalic withColor:Color gray lighter |
10194 | 188 |
! ! |
189 |
||
190 |
!ChangeSetDiffTool class methodsFor:'image specs'! |
|
191 |
||
13880 | 192 |
mergeDiff3AToMergedArrow30x30 |
18288 | 193 |
<resource: #programImage> |
13880 | 194 |
|
195 |
^ToolbarIconLibrary mergeDiff3AToMergedArrow30x30 |
|
196 |
||
197 |
"Created: / 17-01-2013 / 23:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 198 |
"Modified: / 28-07-2018 / 09:50:51 / Claus Gittinger" |
13880 | 199 |
! |
200 |
||
201 |
mergeDiff3BToMergedArrow30x30 |
|
18288 | 202 |
<resource: #programImage> |
13880 | 203 |
|
204 |
^ToolbarIconLibrary mergeDiff3BToMergedArrow30x30 |
|
205 |
||
206 |
"Created: / 17-01-2013 / 23:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 207 |
"Modified: / 28-07-2018 / 09:50:48 / Claus Gittinger" |
13880 | 208 |
! |
209 |
||
210 |
mergeDiff3BaseToAArrow30x30 |
|
18288 | 211 |
<resource: #programImage> |
13880 | 212 |
|
213 |
^ToolbarIconLibrary mergeDiff3BaseToAArrow30x30 |
|
214 |
||
215 |
"Created: / 17-01-2013 / 23:52:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 216 |
"Modified: / 28-07-2018 / 09:50:45 / Claus Gittinger" |
13880 | 217 |
! |
218 |
||
219 |
mergeDiff3BaseToBArrow30x30 |
|
18288 | 220 |
<resource: #programImage> |
13880 | 221 |
|
222 |
^ToolbarIconLibrary mergeDiff3BaseToBArrow30x30 |
|
223 |
||
224 |
"Created: / 17-01-2013 / 23:51:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 225 |
"Modified: / 28-07-2018 / 09:50:43 / Claus Gittinger" |
13880 | 226 |
! |
227 |
||
10194 | 228 |
versionA24x24 |
18288 | 229 |
<resource: #programImage> |
10194 | 230 |
|
231 |
^ToolbarIconLibrary versionA24x24 |
|
232 |
||
233 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 234 |
"Modified: / 28-07-2018 / 09:50:40 / Claus Gittinger" |
10194 | 235 |
! |
236 |
||
237 |
versionB24x24 |
|
18288 | 238 |
<resource: #programImage> |
10194 | 239 |
|
240 |
^ToolbarIconLibrary versionB24x24 |
|
241 |
||
242 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 243 |
"Modified: / 28-07-2018 / 09:50:38 / Claus Gittinger" |
13880 | 244 |
! |
245 |
||
246 |
versionBase24x24 |
|
18288 | 247 |
<resource: #programImage> |
13880 | 248 |
|
249 |
^ToolbarIconLibrary versionBase24x24 |
|
250 |
||
251 |
"Created: / 17-01-2013 / 22:53:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 252 |
"Modified: / 28-07-2018 / 09:50:35 / Claus Gittinger" |
13880 | 253 |
! |
254 |
||
255 |
versionMerged24x24 |
|
18288 | 256 |
<resource: #programImage> |
13880 | 257 |
|
258 |
^ToolbarIconLibrary versionMerged24x24 |
|
259 |
||
260 |
"Created: / 17-01-2013 / 22:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 261 |
"Modified: / 28-07-2018 / 09:50:30 / Claus Gittinger" |
13880 | 262 |
! ! |
263 |
||
264 |
!ChangeSetDiffTool class methodsFor:'interface opening'! |
|
265 |
||
266 |
open |
|
267 |
| tool | |
|
268 |
||
269 |
tool := self new. |
|
270 |
tool open. |
|
271 |
tool window sensor pushUserEvent: #fileMenuOpen for: tool. |
|
272 |
||
273 |
"Created: / 01-08-2012 / 15:13:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 274 |
! ! |
275 |
||
276 |
!ChangeSetDiffTool class methodsFor:'interface specs'! |
|
277 |
||
13880 | 278 |
labelDiff2Spec |
279 |
"This resource specification was automatically generated |
|
280 |
by the UIPainter of ST/X." |
|
281 |
||
282 |
"Do not manually edit this!! If it is corrupted, |
|
283 |
the UIPainter may not be able to read the specification." |
|
284 |
||
285 |
" |
|
286 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff2Spec |
|
287 |
Tools::ChangeSetDiffTool new openInterface:#labelDiff2Spec |
|
288 |
" |
|
289 |
||
290 |
<resource: #canvas> |
|
291 |
||
292 |
^ |
|
293 |
#(FullSpec |
|
294 |
name: labelDiff2Spec |
|
295 |
window: |
|
296 |
(WindowSpec |
|
297 |
label: 'Label' |
|
298 |
name: 'Label' |
|
299 |
min: (Point 10 10) |
|
300 |
bounds: (Rectangle 0 0 600 60) |
|
301 |
) |
|
302 |
component: |
|
303 |
(SpecCollection |
|
304 |
collection: ( |
|
305 |
(UISubSpecification |
|
306 |
name: 'LabelA' |
|
307 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
308 |
minorKey: versionALabelSpec |
|
309 |
) |
|
310 |
(UISubSpecification |
|
311 |
name: 'LabelB' |
|
312 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
313 |
minorKey: versionBLabelSpec |
|
314 |
) |
|
315 |
) |
|
316 |
||
317 |
) |
|
318 |
) |
|
319 |
! |
|
320 |
||
321 |
labelDiff3Spec |
|
322 |
"This resource specification was automatically generated |
|
323 |
by the UIPainter of ST/X." |
|
324 |
||
325 |
"Do not manually edit this!! If it is corrupted, |
|
326 |
the UIPainter may not be able to read the specification." |
|
327 |
||
328 |
" |
|
329 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff3Spec |
|
330 |
Tools::ChangeSetDiffTool new openInterface:#labelDiff3Spec |
|
331 |
" |
|
332 |
||
333 |
<resource: #canvas> |
|
334 |
||
335 |
^ |
|
336 |
#(FullSpec |
|
337 |
name: labelDiff3Spec |
|
338 |
window: |
|
339 |
(WindowSpec |
|
340 |
label: 'Label' |
|
341 |
name: 'Label' |
|
342 |
min: (Point 10 10) |
|
343 |
bounds: (Rectangle 0 0 600 90) |
|
344 |
) |
|
345 |
component: |
|
346 |
(SpecCollection |
|
347 |
collection: ( |
|
348 |
(UISubSpecification |
|
349 |
name: 'LabelBase' |
|
350 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
351 |
minorKey: versionBaseLabelSpec |
|
352 |
) |
|
353 |
(UISubSpecification |
|
354 |
name: 'LabelA' |
|
355 |
layout: (LayoutFrame 0 0 30 0 0 1 60 0) |
|
356 |
minorKey: versionALabelSpec |
|
357 |
) |
|
358 |
(UISubSpecification |
|
359 |
name: 'LabelB' |
|
360 |
layout: (LayoutFrame 0 0 60 0 0 1 0 1) |
|
361 |
minorKey: versionBLabelSpec |
|
362 |
) |
|
363 |
) |
|
364 |
||
365 |
) |
|
366 |
) |
|
367 |
! |
|
368 |
||
369 |
labelMergeSpec |
|
370 |
"This resource specification was automatically generated |
|
371 |
by the UIPainter of ST/X." |
|
372 |
||
373 |
"Do not manually edit this!! If it is corrupted, |
|
374 |
the UIPainter may not be able to read the specification." |
|
375 |
||
376 |
" |
|
377 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelMergeSpec |
|
378 |
Tools::ChangeSetDiffTool new openInterface:#labelMergeSpec |
|
379 |
" |
|
380 |
||
381 |
<resource: #canvas> |
|
382 |
||
383 |
^ |
|
384 |
#(FullSpec |
|
385 |
name: labelMergeSpec |
|
386 |
window: |
|
387 |
(WindowSpec |
|
388 |
label: 'Label' |
|
389 |
name: 'Label' |
|
390 |
min: (Point 10 10) |
|
391 |
bounds: (Rectangle 0 0 600 120) |
|
392 |
) |
|
393 |
component: |
|
394 |
(SpecCollection |
|
395 |
collection: ( |
|
396 |
(UISubSpecification |
|
397 |
name: 'LabelBase' |
|
398 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
399 |
minorKey: mergeBaseLabelSpec |
|
400 |
) |
|
401 |
(UISubSpecification |
|
402 |
name: 'LabelA' |
|
403 |
layout: (LayoutFrame 0 0 30 0 0 1 60 0) |
|
404 |
minorKey: mergeALabelSpec |
|
405 |
) |
|
406 |
(UISubSpecification |
|
407 |
name: 'LabelB' |
|
408 |
layout: (LayoutFrame 0 0 60 0 0 1 90 0) |
|
409 |
minorKey: mergeBLabelSpec |
|
410 |
) |
|
411 |
(UISubSpecification |
|
412 |
name: 'SubSpecification1' |
|
413 |
layout: (LayoutFrame 0 0 90 0 0 1 0 1) |
|
414 |
minorKey: mergeMergeLabelSpec |
|
415 |
) |
|
416 |
) |
|
417 |
||
418 |
) |
|
419 |
) |
|
420 |
||
421 |
"Modified: / 17-01-2013 / 23:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
422 |
! |
|
423 |
||
10194 | 424 |
labelSpec |
425 |
"This resource specification was automatically generated |
|
426 |
by the UIPainter of ST/X." |
|
427 |
||
428 |
"Do not manually edit this!! If it is corrupted, |
|
429 |
the UIPainter may not be able to read the specification." |
|
430 |
||
431 |
" |
|
432 |
UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec |
|
433 |
SVN::DiffBrowser new openInterface:#labelSpec |
|
434 |
" |
|
435 |
||
436 |
<resource: #canvas> |
|
437 |
||
438 |
^ |
|
439 |
#(FullSpec |
|
440 |
name: labelSpec |
|
441 |
window: |
|
442 |
(WindowSpec |
|
443 |
label: 'Label' |
|
444 |
name: 'Label' |
|
445 |
min: (Point 10 10) |
|
446 |
bounds: (Rectangle 0 0 600 48) |
|
447 |
) |
|
448 |
component: |
|
449 |
(SpecCollection |
|
450 |
collection: ( |
|
451 |
(UISubSpecification |
|
452 |
name: 'LabelA' |
|
453 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
454 |
minorKey: versionALabelSpec |
|
455 |
) |
|
456 |
(UISubSpecification |
|
457 |
name: 'LabelB' |
|
458 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
459 |
minorKey: versionBLabelSpec |
|
460 |
) |
|
461 |
) |
|
462 |
||
463 |
) |
|
464 |
) |
|
465 |
! |
|
466 |
||
467 |
oneColumnNavigatorSpec |
|
468 |
"This resource specification was automatically generated |
|
469 |
by the UIPainter of ST/X." |
|
470 |
||
471 |
"Do not manually edit this!! If it is corrupted, |
|
472 |
the UIPainter may not be able to read the specification." |
|
473 |
||
474 |
" |
|
13880 | 475 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec |
476 |
Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec |
|
10194 | 477 |
" |
478 |
||
479 |
<resource: #canvas> |
|
480 |
||
13880 | 481 |
^ |
10194 | 482 |
#(FullSpec |
13880 | 483 |
name: oneColumnNavigatorSpec |
484 |
window: |
|
10194 | 485 |
(WindowSpec |
13880 | 486 |
label: 'One Column Navigator' |
487 |
name: 'One Column Navigator' |
|
488 |
min: (Point 10 10) |
|
489 |
bounds: (Rectangle 0 0 300 300) |
|
490 |
) |
|
491 |
component: |
|
10194 | 492 |
(SpecCollection |
13880 | 493 |
collection: ( |
494 |
(SubCanvasSpec |
|
495 |
name: 'DiffList' |
|
496 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
497 |
hasHorizontalScrollBar: false |
|
498 |
hasVerticalScrollBar: false |
|
499 |
majorKey: #'Tools::ChangeSetDiffList' |
|
500 |
subAspectHolders: |
|
501 |
(Array |
|
502 |
||
503 |
(SubChannelInfoSpec |
|
504 |
subAspect: highlightConflictsHolder |
|
505 |
aspect: highlightConflictsHolder |
|
506 |
) |
|
507 |
(SubChannelInfoSpec |
|
508 |
subAspect: inGeneratorHolder |
|
509 |
aspect: diffsetHolderPrivate |
|
510 |
) |
|
511 |
||
512 |
(SubChannelInfoSpec |
|
513 |
subAspect: listEntryLabelGenerator |
|
514 |
aspect: diffListEntryLabelGeneratorAspect |
|
515 |
) |
|
516 |
(SubChannelInfoSpec |
|
517 |
subAspect: menuHolder |
|
518 |
aspect: listMenuHolder |
|
519 |
) |
|
520 |
||
521 |
(SubChannelInfoSpec |
|
522 |
subAspect: outGeneratorHolder |
|
523 |
aspect: selectionHolder |
|
524 |
) |
|
525 |
(SubChannelInfoSpec |
|
526 |
subAspect: showCopyrightMethodDiffsHolder |
|
527 |
aspect: showCopyrightMethodDiffsHolder |
|
528 |
) |
|
529 |
||
530 |
(SubChannelInfoSpec |
|
531 |
subAspect: showVersionMethodDiffsHolder |
|
532 |
aspect: showVersionMethodDiffsHolder |
|
533 |
) |
|
534 |
) |
|
535 |
createNewApplication: true |
|
536 |
createNewBuilder: false |
|
537 |
postBuildCallback: list1View: |
|
538 |
) |
|
539 |
) |
|
540 |
||
541 |
) |
|
10194 | 542 |
) |
543 |
! |
|
544 |
||
545 |
twoColumnNavigatorSpec |
|
546 |
"This resource specification was automatically generated |
|
547 |
by the UIPainter of ST/X." |
|
548 |
||
549 |
"Do not manually edit this!! If it is corrupted, |
|
550 |
the UIPainter may not be able to read the specification." |
|
551 |
||
552 |
" |
|
13880 | 553 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec |
554 |
Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec |
|
10194 | 555 |
" |
556 |
||
557 |
<resource: #canvas> |
|
558 |
||
13880 | 559 |
^ |
10194 | 560 |
#(FullSpec |
13880 | 561 |
name: twoColumnNavigatorSpec |
562 |
window: |
|
10194 | 563 |
(WindowSpec |
13880 | 564 |
label: 'Two Column Navigator' |
565 |
name: 'Two Column Navigator' |
|
566 |
min: (Point 10 10) |
|
567 |
bounds: (Rectangle 0 0 300 300) |
|
568 |
) |
|
569 |
component: |
|
10194 | 570 |
(SpecCollection |
13880 | 571 |
collection: ( |
572 |
(VariableHorizontalPanelSpec |
|
573 |
name: 'Columns' |
|
574 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
575 |
component: |
|
576 |
(SpecCollection |
|
577 |
collection: ( |
|
578 |
(SubCanvasSpec |
|
579 |
name: 'LeftList' |
|
580 |
hasHorizontalScrollBar: false |
|
581 |
hasVerticalScrollBar: false |
|
582 |
majorKey: #'Tools::ChangeSetDiffList' |
|
583 |
subAspectHolders: |
|
584 |
(Array |
|
585 |
||
586 |
(SubChannelInfoSpec |
|
587 |
subAspect: highlightConflictsHolder |
|
588 |
aspect: highlightConflictsHolder |
|
589 |
) |
|
590 |
(SubChannelInfoSpec |
|
591 |
subAspect: inGeneratorHolder |
|
592 |
aspect: diffsetHolderPrivate |
|
593 |
) |
|
594 |
||
595 |
(SubChannelInfoSpec |
|
596 |
subAspect: listEntryLabelGenerator |
|
597 |
aspect: diffListEntryLabelGeneratorAspect |
|
598 |
) |
|
599 |
(SubChannelInfoSpec |
|
600 |
subAspect: menuHolder |
|
601 |
aspect: listMenuHolder |
|
602 |
) |
|
603 |
||
604 |
(SubChannelInfoSpec |
|
605 |
subAspect: outGeneratorHolder |
|
606 |
aspect: firstColSelectionHolder |
|
607 |
) |
|
608 |
(SubChannelInfoSpec |
|
609 |
subAspect: showCopyrightMethodDiffsHolder |
|
610 |
aspect: showCopyrightMethodDiffsHolder |
|
611 |
) |
|
612 |
||
613 |
(SubChannelInfoSpec |
|
614 |
subAspect: showVersionMethodDiffsHolder |
|
615 |
aspect: showVersionMethodDiffsHolder |
|
616 |
) |
|
617 |
) |
|
618 |
createNewApplication: true |
|
619 |
createNewBuilder: true |
|
620 |
postBuildCallback: list1View: |
|
621 |
) |
|
622 |
(SubCanvasSpec |
|
623 |
name: 'RightList' |
|
624 |
hasHorizontalScrollBar: false |
|
625 |
hasVerticalScrollBar: false |
|
626 |
majorKey: #'Tools::ChangeSetDiffList' |
|
627 |
subAspectHolders: |
|
628 |
(Array |
|
629 |
||
630 |
(SubChannelInfoSpec |
|
631 |
subAspect: highlightConflictsHolder |
|
632 |
aspect: highlightConflictsHolder |
|
633 |
) |
|
634 |
(SubChannelInfoSpec |
|
635 |
subAspect: inGeneratorHolder |
|
636 |
aspect: firstColSelectionHolder |
|
637 |
) |
|
638 |
||
639 |
(SubChannelInfoSpec |
|
640 |
subAspect: listEntryLabelGenerator |
|
641 |
aspect: diffListEntryLabelGeneratorAspect |
|
642 |
) |
|
643 |
(SubChannelInfoSpec |
|
644 |
subAspect: menuHolder |
|
645 |
aspect: listMenuHolder |
|
646 |
) |
|
647 |
||
648 |
(SubChannelInfoSpec |
|
649 |
subAspect: outGeneratorHolder |
|
650 |
aspect: selectionHolder |
|
651 |
) |
|
652 |
(SubChannelInfoSpec |
|
653 |
subAspect: showCopyrightMethodDiffsHolder |
|
654 |
aspect: showCopyrightMethodDiffsHolder |
|
655 |
) |
|
656 |
||
657 |
(SubChannelInfoSpec |
|
658 |
subAspect: showVersionMethodDiffsHolder |
|
659 |
aspect: showVersionMethodDiffsHolder |
|
660 |
) |
|
661 |
) |
|
662 |
createNewApplication: true |
|
663 |
createNewBuilder: true |
|
664 |
postBuildCallback: list2View: |
|
665 |
) |
|
666 |
) |
|
667 |
||
668 |
) |
|
669 |
handles: (Any 0.5 1.0) |
|
670 |
) |
|
671 |
) |
|
672 |
||
673 |
) |
|
10194 | 674 |
) |
675 |
! |
|
676 |
||
677 |
windowSpec |
|
678 |
"This resource specification was automatically generated |
|
679 |
by the UIPainter of ST/X." |
|
680 |
||
681 |
"Do not manually edit this!! If it is corrupted, |
|
682 |
the UIPainter may not be able to read the specification." |
|
683 |
||
684 |
" |
|
685 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec |
|
686 |
Tools::ChangeSetDiffTool new openInterface:#windowSpec |
|
687 |
Tools::ChangeSetDiffTool open |
|
688 |
" |
|
689 |
||
690 |
<resource: #canvas> |
|
691 |
||
13880 | 692 |
^ |
10194 | 693 |
#(FullSpec |
13880 | 694 |
name: windowSpec |
695 |
window: |
|
10194 | 696 |
(WindowSpec |
13880 | 697 |
label: 'Diff Browser' |
698 |
name: 'Diff Browser' |
|
699 |
min: (Point 10 10) |
|
700 |
bounds: (Rectangle 0 0 1024 768) |
|
701 |
menu: mainMenu |
|
702 |
) |
|
703 |
component: |
|
10194 | 704 |
(SpecCollection |
13880 | 705 |
collection: ( |
706 |
(MenuPanelSpec |
|
707 |
name: 'ToolBar' |
|
708 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
709 |
menu: toolbarMenu |
|
710 |
textDefault: true |
|
711 |
) |
|
712 |
(SubCanvasSpec |
|
713 |
name: 'InfoPanel' |
|
714 |
layout: (LayoutFrame 0 0 30 0 0 1 70 0) |
|
715 |
level: 0 |
|
716 |
initiallyInvisible: true |
|
717 |
hasHorizontalScrollBar: false |
|
718 |
hasVerticalScrollBar: false |
|
719 |
clientKey: infoPanel |
|
720 |
createNewBuilder: false |
|
721 |
) |
|
722 |
(ViewSpec |
|
723 |
name: 'Content' |
|
724 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
725 |
component: |
|
726 |
(SpecCollection |
|
727 |
collection: ( |
|
728 |
(SubCanvasSpec |
|
729 |
name: 'Labels' |
|
730 |
layout: (LayoutFrame 0 0 0 0 0 1 60 0) |
|
731 |
hasHorizontalScrollBar: false |
|
732 |
hasVerticalScrollBar: false |
|
733 |
specHolder: labelSpecHolder |
|
734 |
createNewBuilder: false |
|
735 |
postBuildCallback: labelsView: |
|
736 |
) |
|
737 |
(VariableVerticalPanelSpec |
|
738 |
name: 'NavigatorAndDiffPanel' |
|
739 |
layout: (LayoutFrame 0 0 60 0 0 1 0 1) |
|
740 |
initiallyInvisible: true |
|
741 |
visibilityChannel: hasDiffsetHolder |
|
742 |
showHandle: true |
|
743 |
component: |
|
744 |
(SpecCollection |
|
745 |
collection: ( |
|
746 |
(SubCanvasSpec |
|
747 |
name: 'NavigatorPanel' |
|
748 |
hasHorizontalScrollBar: false |
|
749 |
hasVerticalScrollBar: false |
|
750 |
specHolder: navigatorPanelSpecHolder |
|
751 |
createNewBuilder: false |
|
752 |
) |
|
753 |
(SubCanvasSpec |
|
754 |
name: 'SubCanvas1' |
|
755 |
specHolder: textDiffToolWindowSpecHolder |
|
756 |
clientHolder: textDiffToolHolder |
|
757 |
createNewBuilder: false |
|
758 |
) |
|
759 |
) |
|
760 |
||
761 |
) |
|
762 |
handles: (Any 0.3 1.0) |
|
763 |
postBuildCallback: navigatorAndDiffPanelView: |
|
764 |
) |
|
765 |
) |
|
766 |
||
767 |
) |
|
768 |
) |
|
769 |
) |
|
770 |
||
771 |
) |
|
10194 | 772 |
) |
13880 | 773 |
|
774 |
"Modified: / 18-01-2013 / 00:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 775 |
! ! |
776 |
||
777 |
!ChangeSetDiffTool class methodsFor:'interface specs - labels'! |
|
778 |
||
13880 | 779 |
mergeALabelSpec |
780 |
"This resource specification was automatically generated |
|
781 |
by the UIPainter of ST/X." |
|
782 |
||
783 |
"Do not manually edit this!! If it is corrupted, |
|
784 |
the UIPainter may not be able to read the specification." |
|
785 |
||
786 |
" |
|
787 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeALabelSpec |
|
788 |
Tools::ChangeSetDiffTool new openInterface:#mergeALabelSpec |
|
789 |
" |
|
790 |
||
791 |
<resource: #canvas> |
|
792 |
||
793 |
^ |
|
794 |
#(FullSpec |
|
795 |
name: mergeALabelSpec |
|
796 |
window: |
|
797 |
(WindowSpec |
|
798 |
label: 'Version A' |
|
799 |
name: 'Version A' |
|
800 |
min: (Point 10 10) |
|
801 |
bounds: (Rectangle 0 0 300 30) |
|
802 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
803 |
forceRecursiveBackground: true |
|
804 |
) |
|
805 |
component: |
|
806 |
(SpecCollection |
|
807 |
collection: ( |
|
808 |
(LabelSpec |
|
809 |
label: 'mergeDiff3BaseToAArrow30x30' |
|
810 |
name: 'Label1' |
|
811 |
layout: (LayoutFrame 0 0 0 0 30 0 0 1) |
|
812 |
hasCharacterOrientedLabel: false |
|
813 |
translateLabel: true |
|
814 |
) |
|
815 |
(LabelSpec |
|
816 |
label: 'versionA24x24' |
|
817 |
name: 'VersionAIcon' |
|
818 |
layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5) |
|
819 |
hasCharacterOrientedLabel: false |
|
820 |
translateLabel: true |
|
821 |
) |
|
822 |
(LabelSpec |
|
823 |
label: 'mergeDiff3AToMergedArrow30x30' |
|
824 |
name: 'Label2' |
|
825 |
layout: (LayoutFrame 60 0 0 0 90 0 0 1) |
|
826 |
hasCharacterOrientedLabel: false |
|
827 |
translateLabel: true |
|
828 |
) |
|
829 |
(LabelSpec |
|
830 |
label: 'Version A' |
|
831 |
name: 'VersionALabel' |
|
832 |
layout: (LayoutFrame 90 0 0 0 0 1 0 1) |
|
833 |
translateLabel: true |
|
834 |
labelChannel: versionALabelHolder |
|
835 |
resizeForLabel: true |
|
836 |
adjust: left |
|
837 |
) |
|
838 |
(LabelSpec |
|
839 |
label: '(A)' |
|
840 |
name: 'ALabel' |
|
841 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
842 |
translateLabel: true |
|
843 |
) |
|
844 |
) |
|
845 |
||
846 |
) |
|
847 |
) |
|
848 |
! |
|
849 |
||
850 |
mergeBLabelSpec |
|
851 |
"This resource specification was automatically generated |
|
852 |
by the UIPainter of ST/X." |
|
853 |
||
854 |
"Do not manually edit this!! If it is corrupted, |
|
855 |
the UIPainter may not be able to read the specification." |
|
856 |
||
857 |
" |
|
858 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
859 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
860 |
" |
|
861 |
||
862 |
<resource: #canvas> |
|
863 |
||
864 |
^ |
|
865 |
#(FullSpec |
|
866 |
name: versionBLabelSpec |
|
867 |
window: |
|
868 |
(WindowSpec |
|
869 |
label: 'Version B' |
|
870 |
name: 'Version B' |
|
871 |
min: (Point 10 10) |
|
872 |
bounds: (Rectangle 0 0 300 30) |
|
873 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
874 |
forceRecursiveBackground: true |
|
875 |
) |
|
876 |
component: |
|
877 |
(SpecCollection |
|
878 |
collection: ( |
|
879 |
(LabelSpec |
|
880 |
label: 'mergeDiff3BaseToBArrow30x30' |
|
881 |
name: 'Label1' |
|
882 |
layout: (LayoutFrame 0 0 0 0 30 0 0 1) |
|
883 |
hasCharacterOrientedLabel: false |
|
884 |
translateLabel: true |
|
885 |
) |
|
886 |
(LabelSpec |
|
887 |
label: 'versionB24x24' |
|
888 |
name: 'VersionBIcon' |
|
889 |
layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5) |
|
890 |
hasCharacterOrientedLabel: false |
|
891 |
translateLabel: true |
|
892 |
) |
|
893 |
(LabelSpec |
|
894 |
label: 'mergeDiff3BToMergedArrow30x30' |
|
895 |
name: 'Label2' |
|
896 |
layout: (LayoutFrame 60 0 0 0 90 0 0 1) |
|
897 |
hasCharacterOrientedLabel: false |
|
898 |
translateLabel: true |
|
899 |
) |
|
900 |
(LabelSpec |
|
901 |
label: 'Version B' |
|
902 |
name: 'VersionBLabel' |
|
903 |
layout: (LayoutFrame 90 0 0 0 167 0 0 1) |
|
904 |
translateLabel: true |
|
905 |
labelChannel: versionBLabelHolder |
|
906 |
resizeForLabel: true |
|
907 |
adjust: left |
|
908 |
useDynamicPreferredWidth: true |
|
909 |
usePreferredWidth: true |
|
910 |
) |
|
911 |
(LabelSpec |
|
912 |
label: '(B)' |
|
913 |
name: 'BLabel' |
|
914 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
915 |
translateLabel: true |
|
916 |
) |
|
917 |
) |
|
918 |
||
919 |
) |
|
920 |
) |
|
921 |
||
922 |
"Created: / 17-01-2013 / 23:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
923 |
! |
|
924 |
||
925 |
mergeBaseLabelSpec |
|
926 |
"This resource specification was automatically generated |
|
927 |
by the UIPainter of ST/X." |
|
928 |
||
929 |
"Do not manually edit this!! If it is corrupted, |
|
930 |
the UIPainter may not be able to read the specification." |
|
931 |
||
932 |
" |
|
933 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec |
|
934 |
Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec |
|
935 |
" |
|
936 |
||
937 |
<resource: #canvas> |
|
938 |
||
939 |
^ |
|
940 |
#(FullSpec |
|
941 |
name: versionBaseLabelSpec |
|
942 |
window: |
|
943 |
(WindowSpec |
|
944 |
label: 'Version Base' |
|
945 |
name: 'Version Base' |
|
946 |
min: (Point 10 10) |
|
947 |
bounds: (Rectangle 0 0 300 30) |
|
948 |
backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941) |
|
949 |
forceRecursiveBackground: true |
|
950 |
) |
|
951 |
component: |
|
952 |
(SpecCollection |
|
953 |
collection: ( |
|
954 |
(LabelSpec |
|
955 |
label: 'versionBase24x24' |
|
956 |
name: 'VersionBIcon' |
|
957 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
958 |
hasCharacterOrientedLabel: false |
|
959 |
translateLabel: true |
|
960 |
) |
|
961 |
(LabelSpec |
|
962 |
label: 'Version B' |
|
963 |
name: 'VersionBLabel' |
|
964 |
layout: (LayoutFrame 90 0 0 0 190 0 0 1) |
|
965 |
translateLabel: true |
|
966 |
labelChannel: versionBaseLabelHolder |
|
967 |
resizeForLabel: true |
|
968 |
adjust: left |
|
969 |
useDynamicPreferredWidth: true |
|
970 |
usePreferredWidth: true |
|
971 |
) |
|
972 |
(LabelSpec |
|
973 |
label: '(Base)' |
|
974 |
name: 'BaseLabel' |
|
975 |
layout: (LayoutFrame -50 1 0 0 0 1 0 1) |
|
976 |
translateLabel: true |
|
977 |
) |
|
978 |
) |
|
979 |
||
980 |
) |
|
981 |
) |
|
982 |
||
983 |
"Created: / 17-01-2013 / 23:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
984 |
! |
|
985 |
||
986 |
mergeMergeLabelSpec |
|
987 |
"This resource specification was automatically generated |
|
988 |
by the UIPainter of ST/X." |
|
989 |
||
990 |
"Do not manually edit this!! If it is corrupted, |
|
991 |
the UIPainter may not be able to read the specification." |
|
992 |
||
993 |
" |
|
994 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeMergeLabelSpec |
|
995 |
Tools::ChangeSetDiffTool new openInterface:#mergeMergeLabelSpec |
|
996 |
" |
|
997 |
||
998 |
<resource: #canvas> |
|
999 |
||
1000 |
^ |
|
1001 |
#(FullSpec |
|
1002 |
name: mergeMergeLabelSpec |
|
1003 |
window: |
|
1004 |
(WindowSpec |
|
1005 |
label: 'Version Merged' |
|
1006 |
name: 'Version Merged' |
|
1007 |
min: (Point 10 10) |
|
1008 |
bounds: (Rectangle 0 0 300 30) |
|
1009 |
backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577) |
|
1010 |
forceRecursiveBackground: true |
|
1011 |
) |
|
1012 |
component: |
|
1013 |
(SpecCollection |
|
1014 |
collection: ( |
|
1015 |
(LabelSpec |
|
1016 |
label: 'versionMerged24x24' |
|
1017 |
name: 'VersionMergedIcon' |
|
1018 |
layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5) |
|
1019 |
hasCharacterOrientedLabel: false |
|
1020 |
translateLabel: true |
|
1021 |
) |
|
1022 |
(LabelSpec |
|
1023 |
label: 'Version B' |
|
1024 |
name: 'VersionMergedLabel' |
|
1025 |
layout: (LayoutFrame 90 0 0 0 267 0 0 1) |
|
1026 |
translateLabel: true |
|
1027 |
labelChannel: versionMergedLabelHolder |
|
1028 |
resizeForLabel: true |
|
1029 |
adjust: left |
|
1030 |
useDynamicPreferredWidth: true |
|
1031 |
usePreferredWidth: true |
|
1032 |
) |
|
1033 |
(LabelSpec |
|
1034 |
label: '(Merge)' |
|
1035 |
name: 'MergedLabel' |
|
1036 |
layout: (LayoutFrame -70 1 0 0 0 1 0 1) |
|
1037 |
translateLabel: true |
|
1038 |
) |
|
1039 |
) |
|
1040 |
||
1041 |
) |
|
1042 |
) |
|
1043 |
! |
|
1044 |
||
10194 | 1045 |
versionALabelSpec |
1046 |
"This resource specification was automatically generated |
|
1047 |
by the UIPainter of ST/X." |
|
1048 |
||
1049 |
"Do not manually edit this!! If it is corrupted, |
|
1050 |
the UIPainter may not be able to read the specification." |
|
1051 |
||
1052 |
" |
|
1053 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec |
|
1054 |
Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec |
|
1055 |
" |
|
1056 |
||
1057 |
<resource: #canvas> |
|
1058 |
||
1059 |
^ |
|
1060 |
#(FullSpec |
|
1061 |
name: versionALabelSpec |
|
1062 |
window: |
|
1063 |
(WindowSpec |
|
1064 |
label: 'Version A' |
|
1065 |
name: 'Version A' |
|
1066 |
min: (Point 10 10) |
|
1067 |
bounds: (Rectangle 0 0 300 30) |
|
1068 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
1069 |
forceRecursiveBackground: true |
|
1070 |
) |
|
1071 |
component: |
|
1072 |
(SpecCollection |
|
1073 |
collection: ( |
|
1074 |
(LabelSpec |
|
1075 |
label: 'versionA24x24' |
|
1076 |
name: 'VersionAIcon' |
|
1077 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
1078 |
hasCharacterOrientedLabel: false |
|
1079 |
translateLabel: true |
|
1080 |
) |
|
1081 |
(LabelSpec |
|
1082 |
label: 'Version A' |
|
1083 |
name: 'VersionALabel' |
|
1084 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
1085 |
translateLabel: true |
|
1086 |
labelChannel: versionALabelHolder |
|
1087 |
resizeForLabel: true |
|
1088 |
adjust: left |
|
1089 |
) |
|
10975 | 1090 |
(LabelSpec |
1091 |
label: '(A)' |
|
1092 |
name: 'ALabel' |
|
1093 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
1094 |
translateLabel: true |
|
1095 |
) |
|
10194 | 1096 |
) |
1097 |
||
1098 |
) |
|
1099 |
) |
|
1100 |
! |
|
1101 |
||
1102 |
versionBLabelSpec |
|
1103 |
"This resource specification was automatically generated |
|
1104 |
by the UIPainter of ST/X." |
|
1105 |
||
1106 |
"Do not manually edit this!! If it is corrupted, |
|
1107 |
the UIPainter may not be able to read the specification." |
|
1108 |
||
1109 |
" |
|
1110 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
1111 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
1112 |
" |
|
1113 |
||
1114 |
<resource: #canvas> |
|
1115 |
||
1116 |
^ |
|
1117 |
#(FullSpec |
|
1118 |
name: versionBLabelSpec |
|
1119 |
window: |
|
1120 |
(WindowSpec |
|
1121 |
label: 'Version B' |
|
1122 |
name: 'Version B' |
|
1123 |
min: (Point 10 10) |
|
1124 |
bounds: (Rectangle 0 0 300 30) |
|
1125 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
1126 |
forceRecursiveBackground: true |
|
1127 |
) |
|
1128 |
component: |
|
1129 |
(SpecCollection |
|
1130 |
collection: ( |
|
1131 |
(LabelSpec |
|
1132 |
label: 'versionB24x24' |
|
1133 |
name: 'VersionBIcon' |
|
1134 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
1135 |
hasCharacterOrientedLabel: false |
|
1136 |
translateLabel: true |
|
1137 |
) |
|
1138 |
(LabelSpec |
|
1139 |
label: 'Version B' |
|
1140 |
name: 'VersionBLabel' |
|
1141 |
layout: (LayoutFrame 30 0 0 0 167 0 0 1) |
|
1142 |
translateLabel: true |
|
1143 |
labelChannel: versionBLabelHolder |
|
1144 |
resizeForLabel: true |
|
1145 |
adjust: left |
|
1146 |
useDynamicPreferredWidth: true |
|
1147 |
usePreferredWidth: true |
|
1148 |
) |
|
10975 | 1149 |
(LabelSpec |
1150 |
label: '(B)' |
|
1151 |
name: 'BLabel' |
|
1152 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
1153 |
translateLabel: true |
|
1154 |
) |
|
10194 | 1155 |
) |
1156 |
||
1157 |
) |
|
1158 |
) |
|
10975 | 1159 |
|
1160 |
"Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 1161 |
! |
1162 |
||
1163 |
versionBaseLabelSpec |
|
1164 |
"This resource specification was automatically generated |
|
1165 |
by the UIPainter of ST/X." |
|
1166 |
||
1167 |
"Do not manually edit this!! If it is corrupted, |
|
1168 |
the UIPainter may not be able to read the specification." |
|
1169 |
||
1170 |
" |
|
1171 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec |
|
1172 |
Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec |
|
1173 |
" |
|
1174 |
||
1175 |
<resource: #canvas> |
|
1176 |
||
1177 |
^ |
|
1178 |
#(FullSpec |
|
1179 |
name: versionBaseLabelSpec |
|
1180 |
window: |
|
1181 |
(WindowSpec |
|
1182 |
label: 'Version Base' |
|
1183 |
name: 'Version Base' |
|
1184 |
min: (Point 10 10) |
|
1185 |
bounds: (Rectangle 0 0 300 30) |
|
1186 |
backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941) |
|
1187 |
forceRecursiveBackground: true |
|
1188 |
) |
|
1189 |
component: |
|
1190 |
(SpecCollection |
|
1191 |
collection: ( |
|
1192 |
(LabelSpec |
|
1193 |
label: 'versionBase24x24' |
|
1194 |
name: 'VersionBIcon' |
|
1195 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
1196 |
hasCharacterOrientedLabel: false |
|
1197 |
translateLabel: true |
|
1198 |
) |
|
1199 |
(LabelSpec |
|
1200 |
label: 'Version B' |
|
1201 |
name: 'VersionBLabel' |
|
1202 |
layout: (LayoutFrame 30 0 0 0 190 0 0 1) |
|
1203 |
translateLabel: true |
|
1204 |
labelChannel: versionBaseLabelHolder |
|
1205 |
resizeForLabel: true |
|
1206 |
adjust: left |
|
1207 |
useDynamicPreferredWidth: true |
|
1208 |
usePreferredWidth: true |
|
1209 |
) |
|
1210 |
(LabelSpec |
|
1211 |
label: '(Base)' |
|
1212 |
name: 'BaseLabel' |
|
1213 |
layout: (LayoutFrame -50 1 0 0 0 1 0 1) |
|
1214 |
translateLabel: true |
|
1215 |
) |
|
1216 |
) |
|
1217 |
||
1218 |
) |
|
1219 |
) |
|
1220 |
! |
|
1221 |
||
1222 |
versionMergeLabelSpec |
|
1223 |
"This resource specification was automatically generated |
|
1224 |
by the UIPainter of ST/X." |
|
1225 |
||
1226 |
"Do not manually edit this!! If it is corrupted, |
|
1227 |
the UIPainter may not be able to read the specification." |
|
1228 |
||
1229 |
" |
|
1230 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec |
|
1231 |
Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec |
|
1232 |
" |
|
1233 |
||
1234 |
<resource: #canvas> |
|
1235 |
||
1236 |
^ |
|
1237 |
#(FullSpec |
|
1238 |
name: versionBaseLabelSpec |
|
1239 |
window: |
|
1240 |
(WindowSpec |
|
1241 |
label: 'Version Merged' |
|
1242 |
name: 'Version Merged' |
|
1243 |
min: (Point 10 10) |
|
1244 |
bounds: (Rectangle 0 0 300 30) |
|
1245 |
backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577) |
|
1246 |
forceRecursiveBackground: true |
|
1247 |
) |
|
1248 |
component: |
|
1249 |
(SpecCollection |
|
1250 |
collection: ( |
|
1251 |
(LabelSpec |
|
1252 |
label: 'versionMerged24x24' |
|
1253 |
name: 'VersionMergedIcon' |
|
1254 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
1255 |
hasCharacterOrientedLabel: false |
|
1256 |
translateLabel: true |
|
1257 |
) |
|
1258 |
(LabelSpec |
|
1259 |
label: 'Version B' |
|
1260 |
name: 'VersionMergedLabel' |
|
1261 |
layout: (LayoutFrame 30 0 0 0 190 0 0 1) |
|
1262 |
translateLabel: true |
|
1263 |
labelChannel: versionMergedLabelHolder |
|
1264 |
resizeForLabel: true |
|
1265 |
adjust: left |
|
1266 |
useDynamicPreferredWidth: true |
|
1267 |
usePreferredWidth: true |
|
1268 |
) |
|
1269 |
(LabelSpec |
|
1270 |
label: '(Merge)' |
|
1271 |
name: 'MergedLabel' |
|
1272 |
layout: (LayoutFrame -70 1 0 0 0 1 0 1) |
|
1273 |
translateLabel: true |
|
1274 |
) |
|
1275 |
) |
|
1276 |
||
1277 |
) |
|
1278 |
) |
|
1279 |
||
1280 |
"Created: / 17-01-2013 / 22:53:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 1281 |
! ! |
1282 |
||
1283 |
!ChangeSetDiffTool class methodsFor:'menu specs'! |
|
1284 |
||
1285 |
listMenu |
|
1286 |
"This resource specification was automatically generated |
|
1287 |
by the MenuEditor of ST/X." |
|
1288 |
||
1289 |
"Do not manually edit this!! If it is corrupted, |
|
1290 |
the MenuEditor may not be able to read the specification." |
|
1291 |
||
1292 |
" |
|
1293 |
MenuEditor new openOnClass:SVN::DiffBrowser andSelector:#listMenu |
|
1294 |
(Menu new fromLiteralArrayEncoding:(SVN::DiffBrowser listMenu)) startUp |
|
1295 |
" |
|
1296 |
||
1297 |
<resource: #menu> |
|
1298 |
||
1299 |
^ |
|
1300 |
#(Menu |
|
1301 |
( |
|
1302 |
(MenuItem |
|
1303 |
label: 'Browse' |
|
1304 |
itemValue: listMenuBrowse |
|
1305 |
translateLabel: true |
|
1306 |
) |
|
1307 |
(MenuItem |
|
1308 |
label: '-' |
|
1309 |
) |
|
1310 |
(MenuItem |
|
1311 |
label: 'Load version A' |
|
1312 |
itemValue: listMenuLoadVersionA |
|
1313 |
nameKey: LoadVersionA |
|
1314 |
translateLabel: true |
|
1315 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
1316 |
) |
|
1317 |
(MenuItem |
|
1318 |
label: 'Load version B' |
|
1319 |
itemValue: listMenuLoadVersionB |
|
1320 |
nameKey: LoadVersionB |
|
1321 |
translateLabel: true |
|
1322 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
1323 |
) |
|
1324 |
(MenuItem |
|
1325 |
label: '-' |
|
1326 |
) |
|
1327 |
(MenuItem |
|
1328 |
enabled: hasSelection |
|
1329 |
label: 'Inspect' |
|
1330 |
itemValue: listMenuInspect |
|
1331 |
translateLabel: true |
|
1332 |
) |
|
1333 |
) |
|
1334 |
nil |
|
1335 |
nil |
|
1336 |
) |
|
1337 |
! |
|
1338 |
||
13880 | 1339 |
listMenuDiff |
1340 |
"This resource specification was automatically generated |
|
1341 |
by the MenuEditor of ST/X." |
|
1342 |
||
1343 |
"Do not manually edit this!! If it is corrupted, |
|
1344 |
the MenuEditor may not be able to read the specification." |
|
1345 |
||
1346 |
||
1347 |
" |
|
1348 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenu |
|
1349 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenu)) startUp |
|
1350 |
" |
|
1351 |
||
1352 |
<resource: #menu> |
|
1353 |
||
1354 |
^ |
|
1355 |
#(Menu |
|
1356 |
( |
|
1357 |
(MenuItem |
|
1358 |
enabled: hasSelection |
|
1359 |
label: 'Browse' |
|
1360 |
itemValue: listMenuBrowse |
|
1361 |
translateLabel: true |
|
1362 |
) |
|
1363 |
(MenuItem |
|
1364 |
label: '-' |
|
1365 |
) |
|
1366 |
(MenuItem |
|
1367 |
enabled: hasSelection |
|
1368 |
label: 'Load version A' |
|
1369 |
itemValue: listMenuLoadVersionA |
|
1370 |
nameKey: LoadVersionA |
|
1371 |
translateLabel: true |
|
1372 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
1373 |
) |
|
1374 |
(MenuItem |
|
1375 |
enabled: hasSelection |
|
1376 |
label: 'Load version B' |
|
1377 |
itemValue: listMenuLoadVersionB |
|
1378 |
nameKey: LoadVersionB |
|
1379 |
translateLabel: true |
|
1380 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
1381 |
) |
|
1382 |
(MenuItem |
|
1383 |
label: '-' |
|
1384 |
) |
|
1385 |
(MenuItem |
|
1386 |
label: 'Open in...' |
|
1387 |
translateLabel: true |
|
1388 |
submenu: |
|
1389 |
(Menu |
|
1390 |
( |
|
1391 |
(MenuItem |
|
1392 |
enabled: hasSelection |
|
1393 |
label: 'Inspector' |
|
1394 |
itemValue: listMenuInspect |
|
1395 |
translateLabel: true |
|
1396 |
) |
|
1397 |
(MenuItem |
|
1398 |
enabled: hasSelection |
|
1399 |
label: 'kdiff3' |
|
1400 |
itemValue: listMenuOpenInExternal: |
|
1401 |
translateLabel: true |
|
1402 |
argument: 'kdiff3' |
|
1403 |
) |
|
1404 |
(MenuItem |
|
1405 |
enabled: hasSelection |
|
1406 |
label: 'meld' |
|
1407 |
itemValue: listMenuOpenInExternal: |
|
1408 |
translateLabel: true |
|
1409 |
argument: 'meld' |
|
1410 |
) |
|
1411 |
) |
|
1412 |
nil |
|
1413 |
nil |
|
1414 |
) |
|
1415 |
) |
|
1416 |
) |
|
1417 |
nil |
|
1418 |
nil |
|
1419 |
) |
|
1420 |
||
1421 |
"Created: / 16-01-2013 / 15:47:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1422 |
! |
|
1423 |
||
1424 |
listMenuMerge |
|
1425 |
"This resource specification was automatically generated |
|
1426 |
by the MenuEditor of ST/X." |
|
1427 |
||
1428 |
"Do not manually edit this!! If it is corrupted, |
|
1429 |
the MenuEditor may not be able to read the specification." |
|
1430 |
||
1431 |
||
1432 |
" |
|
1433 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenuMerge |
|
1434 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenuMerge)) startUp |
|
1435 |
" |
|
1436 |
||
1437 |
<resource: #menu> |
|
1438 |
||
1439 |
^ |
|
1440 |
#(Menu |
|
1441 |
( |
|
1442 |
(MenuItem |
|
1443 |
enabled: hasSelection |
|
1444 |
label: 'Browse' |
|
1445 |
itemValue: listMenuBrowse |
|
1446 |
) |
|
1447 |
(MenuItem |
|
1448 |
label: '-' |
|
1449 |
) |
|
1450 |
(MenuItem |
|
1451 |
enabled: hasSelection |
|
1452 |
label: 'Merge using A' |
|
1453 |
itemValue: listMenuMergeUsingA |
|
1454 |
shortcutKey: Cmd2 |
|
1455 |
) |
|
1456 |
(MenuItem |
|
1457 |
enabled: hasSelection |
|
1458 |
label: 'Merge using B' |
|
1459 |
itemValue: listMenuMergeUsingB |
|
1460 |
shortcutKey: Cmd3 |
|
1461 |
) |
|
1462 |
(MenuItem |
|
1463 |
enabled: hasSelection |
|
1464 |
label: 'Merge using Base' |
|
1465 |
itemValue: listMenuMergeUsingBase |
|
1466 |
shortcutKey: Cmd1 |
|
1467 |
) |
|
1468 |
(MenuItem |
|
1469 |
label: '-' |
|
1470 |
) |
|
1471 |
(MenuItem |
|
1472 |
label: 'Open in...' |
|
1473 |
submenu: |
|
1474 |
(Menu |
|
1475 |
( |
|
1476 |
(MenuItem |
|
1477 |
enabled: hasSelection |
|
1478 |
label: 'Inspector' |
|
1479 |
itemValue: listMenuInspect |
|
1480 |
) |
|
1481 |
(MenuItem |
|
1482 |
enabled: hasSelection |
|
1483 |
label: 'kdiff3' |
|
1484 |
itemValue: listMenuOpenInExternal: |
|
1485 |
argument: 'kdiff3' |
|
1486 |
) |
|
1487 |
(MenuItem |
|
1488 |
enabled: hasSelection |
|
1489 |
label: 'meld' |
|
1490 |
itemValue: listMenuOpenInExternal: |
|
1491 |
argument: 'meld' |
|
1492 |
) |
|
1493 |
) |
|
1494 |
nil |
|
1495 |
nil |
|
1496 |
) |
|
1497 |
) |
|
1498 |
) |
|
1499 |
nil |
|
1500 |
nil |
|
1501 |
) |
|
1502 |
! |
|
1503 |
||
10194 | 1504 |
mainMenu |
1505 |
"This resource specification was automatically generated |
|
1506 |
by the MenuEditor of ST/X." |
|
1507 |
||
1508 |
"Do not manually edit this!! If it is corrupted, |
|
1509 |
the MenuEditor may not be able to read the specification." |
|
1510 |
||
10975 | 1511 |
|
10194 | 1512 |
" |
10975 | 1513 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu |
1514 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp |
|
10194 | 1515 |
" |
1516 |
||
1517 |
<resource: #menu> |
|
1518 |
||
13880 | 1519 |
^ |
10194 | 1520 |
#(Menu |
13880 | 1521 |
( |
1522 |
(MenuItem |
|
1523 |
label: 'File' |
|
1524 |
submenu: |
|
1525 |
(Menu |
|
1526 |
( |
|
1527 |
(MenuItem |
|
1528 |
label: 'Open...' |
|
1529 |
itemValue: fileMenuOpen |
|
1530 |
shortcutKey: Ctrlo |
|
1531 |
) |
|
1532 |
(MenuItem |
|
1533 |
enabled: canSave |
|
1534 |
label: 'Save' |
|
1535 |
itemValue: fileMenuSave |
|
1536 |
shortcutKey: Ctrls |
|
1537 |
) |
|
1538 |
(MenuItem |
|
1539 |
enabled: canSaveAs |
|
1540 |
label: 'Save As...' |
|
1541 |
itemValue: fileMenuSaveAs |
|
1542 |
) |
|
1543 |
(MenuItem |
|
1544 |
enabled: canSaveAsPatch |
|
1545 |
label: 'Save As Patch ' |
|
1546 |
itemValue: fileMenuSaveAsPatch |
|
1547 |
isVisible: false |
|
1548 |
) |
|
1549 |
(MenuItem |
|
1550 |
enabled: canSaveMergedAs |
|
1551 |
label: 'Save Merged as... ' |
|
1552 |
itemValue: fileMenuSaveMergedAs |
|
1553 |
) |
|
1554 |
(MenuItem |
|
1555 |
label: '-' |
|
1556 |
) |
|
1557 |
(MenuItem |
|
1558 |
label: 'Exit' |
|
1559 |
itemValue: closeRequest |
|
1560 |
shortcutKey: Ctrlq |
|
1561 |
) |
|
1562 |
) |
|
1563 |
nil |
|
1564 |
nil |
|
1565 |
) |
|
1566 |
) |
|
1567 |
(MenuItem |
|
1568 |
label: 'Changeset' |
|
1569 |
submenu: |
|
1570 |
(Menu |
|
1571 |
( |
|
1572 |
(MenuItem |
|
1573 |
enabled: isDiff2Or3 |
|
1574 |
label: 'Browse changes (A)' |
|
1575 |
itemValue: changesetMenuBrowseA |
|
1576 |
) |
|
1577 |
(MenuItem |
|
1578 |
enabled: isDiff2Or3 |
|
1579 |
label: 'Browse changes (B)' |
|
1580 |
itemValue: changesetMenuBrowseB |
|
1581 |
) |
|
1582 |
(MenuItem |
|
1583 |
enabled: isDiff3 |
|
1584 |
label: 'Browse changes (Base)' |
|
1585 |
itemValue: changesetMenuBrowseBase |
|
1586 |
) |
|
1587 |
(MenuItem |
|
1588 |
enabled: isMerge |
|
1589 |
label: 'Browse changes (Merge)' |
|
1590 |
itemValue: changesetMenuBrowseMerge |
|
1591 |
) |
|
1592 |
) |
|
1593 |
nil |
|
1594 |
nil |
|
1595 |
) |
|
1596 |
) |
|
1597 |
(MenuItem |
|
1598 |
label: 'Movement' |
|
1599 |
submenu: |
|
1600 |
(Menu |
|
1601 |
( |
|
1602 |
(MenuItem |
|
1603 |
label: 'Go to Previous Delta' |
|
1604 |
itemValue: menuMoveUp |
|
1605 |
) |
|
1606 |
(MenuItem |
|
1607 |
label: 'Go To Next Delta' |
|
1608 |
itemValue: menuMoveDown |
|
1609 |
) |
|
1610 |
(MenuItem |
|
1611 |
label: 'Go to Previous Conflict' |
|
1612 |
itemValue: menuMoveUpConflict |
|
1613 |
shortcutKey: CmdCursorUp |
|
1614 |
) |
|
1615 |
(MenuItem |
|
1616 |
label: 'Go to Next Conflict' |
|
1617 |
itemValue: menuMoveDownConflict |
|
1618 |
shortcutKey: CmdCursorDown |
|
1619 |
) |
|
1620 |
(MenuItem |
|
1621 |
label: '-' |
|
1622 |
) |
|
1623 |
(MenuItem |
|
1624 |
label: 'Automatically Go to Next Conflict' |
|
1625 |
indication: autoMoveToNextConflictHolder |
|
1626 |
) |
|
1627 |
) |
|
1628 |
nil |
|
1629 |
nil |
|
1630 |
) |
|
1631 |
) |
|
1632 |
(MenuItem |
|
1633 |
label: 'Change' |
|
1634 |
submenuChannel: listMenu |
|
1635 |
) |
|
1636 |
(MenuItem |
|
1637 |
label: 'View' |
|
1638 |
submenu: |
|
1639 |
(Menu |
|
1640 |
( |
|
1641 |
(MenuItem |
|
1642 |
label: 'Show Diffs in Version Methods' |
|
1643 |
indication: showVersionMethodDiffsHolder |
|
1644 |
) |
|
1645 |
(MenuItem |
|
1646 |
label: 'Show Diff in #copyright Methods' |
|
1647 |
indication: showCopyrightMethodDiffsHolder |
|
1648 |
) |
|
1649 |
(MenuItem |
|
1650 |
label: 'Highlight Conflicts' |
|
1651 |
indication: highlightConflictsHolder |
|
1652 |
) |
|
1653 |
) |
|
1654 |
nil |
|
1655 |
nil |
|
1656 |
) |
|
1657 |
) |
|
1658 |
) |
|
1659 |
nil |
|
1660 |
nil |
|
10194 | 1661 |
) |
13880 | 1662 |
! |
1663 |
||
1664 |
toolbarMenu |
|
1665 |
"This resource specification was automatically generated |
|
1666 |
by the MenuEditor of ST/X." |
|
1667 |
||
1668 |
"Do not manually edit this!! If it is corrupted, |
|
1669 |
the MenuEditor may not be able to read the specification." |
|
1670 |
||
1671 |
||
1672 |
" |
|
1673 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#toolbarMenu |
|
1674 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool toolbarMenu)) startUp |
|
1675 |
" |
|
1676 |
||
1677 |
<resource: #menu> |
|
1678 |
||
1679 |
^ |
|
1680 |
#(Menu |
|
1681 |
( |
|
1682 |
(MenuItem |
|
1683 |
label: 'Open' |
|
1684 |
itemValue: fileMenuOpen |
|
1685 |
isButton: true |
|
1686 |
labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFile22x22Icon) |
|
1687 |
) |
|
1688 |
(MenuItem |
|
1689 |
enabled: canSaveHolder |
|
1690 |
label: 'Save' |
|
1691 |
itemValue: fileMenuSave |
|
1692 |
isButton: true |
|
1693 |
labelImage: (ResourceRetriever ToolbarIconLibrary saveImageIcon) |
|
1694 |
) |
|
1695 |
(MenuItem |
|
1696 |
label: '-' |
|
1697 |
) |
|
1698 |
(MenuItem |
|
1699 |
label: 'Go to Previous Delta' |
|
1700 |
itemValue: menuMoveUp |
|
1701 |
isButton: true |
|
1702 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24) |
|
1703 |
) |
|
1704 |
(MenuItem |
|
1705 |
label: 'Go to Next Delta' |
|
1706 |
itemValue: menuMoveDown |
|
1707 |
isButton: true |
|
1708 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24) |
|
1709 |
) |
|
1710 |
(MenuItem |
|
1711 |
label: 'Go to Previous Conflict' |
|
1712 |
itemValue: menuMoveUpConflict |
|
1713 |
isButton: true |
|
1714 |
isVisible: mergeHolder |
|
1715 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24) |
|
1716 |
) |
|
1717 |
(MenuItem |
|
1718 |
label: 'Go to Next Conflict' |
|
1719 |
itemValue: menuMoveDownConflict |
|
1720 |
isButton: true |
|
1721 |
isVisible: mergeHolder |
|
1722 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24) |
|
1723 |
) |
|
1724 |
(MenuItem |
|
1725 |
label: '-' |
|
1726 |
isVisible: mergeHolder |
|
1727 |
) |
|
1728 |
(MenuItem |
|
1729 |
label: 'Merge using Base' |
|
1730 |
itemValue: listMenuMergeUsingBase |
|
1731 |
isButton: true |
|
1732 |
isVisible: mergeHolder |
|
1733 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24) |
|
1734 |
) |
|
1735 |
(MenuItem |
|
1736 |
label: 'Merge using A' |
|
1737 |
itemValue: listMenuMergeUsingA |
|
1738 |
isButton: true |
|
1739 |
isVisible: mergeHolder |
|
1740 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24) |
|
1741 |
) |
|
1742 |
(MenuItem |
|
1743 |
label: 'Merge using B' |
|
1744 |
itemValue: listMenuMergeUsingB |
|
1745 |
isButton: true |
|
1746 |
isVisible: mergeHolder |
|
1747 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24) |
|
1748 |
) |
|
1749 |
) |
|
1750 |
nil |
|
1751 |
nil |
|
1752 |
) |
|
10194 | 1753 |
! ! |
1754 |
||
1755 |
!ChangeSetDiffTool class methodsFor:'plugIn spec'! |
|
1756 |
||
1757 |
aspectSelectors |
|
1758 |
"This resource specification was automatically generated |
|
1759 |
by the UIPainter of ST/X." |
|
1760 |
||
1761 |
"Do not manually edit this. If it is corrupted, |
|
1762 |
the UIPainter may not be able to read the specification." |
|
1763 |
||
1764 |
"Return a description of exported aspects; |
|
1765 |
these can be connected to aspects of an embedding application |
|
1766 |
(if this app is embedded in a subCanvas)." |
|
1767 |
||
1768 |
^ #( |
|
1769 |
#diffsetHolder |
|
1770 |
). |
|
1771 |
||
1772 |
! ! |
|
1773 |
||
1774 |
!ChangeSetDiffTool methodsFor:'accessing'! |
|
1775 |
||
1776 |
beSingleColumn |
|
1777 |
||
1778 |
self navigatorPanelSpecHolder value: #oneColumnNavigatorSpec |
|
1779 |
||
1780 |
"Created: / 20-11-2009 / 20:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1781 |
! |
|
1782 |
||
1783 |
beTwoColumn |
|
1784 |
||
1785 |
self navigatorPanelSpecHolder value: #twoColumnNavigatorSpec |
|
1786 |
||
1787 |
"Created: / 20-11-2009 / 20:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1788 |
! |
|
1789 |
||
1790 |
beTwoColumn: aBoolean |
|
1791 |
||
1792 |
aBoolean |
|
1793 |
ifTrue:[self beTwoColumn] |
|
1794 |
ifFalse:[self beSingleColumn] |
|
1795 |
||
1796 |
"Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1797 |
! |
|
1798 |
||
13880 | 1799 |
codeAspect |
1800 |
^self codeAspectHolder value |
|
1801 |
||
1802 |
"Created: / 04-04-2013 / 18:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1803 |
! |
|
1804 |
||
1805 |
diffInfo |
|
1806 |
||
1807 |
^self diffInfoHolder value |
|
1808 |
||
1809 |
"Created: / 20-03-2012 / 11:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1810 |
! |
|
1811 |
||
10194 | 1812 |
diffset |
1813 |
||
1814 |
^self diffsetHolder value |
|
1815 |
||
1816 |
"Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1817 |
! |
|
1818 |
||
1819 |
diffset: aDiff3Set |
|
1820 |
||
1821 |
self diffsetHolder value: aDiff3Set |
|
1822 |
||
1823 |
"Created: / 01-11-2009 / 09:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1824 |
! |
|
1825 |
||
1826 |
patchset |
|
1827 |
||
1828 |
| patchset | |
|
1829 |
patchset := ChangeSet new. |
|
1830 |
self diffset do: |
|
1831 |
[:diff|patchset add:diff versionA]. |
|
1832 |
^patchset |
|
1833 |
||
1834 |
"Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1835 |
! |
|
1836 |
||
1837 |
selection |
|
1838 |
||
1839 |
^self selectionHolder value |
|
1840 |
||
1841 |
"Created: / 22-10-2008 / 11:30:03 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1842 |
! |
|
1843 |
||
13880 | 1844 |
showCopyrightMethodDiffs |
1845 |
^self showCopyrightMethodDiffsHolder value |
|
1846 |
||
1847 |
"Created: / 10-08-2012 / 16:07:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1848 |
! |
|
1849 |
||
1850 |
showCopyrightMethodDiffs: aBoolean |
|
1851 |
self showCopyrightMethodDiffsHolder value: aBoolean |
|
1852 |
||
1853 |
"Created: / 10-08-2012 / 16:07:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1854 |
! |
|
1855 |
||
1856 |
showVersionMethodDiffs |
|
1857 |
^ self showVersionMethodDiffsHolder value |
|
1858 |
||
1859 |
"Created: / 10-08-2012 / 16:07:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1860 |
! |
|
1861 |
||
1862 |
showVersionMethodDiffs: aBoolean |
|
1863 |
self showVersionMethodDiffsHolder value: aBoolean |
|
1864 |
||
1865 |
"Created: / 10-08-2012 / 16:08:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 1866 |
! |
1867 |
||
1868 |
title: aString |
|
1869 |
||
1870 |
self titleHolder value: aString |
|
1871 |
||
1872 |
"Created: / 19-11-2009 / 15:44:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1873 |
! ! |
|
1874 |
||
13880 | 1875 |
!ChangeSetDiffTool methodsFor:'accessing-menus'! |
1876 |
||
1877 |
listMenu |
|
1878 |
| spec | |
|
1879 |
||
1880 |
spec := self isMerge ifTrue:[self class listMenuMerge] ifFalse:[self class listMenuDiff]. |
|
1881 |
^Menu decodeFromLiteralArray: spec. |
|
1882 |
||
1883 |
"Created: / 16-01-2013 / 15:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1884 |
! ! |
|
1885 |
||
1886 |
!ChangeSetDiffTool methodsFor:'accessing-selection'! |
|
1887 |
||
1888 |
selection: entry |
|
1889 |
||
1890 |
||
1891 |
self isOneColumnBrowser ifTrue:[ |
|
1892 |
list1App selection: entry |
|
1893 |
] ifFalse:[ |
|
1894 |
| parent | |
|
1895 |
||
1896 |
parent := self diffsetHolderPrivate value diffs |
|
1897 |
detect:[:each|each diffs includes: entry] ifNone:[nil]. |
|
1898 |
parent notNil ifTrue:[ |
|
1899 |
list1App selection: parent. |
|
1900 |
list1App updateOutputGenerator. |
|
1901 |
list2App updateList. |
|
1902 |
list2App selection: entry. |
|
1903 |
||
1904 |
] |
|
1905 |
] |
|
1906 |
||
1907 |
"Created: / 22-10-2008 / 11:30:11 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1908 |
"Modified: / 17-01-2013 / 16:28:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1909 |
! |
|
1910 |
||
1911 |
theFirstSelectedEntry |
|
1912 |
| selection | |
|
1913 |
||
1914 |
selection := self selectionHolder value. |
|
1915 |
selection isNil ifTrue:[ ^ nil ]. |
|
1916 |
selection := selection collect:[:e|e]. "/selection might be an Iterator |
|
1917 |
selection isEmpty ifTrue:[ ^nil ]. |
|
1918 |
^selection first |
|
1919 |
||
1920 |
"Created: / 17-01-2013 / 16:58:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1921 |
! |
|
1922 |
||
1923 |
theLastSelectedEntry |
|
1924 |
| selection | |
|
1925 |
||
1926 |
selection := self selectionHolder value. |
|
1927 |
selection isNil ifTrue:[ ^ nil ]. |
|
1928 |
selection := selection collect:[:e|e]. "/selection might be an Iterator |
|
1929 |
selection isEmpty ifTrue:[ ^nil ]. |
|
1930 |
^selection last |
|
1931 |
||
1932 |
"Created: / 17-01-2013 / 13:22:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
15227
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1933 |
! |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1934 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1935 |
theSingleSelectedObject |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1936 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1937 |
| sel selSize obj | |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1938 |
sel := self selection. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1939 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1940 |
(sel isCollection and:[self isString not]) |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1941 |
ifFalse:[^sel]. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1942 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1943 |
selSize := 0. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1944 |
obj := nil. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1945 |
sel do: |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1946 |
[:each| |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1947 |
selSize := selSize + 1. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1948 |
selSize > 1 ifTrue:[^nil]. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1949 |
obj := each]. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1950 |
^obj |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1951 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1952 |
"Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1953 |
"Modified: / 20-11-2009 / 19:54:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13880 | 1954 |
! ! |
1955 |
||
15231
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
1956 |
!ChangeSetDiffTool methodsFor:'accessing-subApps'! |
13880 | 1957 |
|
1958 |
textDiff2Tool |
|
1959 |
textDiff2App isNil ifTrue:[ |
|
1960 |
textDiff2App := TextDiff2Tool new |
|
1961 |
labelAHolder: self versionALabelHolder; |
|
1962 |
textAHolder: self versionATextHolder; |
|
1963 |
||
1964 |
labelBHolder: self versionBLabelHolder; |
|
1965 |
textBHolder: self versionBTextHolder; |
|
1966 |
||
1967 |
codeAspectHolder: self codeAspectHolder; |
|
1968 |
||
1969 |
yourself |
|
1970 |
]. |
|
1971 |
^textDiff2App |
|
1972 |
||
1973 |
"Created: / 16-03-2012 / 13:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1974 |
"Modified: / 04-04-2013 / 18:17:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1975 |
! |
|
1976 |
||
1977 |
textDiff3Tool |
|
1978 |
textDiff3App isNil ifTrue:[ |
|
1979 |
textDiff3App := TextDiff3Tool new |
|
1980 |
mergeHolder: self mergeHolder; |
|
1981 |
mergeDataHolder: self mergeDataHolder; |
|
1982 |
||
1983 |
labelCHolder: self versionBaseLabelHolder; |
|
1984 |
textCHolder: self versionBaseTextHolder; |
|
1985 |
||
1986 |
labelBHolder: self versionBLabelHolder; |
|
1987 |
textBHolder: self versionBTextHolder; |
|
1988 |
||
1989 |
labelAHolder: self versionALabelHolder; |
|
1990 |
textAHolder: self versionATextHolder; |
|
1991 |
||
1992 |
codeAspectHolder: self codeAspectHolder; |
|
1993 |
||
1994 |
||
1995 |
yourself |
|
1996 |
]. |
|
1997 |
^textDiff3App |
|
1998 |
||
1999 |
"Created: / 16-03-2012 / 15:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2000 |
"Modified: / 04-04-2013 / 18:17:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2001 |
! ! |
|
2002 |
||
2003 |
!ChangeSetDiffTool methodsFor:'accessing-subviews'! |
|
2004 |
||
2005 |
labelsView:something |
|
2006 |
labelsView := something. |
|
2007 |
! |
|
2008 |
||
2009 |
list1View: aView |
|
2010 |
list1App := aView application. |
|
2011 |
||
2012 |
"Created: / 17-01-2013 / 13:44:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2013 |
! |
|
2014 |
||
2015 |
list2View: aView |
|
2016 |
list2App := aView application. |
|
2017 |
||
2018 |
"Created: / 17-01-2013 / 13:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2019 |
! |
|
2020 |
||
2021 |
navigatorAndDiffPanelView:something |
|
2022 |
navigatorAndDiffPanelView := something. |
|
2023 |
! ! |
|
2024 |
||
10194 | 2025 |
!ChangeSetDiffTool methodsFor:'aspects'! |
2026 |
||
13880 | 2027 |
autoMoveToNextConflictHolder |
2028 |
||
2029 |
autoMoveToNextConflictHolder isNil ifTrue:[ |
|
2030 |
autoMoveToNextConflictHolder := AspectAdaptor forAspect: #autoMoveToNextConflict. |
|
2031 |
autoMoveToNextConflictHolder subject: self class. |
|
2032 |
]. |
|
2033 |
^autoMoveToNextConflictHolder |
|
2034 |
||
2035 |
"Created: / 17-01-2013 / 19:51:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2036 |
! |
|
2037 |
||
2038 |
canSaveHolder |
|
2039 |
"return/create the 'canSaveHolder' value holder (automatically generated)" |
|
2040 |
||
2041 |
canSaveHolder isNil ifTrue:[ |
|
2042 |
canSaveHolder := false asValue |
|
2043 |
]. |
|
2044 |
^ canSaveHolder |
|
2045 |
||
2046 |
"Modified: / 17-01-2013 / 21:00:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2047 |
! |
|
2048 |
||
2049 |
codeAspectHolder |
|
2050 |
"return/create the valueHolder 'codeAspectHolder'" |
|
2051 |
||
2052 |
codeAspectHolder isNil ifTrue:[ |
|
2053 |
codeAspectHolder := ValueHolder with:nil "defaultValue here". |
|
2054 |
]. |
|
2055 |
^ codeAspectHolder |
|
2056 |
! |
|
2057 |
||
2058 |
diffInfoHolder |
|
2059 |
"return/create the 'diffInfoHolder' value holder (automatically generated)" |
|
2060 |
||
2061 |
diffInfoHolder isNil ifTrue:[ |
|
2062 |
diffInfoHolder := ValueHolder new. |
|
2063 |
diffInfoHolder addDependent:self. |
|
2064 |
]. |
|
2065 |
^ diffInfoHolder |
|
2066 |
! |
|
2067 |
||
2068 |
diffInfoHolder:something |
|
2069 |
"set the 'diffInfoHolder' value holder (automatically generated)" |
|
2070 |
||
2071 |
|oldValue newValue| |
|
2072 |
||
2073 |
diffInfoHolder notNil ifTrue:[ |
|
2074 |
oldValue := diffInfoHolder value. |
|
2075 |
diffInfoHolder removeDependent:self. |
|
2076 |
]. |
|
2077 |
diffInfoHolder := something. |
|
2078 |
diffInfoHolder notNil ifTrue:[ |
|
2079 |
diffInfoHolder addDependent:self. |
|
2080 |
]. |
|
2081 |
newValue := diffInfoHolder value. |
|
2082 |
oldValue ~~ newValue ifTrue:[ |
|
2083 |
self update:#value with:newValue from:diffInfoHolder. |
|
2084 |
]. |
|
2085 |
! |
|
2086 |
||
10194 | 2087 |
diffListEntryLabelGeneratorAspect |
2088 |
||
2089 |
^nil |
|
2090 |
||
2091 |
"Created: / 24-11-2009 / 10:01:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2092 |
! |
|
2093 |
||
2094 |
diffsetHolder |
|
2095 |
"return/create the 'diffsetHolder' value holder (automatically generated)" |
|
2096 |
||
2097 |
diffsetHolder isNil ifTrue:[ |
|
2098 |
diffsetHolder := ValueHolder new. |
|
2099 |
diffsetHolder addDependent:self. |
|
2100 |
]. |
|
2101 |
^ diffsetHolder |
|
2102 |
! |
|
2103 |
||
2104 |
diffsetHolder:aValueHolder |
|
2105 |
"set the 'diffsetHolder' value holder (automatically generated)" |
|
2106 |
||
2107 |
|oldValue newValue| |
|
2108 |
||
2109 |
diffsetHolder notNil ifTrue:[ |
|
2110 |
oldValue := diffsetHolder value. |
|
2111 |
diffsetHolder removeDependent:self. |
|
2112 |
]. |
|
2113 |
diffsetHolder := aValueHolder. |
|
2114 |
diffsetHolder notNil ifTrue:[ |
|
2115 |
diffsetHolder addDependent:self. |
|
2116 |
]. |
|
2117 |
newValue := diffsetHolder value. |
|
2118 |
oldValue ~~ newValue ifTrue:[ |
|
2119 |
self update:#value with:newValue from:diffsetHolder. |
|
2120 |
]. |
|
2121 |
! |
|
2122 |
||
2123 |
diffsetHolderPrivate |
|
2124 |
"return/create the 'diffSetHolderPrivate' value holder (automatically generated)" |
|
2125 |
||
2126 |
diffsetHolderPrivate isNil ifTrue:[ |
|
2127 |
diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value). |
|
2128 |
]. |
|
2129 |
^ diffsetHolderPrivate |
|
2130 |
||
2131 |
"Created: / 05-12-2009 / 11:03:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2132 |
! |
|
2133 |
||
2134 |
firstColSelectionHolder |
|
2135 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
2136 |
||
2137 |
firstColSelectionHolder isNil ifTrue:[ |
|
2138 |
firstColSelectionHolder := ValueHolder with:nil "defaultValue here". |
|
2139 |
]. |
|
2140 |
^ firstColSelectionHolder |
|
2141 |
! |
|
2142 |
||
13880 | 2143 |
hasDiffsetHolder |
2144 |
"return/create the 'hasDiffsetHolder' value holder (automatically generated)" |
|
2145 |
||
2146 |
hasDiffsetHolder isNil ifTrue:[ |
|
2147 |
hasDiffsetHolder := false asValue |
|
2148 |
]. |
|
2149 |
^ hasDiffsetHolder |
|
2150 |
||
2151 |
"Modified: / 01-08-2012 / 17:16:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2152 |
! |
|
2153 |
||
2154 |
hasDiffsetHolder:something |
|
2155 |
"set the 'hasDiffsetHolder' value holder (automatically generated)" |
|
2156 |
||
2157 |
hasDiffsetHolder := something. |
|
2158 |
! |
|
2159 |
||
10194 | 2160 |
hasSelectionHolder |
2161 |
||
2162 |
|holder| |
|
2163 |
||
2164 |
(holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[ |
|
2165 |
holder := (AspectAdaptor forAspect: #notEmptyOrNil) |
|
2166 |
subjectChannel: self selectionHolder. |
|
2167 |
builder aspectAt:#hasSelectionHolder put: holder |
|
2168 |
]. |
|
2169 |
^ holder. |
|
2170 |
||
2171 |
"Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2172 |
"Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2173 |
! |
|
2174 |
||
13880 | 2175 |
highlightConflictsHolder |
2176 |
"return/create the 'highlightConflictsHolder' value holder (automatically generated)" |
|
2177 |
||
2178 |
highlightConflictsHolder isNil ifTrue:[ |
|
2179 |
highlightConflictsHolder := true asValue |
|
2180 |
]. |
|
2181 |
^ highlightConflictsHolder |
|
2182 |
||
2183 |
"Modified: / 01-08-2012 / 17:07:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2184 |
! |
|
2185 |
||
2186 |
highlightConflictsHolder:something |
|
2187 |
"set the 'highlightConflictsHolder' value holder (automatically generated)" |
|
2188 |
||
2189 |
highlightConflictsHolder := something. |
|
2190 |
! |
|
2191 |
||
2192 |
infoPanel |
|
2193 |
infoPanel isNil ifTrue:[ |
|
2194 |
infoPanel := InlineMessageDialog new |
|
2195 |
]. |
|
2196 |
^ infoPanel |
|
2197 |
||
2198 |
"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2199 |
! |
|
2200 |
||
2201 |
labelSpecHolder |
|
2202 |
"return/create the 'labelSpecHolder' value holder (automatically generated)" |
|
2203 |
||
2204 |
labelSpecHolder isNil ifTrue:[ |
|
2205 |
labelSpecHolder := nil asValue |
|
2206 |
||
2207 |
]. |
|
2208 |
^ labelSpecHolder |
|
2209 |
||
2210 |
"Modified: / 17-01-2013 / 23:32:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2211 |
! |
|
2212 |
||
10194 | 2213 |
listHolder |
2214 |
"return/create the 'listHolder' value holder (automatically generated)" |
|
2215 |
||
2216 |
listHolder isNil ifTrue:[ |
|
2217 |
listHolder := ValueHolder new. |
|
2218 |
]. |
|
2219 |
^ listHolder |
|
2220 |
||
2221 |
"Modified: / 01-11-2009 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2222 |
! |
|
2223 |
||
2224 |
listMenuHolder |
|
13880 | 2225 |
diffMenuHolder isNil ifTrue:[ |
2226 |
"/ diffMenuHolder := ValueHolder with:self listMenu |
|
2227 |
diffMenuHolder := BlockValue with:[:v|self listMenu] argument: self mergeHolder |
|
10879 | 2228 |
]. |
10194 | 2229 |
^ diffMenuHolder |
2230 |
||
2231 |
"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10879 | 2232 |
"Modified: / 18-11-2011 / 14:57:47 / cg" |
13880 | 2233 |
"Modified: / 16-01-2013 / 15:59:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2234 |
! |
|
2235 |
||
2236 |
mergeDataHolder |
|
2237 |
"return/create the 'mergeDataHolder' value holder (automatically generated)" |
|
2238 |
||
2239 |
mergeDataHolder isNil ifTrue:[ |
|
2240 |
mergeDataHolder := ValueHolder new. |
|
2241 |
mergeDataHolder addDependent:self. |
|
2242 |
]. |
|
2243 |
^ mergeDataHolder |
|
2244 |
! |
|
2245 |
||
2246 |
mergeDataHolder:something |
|
2247 |
"set the 'mergeDataHolder' value holder (automatically generated)" |
|
2248 |
||
2249 |
|oldValue newValue| |
|
2250 |
||
2251 |
mergeDataHolder notNil ifTrue:[ |
|
2252 |
oldValue := mergeDataHolder value. |
|
2253 |
mergeDataHolder removeDependent:self. |
|
2254 |
]. |
|
2255 |
mergeDataHolder := something. |
|
2256 |
mergeDataHolder notNil ifTrue:[ |
|
2257 |
mergeDataHolder addDependent:self. |
|
2258 |
]. |
|
2259 |
newValue := mergeDataHolder value. |
|
2260 |
oldValue ~~ newValue ifTrue:[ |
|
2261 |
self update:#value with:newValue from:mergeDataHolder. |
|
2262 |
]. |
|
2263 |
! |
|
2264 |
||
2265 |
mergeHolder |
|
2266 |
"return/create the 'mergeHolder' value holder (automatically generated)" |
|
2267 |
||
2268 |
mergeHolder isNil ifTrue:[ |
|
2269 |
mergeHolder := ValueHolder with: false. |
|
2270 |
]. |
|
2271 |
^ mergeHolder |
|
2272 |
||
2273 |
"Modified: / 19-03-2012 / 14:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2274 |
! |
|
2275 |
||
2276 |
mergeHolder:something |
|
2277 |
"set the 'mergeHolder' value holder (automatically generated)" |
|
2278 |
||
2279 |
mergeHolder := something. |
|
2280 |
! |
|
2281 |
||
2282 |
mergeSavedHolder |
|
2283 |
"return/create the 'mergeSavedHolder' value holder (automatically generated)" |
|
2284 |
||
2285 |
mergeSavedHolder isNil ifTrue:[ |
|
2286 |
mergeSavedHolder := false asValue |
|
2287 |
]. |
|
2288 |
^ mergeSavedHolder |
|
2289 |
||
2290 |
"Modified: / 15-01-2013 / 11:39:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2291 |
! |
2292 |
||
2293 |
nameAspect |
|
2294 |
||
2295 |
^(AspectAdaptor forAspect: #name) |
|
2296 |
subjectChannel: self diffsetHolder |
|
2297 |
||
2298 |
"Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2299 |
! |
|
2300 |
||
2301 |
navigatorPanelSpecHolder |
|
2302 |
<resource: #uiAspect> |
|
2303 |
||
2304 |
navigatorPanelSpecHolder isNil ifTrue:[ |
|
2305 |
navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec. |
|
2306 |
]. |
|
2307 |
^ navigatorPanelSpecHolder. |
|
2308 |
||
2309 |
"Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2310 |
! |
|
2311 |
||
13880 | 2312 |
secondColSelectionHolder |
2313 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
2314 |
||
2315 |
^self selectionHolder |
|
2316 |
||
2317 |
"Created: / 17-01-2013 / 12:49:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2318 |
! |
|
2319 |
||
10194 | 2320 |
selectionHolder |
2321 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
|
2322 |
||
2323 |
selectionHolder isNil ifTrue:[ |
|
2324 |
||
2325 |
selectionHolder := ValueHolder new. |
|
2326 |
selectionHolder addDependent:self. |
|
2327 |
]. |
|
2328 |
^ selectionHolder |
|
2329 |
||
2330 |
"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2331 |
! |
|
2332 |
||
13880 | 2333 |
showCopyrightMethodDiffsHolder |
2334 |
"return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)" |
|
2335 |
||
2336 |
showCopyrightMethodDiffsHolder isNil ifTrue:[ |
|
2337 |
showCopyrightMethodDiffsHolder := true asValue |
|
2338 |
]. |
|
2339 |
^ showCopyrightMethodDiffsHolder |
|
2340 |
||
2341 |
"Modified: / 01-08-2012 / 17:06:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2342 |
! |
|
2343 |
||
2344 |
showCopyrightMethodDiffsHolder:something |
|
2345 |
"set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)" |
|
2346 |
||
2347 |
showCopyrightMethodDiffsHolder := something. |
|
2348 |
! |
|
2349 |
||
2350 |
showVersionMethodDiffsHolder |
|
2351 |
"return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
|
2352 |
||
2353 |
showVersionMethodDiffsHolder isNil ifTrue:[ |
|
2354 |
showVersionMethodDiffsHolder := true asValue. |
|
2355 |
]. |
|
2356 |
^ showVersionMethodDiffsHolder |
|
2357 |
||
2358 |
"Modified: / 18-04-2012 / 19:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2359 |
! |
|
2360 |
||
2361 |
showVersionMethodDiffsHolder:something |
|
2362 |
"set the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
|
2363 |
||
2364 |
showVersionMethodDiffsHolder := something. |
|
2365 |
! |
|
2366 |
||
10194 | 2367 |
singleSelectionHolder |
2368 |
"return/create the 'singleSelectionHolder' value holder (automatically generated)" |
|
2369 |
||
2370 |
singleSelectionHolder isNil ifTrue:[ |
|
2371 |
singleSelectionHolder := ValueHolder new. |
|
2372 |
]. |
|
2373 |
^ singleSelectionHolder |
|
2374 |
||
2375 |
"Modified: / 10-11-2009 / 11:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2376 |
! |
|
2377 |
||
13880 | 2378 |
textDiffToolHolder |
2379 |
"return/create the 'textDiffToolHolder' value holder (automatically generated)" |
|
2380 |
||
2381 |
textDiffToolHolder isNil ifTrue:[ |
|
2382 |
textDiffToolHolder := ValueHolder with: self textDiff2Tool. |
|
2383 |
]. |
|
2384 |
^ textDiffToolHolder |
|
2385 |
||
2386 |
"Modified: / 16-03-2012 / 13:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2387 |
! |
|
2388 |
||
2389 |
textDiffToolHolder:something |
|
2390 |
"set the 'textDiffToolHolder' value holder (automatically generated)" |
|
2391 |
||
2392 |
textDiffToolHolder := something. |
|
2393 |
! |
|
2394 |
||
2395 |
textDiffToolWindowSpecHolder |
|
2396 |
"return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
|
2397 |
||
2398 |
textDiffToolWindowSpecHolder isNil ifTrue:[ |
|
2399 |
textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue. |
|
2400 |
]. |
|
2401 |
^ textDiffToolWindowSpecHolder |
|
2402 |
||
2403 |
"Modified: / 16-03-2012 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2404 |
! |
|
2405 |
||
2406 |
textDiffToolWindowSpecHolder:something |
|
2407 |
"set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
|
2408 |
||
2409 |
textDiffToolWindowSpecHolder := something. |
|
2410 |
! |
|
2411 |
||
10194 | 2412 |
titleHolder |
2413 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
2414 |
||
2415 |
titleHolder isNil ifTrue:[ |
|
2416 |
titleHolder := ValueHolder with: 'Diff Browser'. |
|
2417 |
]. |
|
2418 |
^ titleHolder |
|
2419 |
||
2420 |
"Modified: / 01-11-2009 / 14:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2421 |
! |
|
2422 |
||
2423 |
versionALabelHolder |
|
2424 |
||
2425 |
^(AspectAdaptor forAspect: #versionALabel) |
|
2426 |
subjectChannel: self diffsetHolder |
|
2427 |
||
2428 |
"Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2429 |
! |
|
2430 |
||
2431 |
versionATextHolder |
|
2432 |
||
10879 | 2433 |
versionATextHolder isNil ifTrue:[ |
10194 | 2434 |
versionATextHolder := ValueHolder new |
2435 |
]. |
|
2436 |
^versionATextHolder |
|
2437 |
||
2438 |
"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10879 | 2439 |
"Modified: / 18-11-2011 / 14:57:56 / cg" |
10194 | 2440 |
! |
2441 |
||
2442 |
versionBLabelHolder |
|
2443 |
||
2444 |
^(AspectAdaptor forAspect: #versionBLabel) |
|
2445 |
subjectChannel: self diffsetHolder |
|
2446 |
||
2447 |
"Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2448 |
! |
|
2449 |
||
2450 |
versionBTextHolder |
|
2451 |
||
10879 | 2452 |
versionBTextHolder isNil ifTrue:[ |
10194 | 2453 |
versionBTextHolder := ValueHolder new |
2454 |
]. |
|
2455 |
^versionBTextHolder |
|
2456 |
||
2457 |
"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10879 | 2458 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
13880 | 2459 |
! |
2460 |
||
2461 |
versionBaseLabelHolder |
|
2462 |
||
2463 |
^(AspectAdaptor forAspect: #versionBaseLabel) |
|
2464 |
subjectChannel: self diffsetHolder |
|
2465 |
||
2466 |
"Created: / 16-03-2012 / 15:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2467 |
! |
|
2468 |
||
2469 |
versionBaseTextHolder |
|
2470 |
||
2471 |
versionBaseTextHolder isNil ifTrue:[ |
|
2472 |
versionBaseTextHolder := ValueHolder new |
|
2473 |
]. |
|
2474 |
^versionBaseTextHolder |
|
2475 |
||
2476 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
|
2477 |
"Created: / 16-03-2012 / 15:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2478 |
! ! |
2479 |
||
2480 |
!ChangeSetDiffTool methodsFor:'change & update'! |
|
2481 |
||
13880 | 2482 |
diffInfoChanged |
2483 |
||
2484 |
| info | |
|
2485 |
info := self diffInfoHolder value. |
|
2486 |
self hasDiffsetHolder value: false. |
|
2487 |
self mergeSavedHolder value: false. |
|
2488 |
self canSaveHolder value: false. |
|
2489 |
info notNil ifTrue:[ |
|
2490 |
self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [ |
|
2491 |
info read. |
|
2492 |
self diffset: info diffset. |
|
2493 |
]. |
|
2494 |
]. |
|
2495 |
||
2496 |
"Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2497 |
"Modified: / 21-01-2013 / 21:12:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2498 |
! |
|
2499 |
||
10194 | 2500 |
diffsetChanged |
2501 |
| ds | |
|
2502 |
||
2503 |
ds := self diffsetHolder value. |
|
13880 | 2504 |
ds depth = 2 ifTrue:[ |
17357 | 2505 |
self beTwoColumn. |
13880 | 2506 |
] ifFalse:[ |
17357 | 2507 |
self beSingleColumn. |
13880 | 2508 |
]. |
2509 |
self hasDiffsetHolder value: ds notNil. |
|
2510 |
self canSaveHolder value: self canSave. |
|
2511 |
alreadyWarnedAboutUnsavedMerge := false. |
|
2512 |
||
2513 |
||
2514 |
self diffsetHolderPrivate value: |
|
17357 | 2515 |
(self isOneColumnBrowser |
2516 |
ifTrue:[ds flattened sort] |
|
2517 |
ifFalse:[ds value sort]). |
|
13880 | 2518 |
self autoMoveToNextConflictHolder value ifTrue:[ |
17357 | 2519 |
self menuMoveDownConflict. |
13880 | 2520 |
]. |
10194 | 2521 |
self versionALabelHolder value: ds versionALabel. |
2522 |
self versionBLabelHolder value: ds versionBLabel. |
|
13880 | 2523 |
self versionBaseLabelHolder value: ds versionBaseLabel. |
2524 |
self updateViews. |
|
10194 | 2525 |
|
2526 |
"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
17357 | 2527 |
"Modified: / 29-06-2011 / 08:24:18 / Jan Vrany" |
13880 | 2528 |
"Modified: / 21-01-2013 / 21:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2529 |
! |
|
2530 |
||
2531 |
mergeDataChanged |
|
2532 |
"Resolution has been changed..." |
|
2533 |
||
2534 |
self canSaveHolder value: self canSave. |
|
2535 |
alreadyWarnedAboutUnsavedMerge := false. |
|
2536 |
(self autoMoveToNextConflictHolder value and:[mergeData isMerged]) ifTrue:[ |
|
2537 |
self menuMoveDownConflict |
|
2538 |
] |
|
2539 |
||
2540 |
"Created: / 17-01-2013 / 20:06:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2541 |
"Modified: / 17-01-2013 / 21:20:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2542 |
! |
|
2543 |
||
2544 |
mergeDataHolderChanged |
|
2545 |
mergeData notNil ifTrue:[mergeData removeDependent: self]. |
|
2546 |
mergeData := self mergeDataHolder value. |
|
2547 |
mergeData notNil ifTrue:[mergeData addDependent: self]. |
|
2548 |
||
2549 |
"Created: / 16-01-2013 / 09:24:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2550 |
"Modified: / 17-01-2013 / 20:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2551 |
! |
2552 |
||
2553 |
selectionChanged |
|
2554 |
||
13880 | 2555 |
| diffItem mergeData | |
10194 | 2556 |
|
2557 |
diffItem := self theSingleSelectedObject. |
|
2558 |
self singleSelectionHolder value: diffItem. |
|
2559 |
diffItem isNil ifTrue:[^self]. |
|
2560 |
||
13880 | 2561 |
self isMerge ifTrue:[ |
2562 |
self mergeDataHolder setValue: (mergeData := diffItem mergeInfo). |
|
2563 |
]. |
|
10194 | 2564 |
self versionATextHolder setValue: diffItem versionAText. |
2565 |
self versionBTextHolder setValue: diffItem versionBText. |
|
13880 | 2566 |
self versionBaseTextHolder setValue: diffItem versionBaseText. |
2567 |
||
10194 | 2568 |
|
2569 |
self versionATextHolder changed: #value. |
|
2570 |
self versionBTextHolder changed: #value. |
|
13880 | 2571 |
self versionBaseTextHolder changed: #value. |
2572 |
self isMerge ifTrue:[ |
|
2573 |
self mergeDataHolder changed: #value. |
|
2574 |
"Maybe, there was no merge data beforehand. In that case, |
|
2575 |
update" |
|
2576 |
mergeData isNil ifTrue:[ |
|
2577 |
diffItem mergeInfo: (self mergeDataHolder value). |
|
2578 |
] |
|
2579 |
] |
|
10194 | 2580 |
|
2581 |
"Created: / 22-10-2008 / 11:29:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
13880 | 2582 |
"Modified: / 19-03-2012 / 14:59:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2583 |
! |
2584 |
||
2585 |
update: aspect with: param from: sender |
|
2586 |
||
2587 |
sender == selectionHolder ifTrue:[ |
|
13880 | 2588 |
self selectionChanged. |
2589 |
^self. |
|
10194 | 2590 |
]. |
2591 |
||
2592 |
sender == diffsetHolder ifTrue:[ |
|
13880 | 2593 |
self diffsetChanged. |
2594 |
^self. |
|
2595 |
]. |
|
2596 |
||
2597 |
sender == diffInfoHolder ifTrue:[ |
|
2598 |
self diffInfoChanged. |
|
2599 |
^self. |
|
2600 |
]. |
|
2601 |
||
2602 |
sender == mergeDataHolder ifTrue:[ |
|
2603 |
self mergeDataHolderChanged. |
|
2604 |
^self. |
|
2605 |
]. |
|
2606 |
||
2607 |
sender == mergeData ifTrue:[ |
|
2608 |
"Resolution has been changed..." |
|
2609 |
self mergeDataChanged. |
|
2610 |
^self. |
|
10194 | 2611 |
]. |
2612 |
||
2613 |
^super update: aspect with: param from: sender |
|
2614 |
||
2615 |
"Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 2616 |
"Modified (format): / 17-01-2013 / 20:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2617 |
! |
2618 |
||
2619 |
updateListMenu |
|
2620 |
|menu diffs loadA loadB| |
|
2621 |
||
2622 |
menu := self listMenuHolder value. |
|
2623 |
diffs := self selection ? #(). |
|
2624 |
loadA := menu atNameKey:#LoadVersionA. |
|
2625 |
loadA disable. |
|
2626 |
loadB := menu atNameKey:#LoadVersionB. |
|
2627 |
loadB disable. |
|
16916 | 2628 |
|
2629 |
diffs do:[:diff | |
|
10194 | 2630 |
diff versionA |
2631 |
ifNotNil:[ |
|
14409
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2632 |
loadA |
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2633 |
label:('Load version ' , diff versionALabel); |
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2634 |
enable. |
10194 | 2635 |
]. |
2636 |
diff versionB |
|
2637 |
ifNotNil:[ |
|
2638 |
loadB |
|
14409
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2639 |
label:('Load version ' , diff versionBLabel); |
10194 | 2640 |
enable |
2641 |
]. |
|
2642 |
]. |
|
13880 | 2643 |
! |
2644 |
||
2645 |
updateViews |
|
2646 |
||
2647 |
(self diffInfo notNil and:[self diffInfo isDiff3]) ifTrue:[ |
|
2648 |
self diffInfo isMerge ifTrue:[ |
|
2649 |
self mergeHolder value: true. |
|
2650 |
self labelSpecHolder value: #labelMergeSpec. |
|
2651 |
self labelHeight: 120. |
|
2652 |
] ifFalse:[ |
|
2653 |
self mergeHolder value: false. |
|
2654 |
self labelSpecHolder value: #labelDiff3Spec. |
|
2655 |
self labelHeight: 90. |
|
2656 |
]. |
|
2657 |
self textDiffToolHolder value isDiff3 ifFalse:[ |
|
2658 |
textDiffToolHolder value: self textDiff3Tool. |
|
2659 |
]. |
|
2660 |
||
2661 |
||
2662 |
] ifFalse:[ |
|
2663 |
self mergeHolder value: false. |
|
2664 |
self labelSpecHolder value: #labelDiff2Spec. |
|
2665 |
self labelHeight: 60. |
|
2666 |
||
2667 |
self textDiffToolHolder value isDiff2 ifFalse:[ |
|
2668 |
textDiffToolHolder value: self textDiff2Tool. |
|
2669 |
]. |
|
2670 |
]. |
|
2671 |
||
2672 |
"Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2673 |
"Modified: / 21-01-2013 / 21:16:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2674 |
! ! |
|
2675 |
||
2676 |
!ChangeSetDiffTool methodsFor:'hooks'! |
|
2677 |
||
2678 |
commonPostOpen |
|
17313 | 2679 |
super commonPostOpen. |
13880 | 2680 |
self updateViews |
2681 |
||
2682 |
"Created: / 21-01-2013 / 21:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2683 |
! ! |
2684 |
||
2685 |
!ChangeSetDiffTool methodsFor:'initialization'! |
|
2686 |
||
2687 |
initialize |
|
2688 |
||
2689 |
super initialize. |
|
2690 |
self createBuilder |
|
2691 |
||
2692 |
"Created: / 22-10-2008 / 12:37:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2693 |
! ! |
|
2694 |
||
2695 |
!ChangeSetDiffTool methodsFor:'menu actions'! |
|
2696 |
||
10975 | 2697 |
changesetMenuBrowse: changeset |
2698 |
||
13880 | 2699 |
(Tools::ChangeSetBrowser2 on: (changeset , self diffInfo same)) |
2700 |
allowRemove: true; |
|
2701 |
open |
|
10975 | 2702 |
|
2703 |
"Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 2704 |
"Modified: / 12-11-2013 / 17:19:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10975 | 2705 |
! |
2706 |
||
2707 |
changesetMenuBrowseA |
|
2708 |
||
13880 | 2709 |
self changesetMenuBrowse: self diffInfo diffset changesetA |
10975 | 2710 |
|
2711 |
"Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2712 |
! |
|
2713 |
||
2714 |
changesetMenuBrowseB |
|
2715 |
||
13880 | 2716 |
self changesetMenuBrowse: self diffInfo diffset changesetB |
10975 | 2717 |
|
2718 |
"Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2719 |
! |
|
2720 |
||
13880 | 2721 |
changesetMenuBrowseBase |
2722 |
||
2723 |
self changesetMenuBrowse: self diffInfo diffset changesetBase |
|
2724 |
||
2725 |
"Created: / 20-03-2012 / 13:34:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2726 |
! |
|
2727 |
||
2728 |
changesetMenuBrowseMerge |
|
2729 |
||
2730 |
self changesetMenuBrowse: self diffInfo diffset changesetMerged |
|
2731 |
||
2732 |
"Created: / 20-03-2012 / 14:34:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2733 |
! |
|
2734 |
||
10194 | 2735 |
fileMenuOpen |
2736 |
||
13880 | 2737 |
| dlg info | |
10194 | 2738 |
dlg := OpenDialog new. |
13880 | 2739 |
info := LastDiffInfo. |
2740 |
info isNil ifTrue:[ |
|
2741 |
info := ChangeSetDiffInfo new. |
|
2742 |
info specMerge: ChangeSetSpec changeSet |
|
2743 |
] ifFalse:[ |
|
2744 |
info := info deepCopy. |
|
2745 |
]. |
|
2746 |
dlg diffInfo: info. |
|
10194 | 2747 |
dlg open ifFalse:[^self]. |
13880 | 2748 |
info := dlg diffInfo. |
2749 |
||
2750 |
^self fileMenuOpenOnDiffInfo: info |
|
2751 |
||
2752 |
"Modified: / 13-11-2013 / 11:54:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2753 |
! |
2754 |
||
2755 |
fileMenuOpenOnDiffBetween: a and: b |
|
2756 |
||
2757 |
self diffset: (ChangeSetDiff versionA: a versionB: b). |
|
2758 |
||
2759 |
"Created: / 21-03-2011 / 23:23:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
17357 | 2760 |
"Modified: / 29-06-2011 / 08:10:17 / Jan Vrany" |
10194 | 2761 |
"Modified: / 06-07-2011 / 12:56:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2762 |
! |
|
2763 |
||
13880 | 2764 |
fileMenuOpenOnDiffInfo: info |
2765 |
||
2766 |
LastDiffInfo := info. |
|
2767 |
self diffInfoHolder value: info |
|
2768 |
||
2769 |
"Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2770 |
! |
|
2771 |
||
2772 |
fileMenuSave |
|
2773 |
self fileMenuSaveAs: self diffInfo specMergeFile. |
|
2774 |
||
2775 |
"Modified: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2776 |
! |
|
2777 |
||
2778 |
fileMenuSaveAs |
|
2779 |
| info file suggestion | |
|
2780 |
||
2781 |
info := self diffInfo. |
|
2782 |
suggestion := (info specMerge isFile ifTrue:['merged.chg'] ifFalse:[info specMergeFile]). |
|
2783 |
file := Dialog requestFileName:'Select File for Save' default: (suggestion) pattern:('*.chg;*.st'). |
|
2784 |
file isNil ifTrue:[^self]. |
|
2785 |
self fileMenuSaveAs: file. |
|
2786 |
||
2787 |
"Modified: / 20-03-2012 / 15:07:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2788 |
! |
|
2789 |
||
2790 |
fileMenuSaveAs: aFilename |
|
2791 |
||
2792 |
self fileMenuSaveAs: aFilename format: #classSource |
|
2793 |
||
2794 |
"Created: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2795 |
! |
|
2796 |
||
2797 |
fileMenuSaveAs: aFilename format: format |
|
2798 |
||
2799 |
| changesToSave | |
|
2800 |
||
2801 |
changesToSave := (self diffInfo diffset changesetMerged) , (self diffInfo same). |
|
2802 |
changesToSave := changesToSave reject:[:chg|chg isDoIt]. |
|
2803 |
changesToSave saveToFile: aFilename format: format. |
|
2804 |
self mergeSavedHolder value: true |
|
2805 |
||
2806 |
"Created: / 20-03-2012 / 15:09:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2807 |
"Modified: / 15-01-2013 / 11:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2808 |
! |
|
2809 |
||
10194 | 2810 |
fileMenuSaveAsPatch |
2811 |
| filename | |
|
15929 | 2812 |
|
2813 |
filename := Dialog requestFileName: 'Enter filename' default:'patch.chg' ifFail:[^self]. |
|
10194 | 2814 |
self patchset fileOutAs: filename. |
2815 |
||
2816 |
"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2817 |
! |
|
2818 |
||
13880 | 2819 |
fileMenuSaveMergedAs |
2820 |
||
2821 |
self halt. |
|
2822 |
||
2823 |
"Modified: / 03-08-2012 / 15:39:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2824 |
! |
|
2825 |
||
10939 | 2826 |
listMenuBrowse |
2827 |
||
2828 |
| items | |
|
17864 | 2829 |
items := self selection collect:[:e|e]. "/must do collect because selection is an iterator..." |
10939 | 2830 |
items size == 1 ifTrue:[ |
2831 |
| item cls sel | |
|
2832 |
item:= items anElement. |
|
2833 |
cls := item changeClass. |
|
2834 |
sel := item changeSelector. |
|
2835 |
cls notNil ifTrue:[ |
|
2836 |
sel notNil ifTrue:[ |
|
17668 | 2837 |
SystemBrowser default |
10939 | 2838 |
openInClass:cls selector:sel |
2839 |
||
2840 |
] ifFalse:[ |
|
17668 | 2841 |
SystemBrowser default |
10939 | 2842 |
browseClass: cls |
2843 |
] |
|
2844 |
] ifFalse:[ |
|
2845 |
Dialog warn: (self class resources at: 'Oops, class is gone') |
|
2846 |
] |
|
2847 |
] ifFalse:[ |
|
18288 | 2848 |
Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool » listMenuBrowse)'. |
10939 | 2849 |
] |
2850 |
||
2851 |
"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
17668 | 2852 |
"Modified: / 01-09-2017 / 14:22:26 / cg" |
10939 | 2853 |
! |
2854 |
||
10194 | 2855 |
listMenuInspect |
2856 |
||
2857 |
(self selection collect:[:e|e]) inspect |
|
2858 |
||
2859 |
"Modified: / 24-11-2009 / 12:51:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2860 |
! |
|
2861 |
||
2862 |
listMenuLoadVersionA |
|
2863 |
||
2864 |
self selection do: |
|
2865 |
[:diff|diff versionA apply] |
|
2866 |
||
2867 |
"Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2868 |
! |
|
2869 |
||
2870 |
listMenuLoadVersionB |
|
2871 |
||
2872 |
self selection do: |
|
2873 |
[:diff|diff versionB apply] |
|
2874 |
||
2875 |
"Modified: / 09-12-2009 / 23:10:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 2876 |
! |
2877 |
||
2878 |
listMenuMergeUsingA |
|
2879 |
self textDiffToolHolder value doMergeAllUsingA |
|
2880 |
||
2881 |
"Modified: / 16-01-2013 / 15:57:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2882 |
! |
|
2883 |
||
2884 |
listMenuMergeUsingB |
|
2885 |
self textDiffToolHolder value doMergeAllUsingB |
|
2886 |
||
2887 |
"Created: / 16-01-2013 / 15:57:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2888 |
! |
|
2889 |
||
2890 |
listMenuMergeUsingBase |
|
2891 |
self textDiffToolHolder value doMergeAllUsingBase |
|
2892 |
||
2893 |
"Created: / 16-01-2013 / 15:57:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2894 |
! |
|
2895 |
||
2896 |
listMenuOpenInExternal: command |
|
2897 |
||
2898 |
(OperatingSystem canExecuteCommand: command) ifFalse:[ |
|
2899 |
Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH' |
|
2900 |
]. |
|
2901 |
||
2902 |
self selection do:[:item| |
|
2903 |
| base a b cmd | |
|
2904 |
item versionBase notNil ifTrue:[ |
|
2905 |
base := Filename newTemporary. |
|
2906 |
base writingFileDo:[:s|s nextPutAll: item versionBase source]. |
|
2907 |
]. |
|
2908 |
a := Filename newTemporary. |
|
2909 |
a writingFileDo:[:s|s nextPutAll: item versionA source]. |
|
2910 |
b := Filename newTemporary. |
|
2911 |
b writingFileDo:[:s|s nextPutAll: item versionB source]. |
|
2912 |
||
2913 |
base isNil ifTrue:[ |
|
2914 |
cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName |
|
2915 |
] ifFalse:[ |
|
2916 |
cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName. |
|
2917 |
]. |
|
2918 |
[ OperatingSystem executeCommand: cmd. |
|
2919 |
a remove. |
|
2920 |
b remove. |
|
2921 |
base notNil ifTrue:[base remove]. ] fork |
|
2922 |
] |
|
2923 |
||
2924 |
"Modified: / 17-03-2012 / 08:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2925 |
! |
|
2926 |
||
2927 |
menuMoveDown |
|
2928 |
self menuMoveDownToSuchThat: [:entry|true] |
|
2929 |
||
2930 |
"Modified: / 17-01-2013 / 16:53:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2931 |
! |
|
2932 |
||
2933 |
menuMoveDownConflict |
|
2934 |
self menuMoveDownToSuchThat: [:entry|entry isMerged not] |
|
2935 |
||
2936 |
"Modified: / 17-01-2013 / 16:53:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2937 |
! |
|
2938 |
||
2939 |
menuMoveDownToSuchThat: aBlock |
|
2940 |
| oldSel newSel | |
|
2941 |
oldSel := self theLastSelectedEntry. |
|
2942 |
newSel := self diffsetHolderPrivate value nextEntryAfter: oldSel suchThat: aBlock. |
|
2943 |
self menuMoveTo: newSel. |
|
2944 |
||
2945 |
"Created: / 17-01-2013 / 16:52:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2946 |
! |
|
2947 |
||
2948 |
menuMoveTo: entry |
|
2949 |
||
2950 |
"/ self window sensor pushUserEvent:#selection: for: self withArgument: entry |
|
2951 |
self selection: entry. |
|
2952 |
||
2953 |
"Created: / 17-01-2013 / 13:03:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2954 |
"Modified: / 17-01-2013 / 16:27:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2955 |
! |
|
2956 |
||
2957 |
menuMoveUp |
|
2958 |
self menuMoveUpToSuchThat: [:entry|true] |
|
2959 |
||
2960 |
"Created: / 17-01-2013 / 16:58:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2961 |
! |
|
2962 |
||
2963 |
menuMoveUpConflict |
|
2964 |
self menuMoveUpToSuchThat: [:entry|entry isMerged not] |
|
2965 |
||
2966 |
"Created: / 17-01-2013 / 17:00:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2967 |
! |
|
2968 |
||
2969 |
menuMoveUpToSuchThat: aBlock |
|
2970 |
| oldSel newSel | |
|
2971 |
oldSel := self theFirstSelectedEntry. |
|
2972 |
newSel := self diffsetHolderPrivate value nextEntryBefore: oldSel suchThat: aBlock. |
|
2973 |
self menuMoveTo: newSel. |
|
2974 |
||
2975 |
"Created: / 17-01-2013 / 16:58:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2976 |
! ! |
|
2977 |
||
2978 |
!ChangeSetDiffTool methodsFor:'private'! |
|
2979 |
||
2980 |
labelHeight: height |
|
2981 |
(labelsView notNil and:[navigatorAndDiffPanelView notNil]) ifTrue:[ |
|
2982 |
labelsView layout: (labelsView layout copy bottomOffset: height). |
|
2983 |
navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height). |
|
2984 |
]. |
|
2985 |
||
2986 |
"Created: / 17-01-2013 / 23:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2987 |
"Modified: / 21-01-2013 / 21:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2988 |
! ! |
2989 |
||
2990 |
!ChangeSetDiffTool methodsFor:'queries'! |
|
2991 |
||
2992 |
canBrowse |
|
2993 |
||
2994 |
^true |
|
2995 |
||
2996 |
"^[self selection notNil |
|
2997 |
and:[self selection versionA notNil]]" |
|
2998 |
||
2999 |
"Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3000 |
"Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3001 |
! |
|
3002 |
||
13880 | 3003 |
canSave |
3004 |
"Returns true, if a merged file can be saved" |
|
3005 |
||
3006 |
^self canSaveAs and:[self diffInfo specMerge isFile] |
|
3007 |
||
3008 |
"Created: / 20-03-2012 / 15:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3009 |
"Modified: / 17-01-2013 / 21:09:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3010 |
! |
|
3011 |
||
3012 |
canSaveAs |
|
3013 |
"Returns true, if a merged file can be saved" |
|
3014 |
||
3015 |
| info | |
|
3016 |
info := self diffInfo. |
|
3017 |
info isNil ifTrue:[^false]. |
|
3018 |
^info isMerge and:[info diffset notNil and:[info diffset isMerged]] |
|
3019 |
||
3020 |
"Created: / 20-03-2012 / 15:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3021 |
"Modified: / 17-01-2013 / 20:57:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3022 |
! |
|
3023 |
||
3024 |
canSaveAsPatch |
|
3025 |
||
3026 |
^false |
|
3027 |
||
3028 |
"Created: / 20-03-2012 / 14:55:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3029 |
! |
|
3030 |
||
3031 |
canSaveMergedAs |
|
3032 |
"Returns true, if a merged file can be saved" |
|
3033 |
||
3034 |
| info | |
|
3035 |
info := self diffInfo. |
|
3036 |
info isNil ifTrue:[^false]. |
|
3037 |
^info isMerge |
|
3038 |
||
3039 |
"Created: / 03-08-2012 / 15:25:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3040 |
! |
|
3041 |
||
10194 | 3042 |
hasSelection |
17929 | 3043 |
"aspect holding true if a change is selected" |
10194 | 3044 |
|
3045 |
^[self selection notNil] |
|
3046 |
||
3047 |
"Created: / 03-11-2009 / 10:48:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3048 |
! |
|
3049 |
||
3050 |
isOneColumnBrowser |
|
3051 |
||
3052 |
^self navigatorPanelSpecHolder value = #oneColumnNavigatorSpec |
|
3053 |
||
3054 |
"Created: / 05-12-2009 / 11:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3055 |
! ! |
|
3056 |
||
13880 | 3057 |
!ChangeSetDiffTool methodsFor:'startup & release'! |
3058 |
||
3059 |
closeRequest |
|
3060 |
||
3061 |
"/Warn about unsaved merge..." |
|
3062 |
(alreadyWarnedAboutUnsavedMerge not and:[self canSave and:[mergeSavedHolder value not]]) ifTrue:[ |
|
3063 |
alreadyWarnedAboutUnsavedMerge := true. |
|
3064 |
self infoPanel |
|
3065 |
reset; |
|
3066 |
beInformation; |
|
3067 |
message: (self resources string:'Output file (merge) has not been saved. Save?'); |
|
3068 |
addButtonWithLabel: (self resources string:'Save') action: [ |
|
3069 |
self fileMenuSave. |
|
3070 |
self closeDownViews. |
|
3071 |
]; |
|
3072 |
addButtonWithLabel: (self resources string:'Cancel') action:[self infoPanel hide]; |
|
3073 |
show. |
|
3074 |
^self. |
|
3075 |
]. |
|
3076 |
self closeDownViews. |
|
3077 |
||
3078 |
"Created: / 17-01-2013 / 21:02:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3079 |
! ! |
|
3080 |
||
3081 |
!ChangeSetDiffTool methodsFor:'testing'! |
|
3082 |
||
3083 |
isDiff2 |
|
3084 |
^self diffInfo notNil and:[self diffInfo isDiff2] |
|
3085 |
||
3086 |
"Created: / 20-03-2012 / 13:27:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3087 |
! |
|
3088 |
||
3089 |
isDiff2Or3 |
|
3090 |
^self diffInfo notNil and:[self diffInfo isDiff2 or:[self diffInfo isDiff3]] |
|
3091 |
||
3092 |
"Created: / 20-03-2012 / 13:29:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3093 |
! |
|
3094 |
||
3095 |
isDiff3 |
|
3096 |
^self diffInfo notNil and:[self diffInfo isDiff3] |
|
3097 |
||
3098 |
"Created: / 20-03-2012 / 13:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3099 |
! |
|
3100 |
||
3101 |
isMerge |
|
3102 |
^self diffInfo notNil and:[self diffInfo isMerge] |
|
3103 |
||
3104 |
"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3105 |
! ! |
|
3106 |
||
10194 | 3107 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'image specs'! |
3108 |
||
3109 |
versionA24x24 |
|
18288 | 3110 |
<resource: #programImage> |
10194 | 3111 |
|
3112 |
^ToolbarIconLibrary versionA24x24 |
|
3113 |
||
3114 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 3115 |
"Modified: / 28-07-2018 / 09:50:28 / Claus Gittinger" |
10194 | 3116 |
! |
3117 |
||
3118 |
versionB24x24 |
|
18288 | 3119 |
<resource: #programImage> |
10194 | 3120 |
|
3121 |
^ToolbarIconLibrary versionB24x24 |
|
3122 |
||
3123 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 3124 |
"Modified: / 28-07-2018 / 09:50:25 / Claus Gittinger" |
13880 | 3125 |
! |
3126 |
||
3127 |
versionBase24x24 |
|
18288 | 3128 |
<resource: #programImage> |
13880 | 3129 |
|
3130 |
^ToolbarIconLibrary versionBase24x24 |
|
3131 |
||
3132 |
"Created: / 19-03-2012 / 23:11:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 3133 |
"Modified: / 28-07-2018 / 09:50:23 / Claus Gittinger" |
13880 | 3134 |
! |
3135 |
||
3136 |
versionMerged24x24 |
|
18288 | 3137 |
<resource: #programImage> |
13880 | 3138 |
|
3139 |
^ToolbarIconLibrary versionMerged24x24 |
|
3140 |
||
3141 |
"Created: / 19-03-2012 / 23:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18288 | 3142 |
"Modified: / 28-07-2018 / 09:50:20 / Claus Gittinger" |
10194 | 3143 |
! ! |
3144 |
||
3145 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs'! |
|
3146 |
||
3147 |
windowSpec |
|
3148 |
"This resource specification was automatically generated |
|
3149 |
by the UIPainter of ST/X." |
|
3150 |
||
3151 |
"Do not manually edit this!! If it is corrupted, |
|
3152 |
the UIPainter may not be able to read the specification." |
|
3153 |
||
3154 |
" |
|
13880 | 3155 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#windowSpec |
3156 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#windowSpec |
|
3157 |
Tools::ChangeSetDiffTool::OpenDialog open |
|
3158 |
" |
|
3159 |
||
3160 |
<resource: #canvas> |
|
3161 |
||
3162 |
^ |
|
3163 |
#(FullSpec |
|
3164 |
name: windowSpec |
|
3165 |
window: |
|
3166 |
(WindowSpec |
|
3167 |
label: 'Open...' |
|
3168 |
name: 'Open...' |
|
3169 |
min: (Point 10 10) |
|
3170 |
bounds: (Rectangle 0 0 640 457) |
|
3171 |
) |
|
3172 |
component: |
|
3173 |
(SpecCollection |
|
3174 |
collection: ( |
|
3175 |
(VerticalPanelViewSpec |
|
3176 |
name: 'VerticalPanel1' |
|
3177 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
3178 |
horizontalLayout: fit |
|
3179 |
verticalLayout: top |
|
3180 |
horizontalSpace: 3 |
|
3181 |
verticalSpace: 3 |
|
3182 |
component: |
|
3183 |
(SpecCollection |
|
3184 |
collection: ( |
|
3185 |
(ViewSpec |
|
3186 |
name: 'B' |
|
3187 |
component: |
|
3188 |
(SpecCollection |
|
3189 |
collection: ( |
|
3190 |
(UISubSpecification |
|
3191 |
name: 'SubSpecification2' |
|
3192 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3193 |
minorKey: versionBLabelSpec |
|
3194 |
) |
|
3195 |
(SubCanvasSpec |
|
3196 |
name: 'SubCanvas1' |
|
3197 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
|
3198 |
level: 0 |
|
3199 |
hasHorizontalScrollBar: false |
|
3200 |
hasVerticalScrollBar: false |
|
3201 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3202 |
minorKey: windowSpecForEmbedding |
|
3203 |
subAspectHolders: |
|
3204 |
(Array |
|
3205 |
||
3206 |
(SubChannelInfoSpec |
|
3207 |
subAspect: specHolder |
|
3208 |
aspect: changesetSpecBHolder |
|
3209 |
) |
|
3210 |
) |
|
3211 |
createNewApplication: true |
|
3212 |
createNewBuilder: true |
|
3213 |
) |
|
3214 |
) |
|
3215 |
||
3216 |
) |
|
3217 |
extent: (Point 640 99) |
|
3218 |
) |
|
3219 |
(ViewSpec |
|
3220 |
name: 'A' |
|
3221 |
component: |
|
3222 |
(SpecCollection |
|
3223 |
collection: ( |
|
3224 |
(UISubSpecification |
|
3225 |
name: 'SubSpecification1' |
|
3226 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3227 |
minorKey: versionALabelSpec |
|
3228 |
) |
|
3229 |
(SubCanvasSpec |
|
3230 |
name: 'ChangesetASpec' |
|
3231 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
|
3232 |
level: 0 |
|
3233 |
hasHorizontalScrollBar: false |
|
3234 |
hasVerticalScrollBar: false |
|
3235 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3236 |
minorKey: windowSpecForEmbedding |
|
3237 |
subAspectHolders: |
|
3238 |
(Array |
|
3239 |
||
3240 |
(SubChannelInfoSpec |
|
3241 |
subAspect: specHolder |
|
3242 |
aspect: changesetSpecAHolder |
|
3243 |
) |
|
3244 |
) |
|
3245 |
createNewApplication: true |
|
3246 |
createNewBuilder: true |
|
3247 |
) |
|
3248 |
) |
|
3249 |
||
3250 |
) |
|
3251 |
extent: (Point 640 99) |
|
3252 |
) |
|
3253 |
(ViewSpec |
|
3254 |
name: 'Base' |
|
3255 |
component: |
|
3256 |
(SpecCollection |
|
3257 |
collection: ( |
|
3258 |
(UISubSpecification |
|
3259 |
name: 'SubSpecification3' |
|
3260 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3261 |
minorKey: versionBaseLabelSpec |
|
3262 |
) |
|
3263 |
(SubCanvasSpec |
|
3264 |
name: 'SubCanvas2' |
|
3265 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
|
3266 |
level: 0 |
|
3267 |
hasHorizontalScrollBar: false |
|
3268 |
hasVerticalScrollBar: false |
|
3269 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3270 |
minorKey: windowSpecForEmbedding |
|
3271 |
subAspectHolders: |
|
3272 |
(Array |
|
3273 |
||
3274 |
(SubChannelInfoSpec |
|
3275 |
subAspect: enabledHolder |
|
3276 |
aspect: changesetSpecBaseEnabledHolder |
|
3277 |
) |
|
3278 |
(SubChannelInfoSpec |
|
3279 |
subAspect: specHolder |
|
3280 |
aspect: changesetSpecBaseHolder |
|
3281 |
) |
|
3282 |
) |
|
3283 |
createNewApplication: true |
|
3284 |
createNewBuilder: true |
|
3285 |
) |
|
3286 |
) |
|
3287 |
||
3288 |
) |
|
3289 |
extent: (Point 640 98) |
|
3290 |
) |
|
3291 |
(ViewSpec |
|
3292 |
name: 'Merge' |
|
3293 |
component: |
|
3294 |
(SpecCollection |
|
3295 |
collection: ( |
|
3296 |
(UISubSpecification |
|
3297 |
name: 'SubSpecification4' |
|
3298 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3299 |
minorKey: versionMergedLabelSpec |
|
3300 |
) |
|
3301 |
(SubCanvasSpec |
|
3302 |
name: 'SubCanvas3' |
|
3303 |
layout: (LayoutFrame 30 0 30 0 0 1 -25 1) |
|
3304 |
level: 0 |
|
3305 |
hasHorizontalScrollBar: false |
|
3306 |
hasVerticalScrollBar: false |
|
3307 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3308 |
minorKey: windowSpecForEmbedding |
|
3309 |
subAspectHolders: |
|
3310 |
(Array |
|
3311 |
||
3312 |
(SubChannelInfoSpec |
|
3313 |
subAspect: enabledHolder |
|
3314 |
aspect: changesetSpecMergedEnabledHolder |
|
3315 |
) |
|
3316 |
(SubChannelInfoSpec |
|
3317 |
subAspect: specHolder |
|
3318 |
aspect: changesetSpecMergedHolder |
|
3319 |
) |
|
3320 |
) |
|
3321 |
createNewApplication: true |
|
3322 |
createNewBuilder: true |
|
3323 |
) |
|
3324 |
) |
|
3325 |
||
3326 |
) |
|
3327 |
extent: (Point 640 123) |
|
3328 |
) |
|
3329 |
) |
|
3330 |
||
3331 |
) |
|
3332 |
) |
|
3333 |
(HorizontalPanelViewSpec |
|
3334 |
name: 'ButtonPanel' |
|
3335 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
3336 |
horizontalLayout: right |
|
3337 |
verticalLayout: center |
|
3338 |
horizontalSpace: 3 |
|
3339 |
verticalSpace: 3 |
|
3340 |
reverseOrderIfOKAtLeft: true |
|
3341 |
component: |
|
3342 |
(SpecCollection |
|
3343 |
collection: ( |
|
3344 |
(ActionButtonSpec |
|
3345 |
label: 'OK' |
|
3346 |
name: 'Button1' |
|
3347 |
translateLabel: true |
|
3348 |
model: doAccept |
|
3349 |
enableChannel: doAcceptEnabled |
|
3350 |
extent: (Point 125 22) |
|
3351 |
) |
|
3352 |
(ActionButtonSpec |
|
3353 |
label: 'Cancel' |
|
3354 |
name: 'Button2' |
|
3355 |
translateLabel: true |
|
3356 |
model: doCancel |
|
3357 |
extent: (Point 125 22) |
|
3358 |
) |
|
3359 |
) |
|
3360 |
||
3361 |
) |
|
3362 |
) |
|
3363 |
) |
|
3364 |
||
3365 |
) |
|
3366 |
) |
|
3367 |
! |
|
3368 |
||
3369 |
windowSpec_old |
|
3370 |
"This resource specification was automatically generated |
|
3371 |
by the UIPainter of ST/X." |
|
3372 |
||
3373 |
"Do not manually edit this!! If it is corrupted, |
|
3374 |
the UIPainter may not be able to read the specification." |
|
3375 |
||
3376 |
" |
|
10194 | 3377 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#windowSpec |
3378 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#windowSpec |
|
3379 |
Tools::ChangeSetDiffBrowser::OpenDialog open |
|
3380 |
" |
|
3381 |
||
3382 |
<resource: #canvas> |
|
3383 |
||
13880 | 3384 |
^ |
10194 | 3385 |
#(FullSpec |
13880 | 3386 |
name: windowSpec |
3387 |
window: |
|
10194 | 3388 |
(WindowSpec |
13880 | 3389 |
label: 'Open...' |
3390 |
name: 'Open...' |
|
3391 |
min: (Point 10 10) |
|
3392 |
bounds: (Rectangle 0 0 640 130) |
|
3393 |
) |
|
3394 |
component: |
|
10194 | 3395 |
(SpecCollection |
13880 | 3396 |
collection: ( |
3397 |
(VariableHorizontalPanelSpec |
|
3398 |
name: 'ChangeSetsSpecPanel' |
|
3399 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
3400 |
barWidth: 3 |
|
3401 |
showHandle: true |
|
3402 |
component: |
|
3403 |
(SpecCollection |
|
3404 |
collection: ( |
|
3405 |
(ViewSpec |
|
3406 |
name: 'A' |
|
3407 |
component: |
|
3408 |
(SpecCollection |
|
3409 |
collection: ( |
|
3410 |
(UISubSpecification |
|
3411 |
name: 'SubSpecification1' |
|
3412 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3413 |
minorKey: versionALabelSpec |
|
3414 |
) |
|
3415 |
(SubCanvasSpec |
|
3416 |
name: 'ChangesetASpec' |
|
3417 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
3418 |
hasHorizontalScrollBar: false |
|
3419 |
hasVerticalScrollBar: false |
|
3420 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3421 |
minorKey: windowSpecForEmbedding |
|
3422 |
subAspectHolders: |
|
3423 |
(Array |
|
3424 |
||
3425 |
(SubChannelInfoSpec |
|
3426 |
subAspect: specHolder |
|
3427 |
aspect: changesetSpecAHolder |
|
3428 |
) |
|
3429 |
) |
|
3430 |
createNewApplication: true |
|
3431 |
createNewBuilder: true |
|
3432 |
) |
|
3433 |
) |
|
3434 |
||
3435 |
) |
|
3436 |
) |
|
3437 |
(ViewSpec |
|
3438 |
name: 'B' |
|
3439 |
component: |
|
3440 |
(SpecCollection |
|
3441 |
collection: ( |
|
3442 |
(UISubSpecification |
|
3443 |
name: 'SubSpecification2' |
|
3444 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3445 |
minorKey: versionBLabelSpec |
|
3446 |
) |
|
3447 |
(SubCanvasSpec |
|
3448 |
name: 'SubCanvas1' |
|
3449 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
3450 |
hasHorizontalScrollBar: false |
|
3451 |
hasVerticalScrollBar: false |
|
3452 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3453 |
minorKey: windowSpecForEmbedding |
|
3454 |
subAspectHolders: |
|
3455 |
(Array |
|
3456 |
||
3457 |
(SubChannelInfoSpec |
|
3458 |
subAspect: specHolder |
|
3459 |
aspect: changesetSpecBHolder |
|
3460 |
) |
|
3461 |
) |
|
3462 |
createNewApplication: true |
|
3463 |
createNewBuilder: true |
|
3464 |
) |
|
3465 |
) |
|
3466 |
||
3467 |
) |
|
3468 |
) |
|
3469 |
) |
|
3470 |
||
3471 |
) |
|
3472 |
handles: (Any 0.5 1.0) |
|
3473 |
) |
|
3474 |
(HorizontalPanelViewSpec |
|
3475 |
name: 'ButtonPanel' |
|
3476 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
3477 |
horizontalLayout: right |
|
3478 |
verticalLayout: center |
|
3479 |
horizontalSpace: 3 |
|
3480 |
verticalSpace: 3 |
|
3481 |
reverseOrderIfOKAtLeft: true |
|
3482 |
component: |
|
3483 |
(SpecCollection |
|
3484 |
collection: ( |
|
3485 |
(ActionButtonSpec |
|
3486 |
label: 'OK' |
|
3487 |
name: 'Button1' |
|
3488 |
translateLabel: true |
|
3489 |
model: doAccept |
|
3490 |
enableChannel: doAcceptEnabled |
|
3491 |
extent: (Point 125 22) |
|
3492 |
) |
|
3493 |
(ActionButtonSpec |
|
3494 |
label: 'Cancel' |
|
3495 |
name: 'Button2' |
|
3496 |
translateLabel: true |
|
3497 |
model: doCancel |
|
3498 |
extent: (Point 125 22) |
|
3499 |
) |
|
3500 |
) |
|
3501 |
||
3502 |
) |
|
3503 |
) |
|
3504 |
) |
|
3505 |
||
3506 |
) |
|
10194 | 3507 |
) |
3508 |
||
3509 |
"Modified: / 06-07-2011 / 11:32:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 3510 |
"Created: / 19-03-2012 / 22:21:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 3511 |
! ! |
3512 |
||
3513 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs - labels'! |
|
3514 |
||
3515 |
versionALabelSpec |
|
3516 |
"This resource specification was automatically generated |
|
3517 |
by the UIPainter of ST/X." |
|
3518 |
||
3519 |
"Do not manually edit this!! If it is corrupted, |
|
3520 |
the UIPainter may not be able to read the specification." |
|
3521 |
||
3522 |
" |
|
3523 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionALabelSpec |
|
3524 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionALabelSpec |
|
3525 |
" |
|
3526 |
||
3527 |
<resource: #canvas> |
|
3528 |
||
13880 | 3529 |
^ |
10194 | 3530 |
#(FullSpec |
13880 | 3531 |
name: versionALabelSpec |
3532 |
window: |
|
10194 | 3533 |
(WindowSpec |
13880 | 3534 |
label: 'Version A' |
3535 |
name: 'Changeset A' |
|
3536 |
min: (Point 10 10) |
|
3537 |
bounds: (Rectangle 0 0 300 30) |
|
3538 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
3539 |
forceRecursiveBackground: true |
|
3540 |
) |
|
3541 |
component: |
|
10194 | 3542 |
(SpecCollection |
13880 | 3543 |
collection: ( |
3544 |
(LabelSpec |
|
3545 |
label: 'versionA24x24' |
|
3546 |
name: 'VersionAIcon' |
|
3547 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3548 |
hasCharacterOrientedLabel: false |
|
3549 |
translateLabel: true |
|
3550 |
) |
|
3551 |
(LabelSpec |
|
3552 |
label: 'Version A (working copy)' |
|
3553 |
name: 'VersionALabel' |
|
3554 |
layout: (LayoutFrame 30 0 5 0 0 1 0 1) |
|
3555 |
translateLabel: true |
|
3556 |
resizeForLabel: true |
|
3557 |
adjust: left |
|
3558 |
) |
|
3559 |
) |
|
3560 |
||
3561 |
) |
|
10194 | 3562 |
) |
3563 |
||
13880 | 3564 |
"Modified: / 19-03-2012 / 22:15:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 3565 |
! |
3566 |
||
3567 |
versionBLabelSpec |
|
3568 |
"This resource specification was automatically generated |
|
3569 |
by the UIPainter of ST/X." |
|
3570 |
||
3571 |
"Do not manually edit this!! If it is corrupted, |
|
3572 |
the UIPainter may not be able to read the specification." |
|
3573 |
||
3574 |
" |
|
3575 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionBLabelSpec |
|
3576 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionBLabelSpec |
|
3577 |
" |
|
3578 |
||
3579 |
<resource: #canvas> |
|
3580 |
||
13880 | 3581 |
^ |
10194 | 3582 |
#(FullSpec |
13880 | 3583 |
name: versionBLabelSpec |
3584 |
window: |
|
10194 | 3585 |
(WindowSpec |
13880 | 3586 |
label: 'Version B' |
3587 |
name: 'Changeset B' |
|
3588 |
min: (Point 10 10) |
|
3589 |
bounds: (Rectangle 0 0 300 30) |
|
3590 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
3591 |
forceRecursiveBackground: true |
|
3592 |
) |
|
3593 |
component: |
|
3594 |
(SpecCollection |
|
3595 |
collection: ( |
|
3596 |
(LabelSpec |
|
3597 |
label: 'versionB24x24' |
|
3598 |
name: 'VersionBIcon' |
|
3599 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3600 |
hasCharacterOrientedLabel: false |
|
3601 |
translateLabel: true |
|
3602 |
) |
|
3603 |
(LabelSpec |
|
3604 |
label: 'Version B (to be merged)' |
|
3605 |
name: 'VersionBLabel' |
|
3606 |
layout: (LayoutFrame 30 0 5 0 97 0 0 1) |
|
3607 |
translateLabel: true |
|
3608 |
resizeForLabel: true |
|
3609 |
adjust: left |
|
3610 |
useDynamicPreferredWidth: true |
|
3611 |
usePreferredWidth: true |
|
3612 |
) |
|
3613 |
) |
|
3614 |
||
3615 |
) |
|
3616 |
) |
|
3617 |
||
3618 |
"Modified: / 19-03-2012 / 22:15:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3619 |
! |
|
3620 |
||
3621 |
versionBaseLabelSpec |
|
3622 |
"This resource specification was automatically generated |
|
3623 |
by the UIPainter of ST/X." |
|
3624 |
||
3625 |
"Do not manually edit this!! If it is corrupted, |
|
3626 |
the UIPainter may not be able to read the specification." |
|
3627 |
||
3628 |
" |
|
3629 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionBaseLabelSpec |
|
3630 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionBaseLabelSpec |
|
3631 |
" |
|
3632 |
||
3633 |
<resource: #canvas> |
|
3634 |
||
3635 |
^ |
|
3636 |
#(FullSpec |
|
3637 |
name: versionBaseLabelSpec |
|
3638 |
window: |
|
3639 |
(WindowSpec |
|
3640 |
label: 'Version B' |
|
3641 |
name: 'Version B' |
|
3642 |
min: (Point 10 10) |
|
3643 |
bounds: (Rectangle 0 0 300 30) |
|
3644 |
backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396) |
|
3645 |
forceRecursiveBackground: true |
|
3646 |
) |
|
3647 |
component: |
|
10194 | 3648 |
(SpecCollection |
13880 | 3649 |
collection: ( |
3650 |
(LabelSpec |
|
3651 |
label: 'versionBase24x24' |
|
3652 |
name: 'VersionBaseIcon' |
|
3653 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3654 |
hasCharacterOrientedLabel: false |
|
3655 |
translateLabel: true |
|
3656 |
) |
|
3657 |
(LabelSpec |
|
3658 |
label: 'Base' |
|
3659 |
name: 'VersionBLabel' |
|
3660 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
|
3661 |
translateLabel: true |
|
3662 |
resizeForLabel: true |
|
3663 |
adjust: left |
|
3664 |
useDynamicPreferredWidth: true |
|
3665 |
usePreferredWidth: true |
|
3666 |
) |
|
3667 |
(CheckBoxSpec |
|
3668 |
label: '' |
|
3669 |
name: 'CheckBox1' |
|
3670 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
3671 |
model: changesetSpecBaseEnabledHolder |
|
3672 |
translateLabel: true |
|
3673 |
) |
|
3674 |
) |
|
3675 |
||
3676 |
) |
|
10194 | 3677 |
) |
13880 | 3678 |
! |
3679 |
||
3680 |
versionMergedLabelSpec |
|
3681 |
"This resource specification was automatically generated |
|
3682 |
by the UIPainter of ST/X." |
|
3683 |
||
3684 |
"Do not manually edit this!! If it is corrupted, |
|
3685 |
the UIPainter may not be able to read the specification." |
|
3686 |
||
3687 |
" |
|
3688 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionMergedLabelSpec |
|
3689 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionMergedLabelSpec |
|
3690 |
" |
|
3691 |
||
3692 |
<resource: #canvas> |
|
3693 |
||
3694 |
^ |
|
3695 |
#(FullSpec |
|
3696 |
name: versionMergedLabelSpec |
|
3697 |
window: |
|
3698 |
(WindowSpec |
|
3699 |
label: 'Merge' |
|
3700 |
name: 'Merge' |
|
3701 |
min: (Point 10 10) |
|
3702 |
bounds: (Rectangle 0 0 300 30) |
|
3703 |
backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565) |
|
3704 |
forceRecursiveBackground: true |
|
3705 |
) |
|
3706 |
component: |
|
3707 |
(SpecCollection |
|
3708 |
collection: ( |
|
3709 |
(LabelSpec |
|
3710 |
label: 'versionMerged24x24' |
|
3711 |
name: 'VersionMergedIcon' |
|
3712 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3713 |
hasCharacterOrientedLabel: false |
|
3714 |
translateLabel: true |
|
3715 |
) |
|
3716 |
(LabelSpec |
|
3717 |
label: 'Merge' |
|
3718 |
name: 'VersionBLabel' |
|
3719 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
|
3720 |
translateLabel: true |
|
3721 |
resizeForLabel: true |
|
3722 |
adjust: left |
|
3723 |
useDynamicPreferredWidth: true |
|
3724 |
usePreferredWidth: true |
|
3725 |
) |
|
3726 |
(CheckBoxSpec |
|
3727 |
label: '' |
|
3728 |
name: 'CheckBox1' |
|
3729 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
3730 |
model: changesetSpecMergedEnabledHolder |
|
3731 |
translateLabel: true |
|
3732 |
) |
|
3733 |
) |
|
3734 |
||
3735 |
) |
|
3736 |
) |
|
3737 |
||
3738 |
"Modified: / 19-03-2012 / 23:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 3739 |
! ! |
3740 |
||
3741 |
!ChangeSetDiffTool::OpenDialog methodsFor:'accessing'! |
|
3742 |
||
3743 |
changeSetA |
|
3744 |
||
3745 |
| specA | |
|
3746 |
||
3747 |
specA := self changesetSpecAHolder value. |
|
3748 |
^specA ifNil:[nil] ifNotNil:[specA changeSet] |
|
3749 |
||
3750 |
"Created: / 06-07-2011 / 11:36:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3751 |
! |
|
3752 |
||
13880 | 3753 |
changeSetASpec |
3754 |
^self changesetSpecAHolder value. |
|
3755 |
||
3756 |
"Created: / 20-03-2012 / 00:01:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3757 |
! |
|
3758 |
||
3759 |
changeSetASpec: spec |
|
3760 |
^self changesetSpecAHolder value: spec |
|
3761 |
||
3762 |
"Created: / 01-08-2012 / 15:38:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3763 |
! |
|
3764 |
||
10194 | 3765 |
changeSetB |
3766 |
||
3767 |
| specB | |
|
3768 |
||
3769 |
specB := self changesetSpecBHolder value. |
|
3770 |
^specB ifNil:[nil] ifNotNil:[specB changeSet] |
|
3771 |
||
3772 |
"Created: / 06-07-2011 / 11:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 3773 |
! |
3774 |
||
3775 |
changeSetBSpec |
|
3776 |
^self changesetSpecBHolder value. |
|
3777 |
||
3778 |
"Created: / 20-03-2012 / 00:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3779 |
! |
|
3780 |
||
3781 |
changeSetBSpec: spec |
|
3782 |
^self changesetSpecBHolder value: spec |
|
3783 |
||
3784 |
"Created: / 01-08-2012 / 15:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3785 |
! |
|
3786 |
||
3787 |
changeSetBase |
|
3788 |
||
3789 |
| specBase | |
|
3790 |
||
3791 |
specBase := self changesetSpecBaseHolder value. |
|
3792 |
^specBase ifNil:[nil] ifNotNil:[specBase changeSet] |
|
3793 |
||
3794 |
"Created: / 16-03-2012 / 13:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3795 |
! |
|
3796 |
||
3797 |
changeSetBaseSpec |
|
3798 |
^self changesetSpecBaseHolder value. |
|
3799 |
||
3800 |
"Created: / 20-03-2012 / 00:01:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3801 |
! |
|
3802 |
||
3803 |
changeSetBaseSpec: spec |
|
3804 |
^self changesetSpecBaseHolder value: spec |
|
3805 |
||
3806 |
"Created: / 01-08-2012 / 15:38:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3807 |
! |
|
3808 |
||
3809 |
changeSetMerged |
|
3810 |
||
3811 |
| specMerged | |
|
3812 |
||
3813 |
specMerged := self changesetSpecMergedHolder value. |
|
3814 |
^specMerged ifNil:[nil] ifNotNil:[specMerged changeSet] |
|
3815 |
||
3816 |
"Created: / 20-03-2012 / 00:01:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3817 |
! |
|
3818 |
||
3819 |
changeSetMergedSpec |
|
3820 |
^self changesetSpecMergedHolder value. |
|
3821 |
||
3822 |
"Created: / 20-03-2012 / 00:01:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3823 |
! |
|
3824 |
||
3825 |
changeSetMergedSpec: spec |
|
3826 |
^self changesetSpecMergedHolder value: spec |
|
3827 |
||
3828 |
"Created: / 01-08-2012 / 15:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3829 |
! |
|
3830 |
||
3831 |
diffInfo |
|
3832 |
"Returns a ChangeSetDiffInfo based on current data" |
|
3833 |
||
3834 |
| info | |
|
3835 |
info := ChangeSetDiffInfo new. |
|
3836 |
info specA: self changeSetASpec. |
|
3837 |
info specB: self changeSetBSpec. |
|
3838 |
self changesetSpecBaseEnabledHolder value ifTrue:[ |
|
3839 |
info specBase: self changeSetBaseSpec. |
|
3840 |
]. |
|
3841 |
changesetSpecMergedEnabledHolder value ifTrue:[ |
|
3842 |
info specMerge: self changeSetMergedSpec. |
|
3843 |
]. |
|
3844 |
^info |
|
3845 |
||
3846 |
"Created: / 01-08-2012 / 15:41:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3847 |
! |
|
3848 |
||
3849 |
diffInfo: info |
|
3850 |
"Sets up dialog for given diff info" |
|
3851 |
||
3852 |
info isNil ifTrue:[ ^ self ]. |
|
3853 |
||
3854 |
self changeSetASpec: info specA. |
|
3855 |
self changeSetBSpec: info specB. |
|
3856 |
self changeSetBaseSpec: info specBase. |
|
3857 |
self changeSetMergedSpec: info specMerge. |
|
3858 |
||
3859 |
"Created: / 01-08-2012 / 15:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 3860 |
! ! |
3861 |
||
3862 |
!ChangeSetDiffTool::OpenDialog methodsFor:'aspects'! |
|
3863 |
||
3864 |
changesetSpecAHolder |
|
3865 |
"return/create the 'changesetSpecAHolder' value holder (automatically generated)" |
|
3866 |
||
3867 |
changesetSpecAHolder isNil ifTrue:[ |
|
3868 |
changesetSpecAHolder := ValueHolder new. |
|
3869 |
]. |
|
3870 |
^ changesetSpecAHolder |
|
3871 |
! |
|
3872 |
||
3873 |
changesetSpecAHolder:something |
|
3874 |
"set the 'changesetSpecAHolder' value holder (automatically generated)" |
|
3875 |
||
3876 |
changesetSpecAHolder := something. |
|
3877 |
! |
|
3878 |
||
3879 |
changesetSpecBHolder |
|
3880 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3881 |
||
3882 |
changesetSpecBHolder isNil ifTrue:[ |
|
3883 |
changesetSpecBHolder := ValueHolder new. |
|
3884 |
]. |
|
3885 |
^ changesetSpecBHolder |
|
3886 |
! |
|
3887 |
||
3888 |
changesetSpecBHolder:something |
|
3889 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3890 |
||
3891 |
changesetSpecBHolder := something. |
|
3892 |
! |
|
3893 |
||
13880 | 3894 |
changesetSpecBaseEnabledHolder |
3895 |
"return/create the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
|
3896 |
||
3897 |
changesetSpecBaseEnabledHolder isNil ifTrue:[ |
|
3898 |
changesetSpecBaseEnabledHolder := false asValue |
|
3899 |
]. |
|
3900 |
^ changesetSpecBaseEnabledHolder |
|
3901 |
||
3902 |
"Modified: / 19-03-2012 / 23:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3903 |
! |
|
3904 |
||
3905 |
changesetSpecBaseEnabledHolder:something |
|
3906 |
"set the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
|
3907 |
||
3908 |
changesetSpecBaseEnabledHolder := something. |
|
3909 |
! |
|
3910 |
||
3911 |
changesetSpecBaseHolder |
|
3912 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3913 |
||
3914 |
changesetSpecBaseHolder isNil ifTrue:[ |
|
3915 |
changesetSpecBaseHolder := ValueHolder new. |
|
3916 |
]. |
|
3917 |
^ changesetSpecBaseHolder |
|
3918 |
||
3919 |
"Created: / 16-03-2012 / 13:48:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3920 |
! |
|
3921 |
||
3922 |
changesetSpecBaseHolder:something |
|
3923 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3924 |
||
3925 |
changesetSpecBaseHolder := something. |
|
3926 |
||
3927 |
"Created: / 16-03-2012 / 13:49:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3928 |
! |
|
3929 |
||
3930 |
changesetSpecMergedEnabledHolder |
|
3931 |
"return/create the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
|
3932 |
||
3933 |
changesetSpecMergedEnabledHolder isNil ifTrue:[ |
|
3934 |
changesetSpecMergedEnabledHolder := false asValue |
|
3935 |
]. |
|
3936 |
^ changesetSpecMergedEnabledHolder |
|
3937 |
||
3938 |
"Modified: / 19-03-2012 / 23:20:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3939 |
! |
|
3940 |
||
3941 |
changesetSpecMergedEnabledHolder:something |
|
3942 |
"set the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
|
3943 |
||
3944 |
changesetSpecMergedEnabledHolder := something. |
|
3945 |
! |
|
3946 |
||
3947 |
changesetSpecMergedHolder |
|
3948 |
"return/create the 'changesetSpecMergedHolder' value holder (automatically generated)" |
|
3949 |
||
3950 |
changesetSpecMergedHolder isNil ifTrue:[ |
|
3951 |
changesetSpecMergedHolder := ValueHolder new. |
|
3952 |
]. |
|
3953 |
^ changesetSpecMergedHolder |
|
3954 |
! |
|
3955 |
||
3956 |
changesetSpecMergedHolder:something |
|
3957 |
"set the 'changesetSpecMergedHolder' value holder (automatically generated)" |
|
3958 |
||
3959 |
changesetSpecMergedHolder := something. |
|
3960 |
! |
|
3961 |
||
10194 | 3962 |
doAcceptEnabled |
3963 |
<resource: #uiAspect> |
|
3964 |
||
3965 |
^BlockValue |
|
18766 | 3966 |
with:[:a :b| a notNil and:[b notNil]] |
10194 | 3967 |
argument:self changesetSpecAHolder |
18766 | 3968 |
argument:self changesetSpecBHolder. |
10194 | 3969 |
|
3970 |
"Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18766 | 3971 |
"Modified: / 17-05-2019 / 17:09:13 / Stefan Vogel" |
10194 | 3972 |
! ! |
3973 |
||
3974 |
!ChangeSetDiffTool::OpenDialog methodsFor:'events'! |
|
3975 |
||
3976 |
closeAccept |
|
3977 |
||
3978 |
^super closeAccept |
|
3979 |
||
3980 |
"Created: / 06-07-2011 / 12:09:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3981 |
! ! |
|
3982 |
||
3983 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
3984 |
||
15231
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
3985 |
version |
15929 | 3986 |
^ '$Header$' |
15231
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
3987 |
! |
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
3988 |
|
10194 | 3989 |
version_CVS |
15929 | 3990 |
^ '$Header$' |
10194 | 3991 |
! |
3992 |
||
3993 |
version_SVN |
|
15929 | 3994 |
^ '$Id$' |
10194 | 3995 |
! ! |
13017
62a2cd2d8b70
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
10975
diff
changeset
|
3996 |