author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 19 Jul 2017 09:42:32 +0200 | |
branch | jv |
changeset 17619 | edb119820fcb |
parent 17163 | 4bf9cb558e1c |
child 18532 | cccb41254edf |
permissions | -rw-r--r-- |
2626 | 1 |
" |
2 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
11453 | 3 |
All Rights Reserved |
2626 | 4 |
|
5 |
This software is furnished under a license and may be used |
|
6 |
only in accordance with the terms of that license and with the |
|
7 |
inclusion of the above copyright notice. This software may not |
|
8 |
be provided or otherwise made available to, or used by, any |
|
9 |
other person. No title to or ownership of the software is |
|
10 |
hereby transferred. |
|
11 |
" |
|
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
12 |
"{ Package: 'stx:libtool' }" |
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
13 |
|
15167 | 14 |
"{ NameSpace: Smalltalk }" |
15 |
||
2221 | 16 |
ApplicationModel subclass:#VersionDiffBrowser |
2856 | 17 |
instanceVariableNames:'classChangeSet diffTextView boxAVisible boxBVisible boxMVisible |
18 |
classIfSingleClassDiff versionAIfSingleClassDiff |
|
3147 | 19 |
versionBIfSingleClassDiff changedLabelHolder diffTextLabelA |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
20 |
diffTextLabelB methodText methodsChanged methodsChangedFiltered |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
21 |
methodsChangedSelection methodsOnlyInA methodsOnlyInAFiltered |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
22 |
methodsOnlyInASelection methodsOnlyInB methodsOnlyInBFiltered |
5182 | 23 |
methodsOnlyInBSelection onlyInALabelHolder onlyInBLabelHolder |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
24 |
classHolder versionAHolder versionBHolder infoHolder |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
25 |
includeExtensionsHolder canIncludeExtensionsHolder |
14076 | 26 |
includeCategoryChangesHolder includeVersionMethodsHolder |
15621 | 27 |
isMultipleVersionBrowser versionInfoList versionList |
28 |
selectedVersionHolder symbolicVersionList |
|
29 |
selectedSymbolicVersionHolder symbolicToVersionMapping' |
|
2221 | 30 |
classVariableNames:'' |
31 |
poolDictionaries:'' |
|
32 |
category:'Interface-Browsers' |
|
33 |
! |
|
34 |
||
2497 | 35 |
HierarchicalItem subclass:#ClassChangeSet |
13137 | 36 |
instanceVariableNames:'class1BeingCompared class2BeingCompared labelA labelB diffSet |
37 |
versionA versionB' |
|
2497 | 38 |
classVariableNames:'' |
39 |
poolDictionaries:'' |
|
40 |
privateIn:VersionDiffBrowser |
|
41 |
! |
|
42 |
||
2626 | 43 |
!VersionDiffBrowser class methodsFor:'documentation'! |
44 |
||
45 |
copyright |
|
46 |
" |
|
47 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
11453 | 48 |
All Rights Reserved |
2626 | 49 |
|
50 |
This software is furnished under a license and may be used |
|
51 |
only in accordance with the terms of that license and with the |
|
52 |
inclusion of the above copyright notice. This software may not |
|
53 |
be provided or otherwise made available to, or used by, any |
|
54 |
other person. No title to or ownership of the software is |
|
55 |
hereby transferred. |
|
56 |
" |
|
57 |
||
58 |
! |
|
59 |
||
60 |
documentation |
|
61 |
" |
|
62 |
This is not yet finished (work in progress). |
|
63 |
||
15621 | 64 |
A quickly hacked up browser to show differences between class versions, |
2626 | 65 |
allowing easy comparison; will also eventually add capabilities |
66 |
to checkIn / load classes into / from the repository. |
|
67 |
||
68 |
[see also:] |
|
69 |
||
70 |
[instance variables:] |
|
71 |
||
72 |
[class variables:] |
|
73 |
" |
|
74 |
! ! |
|
2221 | 75 |
|
76 |
!VersionDiffBrowser class methodsFor:'interface specs'! |
|
77 |
||
78 |
windowSpec |
|
79 |
"This resource specification was automatically generated |
|
80 |
by the UIPainter of ST/X." |
|
81 |
||
82 |
"Do not manually edit this!! If it is corrupted, |
|
83 |
the UIPainter may not be able to read the specification." |
|
84 |
||
85 |
" |
|
86 |
UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpec |
|
87 |
VersionDiffBrowser new openInterface:#windowSpec |
|
88 |
VersionDiffBrowser open |
|
89 |
" |
|
90 |
||
91 |
<resource: #canvas> |
|
92 |
||
11453 | 93 |
^ |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
94 |
#(FullSpec |
11453 | 95 |
name: windowSpec |
96 |
window: |
|
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
97 |
(WindowSpec |
11453 | 98 |
label: 'Version DiffBrowser' |
99 |
name: 'Version DiffBrowser' |
|
100 |
min: (Point 10 10) |
|
101 |
bounds: (Rectangle 0 0 865 504) |
|
102 |
menu: mainMenu |
|
103 |
) |
|
104 |
component: |
|
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
105 |
(SpecCollection |
11453 | 106 |
collection: ( |
107 |
(VariableVerticalPanelSpec |
|
108 |
name: 'VariableVerticalPanel1' |
|
109 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0) |
|
110 |
component: |
|
111 |
(SpecCollection |
|
112 |
collection: ( |
|
113 |
(HorizontalPanelViewSpec |
|
114 |
name: 'TopHorizontalPanel' |
|
115 |
horizontalLayout: fit |
|
116 |
verticalLayout: fit |
|
117 |
horizontalSpace: 3 |
|
118 |
verticalSpace: 3 |
|
119 |
component: |
|
120 |
(SpecCollection |
|
121 |
collection: ( |
|
122 |
(ViewSpec |
|
123 |
name: 'BoxA' |
|
124 |
level: 0 |
|
125 |
visibilityChannel: boxAVisible |
|
126 |
component: |
|
127 |
(SpecCollection |
|
128 |
collection: ( |
|
129 |
(LabelSpec |
|
130 |
label: 'Only in A' |
|
131 |
name: 'OnlyInALabel' |
|
132 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
133 |
translateLabel: true |
|
134 |
labelChannel: onlyInALabelHolder |
|
135 |
) |
|
136 |
(SequenceViewSpec |
|
137 |
name: 'ListA' |
|
138 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
139 |
model: methodsOnlyInASelection |
|
140 |
menu: menuA |
|
141 |
hasHorizontalScrollBar: true |
|
142 |
hasVerticalScrollBar: true |
|
143 |
miniScrollerHorizontal: true |
|
144 |
doubleClickSelector: methodInADoubleClicked: |
|
145 |
valueChangeSelector: methodsOnlyInASelectionChanged |
|
146 |
useIndex: true |
|
147 |
sequenceList: methodsOnlyInA |
|
148 |
) |
|
149 |
) |
|
150 |
||
151 |
) |
|
152 |
extent: (Point 286 199) |
|
153 |
) |
|
154 |
(ViewSpec |
|
155 |
name: 'BoxM' |
|
156 |
visibilityChannel: boxMVisible |
|
157 |
component: |
|
158 |
(SpecCollection |
|
159 |
collection: ( |
|
160 |
(LabelSpec |
|
161 |
label: 'Changed' |
|
162 |
name: 'ChangedLabel' |
|
163 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
164 |
translateLabel: true |
|
165 |
labelChannel: changedLabelHolder |
|
166 |
) |
|
167 |
(SequenceViewSpec |
|
168 |
name: 'ListM' |
|
169 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
170 |
model: methodsChangedSelection |
|
171 |
menu: menuM |
|
172 |
hasHorizontalScrollBar: true |
|
173 |
hasVerticalScrollBar: true |
|
174 |
miniScrollerHorizontal: true |
|
175 |
doubleClickSelector: methodInChangedDoubleClicked: |
|
176 |
valueChangeSelector: methodsChangedSelectionChanged |
|
177 |
useIndex: true |
|
178 |
sequenceList: methodsChanged |
|
179 |
) |
|
180 |
) |
|
181 |
||
182 |
) |
|
183 |
extent: (Point 286 199) |
|
184 |
) |
|
185 |
(ViewSpec |
|
186 |
name: 'BoxB' |
|
187 |
visibilityChannel: boxBVisible |
|
188 |
component: |
|
189 |
(SpecCollection |
|
190 |
collection: ( |
|
191 |
(LabelSpec |
|
192 |
label: 'Only in B' |
|
193 |
name: 'OnlyInBLabel' |
|
194 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
195 |
translateLabel: true |
|
196 |
labelChannel: onlyInBLabelHolder |
|
197 |
) |
|
198 |
(SequenceViewSpec |
|
199 |
name: 'ListB' |
|
200 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
201 |
model: methodsOnlyInBSelection |
|
202 |
menu: menuB |
|
203 |
hasHorizontalScrollBar: true |
|
204 |
hasVerticalScrollBar: true |
|
205 |
miniScrollerHorizontal: true |
|
206 |
doubleClickSelector: methodInBDoubleClicked: |
|
207 |
valueChangeSelector: methodsOnlyInBSelectionChanged |
|
208 |
useIndex: true |
|
209 |
sequenceList: methodsOnlyInB |
|
210 |
) |
|
211 |
) |
|
212 |
||
213 |
) |
|
214 |
extent: (Point 287 199) |
|
215 |
) |
|
216 |
) |
|
217 |
||
218 |
) |
|
219 |
) |
|
220 |
(ViewSpec |
|
221 |
name: 'Box4' |
|
222 |
component: |
|
223 |
(SpecCollection |
|
224 |
collection: ( |
|
225 |
(ViewSpec |
|
226 |
name: 'diffTextViewBox' |
|
227 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
228 |
initiallyInvisible: true |
|
229 |
component: |
|
230 |
(SpecCollection |
|
231 |
collection: ( |
|
232 |
(LabelSpec |
|
233 |
label: 'A' |
|
234 |
name: 'DiffTextLabelA' |
|
235 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0) |
|
236 |
translateLabel: true |
|
237 |
labelChannel: diffTextLabelA |
|
238 |
) |
|
239 |
(LabelSpec |
|
240 |
label: 'B' |
|
241 |
name: 'DiffTextLabelB' |
|
242 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0) |
|
243 |
translateLabel: true |
|
244 |
labelChannel: diffTextLabelB |
|
245 |
) |
|
246 |
(ArbitraryComponentSpec |
|
247 |
name: 'diffTextView' |
|
248 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0) |
|
249 |
hasBorder: false |
|
250 |
component: diffTextView |
|
251 |
) |
|
252 |
) |
|
253 |
||
254 |
) |
|
255 |
) |
|
256 |
(CodeViewSpec |
|
257 |
name: 'singleTextView' |
|
258 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
259 |
model: methodText |
|
260 |
hasHorizontalScrollBar: true |
|
261 |
hasVerticalScrollBar: true |
|
262 |
miniScrollerHorizontal: true |
|
263 |
isReadOnly: true |
|
264 |
hasKeyboardFocusInitially: false |
|
265 |
) |
|
266 |
) |
|
267 |
||
268 |
) |
|
269 |
) |
|
270 |
) |
|
271 |
||
272 |
) |
|
273 |
handles: (Any 0.42379958246347 1.0) |
|
274 |
) |
|
275 |
(LabelSpec |
|
276 |
name: 'InfoLabel' |
|
277 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1) |
|
278 |
level: -1 |
|
279 |
translateLabel: true |
|
280 |
labelChannel: infoHolder |
|
281 |
adjust: left |
|
282 |
) |
|
283 |
) |
|
284 |
||
285 |
) |
|
2221 | 286 |
) |
14076 | 287 |
! |
288 |
||
289 |
windowSpecForMultipleVersions |
|
290 |
"This resource specification was automatically generated |
|
291 |
by the UIPainter of ST/X." |
|
292 |
||
293 |
"Do not manually edit this!! If it is corrupted, |
|
294 |
the UIPainter may not be able to read the specification." |
|
295 |
||
296 |
" |
|
297 |
UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpecForMultipleVersions |
|
298 |
VersionDiffBrowser new openInterface:#windowSpecForMultipleVersions |
|
299 |
" |
|
300 |
||
301 |
<resource: #canvas> |
|
302 |
||
303 |
^ |
|
304 |
#(FullSpec |
|
305 |
name: windowSpecForMultipleVersions |
|
306 |
window: |
|
307 |
(WindowSpec |
|
308 |
label: 'Version DiffBrowser' |
|
309 |
name: 'Version DiffBrowser' |
|
310 |
min: (Point 10 10) |
|
311 |
bounds: (Rectangle 0 0 865 504) |
|
312 |
menu: mainMenu |
|
313 |
) |
|
314 |
component: |
|
315 |
(SpecCollection |
|
316 |
collection: ( |
|
317 |
(VariableVerticalPanelSpec |
|
318 |
name: 'VariableVerticalPanel1' |
|
319 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0) |
|
320 |
component: |
|
321 |
(SpecCollection |
|
322 |
collection: ( |
|
323 |
(ViewSpec |
|
324 |
name: 'Box1' |
|
325 |
component: |
|
326 |
(SpecCollection |
|
327 |
collection: ( |
|
328 |
(SequenceViewSpec |
|
329 |
name: 'VersionList' |
|
330 |
layout: (LayoutFrame 0 0 0 0 0 0.5 0 1) |
|
331 |
model: selectedVersionHolder |
|
332 |
hasHorizontalScrollBar: true |
|
333 |
hasVerticalScrollBar: true |
|
334 |
useIndex: false |
|
335 |
sequenceList: versionList |
|
336 |
) |
|
337 |
(SequenceViewSpec |
|
338 |
name: 'List1' |
|
339 |
layout: (LayoutFrame 0 0.5 0 0 0 1 0 1) |
|
340 |
model: selectedSymbolicVersionHolder |
|
341 |
hasHorizontalScrollBar: true |
|
342 |
hasVerticalScrollBar: true |
|
343 |
useIndex: false |
|
344 |
sequenceList: symbolicVersionList |
|
345 |
) |
|
346 |
) |
|
347 |
||
348 |
) |
|
349 |
) |
|
350 |
(HorizontalPanelViewSpec |
|
351 |
name: 'TopHorizontalPanel' |
|
352 |
horizontalLayout: fit |
|
353 |
verticalLayout: fit |
|
354 |
horizontalSpace: 3 |
|
355 |
verticalSpace: 3 |
|
356 |
component: |
|
357 |
(SpecCollection |
|
358 |
collection: ( |
|
359 |
(ViewSpec |
|
360 |
name: 'BoxA' |
|
361 |
level: 0 |
|
362 |
visibilityChannel: boxAVisible |
|
363 |
component: |
|
364 |
(SpecCollection |
|
365 |
collection: ( |
|
366 |
(LabelSpec |
|
367 |
label: 'Only in A' |
|
368 |
name: 'OnlyInALabel' |
|
369 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
370 |
translateLabel: true |
|
371 |
labelChannel: onlyInALabelHolder |
|
372 |
) |
|
373 |
(SequenceViewSpec |
|
374 |
name: 'ListA' |
|
375 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
376 |
model: methodsOnlyInASelection |
|
377 |
menu: menuA |
|
378 |
hasHorizontalScrollBar: true |
|
379 |
hasVerticalScrollBar: true |
|
380 |
miniScrollerHorizontal: true |
|
381 |
doubleClickSelector: methodInADoubleClicked: |
|
382 |
valueChangeSelector: methodsOnlyInASelectionChanged |
|
383 |
useIndex: true |
|
384 |
sequenceList: methodsOnlyInA |
|
385 |
) |
|
386 |
) |
|
387 |
||
388 |
) |
|
389 |
extent: (Point 286 207) |
|
390 |
) |
|
391 |
(ViewSpec |
|
392 |
name: 'BoxM' |
|
393 |
visibilityChannel: boxMVisible |
|
394 |
component: |
|
395 |
(SpecCollection |
|
396 |
collection: ( |
|
397 |
(LabelSpec |
|
398 |
label: 'Changed' |
|
399 |
name: 'ChangedLabel' |
|
400 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
401 |
translateLabel: true |
|
402 |
labelChannel: changedLabelHolder |
|
403 |
) |
|
404 |
(SequenceViewSpec |
|
405 |
name: 'ListM' |
|
406 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
407 |
model: methodsChangedSelection |
|
408 |
menu: menuM |
|
409 |
hasHorizontalScrollBar: true |
|
410 |
hasVerticalScrollBar: true |
|
411 |
miniScrollerHorizontal: true |
|
412 |
doubleClickSelector: methodInChangedDoubleClicked: |
|
413 |
valueChangeSelector: methodsChangedSelectionChanged |
|
414 |
useIndex: true |
|
415 |
sequenceList: methodsChanged |
|
416 |
) |
|
417 |
) |
|
418 |
||
419 |
) |
|
420 |
extent: (Point 286 207) |
|
421 |
) |
|
422 |
(ViewSpec |
|
423 |
name: 'BoxB' |
|
424 |
visibilityChannel: boxBVisible |
|
425 |
component: |
|
426 |
(SpecCollection |
|
427 |
collection: ( |
|
428 |
(LabelSpec |
|
429 |
label: 'Only in B' |
|
430 |
name: 'OnlyInBLabel' |
|
431 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
432 |
translateLabel: true |
|
433 |
labelChannel: onlyInBLabelHolder |
|
434 |
) |
|
435 |
(SequenceViewSpec |
|
436 |
name: 'ListB' |
|
437 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
438 |
model: methodsOnlyInBSelection |
|
439 |
menu: menuB |
|
440 |
hasHorizontalScrollBar: true |
|
441 |
hasVerticalScrollBar: true |
|
442 |
miniScrollerHorizontal: true |
|
443 |
doubleClickSelector: methodInBDoubleClicked: |
|
444 |
valueChangeSelector: methodsOnlyInBSelectionChanged |
|
445 |
useIndex: true |
|
446 |
sequenceList: methodsOnlyInB |
|
447 |
) |
|
448 |
) |
|
449 |
||
450 |
) |
|
451 |
extent: (Point 287 207) |
|
452 |
) |
|
453 |
) |
|
454 |
||
455 |
) |
|
456 |
) |
|
457 |
(ViewSpec |
|
458 |
name: 'DiffBox' |
|
459 |
component: |
|
460 |
(SpecCollection |
|
461 |
collection: ( |
|
462 |
(ViewSpec |
|
463 |
name: 'diffTextViewBox' |
|
464 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
465 |
initiallyInvisible: true |
|
466 |
component: |
|
467 |
(SpecCollection |
|
468 |
collection: ( |
|
469 |
(LabelSpec |
|
470 |
label: 'A' |
|
471 |
name: 'DiffTextLabelA' |
|
472 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0) |
|
473 |
translateLabel: true |
|
474 |
labelChannel: diffTextLabelA |
|
475 |
) |
|
476 |
(LabelSpec |
|
477 |
label: 'B' |
|
478 |
name: 'DiffTextLabelB' |
|
479 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0) |
|
480 |
translateLabel: true |
|
481 |
labelChannel: diffTextLabelB |
|
482 |
) |
|
483 |
(ArbitraryComponentSpec |
|
484 |
name: 'diffTextView' |
|
485 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0) |
|
486 |
hasBorder: false |
|
487 |
component: diffTextView |
|
488 |
) |
|
489 |
) |
|
490 |
||
491 |
) |
|
492 |
) |
|
493 |
(CodeViewSpec |
|
494 |
name: 'singleTextView' |
|
495 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
496 |
model: methodText |
|
497 |
hasHorizontalScrollBar: true |
|
498 |
hasVerticalScrollBar: true |
|
499 |
miniScrollerHorizontal: true |
|
500 |
isReadOnly: true |
|
501 |
hasKeyboardFocusInitially: false |
|
502 |
) |
|
503 |
) |
|
504 |
||
505 |
) |
|
506 |
) |
|
507 |
) |
|
508 |
||
509 |
) |
|
510 |
handles: (Any 0.217118997912317 0.666666666666667 1.0) |
|
511 |
) |
|
512 |
(LabelSpec |
|
513 |
name: 'InfoLabel' |
|
514 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1) |
|
515 |
level: -1 |
|
516 |
translateLabel: true |
|
517 |
labelChannel: infoHolder |
|
518 |
adjust: left |
|
519 |
) |
|
520 |
) |
|
521 |
||
522 |
) |
|
523 |
) |
|
2221 | 524 |
! ! |
525 |
||
526 |
!VersionDiffBrowser class methodsFor:'menu specs'! |
|
527 |
||
528 |
mainMenu |
|
529 |
"This resource specification was automatically generated |
|
530 |
by the MenuEditor of ST/X." |
|
531 |
||
532 |
"Do not manually edit this!! If it is corrupted, |
|
533 |
the MenuEditor may not be able to read the specification." |
|
534 |
||
10703 | 535 |
|
2221 | 536 |
" |
537 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu |
|
538 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp |
|
539 |
" |
|
540 |
||
541 |
<resource: #menu> |
|
542 |
||
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
543 |
^ |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
544 |
#(Menu |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
545 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
546 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
547 |
label: 'File' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
548 |
submenu: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
549 |
(Menu |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
550 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
551 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
552 |
label: 'Create PatchFile...' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
553 |
itemValue: createPatchFile |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
554 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
555 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
556 |
label: '-' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
557 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
558 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
559 |
label: 'Exit' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
560 |
itemValue: closeRequest |
11853
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
561 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
562 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
563 |
nil |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
564 |
nil |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
565 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
566 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
567 |
(MenuItem |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
568 |
label: 'Class' |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
569 |
submenu: |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
570 |
(Menu |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
571 |
( |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
572 |
(MenuItem |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
573 |
label: 'Remove from Changeset' |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
574 |
itemValue: removeClassFromChangeSet |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
575 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
576 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
577 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
578 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
579 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
580 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
581 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
582 |
label: 'View' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
583 |
submenu: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
584 |
(Menu |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
585 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
586 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
587 |
enabled: canIncludeExtensionsHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
588 |
label: 'Include Extensions' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
589 |
itemValue: includeExtensions: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
590 |
indication: includeExtensionsHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
591 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
592 |
(MenuItem |
11958 | 593 |
enabled: canIncludeExtensionsHolder |
594 |
label: 'Include Version Methods' |
|
595 |
itemValue: includeVersionMethods: |
|
596 |
indication: includeVersionMethodsHolder |
|
597 |
) |
|
598 |
(MenuItem |
|
599 |
label: '-' |
|
600 |
) |
|
601 |
(MenuItem |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
602 |
label: 'Include Category Changes' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
603 |
itemValue: includeCategoryChanges: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
604 |
indication: includeCategoryChangesHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
605 |
) |
15632 | 606 |
(MenuItem |
607 |
label: '-' |
|
608 |
) |
|
609 |
(MenuItem |
|
610 |
label: 'Show Log Messages' |
|
611 |
itemValue: showLogMessages |
|
612 |
) |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
613 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
614 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
615 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
616 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
617 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
618 |
(MenuItem |
15395
3dd75c489752
help menu layout and title (Menu_Help instead of Help)
Claus Gittinger <cg@exept.de>
parents:
15167
diff
changeset
|
619 |
label: 'MENU_Help' |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
620 |
startGroup: conditionalRight |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
621 |
submenu: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
622 |
(Menu |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
623 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
624 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
625 |
label: 'Documentation' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
626 |
itemValue: openDocumentation |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
627 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
628 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
629 |
label: '-' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
630 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
631 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
632 |
label: 'About this Application...' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
633 |
itemValue: openAboutThisApplication |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
634 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
635 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
636 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
637 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
638 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
639 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
640 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
641 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
642 |
nil |
2221 | 643 |
) |
644 |
! |
|
645 |
||
646 |
menuA |
|
647 |
"This resource specification was automatically generated |
|
648 |
by the MenuEditor of ST/X." |
|
649 |
||
650 |
"Do not manually edit this!! If it is corrupted, |
|
651 |
the MenuEditor may not be able to read the specification." |
|
652 |
||
653 |
" |
|
654 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
655 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
656 |
" |
|
657 |
||
658 |
<resource: #menu> |
|
659 |
||
11453 | 660 |
^ |
2221 | 661 |
#(#Menu |
11453 | 662 |
#( |
663 |
#(#MenuItem |
|
664 |
#label: 'Apply' |
|
665 |
#translateLabel: true |
|
666 |
#value: #applySelectedChangeInA |
|
667 |
#enabled: #hasChangeSelectedInA |
|
668 |
) |
|
669 |
#(#MenuItem |
|
670 |
#label: 'Browse' |
|
671 |
#translateLabel: true |
|
672 |
#value: #browseClassInA |
|
673 |
#enabled: #hasChangeSelectedInA |
|
674 |
) |
|
675 |
#(#MenuItem |
|
676 |
#label: '-' |
|
677 |
) |
|
678 |
#(#MenuItem |
|
679 |
#label: 'Inspect' |
|
680 |
#translateLabel: true |
|
681 |
#value: #inspectSelectedChangeInA |
|
682 |
#choiceValue: 'nil "UndefinedObject" ' |
|
683 |
#enabled: #hasChangeSelectedInA |
|
684 |
) |
|
685 |
) |
|
686 |
nil |
|
687 |
nil |
|
2221 | 688 |
) |
689 |
! |
|
690 |
||
691 |
menuB |
|
692 |
"This resource specification was automatically generated |
|
693 |
by the MenuEditor of ST/X." |
|
694 |
||
695 |
"Do not manually edit this!! If it is corrupted, |
|
696 |
the MenuEditor may not be able to read the specification." |
|
697 |
||
698 |
" |
|
699 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menuB |
|
700 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menuB)) startUp |
|
701 |
" |
|
702 |
||
703 |
<resource: #menu> |
|
704 |
||
11453 | 705 |
^ |
2221 | 706 |
#(#Menu |
11453 | 707 |
#( |
708 |
#(#MenuItem |
|
709 |
#label: 'Apply' |
|
710 |
#translateLabel: true |
|
711 |
#value: #applySelectedChangeInB |
|
712 |
#enabled: #hasChangeSelectedInB |
|
713 |
) |
|
714 |
#(#MenuItem |
|
715 |
#label: 'Browse' |
|
716 |
#translateLabel: true |
|
717 |
#value: #browseClassInB |
|
718 |
#enabled: #hasChangeSelectedInB |
|
719 |
) |
|
720 |
#(#MenuItem |
|
721 |
#label: '-' |
|
722 |
) |
|
723 |
#(#MenuItem |
|
724 |
#label: 'Remove in Image' |
|
725 |
#translateLabel: true |
|
726 |
#value: #removeSelectedChangeInBFromImage |
|
727 |
#enabled: #hasChangeSelectedInB |
|
728 |
) |
|
729 |
#(#MenuItem |
|
730 |
#label: '-' |
|
731 |
) |
|
732 |
#(#MenuItem |
|
733 |
#label: 'Inspect' |
|
734 |
#translateLabel: true |
|
735 |
#value: #inspectSelectedChangeInB |
|
736 |
#choiceValue: 'nil "UndefinedObject" ' |
|
737 |
#enabled: #hasChangeSelectedInB |
|
738 |
) |
|
739 |
) |
|
740 |
nil |
|
741 |
nil |
|
2221 | 742 |
) |
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
743 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
744 |
"Modified: / 15-08-2010 / 21:24:49 / cg" |
2221 | 745 |
! |
746 |
||
747 |
menuM |
|
748 |
"This resource specification was automatically generated |
|
749 |
by the MenuEditor of ST/X." |
|
750 |
||
751 |
"Do not manually edit this!! If it is corrupted, |
|
752 |
the MenuEditor may not be able to read the specification." |
|
753 |
||
754 |
" |
|
755 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
756 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
757 |
" |
|
758 |
||
759 |
<resource: #menu> |
|
760 |
||
11453 | 761 |
^ |
2221 | 762 |
#(#Menu |
11453 | 763 |
#( |
764 |
#(#MenuItem |
|
765 |
#label: 'Browse' |
|
766 |
#translateLabel: true |
|
767 |
#value: #browseClassInM |
|
768 |
#enabled: #hasChangeSelectedInM |
|
769 |
) |
|
770 |
#(#MenuItem |
|
771 |
#label: '-' |
|
772 |
) |
|
773 |
#(#MenuItem |
|
774 |
#label: 'Apply Left Version' |
|
775 |
#translateLabel: true |
|
776 |
#value: #acceptInLeftView |
|
777 |
#enabled: #hasChangeSelectedInM |
|
778 |
) |
|
779 |
#(#MenuItem |
|
780 |
#label: 'Apply Right Version' |
|
781 |
#translateLabel: true |
|
782 |
#value: #acceptInRightView |
|
783 |
#enabled: #hasChangeSelectedInM |
|
784 |
) |
|
785 |
#(#MenuItem |
|
786 |
#label: '-' |
|
787 |
) |
|
788 |
#(#MenuItem |
|
789 |
#label: 'Inspect both' |
|
790 |
#translateLabel: true |
|
791 |
#value: #inspectSelectedChangeInM |
|
792 |
#choiceValue: 'nil "UndefinedObject" ' |
|
793 |
#enabled: #hasChangeSelectedInM |
|
794 |
) |
|
795 |
) |
|
796 |
nil |
|
797 |
nil |
|
2221 | 798 |
) |
7833 | 799 |
|
800 |
"Modified: / 31-08-2007 / 14:16:39 / cg" |
|
2221 | 801 |
! ! |
802 |
||
2695 | 803 |
!VersionDiffBrowser class methodsFor:'plugIn spec'! |
804 |
||
805 |
aspectSelectors |
|
806 |
"This resource specification was automatically generated |
|
807 |
by the UIPainter of ST/X." |
|
808 |
||
809 |
"Do not manually edit this. If it is corrupted, |
|
810 |
the UIPainter may not be able to read the specification." |
|
811 |
||
812 |
"Return a description of exported aspects; |
|
813 |
these can be connected to aspects of an embedding application |
|
814 |
(if this app is embedded in a subCanvas)." |
|
815 |
||
816 |
^ #( |
|
14076 | 817 |
#changedLabelHolder |
818 |
#onlyInALabelHolder |
|
819 |
#onlyInBLabelHolder |
|
2695 | 820 |
). |
821 |
||
822 |
! ! |
|
823 |
||
2221 | 824 |
!VersionDiffBrowser class methodsFor:'startup'! |
825 |
||
14076 | 826 |
openOnAllVersionsOfClass:aClass |
827 |
"create a VersionDiffBrowser instance and set the class change set of the |
|
828 |
browser. The class diff set is generated from aClasses current version against |
|
829 |
the selected version in the top selection list" |
|
830 |
||
831 |
|theBrowser| |
|
832 |
||
833 |
theBrowser := self new. |
|
834 |
theBrowser allButOpenInterface:#windowSpecForMultipleVersions. |
|
835 |
theBrowser beMultipleVersionBrowser. |
|
836 |
theBrowser classHolder:(ValueHolder with:aClass). |
|
837 |
theBrowser setupForClass:aClass againstVersion:nil. |
|
838 |
theBrowser openWindow. |
|
839 |
^ theBrowser. |
|
840 |
||
841 |
" |
|
842 |
self openOnAllVersionsOfClass:Object |
|
843 |
" |
|
844 |
! |
|
845 |
||
11453 | 846 |
openOnClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
847 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
848 |
browser. The class diff set is generated from aClasses current against some version |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
849 |
via the source code manager." |
2507 | 850 |
|
2497 | 851 |
|theBrowser| |
2224 | 852 |
|
2497 | 853 |
theBrowser := self new. |
854 |
theBrowser allButOpen. |
|
2695 | 855 |
theBrowser setupForClass:aClass againstVersion:aVersionA. |
2497 | 856 |
theBrowser openWindow. |
857 |
^ theBrowser. |
|
2224 | 858 |
|
2695 | 859 |
" |
860 |
self openOnClass:Array againstVersion:'1.116' |
|
861 |
self openOnClass:Array againstVersion:nil - against the version on which Array is based upon |
|
862 |
self openOnClass:Array againstVersion:#newest - against the newest repository version |
|
863 |
||
864 |
self openOnClass:VersionDiffBrowser againstVersion:nil |
|
865 |
self openOnClass:VersionDiffBrowser againstVersion:#newest |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
866 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
867 |
(self openOnClass:ByteArray againstVersion:'1.116') includeExtensionsHolder value:true |
2695 | 868 |
" |
869 |
! |
|
870 |
||
11453 | 871 |
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
872 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
873 |
browser. The class diff set is generated from two classes." |
2949 | 874 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
875 |
^ self |
11453 | 876 |
openOnClass:classA labelA:aLabelA |
877 |
andClass:classB labelB:aLabelB |
|
878 |
title:ignoredTitle ifSame:nil |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
879 |
|
3147 | 880 |
" |
11453 | 881 |
self |
882 |
openOnClass:Array labelA:'Array' |
|
883 |
andClass:Collection labelB:'Collection' |
|
884 |
title:'Array vs. Collection' |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
885 |
" |
2949 | 886 |
! |
887 |
||
888 |
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle ifSame:sameAction |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
889 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
890 |
browser. The class diff set is generated from two classes." |
2949 | 891 |
|
8891 | 892 |
|classChangeSet| |
2949 | 893 |
|
8891 | 894 |
classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB. |
895 |
classChangeSet removeAllVersionMethods. |
|
2949 | 896 |
sameAction notNil ifTrue:[ |
11453 | 897 |
"/ check if same ... |
898 |
(classChangeSet methodsOnlyInA isEmpty |
|
899 |
and:[classChangeSet methodsOnlyInB isEmpty |
|
900 |
and:[classChangeSet diffSet isEmpty]]) ifTrue:[ |
|
901 |
sameAction value. |
|
902 |
^ self "/ do not open |
|
903 |
] |
|
2949 | 904 |
]. |
8891 | 905 |
|
906 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
2949 | 907 |
! |
908 |
||
11453 | 909 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
910 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
911 |
browser. The class diff set is generated from two source files." |
2695 | 912 |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
913 |
^ self |
11453 | 914 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
915 |
title:nil |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
916 |
! |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
917 |
|
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
918 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
919 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
920 |
browser. The class diff set is generated from two source files." |
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
921 |
|
11453 | 922 |
^ self |
923 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA |
|
924 |
labelB:aLabelB sourceB:aSourceB |
|
925 |
title:ignoredTitle ifSame:nil |
|
2849 | 926 |
! |
927 |
||
928 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle ifSame:sameAction |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
929 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
930 |
browser. The class diff set is generated from two source files." |
8891 | 931 |
|
932 |
|diffs hasChangedMethods classChangeSet versionMethodChanges| |
|
2695 | 933 |
|
8891 | 934 |
classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB. |
935 |
classChangeSet removeAllVersionMethods. |
|
2849 | 936 |
sameAction notNil ifTrue:[ |
11453 | 937 |
"/ check if same ... |
938 |
(classChangeSet methodsOnlyInA isEmpty |
|
939 |
and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[ |
|
940 |
diffs := classChangeSet diffSet. |
|
3853
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
941 |
|
11453 | 942 |
hasChangedMethods := diffs changed notEmpty. |
943 |
hasChangedMethods ifTrue:[ |
|
944 |
versionMethodChanges := diffs changed select:[:eachDifference | |
|
945 |
|eachChange| |
|
946 |
eachChange := eachDifference first. |
|
947 |
(eachChange isMethodChange |
|
948 |
and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector) |
|
949 |
and:[ eachChange changeClass isMeta ]]). |
|
950 |
]. |
|
951 |
diffs changed size == versionMethodChanges size ifTrue: [ |
|
952 |
hasChangedMethods := false. |
|
953 |
]. |
|
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
954 |
"/ diffs changed size == 1 ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
955 |
"/ theOnlyDifference := diffs changed first. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
956 |
"/ theOnlyChange := theOnlyDifference first. |
11453 | 957 |
"/ (theOnlyChange isMethodChange |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
958 |
"/ and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_']) |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
959 |
"/ and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
960 |
"/ hasChangedMethods := false |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
961 |
"/ ] |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
962 |
"/ ] |
11453 | 963 |
]. |
3853
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
964 |
|
11453 | 965 |
(hasChangedMethods not |
966 |
and:[diffs onlyInArg isEmpty |
|
967 |
and:[diffs onlyInReceiver isEmpty]]) ifTrue:[ |
|
968 |
sameAction value. |
|
969 |
^ self "/ do not open |
|
970 |
]. |
|
971 |
] |
|
2849 | 972 |
]. |
8891 | 973 |
|
974 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
7396 | 975 |
|
976 |
"Modified: / 13-10-2006 / 01:01:05 / cg" |
|
2224 | 977 |
! |
978 |
||
2497 | 979 |
openOnClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
980 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
981 |
browser. The class diff set is generated from two versions of aClass via |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
982 |
the source code manager." |
2507 | 983 |
|
2497 | 984 |
|theBrowser| |
2221 | 985 |
|
2497 | 986 |
theBrowser := self new. |
987 |
theBrowser allButOpen. |
|
2695 | 988 |
theBrowser setupForClass:aClass versionA:aVersionA versionB:aVersionB. |
2497 | 989 |
theBrowser openWindow. |
990 |
^ theBrowser. |
|
2221 | 991 |
|
992 |
" |
|
993 |
self openOnClass:Array versionA:'1.116' versionB:'1.113' |
|
994 |
" |
|
3678 | 995 |
! |
996 |
||
8891 | 997 |
openOnClassChangeSet:classChangeSet title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
998 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
999 |
browser. The class diff set is generated from two classes." |
8891 | 1000 |
|
1001 |
|theBrowser| |
|
1002 |
||
1003 |
theBrowser := self new. |
|
1004 |
theBrowser allButOpen. |
|
1005 |
theBrowser classChangeSet:classChangeSet. |
|
1006 |
theBrowser openWindow. |
|
1007 |
^ theBrowser. |
|
1008 |
! |
|
1009 |
||
3678 | 1010 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle |
10691 | 1011 |
^ self |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1012 |
openOnDiffSet:diffSet |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1013 |
labelA:aLabelA labelB:aLabelB |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1014 |
title:ignoredTitle |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1015 |
ignoreExtensions:false |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1016 |
ignoreVersionMethods:false |
10691 | 1017 |
|
1018 |
"Modified: / 12-09-2011 / 11:52:44 / cg" |
|
1019 |
! |
|
1020 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1021 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1022 |
^ self |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1023 |
openOnDiffSet:diffSet |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1024 |
labelA:aLabelA labelB:aLabelB |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1025 |
title:ignoredTitle |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1026 |
ignoreExtensions:ignoreExtensionsBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1027 |
ignoreVersionMethods:false |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1028 |
! |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1029 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1030 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean ignoreVersionMethods:ignoreVersionMethodsBoolean |
3678 | 1031 |
|theBrowser| |
1032 |
||
1033 |
theBrowser := self new. |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1034 |
theBrowser ignoreExtensions:ignoreExtensionsBoolean. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1035 |
theBrowser ignoreVersionMethods:ignoreVersionMethodsBoolean. |
3678 | 1036 |
theBrowser allButOpen. |
1037 |
theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB. |
|
1038 |
theBrowser window label:ignoredTitle. |
|
1039 |
theBrowser openWindow. |
|
1040 |
^ theBrowser. |
|
10691 | 1041 |
|
1042 |
"Created: / 12-09-2011 / 11:50:18 / cg" |
|
5520 | 1043 |
! |
1044 |
||
1045 |
openOnDiffsBetweenFile:file1 and:file2 |
|
1046 |
|set1 set2 diffset theBrowser| |
|
1047 |
||
1048 |
set1 := ChangeSet fromFile:file1. |
|
1049 |
set2 := ChangeSet fromFile:file2. |
|
1050 |
diffset := set1 diffSetsAgainst:set2. |
|
1051 |
||
1052 |
theBrowser := self new. |
|
1053 |
theBrowser allButOpen. |
|
1054 |
theBrowser setupForDiffSet:diffset labelA:file1 asFilename baseName labelB:file2 asFilename baseName. |
|
1055 |
theBrowser window label:('%1 vs. %2' bindWith:file1 asFilename baseName with:file2 asFilename baseName). |
|
1056 |
theBrowser openWindow. |
|
1057 |
^ theBrowser. |
|
1058 |
||
1059 |
" |
|
11453 | 1060 |
VersionDiffBrowser |
1061 |
openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st' |
|
1062 |
and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st' |
|
5520 | 1063 |
" |
2221 | 1064 |
! ! |
1065 |
||
1066 |
!VersionDiffBrowser methodsFor:'accessing'! |
|
1067 |
||
14076 | 1068 |
beMultipleVersionBrowser |
1069 |
isMultipleVersionBrowser := true |
|
1070 |
! |
|
1071 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1072 |
canIncludeExtensions:something |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1073 |
self canIncludeExtensionsHolder value:something. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1074 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1075 |
|
2497 | 1076 |
changeSetA |
3147 | 1077 |
" |
1078 |
gets the change set which contains only the new methods |
|
1079 |
in versionA of the class |
|
2221 | 1080 |
|
3147 | 1081 |
<return: ChangeSet> |
1082 |
" |
|
2221 | 1083 |
|
2497 | 1084 |
^ self classChangeSet methodsOnlyInA |
2221 | 1085 |
! |
1086 |
||
2497 | 1087 |
changeSetB |
3147 | 1088 |
" |
1089 |
gets the change set which contains only the new methods |
|
1090 |
in versionB of the class |
|
2497 | 1091 |
|
3147 | 1092 |
<return: ChangeSet> |
1093 |
" |
|
2497 | 1094 |
|
1095 |
^ self classChangeSet methodsOnlyInB |
|
1096 |
! |
|
1097 |
||
2856 | 1098 |
class:aClass versionA:revA versionB:revB |
1099 |
classIfSingleClassDiff := aClass. |
|
1100 |
versionAIfSingleClassDiff := revA. |
|
1101 |
versionBIfSingleClassDiff := revB. |
|
1102 |
! |
|
1103 |
||
2497 | 1104 |
classBeingCompared |
13137 | 1105 |
"returns the class from the change set which is compared. |
2224 | 1106 |
|
3147 | 1107 |
<return: Class> |
11453 | 1108 |
" |
2497 | 1109 |
^ self classChangeSet classBeingCompared |
1110 |
! |
|
1111 |
||
1112 |
classChangeSet |
|
11453 | 1113 |
"returns the class change set which is the model of the version diff browser." |
2224 | 1114 |
|
2507 | 1115 |
^ classChangeSet |
1116 |
! |
|
2497 | 1117 |
|
2507 | 1118 |
classChangeSet:aClassChangeSet |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1119 |
"sets the class change set which is the model of the version diff browser. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1120 |
The labels, the lists, the visibility and the selection of the lists must be reseted |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1121 |
when a new change set is given." |
2497 | 1122 |
|
2507 | 1123 |
classChangeSet := aClassChangeSet. |
2501 | 1124 |
self updateLabels. |
1125 |
self updateLists. |
|
1126 |
self resetSelectionHolders. |
|
1127 |
! |
|
2224 | 1128 |
|
10691 | 1129 |
ignoreExtensions |
1130 |
"if true, extension methods are suppressed. |
|
1131 |
Ignoring is useful when comparing for baseClass checkin, |
|
1132 |
as opposed to extension-checking, where extensions should not be ignored. |
|
1133 |
the default is false" |
|
1134 |
||
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1135 |
^ self includeExtensions not |
10691 | 1136 |
|
1137 |
"Created: / 12-09-2011 / 11:54:11 / cg" |
|
1138 |
! |
|
1139 |
||
1140 |
ignoreExtensions:aBoolean |
|
1141 |
"if true, extension methods are suppressed. |
|
1142 |
Ignoring is useful when comparing for baseClass checkin, |
|
1143 |
as opposed to extension-checking, where extensions should not be ignored. |
|
1144 |
the default is false" |
|
1145 |
||
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1146 |
self includeExtensions:aBoolean not |
10691 | 1147 |
|
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1148 |
"Modified: / 06-03-2012 / 15:37:32 / cg" |
10691 | 1149 |
! |
1150 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1151 |
ignoreVersionMethods:aBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1152 |
"if true, version methods (version and version_XXX) are suppressed. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1153 |
Ignoring is useful when comparing for real code changes. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1154 |
the default is false" |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1155 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1156 |
self includeVersionMethods:aBoolean not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1157 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1158 |
"Modified: / 06-03-2012 / 15:37:32 / cg" |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1159 |
! |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1160 |
|
14076 | 1161 |
isMultipleVersionBrowser |
14078 | 1162 |
^ isMultipleVersionBrowser ? false |
14076 | 1163 |
! |
1164 |
||
2507 | 1165 |
selectedChangeInA |
3147 | 1166 |
" |
1167 |
gets the selected method change for the 'method only in version A'. |
|
2507 | 1168 |
|
3147 | 1169 |
<return: MethodChange | nil> |
1170 |
" |
|
11962 | 1171 |
|selIndex change| |
1172 |
||
1173 |
selIndex := self methodsOnlyInASelection value. |
|
1174 |
selIndex notNil ifTrue:[ |
|
1175 |
change := methodsOnlyInAFiltered "self changeSetA" at:selIndex. |
|
2507 | 1176 |
]. |
3753 | 1177 |
^ change |
2507 | 1178 |
! |
1179 |
||
1180 |
selectedChangeInB |
|
3147 | 1181 |
" |
1182 |
gets the selected method change for the 'method only in version B'. |
|
2507 | 1183 |
|
3147 | 1184 |
<return: MethodChange | nil> |
1185 |
" |
|
11962 | 1186 |
|selIndex change| |
1187 |
||
1188 |
selIndex := self methodsOnlyInBSelection value. |
|
1189 |
selIndex notNil ifTrue:[ |
|
1190 |
change := methodsOnlyInBFiltered "self changeSetB" at:selIndex. |
|
2507 | 1191 |
]. |
3753 | 1192 |
^ change |
2507 | 1193 |
! |
1194 |
||
1195 |
selectedChangesInM |
|
3147 | 1196 |
" |
1197 |
get the two method changes for the selected 'changed method'. |
|
2507 | 1198 |
|
3147 | 1199 |
<return: <Array with:MethodChange with:MethodChange | nil>> |
1200 |
" |
|
11962 | 1201 |
|selIndex theTwoChanges| |
1202 |
||
1203 |
selIndex := self methodsChangedSelection value. |
|
1204 |
selIndex notNil ifTrue:[ |
|
1205 |
theTwoChanges := methodsChangedFiltered "self classChangeSet methodsChanged" at:selIndex. |
|
1206 |
^ theTwoChanges. |
|
2507 | 1207 |
]. |
3753 | 1208 |
^ #(nil nil) |
2507 | 1209 |
! |
1210 |
||
2221 | 1211 |
versionA |
3147 | 1212 |
" |
1213 |
gets the first class version to be compared |
|
2221 | 1214 |
|
3147 | 1215 |
<return: String> |
1216 |
" |
|
2731 | 1217 |
classChangeSet isNil ifTrue:[^ 'A']. |
1218 |
^ classChangeSet labelA |
|
2221 | 1219 |
! |
1220 |
||
1221 |
versionB |
|
3147 | 1222 |
" |
1223 |
gets the second class version to be compared |
|
2221 | 1224 |
|
3147 | 1225 |
<return: String> |
1226 |
" |
|
2731 | 1227 |
classChangeSet isNil ifTrue:[^ 'B']. |
1228 |
^ classChangeSet labelB |
|
2221 | 1229 |
! ! |
1230 |
||
1231 |
!VersionDiffBrowser methodsFor:'actions'! |
|
1232 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1233 |
acceptInLeftView |
11453 | 1234 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1235 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1236 |
change := self selectedChangesInM first. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1237 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1238 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1239 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1240 |
acceptInRightView |
11453 | 1241 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1242 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1243 |
change := self selectedChangesInM second. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1244 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1245 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1246 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1247 |
acceptInSingleView |
11453 | 1248 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1249 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1250 |
change := self selectedChangeInA. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1251 |
change isNil ifTrue:[ |
11453 | 1252 |
change := self selectedChangeInB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1253 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1254 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1255 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1256 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1257 |
applySelectedChangeInA |
11453 | 1258 |
self applyChange:(self selectedChangeInA) |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1259 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1260 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1261 |
applySelectedChangeInB |
11453 | 1262 |
self applyChange:(self selectedChangeInB) |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1263 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1264 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1265 |
methodInADoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1266 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1267 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1268 |
"/ change := self changeSetA at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1269 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1270 |
self browseClassInA |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1271 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1272 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1273 |
methodInBDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1274 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1275 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1276 |
"/ change := self changeSetB at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1277 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1278 |
self browseClassInB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1279 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1280 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1281 |
methodInChangedDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1282 |
self browseClassInM. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1283 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1284 |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1285 |
removeSelectedChangeInBFromImage |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1286 |
|change cls sel op| |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1287 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1288 |
change := self selectedChangeInB. |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1289 |
change isMethodChange ifTrue:[ |
11453 | 1290 |
(cls := change changeClass) notNil ifTrue:[ |
1291 |
(sel := change selector) notNil ifTrue:[ |
|
1292 |
RefactoryChangeManager notNil ifTrue:[ |
|
1293 |
op := RemoveMethodChange remove:sel from:cls. |
|
1294 |
RefactoryChangeManager performChange: op. |
|
1295 |
] ifFalse:[ |
|
1296 |
cls removeSelector:sel |
|
1297 |
] |
|
1298 |
] |
|
1299 |
] |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1300 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1301 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1302 |
"Modified: / 15-08-2010 / 21:35:00 / cg" |
15632 | 1303 |
! |
1304 |
||
1305 |
showLogMessages |
|
15633 | 1306 |
"the UI shows code-diffs if any change is selected, and version log entries otherwise. |
1307 |
But there is no way to deselect any of the method-change-lists, to go back to log-messages, |
|
1308 |
once a method has been looked at. |
|
1309 |
This view-menu entry helps." |
|
1310 |
||
15632 | 1311 |
methodsOnlyInASelection value:nil. |
1312 |
methodsOnlyInBSelection value:nil. |
|
1313 |
methodsChangedSelection value:nil. |
|
2221 | 1314 |
! ! |
1315 |
||
1316 |
!VersionDiffBrowser methodsFor:'aspects'! |
|
1317 |
||
2585 | 1318 |
boxAVisible |
2745 | 1319 |
boxAVisible isNil ifTrue:[ |
11453 | 1320 |
boxAVisible := true asValue. |
2585 | 1321 |
]. |
2745 | 1322 |
^ boxAVisible. |
2585 | 1323 |
! |
1324 |
||
1325 |
boxBVisible |
|
2745 | 1326 |
boxBVisible isNil ifTrue:[ |
11453 | 1327 |
boxBVisible := true asValue. |
2585 | 1328 |
]. |
2745 | 1329 |
^ boxBVisible. |
2585 | 1330 |
! |
1331 |
||
1332 |
boxMVisible |
|
2745 | 1333 |
boxMVisible isNil ifTrue:[ |
11453 | 1334 |
boxMVisible := true asValue. |
2585 | 1335 |
]. |
2745 | 1336 |
^ boxMVisible. |
2585 | 1337 |
! |
1338 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1339 |
canIncludeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1340 |
"can include extensions ? (menu item enabler)" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1341 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1342 |
canIncludeExtensionsHolder isNil ifTrue:[ |
11453 | 1343 |
canIncludeExtensionsHolder := true asValue. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1344 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1345 |
^ canIncludeExtensionsHolder. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1346 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1347 |
|
2221 | 1348 |
changedLabelHolder |
3147 | 1349 |
" |
1350 |
aspect for the label of the changed method box. |
|
2221 | 1351 |
|
3147 | 1352 |
<return: ValueHolder on: nil> |
1353 |
" |
|
2221 | 1354 |
|
3147 | 1355 |
changedLabelHolder isNil ifTrue:[ |
11453 | 1356 |
changedLabelHolder := ValueHolder new. |
2221 | 1357 |
]. |
3147 | 1358 |
^ changedLabelHolder. |
2221 | 1359 |
! |
1360 |
||
1361 |
diffTextLabelA |
|
3147 | 1362 |
" |
1363 |
aspect for the label for version A. |
|
2221 | 1364 |
|
3147 | 1365 |
<return: ValueHolder on: nil> |
1366 |
" |
|
2221 | 1367 |
|
3147 | 1368 |
diffTextLabelA isNil ifTrue:[ |
11453 | 1369 |
diffTextLabelA := ValueHolder new. |
2221 | 1370 |
]. |
3147 | 1371 |
^ diffTextLabelA. |
2221 | 1372 |
! |
1373 |
||
1374 |
diffTextLabelB |
|
3147 | 1375 |
" |
1376 |
aspect for the label for version B. |
|
2221 | 1377 |
|
3147 | 1378 |
<return: ValueHolder on: nil> |
1379 |
" |
|
2221 | 1380 |
|
3147 | 1381 |
diffTextLabelB isNil ifTrue:[ |
11453 | 1382 |
diffTextLabelB := ValueHolder new. |
2221 | 1383 |
]. |
3147 | 1384 |
^ diffTextLabelB. |
2221 | 1385 |
! |
1386 |
||
2497 | 1387 |
diffTextView |
3147 | 1388 |
" |
1389 |
return the component for the diff text view. |
|
2497 | 1390 |
|
3147 | 1391 |
<return: HVScrollableView> |
1392 |
" |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1393 |
|v| |
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1394 |
|
2497 | 1395 |
diffTextView isNil ifTrue:[ |
13951 | 1396 |
v := DiffCodeView new. |
1397 |
v textViewClass:CodeView. |
|
1398 |
v initialize. |
|
1399 |
diffTextView := HVScrollableView |
|
1400 |
forView:v |
|
1401 |
miniScrollerH:true miniScrollerV:false. |
|
1402 |
diffTextView addNextPreviousButtons. |
|
2497 | 1403 |
]. |
1404 |
^ diffTextView |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1405 |
|
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1406 |
"Modified: / 06-10-2006 / 14:30:42 / cg" |
2497 | 1407 |
! |
1408 |
||
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1409 |
includeCategoryChanges |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1410 |
^ self includeCategoryChangesHolder value |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1411 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1412 |
"Created: / 17-07-2012 / 18:22:34 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1413 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1414 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1415 |
includeCategoryChanges:aBoolean |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1416 |
self includeCategoryChangesHolder value:aBoolean |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1417 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1418 |
"Created: / 17-07-2012 / 17:50:41 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1419 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1420 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1421 |
includeCategoryChangesHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1422 |
includeCategoryChangesHolder isNil ifTrue:[ |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1423 |
includeCategoryChangesHolder := true asValue. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1424 |
includeCategoryChangesHolder addDependent:self. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1425 |
]. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1426 |
^ includeCategoryChangesHolder. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1427 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1428 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1429 |
"Created: / 17-07-2012 / 16:47:58 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1430 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1431 |
|
10703 | 1432 |
includeExtensions |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1433 |
^ self includeExtensionsHolder value |
10703 | 1434 |
|
1435 |
"Created: / 13-09-2011 / 11:48:51 / cg" |
|
1436 |
! |
|
1437 |
||
1438 |
includeExtensions:aBoolean |
|
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1439 |
self includeExtensionsHolder value:aBoolean |
10703 | 1440 |
|
1441 |
"Created: / 13-09-2011 / 11:48:41 / cg" |
|
1442 |
! |
|
1443 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1444 |
includeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1445 |
"only compare base-methods or include extensions ?" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1446 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1447 |
includeExtensionsHolder isNil ifTrue:[ |
11453 | 1448 |
includeExtensionsHolder := false asValue. |
1449 |
includeExtensionsHolder addDependent:self. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1450 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1451 |
^ includeExtensionsHolder. |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1452 |
|
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1453 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1454 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1455 |
|
11958 | 1456 |
includeVersionMethods |
1457 |
^ self includeVersionMethodsHolder value |
|
1458 |
||
1459 |
"Created: / 13-09-2011 / 11:48:51 / cg" |
|
1460 |
! |
|
1461 |
||
1462 |
includeVersionMethods:aBoolean |
|
1463 |
self includeVersionMethodsHolder value:aBoolean |
|
1464 |
||
1465 |
"Created: / 13-09-2011 / 11:48:41 / cg" |
|
1466 |
! |
|
1467 |
||
1468 |
includeVersionMethodsHolder |
|
1469 |
includeVersionMethodsHolder isNil ifTrue:[ |
|
1470 |
includeVersionMethodsHolder := true asValue. |
|
1471 |
includeVersionMethodsHolder addDependent:self. |
|
1472 |
]. |
|
1473 |
^ includeVersionMethodsHolder. |
|
1474 |
||
1475 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
|
1476 |
"Created: / 17-07-2012 / 16:47:58 / cg" |
|
1477 |
! |
|
1478 |
||
8602 | 1479 |
infoHolder |
1480 |
infoHolder isNil ifTrue:[ |
|
11453 | 1481 |
infoHolder := ValueHolder new. |
8602 | 1482 |
]. |
1483 |
^ infoHolder. |
|
1484 |
! |
|
1485 |
||
2221 | 1486 |
methodText |
3147 | 1487 |
" |
1488 |
aspect for the text in the method text view. |
|
2221 | 1489 |
|
3147 | 1490 |
<return: ValueHolder on: nil> |
1491 |
" |
|
2221 | 1492 |
|
3147 | 1493 |
methodText isNil ifTrue:[ |
11453 | 1494 |
methodText := ValueHolder new. |
2221 | 1495 |
]. |
3147 | 1496 |
^ methodText. |
2221 | 1497 |
! |
1498 |
||
1499 |
methodsChanged |
|
3147 | 1500 |
" |
1501 |
aspect for the 'changed method' list. |
|
2221 | 1502 |
|
3147 | 1503 |
<return: List> |
1504 |
" |
|
2221 | 1505 |
|
3147 | 1506 |
methodsChanged isNil ifTrue:[ |
11453 | 1507 |
methodsChanged := List new. |
2221 | 1508 |
]. |
3147 | 1509 |
^ methodsChanged. |
2221 | 1510 |
! |
1511 |
||
1512 |
methodsChangedSelection |
|
3147 | 1513 |
" |
1514 |
aspect for the selection holder of 'changed method'-list. |
|
2221 | 1515 |
|
3147 | 1516 |
<return: ValueHolder on: nil> |
1517 |
" |
|
2221 | 1518 |
|
3147 | 1519 |
methodsChangedSelection isNil ifTrue:[ |
11453 | 1520 |
methodsChangedSelection := ValueHolder new. |
2221 | 1521 |
]. |
3147 | 1522 |
^ methodsChangedSelection. |
2221 | 1523 |
! |
1524 |
||
1525 |
methodsOnlyInA |
|
6828 | 1526 |
"aspect for the 'method only in version A' list." |
2221 | 1527 |
|
3147 | 1528 |
methodsOnlyInA isNil ifTrue:[ |
11453 | 1529 |
methodsOnlyInA := List new. |
2221 | 1530 |
]. |
3147 | 1531 |
^ methodsOnlyInA. |
6828 | 1532 |
|
1533 |
"Modified: / 25-07-2006 / 11:14:43 / cg" |
|
2221 | 1534 |
! |
1535 |
||
1536 |
methodsOnlyInASelection |
|
6828 | 1537 |
"aspect for the selection holder of 'method only in version A'-list." |
2221 | 1538 |
|
3147 | 1539 |
methodsOnlyInASelection isNil ifTrue:[ |
11453 | 1540 |
methodsOnlyInASelection := ValueHolder new. |
2221 | 1541 |
]. |
3147 | 1542 |
^ methodsOnlyInASelection. |
6828 | 1543 |
|
1544 |
"Modified: / 25-07-2006 / 11:14:53 / cg" |
|
2221 | 1545 |
! |
1546 |
||
1547 |
methodsOnlyInB |
|
6828 | 1548 |
"aspect for the 'method only in version B' list" |
2221 | 1549 |
|
3147 | 1550 |
methodsOnlyInB isNil ifTrue:[ |
11453 | 1551 |
methodsOnlyInB := List new. |
2221 | 1552 |
]. |
3147 | 1553 |
^ methodsOnlyInB. |
6828 | 1554 |
|
1555 |
"Modified: / 25-07-2006 / 11:14:48 / cg" |
|
2221 | 1556 |
! |
1557 |
||
1558 |
methodsOnlyInBSelection |
|
6828 | 1559 |
"aspect for the selection holder of 'method only in version B'-list." |
2221 | 1560 |
|
3147 | 1561 |
methodsOnlyInBSelection isNil ifTrue:[ |
11453 | 1562 |
methodsOnlyInBSelection := ValueHolder new. |
2221 | 1563 |
]. |
3147 | 1564 |
^ methodsOnlyInBSelection. |
6828 | 1565 |
|
1566 |
"Modified: / 25-07-2006 / 11:15:00 / cg" |
|
2221 | 1567 |
! |
1568 |
||
1569 |
onlyInALabelHolder |
|
6828 | 1570 |
"aspect for the label for 'method only in version A'." |
2221 | 1571 |
|
3147 | 1572 |
onlyInALabelHolder isNil ifTrue:[ |
11453 | 1573 |
onlyInALabelHolder := ValueHolder new. |
2221 | 1574 |
]. |
3147 | 1575 |
^ onlyInALabelHolder. |
6828 | 1576 |
|
1577 |
"Modified: / 25-07-2006 / 11:15:12 / cg" |
|
2221 | 1578 |
! |
1579 |
||
1580 |
onlyInBLabelHolder |
|
6828 | 1581 |
"aspect for the label for 'method only in version B'." |
2221 | 1582 |
|
3147 | 1583 |
onlyInBLabelHolder isNil ifTrue:[ |
11453 | 1584 |
onlyInBLabelHolder := ValueHolder new. |
2221 | 1585 |
]. |
3147 | 1586 |
^ onlyInBLabelHolder. |
6828 | 1587 |
|
1588 |
"Modified: / 25-07-2006 / 11:15:07 / cg" |
|
14076 | 1589 |
! |
1590 |
||
1591 |
selectedSymbolicVersionHolder |
|
1592 |
selectedSymbolicVersionHolder isNil ifTrue:[ |
|
1593 |
selectedSymbolicVersionHolder := nil asValue. |
|
1594 |
selectedSymbolicVersionHolder onChangeSend:#selectedSymbolicVersionHolderChanged to:self. |
|
1595 |
]. |
|
1596 |
^ selectedSymbolicVersionHolder |
|
1597 |
! |
|
1598 |
||
1599 |
selectedVersionHolder |
|
1600 |
selectedVersionHolder isNil ifTrue:[ |
|
15621 | 1601 |
selectedVersionHolder := nil asValue. |
14076 | 1602 |
selectedVersionHolder onChangeSend:#selectedVersionHolderChanged to:self. |
1603 |
]. |
|
1604 |
^ selectedVersionHolder |
|
1605 |
! |
|
1606 |
||
1607 |
symbolicVersionList |
|
1608 |
symbolicVersionList isNil ifTrue:[ |
|
1609 |
symbolicVersionList := List new. |
|
1610 |
]. |
|
1611 |
^ symbolicVersionList |
|
1612 |
! |
|
1613 |
||
1614 |
versionList |
|
1615 |
versionList isNil ifTrue:[ |
|
1616 |
versionList := List new. |
|
1617 |
]. |
|
1618 |
^ versionList |
|
2221 | 1619 |
! ! |
1620 |
||
2725 | 1621 |
!VersionDiffBrowser methodsFor:'aspects-exported'! |
2695 | 1622 |
|
1623 |
changedLabelHolder:aValueHolder |
|
1624 |
builder aspectAt:#changedLabelHolder put:aValueHolder. |
|
1625 |
||
1626 |
! |
|
1627 |
||
1628 |
classHolder:aValueHolder |
|
5182 | 1629 |
classHolder notNil ifTrue:[ |
11453 | 1630 |
classHolder removeDependent:self |
2695 | 1631 |
]. |
5182 | 1632 |
classHolder := aValueHolder. |
1633 |
classHolder notNil ifTrue:[ |
|
11453 | 1634 |
classHolder addDependent:self |
2695 | 1635 |
] |
1636 |
! |
|
1637 |
||
1638 |
onlyInALabelHolder:aValueHolder |
|
1639 |
builder aspectAt:#onlyInALabelHolder put:aValueHolder. |
|
1640 |
! |
|
1641 |
||
1642 |
onlyInBLabelHolder:aValueHolder |
|
1643 |
builder aspectAt:#onlyInBLabelHolder put:aValueHolder. |
|
1644 |
! |
|
1645 |
||
1646 |
versionAHolder:aValueHolder |
|
5182 | 1647 |
versionAHolder notNil ifTrue:[ |
11453 | 1648 |
versionAHolder removeDependent:self |
2695 | 1649 |
]. |
5182 | 1650 |
versionAHolder := aValueHolder. |
1651 |
versionAHolder notNil ifTrue:[ |
|
11453 | 1652 |
versionAHolder addDependent:self |
2695 | 1653 |
] |
1654 |
! |
|
1655 |
||
1656 |
versionBHolder:aValueHolder |
|
5182 | 1657 |
versionBHolder notNil ifTrue:[ |
11453 | 1658 |
versionBHolder removeDependent:self |
2695 | 1659 |
]. |
5182 | 1660 |
versionBHolder := aValueHolder. |
1661 |
versionBHolder notNil ifTrue:[ |
|
11453 | 1662 |
versionBHolder addDependent:self |
2695 | 1663 |
] |
1664 |
! ! |
|
1665 |
||
4359 | 1666 |
!VersionDiffBrowser methodsFor:'aspects-menu'! |
1667 |
||
1668 |
canAcceptInCodeView |
|
1669 |
^ self hasChangeSelectedInA |
|
1670 |
or:[self hasChangeSelectedInB |
|
1671 |
or:[self hasChangeSelectedInM]] |
|
1672 |
! |
|
1673 |
||
1674 |
hasChangeSelectedInA |
|
1675 |
^ self selectedChangeInA notNil |
|
1676 |
! |
|
1677 |
||
1678 |
hasChangeSelectedInB |
|
1679 |
^ self selectedChangeInB notNil |
|
1680 |
! |
|
1681 |
||
1682 |
hasChangeSelectedInM |
|
1683 |
^ self methodsChangedSelection value notNil |
|
1684 |
! ! |
|
1685 |
||
2695 | 1686 |
!VersionDiffBrowser methodsFor:'change & update'! |
1687 |
||
12512 | 1688 |
methodsChangedSelectionChanged |
1689 |
" |
|
1690 |
the selection in the list of the 'changed methods' changed. |
|
1691 |
Reset the selection of the two other lists and calc the method change. |
|
1692 |
||
1693 |
<return: self> |
|
1694 |
" |
|
1695 |
|sel changeA changeB methodsChanged parseError treeA treeB| |
|
1696 |
||
1697 |
self infoHolder value:''. |
|
1698 |
||
1699 |
sel := self methodsChangedSelection value. |
|
1700 |
sel notNil ifTrue:[ |
|
1701 |
self methodsOnlyInASelection value:nil. |
|
1702 |
self methodsOnlyInBSelection value:nil. |
|
1703 |
methodsChanged := self classChangeSet methodsChanged. |
|
1704 |
changeA := (methodsChangedFiltered at:sel) first. |
|
1705 |
changeB := (methodsChangedFiltered at:sel) second. |
|
1706 |
self withReadCursorDo:[ |
|
1707 |
"/ see if the semantics have changed (or only prettyPrinted) |
|
1708 |
RBParser notNil ifTrue:[ |
|
1709 |
(classChangeSet notNil |
|
1710 |
and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[ |
|
1711 |
parseError := false. |
|
1712 |
treeA := RBParser parseMethod:changeA source onError: [:str :pos | parseError := true]. |
|
1713 |
treeB := RBParser parseMethod:changeB source onError: [:str :pos | parseError := true]. |
|
1714 |
parseError ifFalse:[ |
|
17160 | 1715 |
(treeA "semanticallyEqualTo:" equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
12512 | 1716 |
self infoHolder value:'Methods only differ in formatting / comments.'. |
1717 |
] |
|
1718 |
] |
|
1719 |
]. |
|
1720 |
]. |
|
1721 |
self diffTextView |
|
1722 |
text1:(changeA prettyPrintedSource) |
|
1723 |
text2:(changeB prettyPrintedSource) |
|
1724 |
]. |
|
1725 |
self showDiffTextView. |
|
1726 |
self diffTextView moveToNextChanged |
|
15621 | 1727 |
] ifFalse:[ |
1728 |
self showVersionInfoIfNothingSelected |
|
12512 | 1729 |
] |
1730 |
||
1731 |
"Modified: / 03-09-1999 / 15:01:30 / ps" |
|
1732 |
"Modified: / 17-07-2012 / 18:27:06 / cg" |
|
1733 |
! |
|
1734 |
||
1735 |
methodsOnlyInASelectionChanged |
|
1736 |
" |
|
1737 |
the selection in the list of the 'method only in version A' changed. |
|
1738 |
Reset the selection of the two other lists and show the method in |
|
1739 |
the text view. |
|
1740 |
||
1741 |
<return: self> |
|
1742 |
" |
|
1743 |
|change sel| |
|
1744 |
||
1745 |
self infoHolder value:''. |
|
1746 |
||
1747 |
sel := self methodsOnlyInASelection value. |
|
1748 |
sel notNil ifTrue:[ |
|
1749 |
self methodsOnlyInBSelection value:nil. |
|
1750 |
self methodsChangedSelection value:nil. |
|
1751 |
change := methodsOnlyInAFiltered "self changeSetA" at:sel. |
|
1752 |
self methodText value:(change prettyPrintedSource). |
|
1753 |
self showSingleTextView. |
|
15621 | 1754 |
] ifFalse:[ |
1755 |
self showVersionInfoIfNothingSelected |
|
1756 |
]. |
|
12512 | 1757 |
|
1758 |
"Modified: / 17-07-2012 / 18:31:22 / cg" |
|
1759 |
! |
|
1760 |
||
1761 |
methodsOnlyInBSelectionChanged |
|
1762 |
" |
|
1763 |
the selection in the list of the 'method only in version B' changed. |
|
1764 |
Reset the selection of the two other lists and show the method in |
|
1765 |
the text view. |
|
1766 |
||
1767 |
<return: self> |
|
1768 |
" |
|
1769 |
|change sel| |
|
1770 |
||
1771 |
self infoHolder value:''. |
|
1772 |
||
1773 |
sel := self methodsOnlyInBSelection value. |
|
1774 |
sel notNil ifTrue:[ |
|
1775 |
self methodsOnlyInASelection value:nil. |
|
1776 |
self methodsChangedSelection value:nil. |
|
1777 |
change := methodsOnlyInBFiltered "self changeSetB" at:sel. |
|
1778 |
self methodText value:(change prettyPrintedSource). |
|
1779 |
self showSingleTextView. |
|
15621 | 1780 |
] ifFalse:[ |
1781 |
self showVersionInfoIfNothingSelected |
|
1782 |
]. |
|
12512 | 1783 |
|
1784 |
"Modified: / 17-07-2012 / 18:31:32 / cg" |
|
1785 |
! |
|
1786 |
||
14076 | 1787 |
selectedSymbolicVersionHolderChanged |
1788 |
self selectedVersionHolder |
|
1789 |
value:(symbolicToVersionMapping at:( self selectedSymbolicVersionHolder value )) |
|
1790 |
! |
|
1791 |
||
1792 |
selectedVersionHolderChanged |
|
1793 |
||
1794 |
self withWaitCursorDo:[ |
|
15621 | 1795 |
|idx prevSelectionIndexA prevSelectionIndexB prevSelectionIndexDifferent |
1796 |
previousChange previousClass previousSelector| |
|
1797 |
||
1798 |
"/ remember the previous selected method |
|
1799 |
(prevSelectionIndexA := methodsOnlyInASelection value) notNil ifTrue:[ |
|
1800 |
previousChange := methodsOnlyInAFiltered at:prevSelectionIndexA. |
|
1801 |
]. |
|
1802 |
(prevSelectionIndexB := methodsOnlyInBSelection value) notNil ifTrue:[ |
|
1803 |
previousChange := methodsOnlyInBFiltered at:prevSelectionIndexB. |
|
1804 |
]. |
|
1805 |
(prevSelectionIndexDifferent := methodsChangedSelection value) notNil ifTrue:[ |
|
1806 |
previousChange := (methodsChangedFiltered at:prevSelectionIndexDifferent) first. |
|
1807 |
]. |
|
1808 |
previousChange notNil ifTrue:[ |
|
1809 |
previousClass := previousChange className. |
|
1810 |
previousSelector := previousChange selector. |
|
1811 |
]. |
|
1812 |
||
1813 |
"/ possibly expand a contracted list |
|
14076 | 1814 |
selectedVersionHolder value = '...' ifTrue:[ |
1815 |
idx := self versionList size. |
|
1816 |
self updateVersionList. |
|
1817 |
selectedVersionHolder setValue:(self versionList at:idx). |
|
1818 |
]. |
|
1819 |
||
15621 | 1820 |
"/ update the view |
14076 | 1821 |
self |
1822 |
setupForClass:classHolder value |
|
1823 |
againstVersion:(selectedVersionHolder value). |
|
15621 | 1824 |
|
1825 |
"/ try to reselect the same method again. |
|
1826 |
previousChange notNil ifTrue:[ |
|
1827 |
"/ search a change for that in the three lists |
|
1828 |
||
1829 |
(idx := methodsChangedFiltered findFirst:[:entry | entry first className = previousClass |
|
1830 |
and:[ entry first selector = previousSelector]]) ~= 0 |
|
1831 |
ifTrue:[ |
|
1832 |
methodsChangedSelection value:idx. self methodsChangedSelectionChanged. |
|
1833 |
] ifFalse:[ |
|
1834 |
(idx := methodsOnlyInAFiltered findFirst:[:chg | chg className = previousClass |
|
1835 |
and:[ chg selector = previousSelector]]) ~= 0 |
|
1836 |
ifTrue:[ |
|
1837 |
methodsOnlyInASelection value:idx. self methodsOnlyInASelectionChanged |
|
1838 |
] ifFalse:[ |
|
1839 |
(idx := methodsOnlyInBFiltered findFirst:[:chg | chg className = previousClass |
|
1840 |
and:[ chg selector = previousSelector]]) ~= 0 |
|
1841 |
ifTrue:[ |
|
1842 |
methodsOnlyInBSelection value:idx. self methodsOnlyInBSelectionChanged. |
|
1843 |
] |
|
1844 |
] |
|
1845 |
]. |
|
1846 |
]. |
|
1847 |
self showVersionInfoIfNothingSelected |
|
14076 | 1848 |
] |
1849 |
! |
|
1850 |
||
2695 | 1851 |
update:something with:parameter from:changedObject |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1852 |
((changedObject == includeExtensionsHolder) |
11958 | 1853 |
or:[ changedObject == includeCategoryChangesHolder |
1854 |
or:[ changedObject == includeVersionMethodsHolder ]]) ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1855 |
self updateLists. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1856 |
^ self |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1857 |
]. |
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1858 |
|
11453 | 1859 |
(changedObject == classHolder |
2695 | 1860 |
or:[changedObject == versionAHolder |
11453 | 1861 |
or:[changedObject == versionBHolder]]) ifTrue:[ |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1862 |
self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value). |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1863 |
^ self |
2695 | 1864 |
]. |
1865 |
super update:something with:parameter from:changedObject |
|
10703 | 1866 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1867 |
"Modified: / 17-07-2012 / 17:48:58 / cg" |
2695 | 1868 |
! ! |
1869 |
||
2221 | 1870 |
!VersionDiffBrowser methodsFor:'initialization & release'! |
1871 |
||
1872 |
postBuildWith:aBuilder |
|
3147 | 1873 |
" |
1874 |
components which are invisible should be ignored by the panel. |
|
1875 |
Cannot be set via the interface builder. |
|
2221 | 1876 |
|
3147 | 1877 |
<return: self> |
1878 |
" |
|
1879 |
||
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1880 |
(self componentAt:#TopHorizontalPanel) ignoreInvisibleComponents:true. |
6642 | 1881 |
super postBuildWith:aBuilder |
14076 | 1882 |
! |
1883 |
||
1884 |
postOpenWith:aBuilder |
|
1885 |
super postOpenWith:aBuilder. |
|
1886 |
||
1887 |
self isMultipleVersionBrowser ifTrue:[ |
|
1888 |
self withWaitCursorDo:[ |
|
1889 |
self updateVersionList. |
|
1890 |
] |
|
1891 |
] |
|
2221 | 1892 |
! ! |
1893 |
||
1894 |
!VersionDiffBrowser methodsFor:'menu action'! |
|
1895 |
||
2465 | 1896 |
browseChange:aChange |
6828 | 1897 |
"browse the change in aChange" |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1898 |
|
7396 | 1899 |
|cls sel m browserClass| |
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
1900 |
|
2578
29264fb3847e
avoid debugger in browse-menu
Claus Gittinger <cg@exept.de>
parents:
2536
diff
changeset
|
1901 |
aChange isNil ifTrue:[^ self]. |
7396 | 1902 |
browserClass := UserPreferences systemBrowserClass. |
1903 |
||
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
1904 |
cls := aChange changeClass. |
11962 | 1905 |
cls isNil ifTrue:[ |
1906 |
Dialog information:'The class is not present in the image'. |
|
1907 |
^ self |
|
1908 |
]. |
|
7396 | 1909 |
aChange isMethodChange ifTrue:[ |
11962 | 1910 |
sel := aChange changeSelector. |
7396 | 1911 |
"/ (cls compiledMethodAt:sel) isNil ifTrue:[ |
1912 |
"/ (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[ |
|
1913 |
"/ browserClass openInClass:cls |
|
1914 |
"/ ]. |
|
1915 |
"/ sel := nil. |
|
1916 |
"/ ] |
|
1917 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1918 |
self withWaitCursorDo:[ |
11962 | 1919 |
browserClass openInClass:cls selector:sel. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1920 |
] |
6828 | 1921 |
|
7396 | 1922 |
"Modified: / 12-10-2006 / 23:58:40 / cg" |
2465 | 1923 |
! |
1924 |
||
1925 |
browseClassInA |
|
6828 | 1926 |
"browse the selected method." |
1927 |
self browseChange:(self selectedChangeInA). |
|
2507 | 1928 |
|
6828 | 1929 |
"Modified: / 25-07-2006 / 11:14:02 / cg" |
2465 | 1930 |
! |
2221 | 1931 |
|
2465 | 1932 |
browseClassInB |
6828 | 1933 |
"browse the selected method." |
1934 |
self browseChange:(self selectedChangeInB). |
|
2507 | 1935 |
|
6828 | 1936 |
"Modified: / 25-07-2006 / 11:13:58 / cg" |
2465 | 1937 |
! |
1938 |
||
1939 |
browseClassInM |
|
6828 | 1940 |
"browse the selected method." |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1941 |
|
6828 | 1942 |
self browseChange:(self selectedChangesInM first). |
2507 | 1943 |
|
6828 | 1944 |
"Modified: / 25-07-2006 / 11:13:54 / cg" |
2465 | 1945 |
! |
1946 |
||
2469 | 1947 |
createPatchFile |
15621 | 1948 |
"create a patchFile, to patch the old version (versionA) into the new version (versionB). |
2856 | 1949 |
I.e. a little changeFile to transport those changes." |
1950 |
||
15621 | 1951 |
|defaultName diffSet f oldVersion newVersion vsnMthdA vsnMthdB vsnA vsnB info classBeingCompared| |
1952 |
||
1953 |
self warn:'Sorry: This function is not yet implemented'. |
|
2856 | 1954 |
defaultName := 'patchFile.chg'. |
2469 | 1955 |
|
6828 | 1956 |
classBeingCompared := classChangeSet classBeingCompared. |
15621 | 1957 |
defaultName := '%1-%2-to-%3.chg' |
1958 |
bindWith:(classBeingCompared isNil ifTrue:['unknown'] ifFalse:[classBeingCompared nameWithoutPrefix]) |
|
1959 |
with:(classChangeSet versionA ? 'old') |
|
1960 |
with:(classChangeSet versionB ? 'new'). |
|
11453 | 1961 |
f := Dialog |
15621 | 1962 |
requestFileNameForSave:'Name of patchFile:' |
1963 |
default:defaultName. |
|
1964 |
self halt. |
|
1965 |
diffSet := classChangeSet diffSet. |
|
2730 | 1966 |
^ self. |
1967 |
||
11453 | 1968 |
"/ vsnMthdA := self changeSetA |
3103 | 1969 |
"/ detect:[:ch | ch isMethodChange |
1970 |
"/ and:[ch changeClass isMeta |
|
1971 |
"/ and:[ch changeSelector = #version]]] |
|
1972 |
"/ ifNone:nil. |
|
11453 | 1973 |
"/ vsnMthdB := self changeSetA |
3103 | 1974 |
"/ detect:[:ch | ch isMethodChange |
1975 |
"/ and:[ch changeClass isMeta |
|
1976 |
"/ and:[ch changeSelector = #version]]] |
|
1977 |
"/ ifNone:nil. |
|
1978 |
"/ |
|
1979 |
"/ vsnMthdA notNil ifTrue:[ |
|
11453 | 1980 |
"/ "/ extract the version |
3103 | 1981 |
"/ vsnA := Class revisionStringFromSource:vsnMthdA source. |
1982 |
"/ vsnA notNil ifTrue:[ |
|
1983 |
"/ info := Class revisionInfoFromString:vsnA. |
|
1984 |
"/ info notNil ifTrue:[ |
|
1985 |
"/ vsnA := info at:#revision ifAbsent:nil. |
|
1986 |
"/ ] ifFalse:[ |
|
1987 |
"/ vsnA := nil. |
|
1988 |
"/ ]. |
|
1989 |
"/ ]. |
|
1990 |
"/ ]. |
|
1991 |
"/ vsnMthdB notNil ifTrue:[ |
|
11453 | 1992 |
"/ "/ extract the version |
3103 | 1993 |
"/ vsnB := Class revisionStringFromSource:vsnMthdB source. |
1994 |
"/ vsnB notNil ifTrue:[ |
|
1995 |
"/ info := Class revisionInfoFromString:vsnB. |
|
1996 |
"/ info notNil ifTrue:[ |
|
1997 |
"/ vsnB := info at:#revision ifAbsent:nil. |
|
1998 |
"/ ] ifFalse:[ |
|
1999 |
"/ vsnB := nil. |
|
2000 |
"/ ]. |
|
2001 |
"/ ]. |
|
2002 |
"/ ]. |
|
2003 |
"/ |
|
2004 |
"/ (vsnA isNil or:[vsnB isNil or:[vsnA = vsnB]]) ifTrue:[ |
|
2005 |
"/ self warn:'The generated patch file will not be able to validate/update the class version'. |
|
2006 |
"/ ]. |
|
2007 |
"/ |
|
2008 |
"/self halt:'not yet finished'. |
|
6828 | 2009 |
|
9602 | 2010 |
"Modified: / 27-10-2010 / 11:34:58 / cg" |
2469 | 2011 |
! |
2012 |
||
2465 | 2013 |
inspectSelectedChangeInA |
6828 | 2014 |
"inspect the selected method change for the 'method only in version A'." |
2507 | 2015 |
|
2465 | 2016 |
self selectedChangeInA inspect. |
6828 | 2017 |
|
2018 |
"Modified: / 25-07-2006 / 11:13:30 / cg" |
|
2221 | 2019 |
! |
2020 |
||
2021 |
inspectSelectedChangeInB |
|
6828 | 2022 |
"inspect the selected method change for the 'method only in version B'." |
2507 | 2023 |
|
2465 | 2024 |
self selectedChangeInB inspect. |
6828 | 2025 |
|
2026 |
"Modified: / 25-07-2006 / 11:13:22 / cg" |
|
2465 | 2027 |
! |
2028 |
||
2029 |
inspectSelectedChangeInM |
|
6828 | 2030 |
"inspect the two method changes for the selected 'changed method'." |
2507 | 2031 |
|
2465 | 2032 |
|changes| |
2033 |
||
2034 |
changes := self selectedChangesInM. |
|
2035 |
changes do:[:change | |
|
11453 | 2036 |
change inspect |
2465 | 2037 |
]. |
6828 | 2038 |
|
2039 |
"Modified: / 25-07-2006 / 11:13:13 / cg" |
|
2465 | 2040 |
! |
2041 |
||
2501 | 2042 |
mainMenu |
6828 | 2043 |
"if this application runs as an subapplication, |
2044 |
the menu bar should not be used." |
|
2507 | 2045 |
|
2501 | 2046 |
self masterApplication isNil ifTrue:[ |
11453 | 2047 |
^ self class mainMenu |
2501 | 2048 |
]. |
2049 |
^ nil |
|
6828 | 2050 |
|
2051 |
"Modified: / 25-07-2006 / 11:13:44 / cg" |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2052 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2053 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2054 |
openDocumentation |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2055 |
HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF' |
11855
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2056 |
! |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2057 |
|
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2058 |
removeClassFromChangeSet |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2059 |
|cls ok changedClasses| |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2060 |
|
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2061 |
classChangeSet notNil ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2062 |
"/ only do if we compare a single class |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2063 |
(cls := classChangeSet classBeingCompared) notNil ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2064 |
ok := classChangeSet diffSet isEmptyOrNil. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2065 |
ok ifFalse:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2066 |
changedClasses := classChangeSet diffSet changedClasses. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2067 |
(changedClasses size == 1 |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2068 |
and:[ changedClasses anElement theNonMetaclass == cls theNonMetaclass]) ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2069 |
(methodsChangedFiltered isEmptyOrNil |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2070 |
and:[ methodsOnlyInAFiltered isEmptyOrNil |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2071 |
and:[ methodsOnlyInBFiltered isEmptyOrNil ]]) ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2072 |
ok := true. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2073 |
] |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2074 |
] |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2075 |
]. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2076 |
ok ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2077 |
ChangeSet current condenseChangesForClass:cls |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2078 |
]. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2079 |
]. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2080 |
]. |
2221 | 2081 |
! ! |
2082 |
||
2083 |
!VersionDiffBrowser methodsFor:'private'! |
|
2084 |
||
2745 | 2085 |
addAcceptToTextViewMenus |
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2086 |
"add to the standard diff text view or single text views menu an accept entry. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2087 |
The acceptAction will fetch the corresponding change and apply it |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2088 |
(not the shown text) |
2745 | 2089 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2090 |
<return: self> |
3147 | 2091 |
" |
2745 | 2092 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2093 |
|diffTextView leftView rightView singleView| |
2745 | 2094 |
|
2095 |
diffTextView := self diffTextView. |
|
2096 |
leftView := diffTextView leftTextView. |
|
2097 |
rightView := diffTextView rightTextView. |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2098 |
singleView := self componentAt:#singleTextView. |
2745 | 2099 |
|
11453 | 2100 |
(Array |
13547 | 2101 |
with:leftView |
2102 |
with:rightView |
|
2103 |
with:singleView) |
|
2745 | 2104 |
do:[:v | |
13547 | 2105 |
|mGen| |
2106 |
||
2107 |
mGen := [ |
|
2108 |
|m| |
|
2109 |
||
2110 |
m := v editMenu. |
|
2111 |
||
2112 |
(m selectorAt:#accept) isNil ifTrue:[ |
|
2113 |
m addLabels:(resources array:#('-' 'Accept')) |
|
2114 |
selectors:#(nil #accept) |
|
2115 |
after:#copySelection. |
|
2116 |
]. |
|
2117 |
m |
|
2118 |
actionAt:#accept |
|
2119 |
put:[ |
|
2120 |
v == singleView ifTrue:[ |
|
2121 |
self acceptInSingleView |
|
2122 |
] ifFalse:[ |
|
2123 |
v == leftView ifTrue:[ |
|
2124 |
self acceptInLeftView |
|
2125 |
] ifFalse:[ |
|
2126 |
self acceptInRightView |
|
2127 |
]. |
|
2128 |
]. |
|
2129 |
]. |
|
2130 |
m selectorAt:#accept put:nil. |
|
2131 |
m enable:#copySelection. |
|
2132 |
m setEnable:#accept to:[self canAcceptInCodeView]. |
|
2133 |
m |
|
2134 |
]. |
|
2135 |
v menuHolder:mGen. |
|
2136 |
v menuMessage:#value. |
|
2745 | 2137 |
] |
2138 |
! |
|
2139 |
||
3753 | 2140 |
applyChange:change |
2141 |
change notNil ifTrue:[ |
|
11453 | 2142 |
change apply |
3753 | 2143 |
] |
2144 |
! |
|
2145 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2146 |
printStringForChange:aChange |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2147 |
"generate a print string for a change." |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2148 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2149 |
|m changeClassName classOrMetaString useChangesString selectorString |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2150 |
singleComparedClass singleComparedClassesName singleComparedMetaclassesName |
13137 | 2151 |
printString class1 class2| |
2152 |
||
2153 |
class1 := self classChangeSet class1BeingCompared. |
|
2154 |
class2 := self classChangeSet class2BeingCompared. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2155 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2156 |
(singleComparedClass := self classBeingCompared) notNil ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2157 |
singleComparedClassesName := singleComparedClass name. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2158 |
singleComparedMetaclassesName := singleComparedClass theMetaclass name. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2159 |
]. |
2497 | 2160 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2161 |
aChange isClassDefinitionChange ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2162 |
^ aChange printStringWithoutClassName |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2163 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2164 |
aChange isDoIt ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2165 |
^ aChange source , ' (doIt)' |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2166 |
]. |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2167 |
aChange isNameSpaceCreationChange ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2168 |
^ aChange source |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2169 |
]. |
3678 | 2170 |
|
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2171 |
changeClassName := aChange className. |
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2172 |
changeClassName isNil ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2173 |
^ aChange source |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2174 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2175 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2176 |
useChangesString := false. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2177 |
classOrMetaString := ''. |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2178 |
|
13137 | 2179 |
(class1 notNil |
2180 |
and:[ class2 notNil |
|
2181 |
and:[ class1 ~= class2 ]]) ifTrue:[ |
|
2182 |
changeClassName := ''. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2183 |
] ifFalse:[ |
13137 | 2184 |
(changeClassName = singleComparedClassesName) ifTrue:[ |
2185 |
"/ changeClassName := ''. |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2186 |
useChangesString := true. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2187 |
] ifFalse:[ |
13137 | 2188 |
(changeClassName = singleComparedMetaclassesName) ifTrue:[ |
2189 |
"/ classOrMetaString := ' class'. |
|
2190 |
useChangesString := true. |
|
2191 |
] ifFalse:[ |
|
2192 |
((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[ |
|
2193 |
changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1. |
|
2194 |
]. |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2195 |
]. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2196 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2197 |
]. |
6272 | 2198 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2199 |
selectorString := ''. |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2200 |
(aChange isMethodChange) ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2201 |
selectorString := aChange selector. |
13137 | 2202 |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2203 |
aChange changeClass notNil ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2204 |
m := aChange changeMethod. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2205 |
m notNil ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2206 |
m := m originalMethodIfWrapped. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2207 |
selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2208 |
]. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2209 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2210 |
changeClassName notEmptyOrNil ifTrue:[ |
17160 | 2211 |
selectorString := ' » ',selectorString |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2212 |
] |
2497 | 2213 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2214 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2215 |
printString := changeClassName,classOrMetaString,selectorString. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2216 |
aChange isMethodCategoryChange ifTrue:[ |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2217 |
^ printString, ' (category)' |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2218 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2219 |
^ printString |
9587
9f33d5c62efa
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
9550
diff
changeset
|
2220 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2221 |
"Modified: / 17-07-2012 / 18:43:27 / cg" |
2497 | 2222 |
! |
2223 |
||
2501 | 2224 |
resetSelectionHolders |
3147 | 2225 |
" |
2226 |
reset all selection holders when a new change set is given. |
|
11453 | 2227 |
First set the selection to nil. |
2507 | 2228 |
|
3147 | 2229 |
<return: self> |
2230 |
" |
|
2501 | 2231 |
|
2232 |
self methodsChangedSelection value:nil. |
|
2233 |
self methodsOnlyInASelection value:nil. |
|
2234 |
self methodsOnlyInBSelection value:nil. |
|
2507 | 2235 |
self diffTextView text1:'' text2:''. |
2236 |
self methodText value:''. |
|
2237 |
||
2238 |
"/ self methodsChangedSelectionChanged. |
|
2239 |
"/ self methodsOnlyInASelectionChanged. |
|
2240 |
"/ self methodsOnlyInBSelectionChanged. |
|
2501 | 2241 |
! |
2242 |
||
2221 | 2243 |
showDiffTextView |
3147 | 2244 |
" |
2245 |
if a method change is selected, then show the diff text view. |
|
2246 |
Add an accept entry to the popup menu. |
|
2507 | 2247 |
|
3147 | 2248 |
<return: self> |
2249 |
" |
|
2694 | 2250 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2251 |
(self componentAt:#diffTextViewBox) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2252 |
(self componentAt:#singleTextView) beInvisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2253 |
(self componentAt:#diffTextView) realizeAllSubViews. |
2694 | 2254 |
|
2465 | 2255 |
self addAcceptToTextViewMenus. |
2221 | 2256 |
! |
2257 |
||
2258 |
showSingleTextView |
|
3147 | 2259 |
" |
2260 |
if a method is selected which is only in version A or B of the class, |
|
2261 |
then show the text view. |
|
2262 |
Add an accept entry to the popup menu. |
|
2507 | 2263 |
|
3147 | 2264 |
<return: self> |
2265 |
" |
|
2507 | 2266 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2267 |
(self componentAt:#singleTextView) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2268 |
(self componentAt:#diffTextViewBox) beInvisible. |
2501 | 2269 |
self addAcceptToTextViewMenus. |
2221 | 2270 |
! |
2271 |
||
15621 | 2272 |
showVersionInfoIfNothingSelected |
2273 |
"show the revision info (author, date, time and logMessage), if no method is selected" |
|
2274 |
||
2275 |
|revInfo infoText| |
|
2276 |
||
2277 |
self infoHolder value:''. |
|
2278 |
||
2279 |
(methodsOnlyInASelection value isNil |
|
2280 |
and:[ methodsOnlyInBSelection value isNil |
|
2281 |
and:[ methodsChangedSelection value isNil ]]) ifTrue:[ |
|
2282 |
revInfo := versionInfoList detect:[:info | (info at:#revision) = selectedVersionHolder value] ifNone:nil. |
|
2283 |
revInfo notNil ifTrue:[ |
|
2284 |
infoText := 'Revision: %1\Author: %2\Date: %3\Log:\\%4' withCRs |
|
2285 |
bindWith:(revInfo at:#revision) |
|
2286 |
with:(revInfo at:#author) |
|
2287 |
with:(revInfo at:#date) |
|
2288 |
with:(revInfo at:#logMessage). |
|
2289 |
]. |
|
2290 |
self methodText value:infoText. |
|
2291 |
self showSingleTextView. |
|
2292 |
]. |
|
2293 |
! |
|
2294 |
||
2497 | 2295 |
updateLabels |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2296 |
"update the labels of the diff text view. Show the version numbers |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2297 |
of the class." |
2221 | 2298 |
|
16711 | 2299 |
|theVersionA theVersionB builder makeLabel| |
2300 |
||
2301 |
makeLabel := |
|
2302 |
[:theVersion | |
|
2303 |
|label date author revInfo| |
|
2304 |
||
2305 |
label := theVersion. |
|
2306 |
versionInfoList notNil ifTrue:[ |
|
2307 |
revInfo := versionInfoList detect:[:info | (info at:#revision) = theVersion] ifNone:nil. |
|
2308 |
revInfo notNil ifTrue:[ |
|
2309 |
date := (Timestamp readGeneralizedFrom:(revInfo at:#date)) asDate. |
|
2310 |
author := (revInfo at:#author) ? '?'. |
|
2311 |
label := theVersion , ' [',date printString,' by ',author,']'. |
|
2312 |
]. |
|
2313 |
]. |
|
2314 |
label |
|
2315 |
]. |
|
2316 |
||
2694 | 2317 |
builder := self builder. |
2497 | 2318 |
(theVersionA := self versionA) notNil ifTrue:[ |
16711 | 2319 |
self diffTextLabelA value:(makeLabel value:theVersionA). |
16710 | 2320 |
self onlyInALabelHolder value:('Only in ' , theVersionA). |
2321 |
(self componentAt:#OnlyInALabel) |
|
2322 |
foregroundColor:Color white; |
|
2323 |
backgroundColor:Color green darkened. |
|
2224 | 2324 |
]. |
2497 | 2325 |
(theVersionB :=self versionB) notNil ifTrue:[ |
16711 | 2326 |
self diffTextLabelB value:(makeLabel value:theVersionB). |
16710 | 2327 |
self onlyInBLabelHolder value:('Only in ' , theVersionB). |
2328 |
(self componentAt:#OnlyInBLabel) |
|
2329 |
foregroundColor:Color white; |
|
2330 |
backgroundColor:Color red darkened. |
|
2224 | 2331 |
]. |
7396 | 2332 |
|
2333 |
self changedLabelHolder value:('Different'). |
|
2334 |
||
2335 |
"Modified: / 13-10-2006 / 01:07:08 / cg" |
|
2224 | 2336 |
! |
2337 |
||
2338 |
updateLists |
|
13137 | 2339 |
"walk over the changeSet and setup the 3 lists: |
2340 |
onlyInA, changed, onlyInB, |
|
2341 |
Optionally filter extensions, categoryChanges and versionMethods" |
|
2342 |
||
11453 | 2343 |
|classChangeSet listOnlyInA listOnlyInB listChanged |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2344 |
printStringGenerator sortBlockForChangeLists filteredList |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2345 |
isIgnoredChange numIgnoredExtensions numIgnoredVersionMethods |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2346 |
info needFilter| |
2230
5e10eebb1de2
move change-compare code to where it belongs (Change-hierarchy)
Claus Gittinger <cg@exept.de>
parents:
2229
diff
changeset
|
2347 |
|
2585 | 2348 |
classChangeSet := self classChangeSet. |
2349 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2350 |
printStringGenerator := [:aChange | self printStringForChange:aChange]. |
3839 | 2351 |
sortBlockForChangeLists := [:a :b | (printStringGenerator value:a) < (printStringGenerator value:b)]. |
2352 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2353 |
numIgnoredExtensions := numIgnoredVersionMethods := 0. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2354 |
needFilter := self includeExtensions not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2355 |
or:[self includeCategoryChanges not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2356 |
or:[self includeVersionMethods not]]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2357 |
|
11962 | 2358 |
needFilter ifTrue:[ |
2359 |
isIgnoredChange := |
|
2360 |
[:change | |
|
2361 |
|packageOfMethodInChange packageOfMethodInImage changeMethod ignored| |
|
2362 |
||
2363 |
ignored := false. |
|
2364 |
change isMethodCodeChange ifTrue:[ |
|
2365 |
self includeExtensions ifFalse:[ |
|
2366 |
packageOfMethodInChange := change package. |
|
2367 |
(packageOfMethodInChange notNil |
|
2368 |
and:[ packageOfMethodInChange ~= PackageId noProjectID |
|
12865 | 2369 |
and:[ change changeClass notNil |
2370 |
and:[ packageOfMethodInChange ~= change changeClass package ]]]) ifTrue:[ |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2371 |
ignored := true |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2372 |
]. |
11962 | 2373 |
|
2374 |
changeMethod := change changeMethod. |
|
2375 |
changeMethod notNil ifTrue:[ |
|
2376 |
packageOfMethodInImage := changeMethod package. |
|
2377 |
(true "packageOfMethodInImage notNil" |
|
2378 |
and:[ packageOfMethodInImage ~= PackageId noProjectID |
|
2379 |
and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[ |
|
2380 |
ignored := true |
|
2381 |
]. |
|
2382 |
]. |
|
2383 |
numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]). |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2384 |
]. |
11962 | 2385 |
self includeVersionMethods ifFalse:[ |
2386 |
(change isMethodChangeForVersionMethod |
|
2387 |
or:[ change isMethodChangeForExtensionsVersionMethod ]) ifTrue:[ |
|
2388 |
ignored := true. |
|
2389 |
numIgnoredVersionMethods := numIgnoredVersionMethods + 1 |
|
2390 |
]. |
|
2391 |
]. |
|
2392 |
] ifFalse:[ |
|
2393 |
change isMethodCategoryChange ifTrue:[ |
|
2394 |
self includeCategoryChanges ifFalse:[ |
|
2395 |
ignored := true |
|
2396 |
] |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2397 |
]. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2398 |
]. |
11962 | 2399 |
ignored. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2400 |
]. |
11962 | 2401 |
] ifFalse:[ |
2402 |
isIgnoredChange := [:change | false]. |
|
2403 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2404 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2405 |
listOnlyInA := filteredList := self methodsOnlyInA. |
2731 | 2406 |
listOnlyInA removeAll. |
2407 |
classChangeSet notNil ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2408 |
"/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists. |
11962 | 2409 |
filteredList := classChangeSet methodsOnlyInA reject:isIgnoredChange. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2410 |
listOnlyInA addAll: (filteredList collect:printStringGenerator). |
2731 | 2411 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2412 |
methodsOnlyInAFiltered := filteredList. |
2585 | 2413 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2414 |
listOnlyInB := filteredList := self methodsOnlyInB. |
2731 | 2415 |
listOnlyInB removeAll. |
2416 |
classChangeSet notNil ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2417 |
"/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists. |
11962 | 2418 |
filteredList := classChangeSet methodsOnlyInB reject:isIgnoredChange. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2419 |
listOnlyInB addAll: (filteredList collect:printStringGenerator). |
2731 | 2420 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2421 |
methodsOnlyInBFiltered := filteredList. |
2221 | 2422 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2423 |
listChanged := filteredList := self methodsChanged. |
2731 | 2424 |
listChanged removeAll. |
2425 |
classChangeSet notNil ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2426 |
"/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first]. |
11962 | 2427 |
filteredList := classChangeSet methodsChanged reject:[:entry | isIgnoredChange value:entry first]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2428 |
listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]). |
2731 | 2429 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2430 |
methodsChangedFiltered := filteredList. |
2221 | 2431 |
|
2731 | 2432 |
self boxAVisible value:(listOnlyInA notEmpty). |
2433 |
self boxBVisible value:(listOnlyInB notEmpty). |
|
2221 | 2434 |
|
11453 | 2435 |
self boxMVisible value:(listChanged isEmpty |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2436 |
and: [(listOnlyInA notEmpty |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2437 |
or:[listOnlyInB notEmpty])]) not. |
11453 | 2438 |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2439 |
info := ''. |
11453 | 2440 |
numIgnoredExtensions ~~ 0 ifTrue:[ |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2441 |
info := info , ('%1 extension methods ignored. ' bindWith:numIgnoredExtensions). |
11453 | 2442 |
]. |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2443 |
numIgnoredVersionMethods ~~ 0 ifTrue:[ |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2444 |
info := info , ('%1 version methods ignored.' bindWith:numIgnoredVersionMethods). |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2445 |
]. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2446 |
self infoHolder value:info |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2447 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2448 |
"Modified: / 17-07-2012 / 18:34:36 / cg" |
14076 | 2449 |
! |
2450 |
||
2451 |
updateVersionList |
|
15621 | 2452 |
"asks the classes source code manager for a list of revisions; |
2453 |
construct versionInfoList (containing the full info), versionList (containing version numbers only) |
|
2454 |
and tagList (containing symbolic names only)" |
|
2455 |
||
14076 | 2456 |
|cls sourceCodeManager numShown newNumShown numOverallRevisions |
2457 |
partialLog newestRev revisions symbolicNames |
|
2458 |
stableRevision releasedRevision tagList logMessages items| |
|
2459 |
||
2460 |
cls := classHolder value. |
|
2461 |
sourceCodeManager := cls sourceCodeManager. |
|
2462 |
||
2463 |
numShown := versionList size - 1. |
|
2464 |
newNumShown := (numShown + 50) max:30. |
|
2465 |
partialLog := sourceCodeManager revisionLogOf:cls numberOfRevisions:newNumShown. |
|
2466 |
||
2467 |
partialLog isNil ifTrue:[ |
|
2468 |
self warn:'Could not find/access the container for class ',cls name,' in the repository. |
|
2469 |
This could be due to: |
|
2470 |
- invalid/wrong CVS-Root setting |
|
2471 |
- missing CVS access rights |
|
2472 |
(no access / not logged in) |
|
2473 |
- changed CVSRoot after compilation |
|
2474 |
(i.e. wrong CVS-path in classes version method) |
|
2475 |
'. |
|
2476 |
^ nil |
|
2477 |
]. |
|
15621 | 2478 |
|
14076 | 2479 |
numOverallRevisions := partialLog at:#numberOfRevisions. |
2480 |
newestRev := partialLog at:#newestRevision. |
|
2481 |
revisions := partialLog at:#revisions. |
|
15621 | 2482 |
|
2483 |
"/ fetch the symbolic (tag) version list |
|
14076 | 2484 |
symbolicNames := partialLog at:#symbolicNames ifAbsent:[]. |
2485 |
symbolicNames notNil ifTrue:[ |
|
2486 |
stableRevision := symbolicNames at:'stable' ifAbsent:[]. |
|
2487 |
releasedRevision := symbolicNames at:'released' ifAbsent:[]. |
|
2488 |
tagList := ((symbolicNames associations sort:[:a :b | a key < b key "self versionString:(a value) isLessThan:(b value)"]) |
|
2489 |
collect:[:assoc | assoc key]) reverse. |
|
2490 |
tagList remove:'stable' ifAbsent:[]. |
|
2491 |
tagList notEmpty ifTrue:[tagList addFirst:'-']. |
|
2492 |
tagList addFirst:'stable'. |
|
2493 |
]. |
|
2494 |
logMessages := Dictionary new. |
|
2495 |
||
15621 | 2496 |
versionInfoList := revisions. |
2497 |
||
2498 |
"/ items := versionInfoList collect:[:each | |rev date who flag| |
|
2499 |
"/ rev := each at:#revision. |
|
2500 |
"/ logMessages at:rev put:(each at:#logMessage). |
|
2501 |
"/ date := (each at:#date ifAbsent:nil) ? '?'. |
|
2502 |
"/ who := (each at:#author ifAbsent:nil) ? '?'. |
|
2503 |
"/ rev = stableRevision ifTrue:[ |
|
2504 |
"/ flag := ' Stable' allBold. |
|
2505 |
"/ ] ifFalse:[rev = releasedRevision ifTrue:[ |
|
2506 |
"/ flag := ' Released' allBold. |
|
2507 |
"/ ] ifFalse:[ |
|
2508 |
"/ flag := ' ' |
|
2509 |
"/ ]]. |
|
2510 |
"/ rev allBold , flag, ' [' , date , ' by ' , who , ']' |
|
2511 |
"/ ]. |
|
2512 |
"/ |
|
2513 |
"/ revisions := revisions collect:[:eachItem | eachItem at:#revision]. |
|
2514 |
revisions := versionInfoList collect:[:each | each at:#revision]. |
|
2515 |
||
14076 | 2516 |
revisions size < numOverallRevisions ifTrue:[ |
2517 |
revisions add:'...' |
|
2518 |
]. |
|
2519 |
symbolicToVersionMapping := symbolicNames. |
|
2520 |
self symbolicVersionList contents:tagList. |
|
2521 |
self versionList contents:revisions. |
|
2221 | 2522 |
! ! |
2523 |
||
2501 | 2524 |
!VersionDiffBrowser methodsFor:'setup'! |
2525 |
||
2695 | 2526 |
setupForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2527 |
"compute the class change set for the class aClass of its current version against the repository version A. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2528 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2529 |
are updated." |
2695 | 2530 |
|
2731 | 2531 |
|changeSet| |
2532 |
||
2745 | 2533 |
aClass isNil ifTrue:[ |
16551 | 2534 |
changeSet := nil |
2745 | 2535 |
] ifFalse:[ |
16551 | 2536 |
(aClass isRealNameSpace) ifFalse:[ |
2537 |
aClass isLoaded ifTrue:[ |
|
2538 |
changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA). |
|
2539 |
] |
|
2540 |
]. |
|
2731 | 2541 |
]. |
2856 | 2542 |
self classChangeSet:changeSet. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
2543 |
aVersionA isNil ifTrue:[ |
16551 | 2544 |
self class:aClass versionA:'Repository' versionB:'Current'. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
2545 |
] ifFalse:[ |
16551 | 2546 |
self class:aClass versionA:aVersionA versionB:(aVersionA , 'm'). |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
2547 |
] |
2695 | 2548 |
! |
2549 |
||
2949 | 2550 |
setupForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2551 |
"generate the class change set from the two classes A and B. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2552 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2553 |
are updated." |
2949 | 2554 |
|
2555 |
|changeSet| |
|
2556 |
||
2557 |
changeSet := (ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB). |
|
2558 |
self classChangeSet:changeSet |
|
2559 |
! |
|
2560 |
||
2510 | 2561 |
setupForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2562 |
"generate the class change set from the two source files A and B. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2563 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2564 |
are updated." |
2510 | 2565 |
|
2731 | 2566 |
|changeSet| |
2567 |
||
9383 | 2568 |
aClass isRealNameSpace ifFalse:[ |
11453 | 2569 |
aClass isLoaded ifTrue:[ |
2570 |
changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB). |
|
2571 |
] |
|
2731 | 2572 |
]. |
2573 |
self classChangeSet:changeSet |
|
7499 | 2574 |
|
2575 |
"Modified: / 10-11-2006 / 17:15:26 / cg" |
|
2510 | 2576 |
! |
2577 |
||
2501 | 2578 |
setupForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2579 |
"compute the class change set for the class aClass and the versions A and B. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2580 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2581 |
are updated." |
2501 | 2582 |
|
2731 | 2583 |
|changeSet| |
2584 |
||
2585 |
aClass isNameSpace ifFalse:[ |
|
11453 | 2586 |
aClass isLoaded ifTrue:[ |
2587 |
changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB). |
|
2588 |
] |
|
2731 | 2589 |
]. |
2856 | 2590 |
self classChangeSet:changeSet. |
2591 |
self class:aClass versionA:aVersionA versionB:aVersionB. |
|
3678 | 2592 |
! |
2593 |
||
2594 |
setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB |
|
2595 |
|changeSet| |
|
2596 |
||
2597 |
changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB). |
|
2598 |
self classChangeSet:changeSet |
|
2501 | 2599 |
! ! |
2600 |
||
2497 | 2601 |
!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'! |
2602 |
||
11453 | 2603 |
changeSetForClass:aClass |
3756 | 2604 |
"return a ChangeSet for the class aClass and its current source. |
2605 |
The source is generated into a stream and then the change set is generated |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2606 |
from the source stream." |
2695 | 2607 |
|
3756 | 2608 |
^ ChangeSet forExistingClass:aClass. |
2695 | 2609 |
! |
2610 |
||
2497 | 2611 |
changeSetForClass:aClass andRevision:aVersion |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2612 |
"return a ChangeSet for the class aClass and version aVersion. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2613 |
The version from the class source stream is checked out from the repositiory |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2614 |
into a source stream. Then the change set is generated from the source stream." |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2615 |
|
2497 | 2616 |
|theSourceCodeManager theSourceStream theChangeSet| |
2617 |
||
13305 | 2618 |
theSourceCodeManager := SourceCodeManagerUtilities sourceCodeManagerFor:aClass. |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2619 |
[ |
13305 | 2620 |
theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion. |
15167 | 2621 |
theSourceStream notNil ifTrue:[ |
2622 |
theChangeSet := ChangeSet fromStream:theSourceStream |
|
2623 |
] |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2624 |
] ensure:[ |
13305 | 2625 |
theSourceStream notNil ifTrue:[theSourceStream close] |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2626 |
]. |
15167 | 2627 |
theChangeSet isNil ifTrue:[ |
2628 |
self error:'Could not read source of class ',aClass name mayProceed:true. |
|
2629 |
^ nil |
|
2630 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2631 |
self sortChangeSet:theChangeSet. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2632 |
^ theChangeSet |
7108 | 2633 |
|
2634 |
"Modified: / 12-09-2006 / 14:24:51 / cg" |
|
2497 | 2635 |
! |
2636 |
||
11453 | 2637 |
changeSetForClass:aClass andSource:aSource |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2638 |
"return a ChangeSet for the class aClass and source aSource. |
4638
79734f7bdfc4
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4359
diff
changeset
|
2639 |
The source is converted to a stream and then the change set is generated |
79734f7bdfc4
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4359
diff
changeset
|
2640 |
from the source stream. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2641 |
Raise an error if the source stream cannot be opened." |
4638
79734f7bdfc4
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4359
diff
changeset
|
2642 |
|
2497 | 2643 |
|theChangeSet theSourceStream| |
2644 |
||
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2645 |
[ |
15167 | 2646 |
theSourceStream := aSource readStream. |
2647 |
theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream) |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2648 |
] ensure:[ |
15167 | 2649 |
theSourceStream notNil ifTrue:[ |
2650 |
theSourceStream close |
|
2651 |
] |
|
2652 |
]. |
|
2653 |
theChangeSet isNil ifTrue:[ |
|
2654 |
self error:'Could not read source of class ',aClass name mayProceed:true. |
|
2655 |
^ nil |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2656 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2657 |
self sortChangeSet:theChangeSet. |
4653
0a97ce41f5bd
More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents:
4638
diff
changeset
|
2658 |
^ theChangeSet |
2497 | 2659 |
! |
2660 |
||
2695 | 2661 |
newForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2662 |
"return a ClassChangeSet for the class aClass against some verson in the repository. |
11453 | 2663 |
A new instance of ClassChangeSet is generated containing |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2664 |
the correspondenting changes." |
2695 | 2665 |
|
8891 | 2666 |
|theClassChangeSet| |
2695 | 2667 |
|
2668 |
theClassChangeSet := self new. |
|
8891 | 2669 |
theClassChangeSet setupForClass:aClass againstVersion:aVersionA. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2670 |
^ theClassChangeSet |
2695 | 2671 |
! |
2672 |
||
2949 | 2673 |
newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2674 |
"return a ClassChangeSet for two classes. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2675 |
A new instance of ClassChangeSet is generated containing the correspondenting changes." |
2949 | 2676 |
|
2677 |
|aStream sourceA sourceB theChangeSetA theChangeSetB theClassChangeSet| |
|
2678 |
||
2679 |
theClassChangeSet := self new. |
|
13137 | 2680 |
theClassChangeSet class1BeingCompared:classA class2BeingCompared:classB. |
2949 | 2681 |
theClassChangeSet labelA:aLabelA. |
2682 |
theClassChangeSet labelB:aLabelB. |
|
2683 |
||
16615 | 2684 |
theChangeSetA := ChangeSet forExistingClass:classA withExtensions:true withLooseMethods:true. |
2685 |
theChangeSetB := ChangeSet forExistingClass:classB withExtensions:true withLooseMethods:true. |
|
2686 |
||
2687 |
"/ aStream := '' writeStream. |
|
2688 |
"/ Method flushSourceStreamCache. |
|
2689 |
"/ classA fileOutOn:aStream withTimeStamp:false. |
|
2690 |
"/ sourceA := aStream contents asString. |
|
2691 |
||
2692 |
"/ aStream := '' writeStream. |
|
2693 |
"/ Method flushSourceStreamCache. |
|
2694 |
"/ classB fileOutOn:aStream withTimeStamp:false. |
|
2695 |
"/ sourceB := aStream contents asString. |
|
2696 |
||
2697 |
"/ theChangeSetA:=self changeSetForClass:classA andSource:sourceA. |
|
2698 |
"/ theChangeSetB:=self changeSetForClass:classB andSource:sourceB. |
|
2699 |
"/ theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
|
2700 |
"/ theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
|
2949 | 2701 |
|
2702 |
"/ just in case (if comparing a class against another), |
|
2703 |
"/ unify the classes of the changes (to avoid that all changes are detected as different) |
|
2704 |
||
16615 | 2705 |
"/ theChangeSetB do:[:eachChange | |
2706 |
"/ eachChange isMethodChange ifTrue:[ |
|
2707 |
"/ eachChange changeClass isMeta ifTrue:[ |
|
2708 |
"/ eachChange changeClass ~~ classA theMetaclass ifTrue:[ |
|
2709 |
"/ eachChange changeClass:classA theMetaclass. |
|
2710 |
"/ ] |
|
2711 |
"/ ] ifFalse:[ |
|
2712 |
"/ eachChange changeClass ~~ classA theNonMetaclass ifTrue:[ |
|
2713 |
"/ eachChange changeClass:classA theNonMetaclass. |
|
2714 |
"/ ] |
|
2715 |
"/ ]. |
|
2716 |
"/ ]. |
|
2717 |
"/ ]. |
|
2949 | 2718 |
"/ remove all #initialize doIts |
16615 | 2719 |
theChangeSetA := theChangeSetA reject:[:eachChange | eachChange isDoIt and:[eachChange isInitialize]]. |
2720 |
theChangeSetB := theChangeSetB reject:[:eachChange | eachChange isDoIt and:[eachChange isInitialize]]. |
|
2721 |
||
2722 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB comparingDifferentClasses:true). |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2723 |
^ theClassChangeSet |
2949 | 2724 |
! |
2725 |
||
2497 | 2726 |
newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2727 |
"return a ClassChangeSet for the class aClass and the two sources. |
11453 | 2728 |
The two classes are compared via the source files. A new instance of |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2729 |
ClassChangeSet is generated containing the correspondenting changes." |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2730 |
|
4128 | 2731 |
|theChangeSetA theChangeSetB theClassChangeSet className metaClassName| |
2497 | 2732 |
|
2733 |
theClassChangeSet := self new. |
|
2734 |
theClassChangeSet classBeingCompared:aClass. |
|
2735 |
theClassChangeSet labelA:aLabelA. |
|
2736 |
theClassChangeSet labelB:aLabelB. |
|
11453 | 2737 |
theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA. |
2497 | 2738 |
theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2739 |
|
4128 | 2740 |
className := aClass name. |
2741 |
metaClassName := aClass class name. |
|
2742 |
||
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2743 |
aClass isPrivate ifTrue:[ |
11453 | 2744 |
theChangeSetA := theChangeSetA select:[:change | change isMethodChange not |
2745 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2746 |
theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not |
|
2747 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2748 |
theChangeSetA := theChangeSetA select:[:change | change isDoIt not |
|
2749 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
|
2750 |
theChangeSetB := theChangeSetB select:[:change | change isMethodChange not |
|
2751 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2752 |
theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not |
|
2753 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2754 |
theChangeSetB := theChangeSetB select:[:change | change isDoIt not |
|
2755 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
|
2756 |
"/ there might be more needed... |
|
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2757 |
]. |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2758 |
|
2497 | 2759 |
theChangeSetA isNil |
11453 | 2760 |
ifTrue: [theChangeSetA := ChangeSet new]. |
2497 | 2761 |
theChangeSetB isNil |
11453 | 2762 |
ifTrue: [theChangeSetB := ChangeSet new]. |
2947 | 2763 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2764 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2765 |
^ theClassChangeSet |
2465 | 2766 |
! |
2767 |
||
2497 | 2768 |
newForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2769 |
"return a ClassChangeSet for the class aClass and the two versions. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2770 |
The two class version are checked out from the repository and then being |
11453 | 2771 |
compared. A new instance of ClassChangeSet is generated containing |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2772 |
the correspondenting changes." |
2497 | 2773 |
|
2774 |
|theChangeSetA theChangeSetB theClassChangeSet| |
|
2775 |
||
2776 |
theClassChangeSet := self new. |
|
2777 |
theClassChangeSet classBeingCompared:aClass. |
|
2856 | 2778 |
theClassChangeSet versionA:aVersionA. |
2779 |
theClassChangeSet versionB:aVersionB. |
|
2497 | 2780 |
theClassChangeSet labelA:aVersionA. |
2781 |
theClassChangeSet labelB:aVersionB. |
|
2782 |
theChangeSetA := self changeSetForClass: aClass andRevision: aVersionA. |
|
2783 |
theChangeSetB := self changeSetForClass: aClass andRevision: aVersionB. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2784 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2785 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2786 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2787 |
^ theClassChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2788 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2789 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2790 |
sortChangeSet:aChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2791 |
"/ sort by meta and selector |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2792 |
|
11453 | 2793 |
aChangeSet |
14363 | 2794 |
sort:[:a :b | |
2795 |
a == b ifTrue:[ |
|
2796 |
false |
|
2797 |
] ifFalse:[ |
|
2798 |
a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[ |
|
2799 |
a isClassChange == b isClassChange ifTrue:[ |
|
2800 |
a isClassChange ifTrue:[ |
|
2801 |
a isForMeta == b isForMeta ifTrue:[ |
|
2802 |
(a isMethodChange and:[b isMethodChange]) ifTrue:[ |
|
2803 |
a className < b className |
|
2804 |
or:[ a className = b className |
|
2805 |
and:[ a isPrimitiveChange not |
|
2806 |
and:[ b isPrimitiveChange not |
|
2807 |
and:[ a selector < b selector ]]]] |
|
2808 |
] ifFalse:[ |
|
2809 |
a isMethodChange not |
|
2810 |
]. |
|
2811 |
] ifFalse:[ |
|
2812 |
a isForMeta |
|
2813 |
]. |
|
2814 |
] ifFalse:[ |
|
2815 |
a printString < b printString |
|
2816 |
]. |
|
2817 |
] ifFalse:[ |
|
2818 |
a isClassChange |
|
2819 |
]. |
|
2820 |
] ifFalse:[ |
|
2821 |
a isClassDefinitionChange |
|
2822 |
]. |
|
2823 |
] |
|
2824 |
]. |
|
2497 | 2825 |
! ! |
2826 |
||
2827 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'! |
|
2828 |
||
13137 | 2829 |
class1BeingCompared |
2830 |
"returns the class which is compared" |
|
2831 |
||
2832 |
^ class1BeingCompared |
|
2833 |
! |
|
2834 |
||
2835 |
class1BeingCompared:class1 class2BeingCompared:class2 |
|
2836 |
"returns the class which is compared" |
|
2837 |
||
2838 |
class1BeingCompared := class1. |
|
2839 |
class2BeingCompared := class2 |
|
2840 |
! |
|
2841 |
||
2842 |
class2BeingCompared |
|
2843 |
"returns the class which is compared" |
|
2844 |
||
2845 |
^ class2BeingCompared |
|
2846 |
! |
|
2847 |
||
2497 | 2848 |
classBeingCompared |
13137 | 2849 |
"returns the class which is compared" |
2850 |
||
2851 |
^ class1BeingCompared |
|
2497 | 2852 |
! |
2221 | 2853 |
|
2497 | 2854 |
classBeingCompared:something |
3756 | 2855 |
"set the value of the class which is compared" |
2497 | 2856 |
|
13137 | 2857 |
class1BeingCompared := class2BeingCompared := something. |
2497 | 2858 |
! |
2859 |
||
2695 | 2860 |
diffSet |
3756 | 2861 |
"returns a diffSet containing the different changes. |
2862 |
it responds to: |
|
2695 | 2863 |
|
11453 | 2864 |
changed OrderedCollection of arrays containing ChangeSets for methods |
2865 |
which are changed and exists in the class versionA and versionB |
|
3756 | 2866 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
2867 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
11453 | 2868 |
" |
3756 | 2869 |
|
2695 | 2870 |
^ diffSet |
2871 |
! |
|
2872 |
||
2873 |
diffSet:something |
|
3756 | 2874 |
"sets the diffSet containing the different changes. |
2875 |
it responds to: |
|
2695 | 2876 |
|
11453 | 2877 |
changed OrderedCollection of arrays containing ChangeSets for methods |
2878 |
which are changed and exists in the class versionA and versionB |
|
3756 | 2879 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
2880 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
11453 | 2881 |
" |
2695 | 2882 |
|
2883 |
diffSet := something. |
|
2884 |
! |
|
2885 |
||
2497 | 2886 |
labelA |
3756 | 2887 |
"returns the label for the class versionA" |
2497 | 2888 |
|
2889 |
^ labelA |
|
2890 |
! |
|
2891 |
||
2892 |
labelA:something |
|
3756 | 2893 |
"sets the label for the class versionA" |
2497 | 2894 |
|
2895 |
labelA := something. |
|
2896 |
! |
|
2897 |
||
2898 |
labelB |
|
3756 | 2899 |
"returns the label for the class versionB" |
2497 | 2900 |
|
2901 |
^ labelB |
|
2902 |
! |
|
2465 | 2903 |
|
2497 | 2904 |
labelB:something |
3756 | 2905 |
"sets the label for the class versionB" |
2497 | 2906 |
|
2907 |
labelB := something. |
|
2908 |
! |
|
2909 |
||
2910 |
methodsChanged |
|
11453 | 2911 |
"returns an OrderedCollection of arrays containing ChangeSets for methods |
3756 | 2912 |
which are changed and exists in the class versionA and versionB |
2497 | 2913 |
|
3756 | 2914 |
<return: OrderedCollection of Array(2)> |
2915 |
" |
|
2916 |
||
2917 |
^ self diffSet changed |
|
2497 | 2918 |
! |
2919 |
||
2920 |
methodsOnlyInA |
|
11453 | 2921 |
"returns a ChangeSet for the methods which exists only in the class versionA" |
2497 | 2922 |
|
3756 | 2923 |
^ self diffSet onlyInReceiver |
2497 | 2924 |
! |
2925 |
||
2926 |
methodsOnlyInB |
|
11453 | 2927 |
"returns a ChangeSet for the methods which exists only in the class versionB" |
2497 | 2928 |
|
3756 | 2929 |
^ self diffSet onlyInArg |
2856 | 2930 |
! |
2931 |
||
2932 |
versionA |
|
2933 |
^ versionA |
|
2934 |
! |
|
2935 |
||
2936 |
versionA:something |
|
2937 |
versionA := something. |
|
2938 |
! |
|
2939 |
||
2940 |
versionB |
|
2941 |
^ versionB |
|
2942 |
! |
|
2943 |
||
2944 |
versionB:something |
|
2945 |
versionB := something. |
|
2221 | 2946 |
! ! |
2947 |
||
8891 | 2948 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'misc'! |
2949 |
||
2950 |
removeAllVersionMethods |
|
2951 |
diffSet removeAllVersionMethods. |
|
2952 |
! ! |
|
2953 |
||
2954 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'setup'! |
|
2955 |
||
2956 |
setupForClass:aClass againstVersion:aVersionA |
|
2957 |
"return a ClassChangeSet for the class aClass against some verison in the repository. |
|
11453 | 2958 |
A new instance of ClassChangeSet is generated containing |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2959 |
the correspondenting changes." |
8891 | 2960 |
|
2961 |
|theChangeSetA theChangeSetB versionCompared| |
|
2962 |
||
2963 |
self classBeingCompared:aClass. |
|
2964 |
versionCompared := aVersionA. |
|
2965 |
aVersionA isNil ifTrue:[ |
|
11453 | 2966 |
self labelA:(versionCompared := aClass revision). |
2967 |
self versionA:versionCompared. |
|
8891 | 2968 |
] ifFalse:[ |
11453 | 2969 |
aVersionA == #newest ifTrue:[ |
2970 |
self labelA:(VersionDiffBrowser resources string:'Newest'). |
|
2971 |
] ifFalse:[ |
|
2972 |
self labelA:versionCompared. |
|
2973 |
self versionA:versionCompared. |
|
2974 |
] |
|
8891 | 2975 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2976 |
self labelB:(VersionDiffBrowser resources string:'Current'). |
8891 | 2977 |
theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared. |
2978 |
theChangeSetB := self class changeSetForClass: aClass. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2979 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2980 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2981 |
|
8891 | 2982 |
"/ if we are comparing a private class, prune out other changes |
2983 |
aClass isPrivate ifTrue:[ |
|
11453 | 2984 |
theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
2985 |
theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
|
8891 | 2986 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2987 |
self activityNotification:'Generating diff-set...'. |
8891 | 2988 |
self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
2989 |
self activityNotification:nil. |
|
2990 |
^ diffSet |
|
2991 |
! ! |
|
2992 |
||
2221 | 2993 |
!VersionDiffBrowser class methodsFor:'documentation'! |
2994 |
||
2995 |
version |
|
16530 | 2996 |
^ '$Header$' |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2997 |
! |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2998 |
|
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2999 |
version_CVS |
16530 | 3000 |
^ '$Header$' |
2221 | 3001 |
! ! |
12512 | 3002 |