author | Claus Gittinger <cg@exept.de> |
Fri, 28 Feb 2014 19:58:16 +0100 | |
changeset 14078 | 92e2df7adcca |
parent 14076 | fbed27a15014 |
child 14363 | f70b27db57b6 |
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 |
|
2221 | 14 |
ApplicationModel subclass:#VersionDiffBrowser |
2856 | 15 |
instanceVariableNames:'classChangeSet diffTextView boxAVisible boxBVisible boxMVisible |
16 |
classIfSingleClassDiff versionAIfSingleClassDiff |
|
3147 | 17 |
versionBIfSingleClassDiff changedLabelHolder diffTextLabelA |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
18 |
diffTextLabelB methodText methodsChanged methodsChangedFiltered |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
19 |
methodsChangedSelection methodsOnlyInA methodsOnlyInAFiltered |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
20 |
methodsOnlyInASelection methodsOnlyInB methodsOnlyInBFiltered |
5182 | 21 |
methodsOnlyInBSelection onlyInALabelHolder onlyInBLabelHolder |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
22 |
classHolder versionAHolder versionBHolder infoHolder |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
23 |
includeExtensionsHolder canIncludeExtensionsHolder |
14076 | 24 |
includeCategoryChangesHolder includeVersionMethodsHolder |
25 |
isMultipleVersionBrowser versionList selectedVersionHolder |
|
26 |
symbolicVersionList selectedSymbolicVersionHolder |
|
27 |
symbolicToVersionMapping' |
|
2221 | 28 |
classVariableNames:'' |
29 |
poolDictionaries:'' |
|
30 |
category:'Interface-Browsers' |
|
31 |
! |
|
32 |
||
2497 | 33 |
HierarchicalItem subclass:#ClassChangeSet |
13137 | 34 |
instanceVariableNames:'class1BeingCompared class2BeingCompared labelA labelB diffSet |
35 |
versionA versionB' |
|
2497 | 36 |
classVariableNames:'' |
37 |
poolDictionaries:'' |
|
38 |
privateIn:VersionDiffBrowser |
|
39 |
! |
|
40 |
||
2626 | 41 |
!VersionDiffBrowser class methodsFor:'documentation'! |
42 |
||
43 |
copyright |
|
44 |
" |
|
45 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
11453 | 46 |
All Rights Reserved |
2626 | 47 |
|
48 |
This software is furnished under a license and may be used |
|
49 |
only in accordance with the terms of that license and with the |
|
50 |
inclusion of the above copyright notice. This software may not |
|
51 |
be provided or otherwise made available to, or used by, any |
|
52 |
other person. No title to or ownership of the software is |
|
53 |
hereby transferred. |
|
54 |
" |
|
55 |
||
56 |
! |
|
57 |
||
58 |
documentation |
|
59 |
" |
|
60 |
This is not yet finished (work in progress). |
|
61 |
||
62 |
A browser to show differences between class versions, |
|
63 |
allowing easy comparison; will also eventually add capabilities |
|
64 |
to checkIn / load classes into / from the repository. |
|
65 |
||
66 |
[see also:] |
|
67 |
||
68 |
[instance variables:] |
|
69 |
||
70 |
[class variables:] |
|
71 |
" |
|
72 |
||
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 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
606 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
607 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
608 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
609 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
610 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
611 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
612 |
label: 'Help' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
613 |
startGroup: conditionalRight |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
614 |
submenu: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
615 |
(Menu |
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 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
618 |
label: 'Documentation' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
619 |
itemValue: openDocumentation |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
620 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
621 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
622 |
label: '-' |
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: 'About this Application...' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
626 |
itemValue: openAboutThisApplication |
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 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
629 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
630 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
631 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
632 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
633 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
634 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
635 |
nil |
2221 | 636 |
) |
637 |
! |
|
638 |
||
639 |
menuA |
|
640 |
"This resource specification was automatically generated |
|
641 |
by the MenuEditor of ST/X." |
|
642 |
||
643 |
"Do not manually edit this!! If it is corrupted, |
|
644 |
the MenuEditor may not be able to read the specification." |
|
645 |
||
646 |
" |
|
647 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
648 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
649 |
" |
|
650 |
||
651 |
<resource: #menu> |
|
652 |
||
11453 | 653 |
^ |
2221 | 654 |
#(#Menu |
11453 | 655 |
#( |
656 |
#(#MenuItem |
|
657 |
#label: 'Apply' |
|
658 |
#translateLabel: true |
|
659 |
#value: #applySelectedChangeInA |
|
660 |
#enabled: #hasChangeSelectedInA |
|
661 |
) |
|
662 |
#(#MenuItem |
|
663 |
#label: 'Browse' |
|
664 |
#translateLabel: true |
|
665 |
#value: #browseClassInA |
|
666 |
#enabled: #hasChangeSelectedInA |
|
667 |
) |
|
668 |
#(#MenuItem |
|
669 |
#label: '-' |
|
670 |
) |
|
671 |
#(#MenuItem |
|
672 |
#label: 'Inspect' |
|
673 |
#translateLabel: true |
|
674 |
#value: #inspectSelectedChangeInA |
|
675 |
#choiceValue: 'nil "UndefinedObject" ' |
|
676 |
#enabled: #hasChangeSelectedInA |
|
677 |
) |
|
678 |
) |
|
679 |
nil |
|
680 |
nil |
|
2221 | 681 |
) |
682 |
! |
|
683 |
||
684 |
menuB |
|
685 |
"This resource specification was automatically generated |
|
686 |
by the MenuEditor of ST/X." |
|
687 |
||
688 |
"Do not manually edit this!! If it is corrupted, |
|
689 |
the MenuEditor may not be able to read the specification." |
|
690 |
||
691 |
" |
|
692 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menuB |
|
693 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menuB)) startUp |
|
694 |
" |
|
695 |
||
696 |
<resource: #menu> |
|
697 |
||
11453 | 698 |
^ |
2221 | 699 |
#(#Menu |
11453 | 700 |
#( |
701 |
#(#MenuItem |
|
702 |
#label: 'Apply' |
|
703 |
#translateLabel: true |
|
704 |
#value: #applySelectedChangeInB |
|
705 |
#enabled: #hasChangeSelectedInB |
|
706 |
) |
|
707 |
#(#MenuItem |
|
708 |
#label: 'Browse' |
|
709 |
#translateLabel: true |
|
710 |
#value: #browseClassInB |
|
711 |
#enabled: #hasChangeSelectedInB |
|
712 |
) |
|
713 |
#(#MenuItem |
|
714 |
#label: '-' |
|
715 |
) |
|
716 |
#(#MenuItem |
|
717 |
#label: 'Remove in Image' |
|
718 |
#translateLabel: true |
|
719 |
#value: #removeSelectedChangeInBFromImage |
|
720 |
#enabled: #hasChangeSelectedInB |
|
721 |
) |
|
722 |
#(#MenuItem |
|
723 |
#label: '-' |
|
724 |
) |
|
725 |
#(#MenuItem |
|
726 |
#label: 'Inspect' |
|
727 |
#translateLabel: true |
|
728 |
#value: #inspectSelectedChangeInB |
|
729 |
#choiceValue: 'nil "UndefinedObject" ' |
|
730 |
#enabled: #hasChangeSelectedInB |
|
731 |
) |
|
732 |
) |
|
733 |
nil |
|
734 |
nil |
|
2221 | 735 |
) |
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
736 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
737 |
"Modified: / 15-08-2010 / 21:24:49 / cg" |
2221 | 738 |
! |
739 |
||
740 |
menuM |
|
741 |
"This resource specification was automatically generated |
|
742 |
by the MenuEditor of ST/X." |
|
743 |
||
744 |
"Do not manually edit this!! If it is corrupted, |
|
745 |
the MenuEditor may not be able to read the specification." |
|
746 |
||
747 |
" |
|
748 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
749 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
750 |
" |
|
751 |
||
752 |
<resource: #menu> |
|
753 |
||
11453 | 754 |
^ |
2221 | 755 |
#(#Menu |
11453 | 756 |
#( |
757 |
#(#MenuItem |
|
758 |
#label: 'Browse' |
|
759 |
#translateLabel: true |
|
760 |
#value: #browseClassInM |
|
761 |
#enabled: #hasChangeSelectedInM |
|
762 |
) |
|
763 |
#(#MenuItem |
|
764 |
#label: '-' |
|
765 |
) |
|
766 |
#(#MenuItem |
|
767 |
#label: 'Apply Left Version' |
|
768 |
#translateLabel: true |
|
769 |
#value: #acceptInLeftView |
|
770 |
#enabled: #hasChangeSelectedInM |
|
771 |
) |
|
772 |
#(#MenuItem |
|
773 |
#label: 'Apply Right Version' |
|
774 |
#translateLabel: true |
|
775 |
#value: #acceptInRightView |
|
776 |
#enabled: #hasChangeSelectedInM |
|
777 |
) |
|
778 |
#(#MenuItem |
|
779 |
#label: '-' |
|
780 |
) |
|
781 |
#(#MenuItem |
|
782 |
#label: 'Inspect both' |
|
783 |
#translateLabel: true |
|
784 |
#value: #inspectSelectedChangeInM |
|
785 |
#choiceValue: 'nil "UndefinedObject" ' |
|
786 |
#enabled: #hasChangeSelectedInM |
|
787 |
) |
|
788 |
) |
|
789 |
nil |
|
790 |
nil |
|
2221 | 791 |
) |
7833 | 792 |
|
793 |
"Modified: / 31-08-2007 / 14:16:39 / cg" |
|
2221 | 794 |
! ! |
795 |
||
2695 | 796 |
!VersionDiffBrowser class methodsFor:'plugIn spec'! |
797 |
||
798 |
aspectSelectors |
|
799 |
"This resource specification was automatically generated |
|
800 |
by the UIPainter of ST/X." |
|
801 |
||
802 |
"Do not manually edit this. If it is corrupted, |
|
803 |
the UIPainter may not be able to read the specification." |
|
804 |
||
805 |
"Return a description of exported aspects; |
|
806 |
these can be connected to aspects of an embedding application |
|
807 |
(if this app is embedded in a subCanvas)." |
|
808 |
||
809 |
^ #( |
|
14076 | 810 |
#changedLabelHolder |
811 |
#onlyInALabelHolder |
|
812 |
#onlyInBLabelHolder |
|
2695 | 813 |
). |
814 |
||
815 |
! ! |
|
816 |
||
2221 | 817 |
!VersionDiffBrowser class methodsFor:'startup'! |
818 |
||
14076 | 819 |
openOnAllVersionsOfClass:aClass |
820 |
"create a VersionDiffBrowser instance and set the class change set of the |
|
821 |
browser. The class diff set is generated from aClasses current version against |
|
822 |
the selected version in the top selection list" |
|
823 |
||
824 |
|theBrowser| |
|
825 |
||
826 |
theBrowser := self new. |
|
827 |
theBrowser allButOpenInterface:#windowSpecForMultipleVersions. |
|
828 |
theBrowser beMultipleVersionBrowser. |
|
829 |
theBrowser classHolder:(ValueHolder with:aClass). |
|
830 |
theBrowser setupForClass:aClass againstVersion:nil. |
|
831 |
theBrowser openWindow. |
|
832 |
^ theBrowser. |
|
833 |
||
834 |
" |
|
835 |
self openOnAllVersionsOfClass:Object |
|
836 |
" |
|
837 |
! |
|
838 |
||
11453 | 839 |
openOnClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
840 |
"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
|
841 |
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
|
842 |
via the source code manager." |
2507 | 843 |
|
2497 | 844 |
|theBrowser| |
2224 | 845 |
|
2497 | 846 |
theBrowser := self new. |
847 |
theBrowser allButOpen. |
|
2695 | 848 |
theBrowser setupForClass:aClass againstVersion:aVersionA. |
2497 | 849 |
theBrowser openWindow. |
850 |
^ theBrowser. |
|
2224 | 851 |
|
2695 | 852 |
" |
853 |
self openOnClass:Array againstVersion:'1.116' |
|
854 |
self openOnClass:Array againstVersion:nil - against the version on which Array is based upon |
|
855 |
self openOnClass:Array againstVersion:#newest - against the newest repository version |
|
856 |
||
857 |
self openOnClass:VersionDiffBrowser againstVersion:nil |
|
858 |
self openOnClass:VersionDiffBrowser againstVersion:#newest |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
859 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
860 |
(self openOnClass:ByteArray againstVersion:'1.116') includeExtensionsHolder value:true |
2695 | 861 |
" |
862 |
! |
|
863 |
||
11453 | 864 |
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
|
865 |
"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
|
866 |
browser. The class diff set is generated from two classes." |
2949 | 867 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
868 |
^ self |
11453 | 869 |
openOnClass:classA labelA:aLabelA |
870 |
andClass:classB labelB:aLabelB |
|
871 |
title:ignoredTitle ifSame:nil |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
872 |
|
3147 | 873 |
" |
11453 | 874 |
self |
875 |
openOnClass:Array labelA:'Array' |
|
876 |
andClass:Collection labelB:'Collection' |
|
877 |
title:'Array vs. Collection' |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
878 |
" |
2949 | 879 |
! |
880 |
||
881 |
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
|
882 |
"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
|
883 |
browser. The class diff set is generated from two classes." |
2949 | 884 |
|
8891 | 885 |
|classChangeSet| |
2949 | 886 |
|
8891 | 887 |
classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB. |
888 |
classChangeSet removeAllVersionMethods. |
|
2949 | 889 |
sameAction notNil ifTrue:[ |
11453 | 890 |
"/ check if same ... |
891 |
(classChangeSet methodsOnlyInA isEmpty |
|
892 |
and:[classChangeSet methodsOnlyInB isEmpty |
|
893 |
and:[classChangeSet diffSet isEmpty]]) ifTrue:[ |
|
894 |
sameAction value. |
|
895 |
^ self "/ do not open |
|
896 |
] |
|
2949 | 897 |
]. |
8891 | 898 |
|
899 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
2949 | 900 |
! |
901 |
||
11453 | 902 |
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
|
903 |
"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
|
904 |
browser. The class diff set is generated from two source files." |
2695 | 905 |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
906 |
^ self |
11453 | 907 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
908 |
title:nil |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
909 |
! |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
910 |
|
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
911 |
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
|
912 |
"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
|
913 |
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
|
914 |
|
11453 | 915 |
^ self |
916 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA |
|
917 |
labelB:aLabelB sourceB:aSourceB |
|
918 |
title:ignoredTitle ifSame:nil |
|
2849 | 919 |
! |
920 |
||
921 |
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
|
922 |
"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
|
923 |
browser. The class diff set is generated from two source files." |
8891 | 924 |
|
925 |
|diffs hasChangedMethods classChangeSet versionMethodChanges| |
|
2695 | 926 |
|
8891 | 927 |
classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB. |
928 |
classChangeSet removeAllVersionMethods. |
|
2849 | 929 |
sameAction notNil ifTrue:[ |
11453 | 930 |
"/ check if same ... |
931 |
(classChangeSet methodsOnlyInA isEmpty |
|
932 |
and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[ |
|
933 |
diffs := classChangeSet diffSet. |
|
3853
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
934 |
|
11453 | 935 |
hasChangedMethods := diffs changed notEmpty. |
936 |
hasChangedMethods ifTrue:[ |
|
937 |
versionMethodChanges := diffs changed select:[:eachDifference | |
|
938 |
|eachChange| |
|
939 |
eachChange := eachDifference first. |
|
940 |
(eachChange isMethodChange |
|
941 |
and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector) |
|
942 |
and:[ eachChange changeClass isMeta ]]). |
|
943 |
]. |
|
944 |
diffs changed size == versionMethodChanges size ifTrue: [ |
|
945 |
hasChangedMethods := false. |
|
946 |
]. |
|
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
947 |
"/ diffs changed size == 1 ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
948 |
"/ theOnlyDifference := diffs changed first. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
949 |
"/ theOnlyChange := theOnlyDifference first. |
11453 | 950 |
"/ (theOnlyChange isMethodChange |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
951 |
"/ and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_']) |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
952 |
"/ and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
953 |
"/ hasChangedMethods := false |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
954 |
"/ ] |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
955 |
"/ ] |
11453 | 956 |
]. |
3853
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
957 |
|
11453 | 958 |
(hasChangedMethods not |
959 |
and:[diffs onlyInArg isEmpty |
|
960 |
and:[diffs onlyInReceiver isEmpty]]) ifTrue:[ |
|
961 |
sameAction value. |
|
962 |
^ self "/ do not open |
|
963 |
]. |
|
964 |
] |
|
2849 | 965 |
]. |
8891 | 966 |
|
967 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
7396 | 968 |
|
969 |
"Modified: / 13-10-2006 / 01:01:05 / cg" |
|
2224 | 970 |
! |
971 |
||
2497 | 972 |
openOnClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
973 |
"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
|
974 |
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
|
975 |
the source code manager." |
2507 | 976 |
|
2497 | 977 |
|theBrowser| |
2221 | 978 |
|
2497 | 979 |
theBrowser := self new. |
980 |
theBrowser allButOpen. |
|
2695 | 981 |
theBrowser setupForClass:aClass versionA:aVersionA versionB:aVersionB. |
2497 | 982 |
theBrowser openWindow. |
983 |
^ theBrowser. |
|
2221 | 984 |
|
985 |
" |
|
986 |
self openOnClass:Array versionA:'1.116' versionB:'1.113' |
|
987 |
" |
|
3678 | 988 |
! |
989 |
||
8891 | 990 |
openOnClassChangeSet:classChangeSet title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
991 |
"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
|
992 |
browser. The class diff set is generated from two classes." |
8891 | 993 |
|
994 |
|theBrowser| |
|
995 |
||
996 |
theBrowser := self new. |
|
997 |
theBrowser allButOpen. |
|
998 |
theBrowser classChangeSet:classChangeSet. |
|
999 |
theBrowser openWindow. |
|
1000 |
^ theBrowser. |
|
1001 |
! |
|
1002 |
||
3678 | 1003 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle |
10691 | 1004 |
^ self |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1005 |
openOnDiffSet:diffSet |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1006 |
labelA:aLabelA labelB:aLabelB |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1007 |
title:ignoredTitle |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1008 |
ignoreExtensions:false |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1009 |
ignoreVersionMethods:false |
10691 | 1010 |
|
1011 |
"Modified: / 12-09-2011 / 11:52:44 / cg" |
|
1012 |
! |
|
1013 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1014 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1015 |
^ self |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1016 |
openOnDiffSet:diffSet |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1017 |
labelA:aLabelA labelB:aLabelB |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1018 |
title:ignoredTitle |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1019 |
ignoreExtensions:ignoreExtensionsBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1020 |
ignoreVersionMethods:false |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1021 |
! |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1022 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1023 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean ignoreVersionMethods:ignoreVersionMethodsBoolean |
3678 | 1024 |
|theBrowser| |
1025 |
||
1026 |
theBrowser := self new. |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1027 |
theBrowser ignoreExtensions:ignoreExtensionsBoolean. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1028 |
theBrowser ignoreVersionMethods:ignoreVersionMethodsBoolean. |
3678 | 1029 |
theBrowser allButOpen. |
1030 |
theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB. |
|
1031 |
theBrowser window label:ignoredTitle. |
|
1032 |
theBrowser openWindow. |
|
1033 |
^ theBrowser. |
|
10691 | 1034 |
|
1035 |
"Created: / 12-09-2011 / 11:50:18 / cg" |
|
5520 | 1036 |
! |
1037 |
||
1038 |
openOnDiffsBetweenFile:file1 and:file2 |
|
1039 |
|set1 set2 diffset theBrowser| |
|
1040 |
||
1041 |
set1 := ChangeSet fromFile:file1. |
|
1042 |
set2 := ChangeSet fromFile:file2. |
|
1043 |
diffset := set1 diffSetsAgainst:set2. |
|
1044 |
||
1045 |
theBrowser := self new. |
|
1046 |
theBrowser allButOpen. |
|
1047 |
theBrowser setupForDiffSet:diffset labelA:file1 asFilename baseName labelB:file2 asFilename baseName. |
|
1048 |
theBrowser window label:('%1 vs. %2' bindWith:file1 asFilename baseName with:file2 asFilename baseName). |
|
1049 |
theBrowser openWindow. |
|
1050 |
^ theBrowser. |
|
1051 |
||
1052 |
" |
|
11453 | 1053 |
VersionDiffBrowser |
1054 |
openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st' |
|
1055 |
and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st' |
|
5520 | 1056 |
" |
2221 | 1057 |
! ! |
1058 |
||
1059 |
!VersionDiffBrowser methodsFor:'accessing'! |
|
1060 |
||
14076 | 1061 |
beMultipleVersionBrowser |
1062 |
isMultipleVersionBrowser := true |
|
1063 |
! |
|
1064 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1065 |
canIncludeExtensions:something |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1066 |
self canIncludeExtensionsHolder value:something. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1067 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1068 |
|
2497 | 1069 |
changeSetA |
3147 | 1070 |
" |
1071 |
gets the change set which contains only the new methods |
|
1072 |
in versionA of the class |
|
2221 | 1073 |
|
3147 | 1074 |
<return: ChangeSet> |
1075 |
" |
|
2221 | 1076 |
|
2497 | 1077 |
^ self classChangeSet methodsOnlyInA |
2221 | 1078 |
! |
1079 |
||
2497 | 1080 |
changeSetB |
3147 | 1081 |
" |
1082 |
gets the change set which contains only the new methods |
|
1083 |
in versionB of the class |
|
2497 | 1084 |
|
3147 | 1085 |
<return: ChangeSet> |
1086 |
" |
|
2497 | 1087 |
|
1088 |
^ self classChangeSet methodsOnlyInB |
|
1089 |
! |
|
1090 |
||
2856 | 1091 |
class:aClass versionA:revA versionB:revB |
1092 |
classIfSingleClassDiff := aClass. |
|
1093 |
versionAIfSingleClassDiff := revA. |
|
1094 |
versionBIfSingleClassDiff := revB. |
|
1095 |
! |
|
1096 |
||
2497 | 1097 |
classBeingCompared |
13137 | 1098 |
"returns the class from the change set which is compared. |
2224 | 1099 |
|
3147 | 1100 |
<return: Class> |
11453 | 1101 |
" |
2497 | 1102 |
^ self classChangeSet classBeingCompared |
1103 |
! |
|
1104 |
||
1105 |
classChangeSet |
|
11453 | 1106 |
"returns the class change set which is the model of the version diff browser." |
2224 | 1107 |
|
2507 | 1108 |
^ classChangeSet |
1109 |
! |
|
2497 | 1110 |
|
2507 | 1111 |
classChangeSet:aClassChangeSet |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1112 |
"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
|
1113 |
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
|
1114 |
when a new change set is given." |
2497 | 1115 |
|
2507 | 1116 |
classChangeSet := aClassChangeSet. |
2501 | 1117 |
self updateLabels. |
1118 |
self updateLists. |
|
1119 |
self resetSelectionHolders. |
|
1120 |
! |
|
2224 | 1121 |
|
10691 | 1122 |
ignoreExtensions |
1123 |
"if true, extension methods are suppressed. |
|
1124 |
Ignoring is useful when comparing for baseClass checkin, |
|
1125 |
as opposed to extension-checking, where extensions should not be ignored. |
|
1126 |
the default is false" |
|
1127 |
||
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1128 |
^ self includeExtensions not |
10691 | 1129 |
|
1130 |
"Created: / 12-09-2011 / 11:54:11 / cg" |
|
1131 |
! |
|
1132 |
||
1133 |
ignoreExtensions:aBoolean |
|
1134 |
"if true, extension methods are suppressed. |
|
1135 |
Ignoring is useful when comparing for baseClass checkin, |
|
1136 |
as opposed to extension-checking, where extensions should not be ignored. |
|
1137 |
the default is false" |
|
1138 |
||
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1139 |
self includeExtensions:aBoolean not |
10691 | 1140 |
|
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1141 |
"Modified: / 06-03-2012 / 15:37:32 / cg" |
10691 | 1142 |
! |
1143 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1144 |
ignoreVersionMethods:aBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1145 |
"if true, version methods (version and version_XXX) are suppressed. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1146 |
Ignoring is useful when comparing for real code changes. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1147 |
the default is false" |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1148 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1149 |
self includeVersionMethods:aBoolean not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1150 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1151 |
"Modified: / 06-03-2012 / 15:37:32 / cg" |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1152 |
! |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1153 |
|
14076 | 1154 |
isMultipleVersionBrowser |
14078 | 1155 |
^ isMultipleVersionBrowser ? false |
14076 | 1156 |
! |
1157 |
||
2507 | 1158 |
selectedChangeInA |
3147 | 1159 |
" |
1160 |
gets the selected method change for the 'method only in version A'. |
|
2507 | 1161 |
|
3147 | 1162 |
<return: MethodChange | nil> |
1163 |
" |
|
11962 | 1164 |
|selIndex change| |
1165 |
||
1166 |
selIndex := self methodsOnlyInASelection value. |
|
1167 |
selIndex notNil ifTrue:[ |
|
1168 |
change := methodsOnlyInAFiltered "self changeSetA" at:selIndex. |
|
2507 | 1169 |
]. |
3753 | 1170 |
^ change |
2507 | 1171 |
! |
1172 |
||
1173 |
selectedChangeInB |
|
3147 | 1174 |
" |
1175 |
gets the selected method change for the 'method only in version B'. |
|
2507 | 1176 |
|
3147 | 1177 |
<return: MethodChange | nil> |
1178 |
" |
|
11962 | 1179 |
|selIndex change| |
1180 |
||
1181 |
selIndex := self methodsOnlyInBSelection value. |
|
1182 |
selIndex notNil ifTrue:[ |
|
1183 |
change := methodsOnlyInBFiltered "self changeSetB" at:selIndex. |
|
2507 | 1184 |
]. |
3753 | 1185 |
^ change |
2507 | 1186 |
! |
1187 |
||
1188 |
selectedChangesInM |
|
3147 | 1189 |
" |
1190 |
get the two method changes for the selected 'changed method'. |
|
2507 | 1191 |
|
3147 | 1192 |
<return: <Array with:MethodChange with:MethodChange | nil>> |
1193 |
" |
|
11962 | 1194 |
|selIndex theTwoChanges| |
1195 |
||
1196 |
selIndex := self methodsChangedSelection value. |
|
1197 |
selIndex notNil ifTrue:[ |
|
1198 |
theTwoChanges := methodsChangedFiltered "self classChangeSet methodsChanged" at:selIndex. |
|
1199 |
^ theTwoChanges. |
|
2507 | 1200 |
]. |
3753 | 1201 |
^ #(nil nil) |
2507 | 1202 |
! |
1203 |
||
2221 | 1204 |
versionA |
3147 | 1205 |
" |
1206 |
gets the first class version to be compared |
|
2221 | 1207 |
|
3147 | 1208 |
<return: String> |
1209 |
" |
|
2731 | 1210 |
classChangeSet isNil ifTrue:[^ 'A']. |
1211 |
^ classChangeSet labelA |
|
2221 | 1212 |
! |
1213 |
||
1214 |
versionB |
|
3147 | 1215 |
" |
1216 |
gets the second class version to be compared |
|
2221 | 1217 |
|
3147 | 1218 |
<return: String> |
1219 |
" |
|
2731 | 1220 |
classChangeSet isNil ifTrue:[^ 'B']. |
1221 |
^ classChangeSet labelB |
|
2221 | 1222 |
! ! |
1223 |
||
1224 |
!VersionDiffBrowser methodsFor:'actions'! |
|
1225 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1226 |
acceptInLeftView |
11453 | 1227 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1228 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1229 |
change := self selectedChangesInM first. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1230 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1231 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1232 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1233 |
acceptInRightView |
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 second. |
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 |
acceptInSingleView |
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 selectedChangeInA. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1244 |
change isNil ifTrue:[ |
11453 | 1245 |
change := self selectedChangeInB |
9239
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 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1248 |
! |
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 |
applySelectedChangeInA |
11453 | 1251 |
self applyChange:(self selectedChangeInA) |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1252 |
! |
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 |
applySelectedChangeInB |
11453 | 1255 |
self applyChange:(self selectedChangeInB) |
9239
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 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1258 |
methodInADoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1259 |
"/ |change| |
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 |
"/ change := self changeSetA at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1262 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1263 |
self browseClassInA |
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 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1266 |
methodInBDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1267 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1268 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1269 |
"/ change := self changeSetB at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1270 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1271 |
self browseClassInB |
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 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1274 |
methodInChangedDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1275 |
self browseClassInM. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1276 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1277 |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1278 |
removeSelectedChangeInBFromImage |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1279 |
|change cls sel op| |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1280 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1281 |
change := self selectedChangeInB. |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1282 |
change isMethodChange ifTrue:[ |
11453 | 1283 |
(cls := change changeClass) notNil ifTrue:[ |
1284 |
(sel := change selector) notNil ifTrue:[ |
|
1285 |
RefactoryChangeManager notNil ifTrue:[ |
|
1286 |
op := RemoveMethodChange remove:sel from:cls. |
|
1287 |
RefactoryChangeManager performChange: op. |
|
1288 |
] ifFalse:[ |
|
1289 |
cls removeSelector:sel |
|
1290 |
] |
|
1291 |
] |
|
1292 |
] |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1293 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1294 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1295 |
"Modified: / 15-08-2010 / 21:35:00 / cg" |
2221 | 1296 |
! ! |
1297 |
||
1298 |
!VersionDiffBrowser methodsFor:'aspects'! |
|
1299 |
||
2585 | 1300 |
boxAVisible |
2745 | 1301 |
boxAVisible isNil ifTrue:[ |
11453 | 1302 |
boxAVisible := true asValue. |
2585 | 1303 |
]. |
2745 | 1304 |
^ boxAVisible. |
2585 | 1305 |
! |
1306 |
||
1307 |
boxBVisible |
|
2745 | 1308 |
boxBVisible isNil ifTrue:[ |
11453 | 1309 |
boxBVisible := true asValue. |
2585 | 1310 |
]. |
2745 | 1311 |
^ boxBVisible. |
2585 | 1312 |
! |
1313 |
||
1314 |
boxMVisible |
|
2745 | 1315 |
boxMVisible isNil ifTrue:[ |
11453 | 1316 |
boxMVisible := true asValue. |
2585 | 1317 |
]. |
2745 | 1318 |
^ boxMVisible. |
2585 | 1319 |
! |
1320 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1321 |
canIncludeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1322 |
"can include extensions ? (menu item enabler)" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1323 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1324 |
canIncludeExtensionsHolder isNil ifTrue:[ |
11453 | 1325 |
canIncludeExtensionsHolder := true asValue. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1326 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1327 |
^ canIncludeExtensionsHolder. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1328 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1329 |
|
2221 | 1330 |
changedLabelHolder |
3147 | 1331 |
" |
1332 |
aspect for the label of the changed method box. |
|
2221 | 1333 |
|
3147 | 1334 |
<return: ValueHolder on: nil> |
1335 |
" |
|
2221 | 1336 |
|
3147 | 1337 |
changedLabelHolder isNil ifTrue:[ |
11453 | 1338 |
changedLabelHolder := ValueHolder new. |
2221 | 1339 |
]. |
3147 | 1340 |
^ changedLabelHolder. |
2221 | 1341 |
! |
1342 |
||
1343 |
diffTextLabelA |
|
3147 | 1344 |
" |
1345 |
aspect for the label for version A. |
|
2221 | 1346 |
|
3147 | 1347 |
<return: ValueHolder on: nil> |
1348 |
" |
|
2221 | 1349 |
|
3147 | 1350 |
diffTextLabelA isNil ifTrue:[ |
11453 | 1351 |
diffTextLabelA := ValueHolder new. |
2221 | 1352 |
]. |
3147 | 1353 |
^ diffTextLabelA. |
2221 | 1354 |
! |
1355 |
||
1356 |
diffTextLabelB |
|
3147 | 1357 |
" |
1358 |
aspect for the label for version B. |
|
2221 | 1359 |
|
3147 | 1360 |
<return: ValueHolder on: nil> |
1361 |
" |
|
2221 | 1362 |
|
3147 | 1363 |
diffTextLabelB isNil ifTrue:[ |
11453 | 1364 |
diffTextLabelB := ValueHolder new. |
2221 | 1365 |
]. |
3147 | 1366 |
^ diffTextLabelB. |
2221 | 1367 |
! |
1368 |
||
2497 | 1369 |
diffTextView |
3147 | 1370 |
" |
1371 |
return the component for the diff text view. |
|
2497 | 1372 |
|
3147 | 1373 |
<return: HVScrollableView> |
1374 |
" |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1375 |
|v| |
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1376 |
|
2497 | 1377 |
diffTextView isNil ifTrue:[ |
13951 | 1378 |
v := DiffCodeView new. |
1379 |
v textViewClass:CodeView. |
|
1380 |
v initialize. |
|
1381 |
diffTextView := HVScrollableView |
|
1382 |
forView:v |
|
1383 |
miniScrollerH:true miniScrollerV:false. |
|
1384 |
diffTextView addNextPreviousButtons. |
|
2497 | 1385 |
]. |
1386 |
^ diffTextView |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1387 |
|
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1388 |
"Modified: / 06-10-2006 / 14:30:42 / cg" |
2497 | 1389 |
! |
1390 |
||
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1391 |
includeCategoryChanges |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1392 |
^ self includeCategoryChangesHolder value |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1393 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1394 |
"Created: / 17-07-2012 / 18:22:34 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1395 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1396 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1397 |
includeCategoryChanges:aBoolean |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1398 |
self includeCategoryChangesHolder value:aBoolean |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1399 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1400 |
"Created: / 17-07-2012 / 17:50:41 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1401 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1402 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1403 |
includeCategoryChangesHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1404 |
includeCategoryChangesHolder isNil ifTrue:[ |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1405 |
includeCategoryChangesHolder := true asValue. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1406 |
includeCategoryChangesHolder addDependent:self. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1407 |
]. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1408 |
^ includeCategoryChangesHolder. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1409 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1410 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1411 |
"Created: / 17-07-2012 / 16:47:58 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1412 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1413 |
|
10703 | 1414 |
includeExtensions |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1415 |
^ self includeExtensionsHolder value |
10703 | 1416 |
|
1417 |
"Created: / 13-09-2011 / 11:48:51 / cg" |
|
1418 |
! |
|
1419 |
||
1420 |
includeExtensions:aBoolean |
|
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1421 |
self includeExtensionsHolder value:aBoolean |
10703 | 1422 |
|
1423 |
"Created: / 13-09-2011 / 11:48:41 / cg" |
|
1424 |
! |
|
1425 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1426 |
includeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1427 |
"only compare base-methods or include extensions ?" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1428 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1429 |
includeExtensionsHolder isNil ifTrue:[ |
11453 | 1430 |
includeExtensionsHolder := false asValue. |
1431 |
includeExtensionsHolder addDependent:self. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1432 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1433 |
^ includeExtensionsHolder. |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1434 |
|
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1435 |
"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
|
1436 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1437 |
|
11958 | 1438 |
includeVersionMethods |
1439 |
^ self includeVersionMethodsHolder value |
|
1440 |
||
1441 |
"Created: / 13-09-2011 / 11:48:51 / cg" |
|
1442 |
! |
|
1443 |
||
1444 |
includeVersionMethods:aBoolean |
|
1445 |
self includeVersionMethodsHolder value:aBoolean |
|
1446 |
||
1447 |
"Created: / 13-09-2011 / 11:48:41 / cg" |
|
1448 |
! |
|
1449 |
||
1450 |
includeVersionMethodsHolder |
|
1451 |
includeVersionMethodsHolder isNil ifTrue:[ |
|
1452 |
includeVersionMethodsHolder := true asValue. |
|
1453 |
includeVersionMethodsHolder addDependent:self. |
|
1454 |
]. |
|
1455 |
^ includeVersionMethodsHolder. |
|
1456 |
||
1457 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
|
1458 |
"Created: / 17-07-2012 / 16:47:58 / cg" |
|
1459 |
! |
|
1460 |
||
8602 | 1461 |
infoHolder |
1462 |
infoHolder isNil ifTrue:[ |
|
11453 | 1463 |
infoHolder := ValueHolder new. |
8602 | 1464 |
]. |
1465 |
^ infoHolder. |
|
1466 |
! |
|
1467 |
||
2221 | 1468 |
methodText |
3147 | 1469 |
" |
1470 |
aspect for the text in the method text view. |
|
2221 | 1471 |
|
3147 | 1472 |
<return: ValueHolder on: nil> |
1473 |
" |
|
2221 | 1474 |
|
3147 | 1475 |
methodText isNil ifTrue:[ |
11453 | 1476 |
methodText := ValueHolder new. |
2221 | 1477 |
]. |
3147 | 1478 |
^ methodText. |
2221 | 1479 |
! |
1480 |
||
1481 |
methodsChanged |
|
3147 | 1482 |
" |
1483 |
aspect for the 'changed method' list. |
|
2221 | 1484 |
|
3147 | 1485 |
<return: List> |
1486 |
" |
|
2221 | 1487 |
|
3147 | 1488 |
methodsChanged isNil ifTrue:[ |
11453 | 1489 |
methodsChanged := List new. |
2221 | 1490 |
]. |
3147 | 1491 |
^ methodsChanged. |
2221 | 1492 |
! |
1493 |
||
1494 |
methodsChangedSelection |
|
3147 | 1495 |
" |
1496 |
aspect for the selection holder of 'changed method'-list. |
|
2221 | 1497 |
|
3147 | 1498 |
<return: ValueHolder on: nil> |
1499 |
" |
|
2221 | 1500 |
|
3147 | 1501 |
methodsChangedSelection isNil ifTrue:[ |
11453 | 1502 |
methodsChangedSelection := ValueHolder new. |
2221 | 1503 |
]. |
3147 | 1504 |
^ methodsChangedSelection. |
2221 | 1505 |
! |
1506 |
||
1507 |
methodsOnlyInA |
|
6828 | 1508 |
"aspect for the 'method only in version A' list." |
2221 | 1509 |
|
3147 | 1510 |
methodsOnlyInA isNil ifTrue:[ |
11453 | 1511 |
methodsOnlyInA := List new. |
2221 | 1512 |
]. |
3147 | 1513 |
^ methodsOnlyInA. |
6828 | 1514 |
|
1515 |
"Modified: / 25-07-2006 / 11:14:43 / cg" |
|
2221 | 1516 |
! |
1517 |
||
1518 |
methodsOnlyInASelection |
|
6828 | 1519 |
"aspect for the selection holder of 'method only in version A'-list." |
2221 | 1520 |
|
3147 | 1521 |
methodsOnlyInASelection isNil ifTrue:[ |
11453 | 1522 |
methodsOnlyInASelection := ValueHolder new. |
2221 | 1523 |
]. |
3147 | 1524 |
^ methodsOnlyInASelection. |
6828 | 1525 |
|
1526 |
"Modified: / 25-07-2006 / 11:14:53 / cg" |
|
2221 | 1527 |
! |
1528 |
||
1529 |
methodsOnlyInB |
|
6828 | 1530 |
"aspect for the 'method only in version B' list" |
2221 | 1531 |
|
3147 | 1532 |
methodsOnlyInB isNil ifTrue:[ |
11453 | 1533 |
methodsOnlyInB := List new. |
2221 | 1534 |
]. |
3147 | 1535 |
^ methodsOnlyInB. |
6828 | 1536 |
|
1537 |
"Modified: / 25-07-2006 / 11:14:48 / cg" |
|
2221 | 1538 |
! |
1539 |
||
1540 |
methodsOnlyInBSelection |
|
6828 | 1541 |
"aspect for the selection holder of 'method only in version B'-list." |
2221 | 1542 |
|
3147 | 1543 |
methodsOnlyInBSelection isNil ifTrue:[ |
11453 | 1544 |
methodsOnlyInBSelection := ValueHolder new. |
2221 | 1545 |
]. |
3147 | 1546 |
^ methodsOnlyInBSelection. |
6828 | 1547 |
|
1548 |
"Modified: / 25-07-2006 / 11:15:00 / cg" |
|
2221 | 1549 |
! |
1550 |
||
1551 |
onlyInALabelHolder |
|
6828 | 1552 |
"aspect for the label for 'method only in version A'." |
2221 | 1553 |
|
3147 | 1554 |
onlyInALabelHolder isNil ifTrue:[ |
11453 | 1555 |
onlyInALabelHolder := ValueHolder new. |
2221 | 1556 |
]. |
3147 | 1557 |
^ onlyInALabelHolder. |
6828 | 1558 |
|
1559 |
"Modified: / 25-07-2006 / 11:15:12 / cg" |
|
2221 | 1560 |
! |
1561 |
||
1562 |
onlyInBLabelHolder |
|
6828 | 1563 |
"aspect for the label for 'method only in version B'." |
2221 | 1564 |
|
3147 | 1565 |
onlyInBLabelHolder isNil ifTrue:[ |
11453 | 1566 |
onlyInBLabelHolder := ValueHolder new. |
2221 | 1567 |
]. |
3147 | 1568 |
^ onlyInBLabelHolder. |
6828 | 1569 |
|
1570 |
"Modified: / 25-07-2006 / 11:15:07 / cg" |
|
14076 | 1571 |
! |
1572 |
||
1573 |
selectedSymbolicVersionHolder |
|
1574 |
selectedSymbolicVersionHolder isNil ifTrue:[ |
|
1575 |
selectedSymbolicVersionHolder := nil asValue. |
|
1576 |
selectedSymbolicVersionHolder onChangeSend:#selectedSymbolicVersionHolderChanged to:self. |
|
1577 |
]. |
|
1578 |
^ selectedSymbolicVersionHolder |
|
1579 |
! |
|
1580 |
||
1581 |
selectedVersionHolder |
|
1582 |
selectedVersionHolder isNil ifTrue:[ |
|
1583 |
selectedVersionHolder := nil asValue. |
|
1584 |
selectedVersionHolder onChangeSend:#selectedVersionHolderChanged to:self. |
|
1585 |
]. |
|
1586 |
^ selectedVersionHolder |
|
1587 |
! |
|
1588 |
||
1589 |
symbolicVersionList |
|
1590 |
symbolicVersionList isNil ifTrue:[ |
|
1591 |
symbolicVersionList := List new. |
|
1592 |
]. |
|
1593 |
^ symbolicVersionList |
|
1594 |
! |
|
1595 |
||
1596 |
versionList |
|
1597 |
versionList isNil ifTrue:[ |
|
1598 |
versionList := List new. |
|
1599 |
]. |
|
1600 |
^ versionList |
|
2221 | 1601 |
! ! |
1602 |
||
2725 | 1603 |
!VersionDiffBrowser methodsFor:'aspects-exported'! |
2695 | 1604 |
|
1605 |
changedLabelHolder:aValueHolder |
|
1606 |
builder aspectAt:#changedLabelHolder put:aValueHolder. |
|
1607 |
||
1608 |
! |
|
1609 |
||
1610 |
classHolder:aValueHolder |
|
5182 | 1611 |
classHolder notNil ifTrue:[ |
11453 | 1612 |
classHolder removeDependent:self |
2695 | 1613 |
]. |
5182 | 1614 |
classHolder := aValueHolder. |
1615 |
classHolder notNil ifTrue:[ |
|
11453 | 1616 |
classHolder addDependent:self |
2695 | 1617 |
] |
1618 |
! |
|
1619 |
||
1620 |
onlyInALabelHolder:aValueHolder |
|
1621 |
builder aspectAt:#onlyInALabelHolder put:aValueHolder. |
|
1622 |
! |
|
1623 |
||
1624 |
onlyInBLabelHolder:aValueHolder |
|
1625 |
builder aspectAt:#onlyInBLabelHolder put:aValueHolder. |
|
1626 |
! |
|
1627 |
||
1628 |
versionAHolder:aValueHolder |
|
5182 | 1629 |
versionAHolder notNil ifTrue:[ |
11453 | 1630 |
versionAHolder removeDependent:self |
2695 | 1631 |
]. |
5182 | 1632 |
versionAHolder := aValueHolder. |
1633 |
versionAHolder notNil ifTrue:[ |
|
11453 | 1634 |
versionAHolder addDependent:self |
2695 | 1635 |
] |
1636 |
! |
|
1637 |
||
1638 |
versionBHolder:aValueHolder |
|
5182 | 1639 |
versionBHolder notNil ifTrue:[ |
11453 | 1640 |
versionBHolder removeDependent:self |
2695 | 1641 |
]. |
5182 | 1642 |
versionBHolder := aValueHolder. |
1643 |
versionBHolder notNil ifTrue:[ |
|
11453 | 1644 |
versionBHolder addDependent:self |
2695 | 1645 |
] |
1646 |
! ! |
|
1647 |
||
4359 | 1648 |
!VersionDiffBrowser methodsFor:'aspects-menu'! |
1649 |
||
1650 |
canAcceptInCodeView |
|
1651 |
^ self hasChangeSelectedInA |
|
1652 |
or:[self hasChangeSelectedInB |
|
1653 |
or:[self hasChangeSelectedInM]] |
|
1654 |
! |
|
1655 |
||
1656 |
hasChangeSelectedInA |
|
1657 |
^ self selectedChangeInA notNil |
|
1658 |
! |
|
1659 |
||
1660 |
hasChangeSelectedInB |
|
1661 |
^ self selectedChangeInB notNil |
|
1662 |
! |
|
1663 |
||
1664 |
hasChangeSelectedInM |
|
1665 |
^ self methodsChangedSelection value notNil |
|
1666 |
! ! |
|
1667 |
||
2695 | 1668 |
!VersionDiffBrowser methodsFor:'change & update'! |
1669 |
||
12512 | 1670 |
methodsChangedSelectionChanged |
1671 |
" |
|
1672 |
the selection in the list of the 'changed methods' changed. |
|
1673 |
Reset the selection of the two other lists and calc the method change. |
|
1674 |
||
1675 |
<return: self> |
|
1676 |
" |
|
1677 |
|sel changeA changeB methodsChanged parseError treeA treeB| |
|
1678 |
||
1679 |
self infoHolder value:''. |
|
1680 |
||
1681 |
sel := self methodsChangedSelection value. |
|
1682 |
sel notNil ifTrue:[ |
|
1683 |
self methodsOnlyInASelection value:nil. |
|
1684 |
self methodsOnlyInBSelection value:nil. |
|
1685 |
methodsChanged := self classChangeSet methodsChanged. |
|
1686 |
changeA := (methodsChangedFiltered at:sel) first. |
|
1687 |
changeB := (methodsChangedFiltered at:sel) second. |
|
1688 |
self withReadCursorDo:[ |
|
1689 |
"/ see if the semantics have changed (or only prettyPrinted) |
|
1690 |
RBParser notNil ifTrue:[ |
|
1691 |
(classChangeSet notNil |
|
1692 |
and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[ |
|
1693 |
parseError := false. |
|
1694 |
treeA := RBParser parseMethod:changeA source onError: [:str :pos | parseError := true]. |
|
1695 |
treeB := RBParser parseMethod:changeB source onError: [:str :pos | parseError := true]. |
|
1696 |
parseError ifFalse:[ |
|
1697 |
(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
|
1698 |
self infoHolder value:'Methods only differ in formatting / comments.'. |
|
1699 |
] |
|
1700 |
] |
|
1701 |
]. |
|
1702 |
]. |
|
1703 |
self diffTextView |
|
1704 |
text1:(changeA prettyPrintedSource) |
|
1705 |
text2:(changeB prettyPrintedSource) |
|
1706 |
]. |
|
1707 |
self showDiffTextView. |
|
1708 |
self diffTextView moveToNextChanged |
|
1709 |
] |
|
1710 |
||
1711 |
"Modified: / 03-09-1999 / 15:01:30 / ps" |
|
1712 |
"Modified: / 17-07-2012 / 18:27:06 / cg" |
|
1713 |
! |
|
1714 |
||
1715 |
methodsOnlyInASelectionChanged |
|
1716 |
" |
|
1717 |
the selection in the list of the 'method only in version A' changed. |
|
1718 |
Reset the selection of the two other lists and show the method in |
|
1719 |
the text view. |
|
1720 |
||
1721 |
<return: self> |
|
1722 |
" |
|
1723 |
|change sel| |
|
1724 |
||
1725 |
self infoHolder value:''. |
|
1726 |
||
1727 |
sel := self methodsOnlyInASelection value. |
|
1728 |
sel notNil ifTrue:[ |
|
1729 |
self methodsOnlyInBSelection value:nil. |
|
1730 |
self methodsChangedSelection value:nil. |
|
1731 |
change := methodsOnlyInAFiltered "self changeSetA" at:sel. |
|
1732 |
self methodText value:(change prettyPrintedSource). |
|
1733 |
self showSingleTextView. |
|
1734 |
] |
|
1735 |
||
1736 |
"Modified: / 17-07-2012 / 18:31:22 / cg" |
|
1737 |
! |
|
1738 |
||
1739 |
methodsOnlyInBSelectionChanged |
|
1740 |
" |
|
1741 |
the selection in the list of the 'method only in version B' changed. |
|
1742 |
Reset the selection of the two other lists and show the method in |
|
1743 |
the text view. |
|
1744 |
||
1745 |
<return: self> |
|
1746 |
" |
|
1747 |
|change sel| |
|
1748 |
||
1749 |
self infoHolder value:''. |
|
1750 |
||
1751 |
sel := self methodsOnlyInBSelection value. |
|
1752 |
sel notNil ifTrue:[ |
|
1753 |
self methodsOnlyInASelection value:nil. |
|
1754 |
self methodsChangedSelection value:nil. |
|
1755 |
change := methodsOnlyInBFiltered "self changeSetB" at:sel. |
|
1756 |
self methodText value:(change prettyPrintedSource). |
|
1757 |
self showSingleTextView. |
|
1758 |
] |
|
1759 |
||
1760 |
"Modified: / 17-07-2012 / 18:31:32 / cg" |
|
1761 |
! |
|
1762 |
||
14076 | 1763 |
selectedSymbolicVersionHolderChanged |
1764 |
self selectedVersionHolder |
|
1765 |
value:(symbolicToVersionMapping at:( self selectedSymbolicVersionHolder value )) |
|
1766 |
! |
|
1767 |
||
1768 |
selectedVersionHolderChanged |
|
1769 |
|idx| |
|
1770 |
||
1771 |
self withWaitCursorDo:[ |
|
1772 |
selectedVersionHolder value = '...' ifTrue:[ |
|
1773 |
idx := self versionList size. |
|
1774 |
self updateVersionList. |
|
1775 |
selectedVersionHolder setValue:(self versionList at:idx). |
|
1776 |
]. |
|
1777 |
||
1778 |
self |
|
1779 |
setupForClass:classHolder value |
|
1780 |
againstVersion:(selectedVersionHolder value). |
|
1781 |
] |
|
1782 |
! |
|
1783 |
||
2695 | 1784 |
update:something with:parameter from:changedObject |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1785 |
((changedObject == includeExtensionsHolder) |
11958 | 1786 |
or:[ changedObject == includeCategoryChangesHolder |
1787 |
or:[ changedObject == includeVersionMethodsHolder ]]) ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1788 |
self updateLists. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1789 |
^ self |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1790 |
]. |
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1791 |
|
11453 | 1792 |
(changedObject == classHolder |
2695 | 1793 |
or:[changedObject == versionAHolder |
11453 | 1794 |
or:[changedObject == versionBHolder]]) ifTrue:[ |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1795 |
self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value). |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1796 |
^ self |
2695 | 1797 |
]. |
1798 |
super update:something with:parameter from:changedObject |
|
10703 | 1799 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1800 |
"Modified: / 17-07-2012 / 17:48:58 / cg" |
2695 | 1801 |
! ! |
1802 |
||
2221 | 1803 |
!VersionDiffBrowser methodsFor:'initialization & release'! |
1804 |
||
1805 |
postBuildWith:aBuilder |
|
3147 | 1806 |
" |
1807 |
components which are invisible should be ignored by the panel. |
|
1808 |
Cannot be set via the interface builder. |
|
2221 | 1809 |
|
3147 | 1810 |
<return: self> |
1811 |
" |
|
1812 |
||
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1813 |
(self componentAt:#TopHorizontalPanel) ignoreInvisibleComponents:true. |
6642 | 1814 |
super postBuildWith:aBuilder |
14076 | 1815 |
! |
1816 |
||
1817 |
postOpenWith:aBuilder |
|
1818 |
super postOpenWith:aBuilder. |
|
1819 |
||
1820 |
self isMultipleVersionBrowser ifTrue:[ |
|
1821 |
self withWaitCursorDo:[ |
|
1822 |
self updateVersionList. |
|
1823 |
] |
|
1824 |
] |
|
2221 | 1825 |
! ! |
1826 |
||
1827 |
!VersionDiffBrowser methodsFor:'menu action'! |
|
1828 |
||
2465 | 1829 |
browseChange:aChange |
6828 | 1830 |
"browse the change in aChange" |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1831 |
|
7396 | 1832 |
|cls sel m browserClass| |
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
1833 |
|
2578
29264fb3847e
avoid debugger in browse-menu
Claus Gittinger <cg@exept.de>
parents:
2536
diff
changeset
|
1834 |
aChange isNil ifTrue:[^ self]. |
7396 | 1835 |
browserClass := UserPreferences systemBrowserClass. |
1836 |
||
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
1837 |
cls := aChange changeClass. |
11962 | 1838 |
cls isNil ifTrue:[ |
1839 |
Dialog information:'The class is not present in the image'. |
|
1840 |
^ self |
|
1841 |
]. |
|
7396 | 1842 |
aChange isMethodChange ifTrue:[ |
11962 | 1843 |
sel := aChange changeSelector. |
7396 | 1844 |
"/ (cls compiledMethodAt:sel) isNil ifTrue:[ |
1845 |
"/ (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[ |
|
1846 |
"/ browserClass openInClass:cls |
|
1847 |
"/ ]. |
|
1848 |
"/ sel := nil. |
|
1849 |
"/ ] |
|
1850 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1851 |
self withWaitCursorDo:[ |
11962 | 1852 |
browserClass openInClass:cls selector:sel. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1853 |
] |
6828 | 1854 |
|
7396 | 1855 |
"Modified: / 12-10-2006 / 23:58:40 / cg" |
2465 | 1856 |
! |
1857 |
||
1858 |
browseClassInA |
|
6828 | 1859 |
"browse the selected method." |
1860 |
self browseChange:(self selectedChangeInA). |
|
2507 | 1861 |
|
6828 | 1862 |
"Modified: / 25-07-2006 / 11:14:02 / cg" |
2465 | 1863 |
! |
2221 | 1864 |
|
2465 | 1865 |
browseClassInB |
6828 | 1866 |
"browse the selected method." |
1867 |
self browseChange:(self selectedChangeInB). |
|
2507 | 1868 |
|
6828 | 1869 |
"Modified: / 25-07-2006 / 11:13:58 / cg" |
2465 | 1870 |
! |
1871 |
||
1872 |
browseClassInM |
|
6828 | 1873 |
"browse the selected method." |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1874 |
|
6828 | 1875 |
self browseChange:(self selectedChangesInM first). |
2507 | 1876 |
|
6828 | 1877 |
"Modified: / 25-07-2006 / 11:13:54 / cg" |
2465 | 1878 |
! |
1879 |
||
2469 | 1880 |
createPatchFile |
2856 | 1881 |
"create a patchFile, to patch the old version (versionB) into the new version (versionA). |
1882 |
I.e. a little changeFile to transport those changes." |
|
1883 |
||
6828 | 1884 |
|defaultName f oldVersion newVersion vsnMthdA vsnMthdB vsnA vsnB info classBeingCompared| |
2856 | 1885 |
|
1886 |
defaultName := 'patchFile.chg'. |
|
2469 | 1887 |
|
6828 | 1888 |
classBeingCompared := classChangeSet classBeingCompared. |
1889 |
classBeingCompared notNil ifTrue:[ |
|
11453 | 1890 |
defaultName := classBeingCompared nameWithoutPrefix. |
1891 |
classChangeSet versionA notNil ifTrue:[ |
|
1892 |
defaultName := defaultName , '-'. |
|
1893 |
defaultName := defaultName , classChangeSet versionA. |
|
1894 |
classChangeSet versionB notNil ifTrue:[ |
|
1895 |
defaultName := defaultName , '-'. |
|
1896 |
defaultName := defaultName , classChangeSet versionB. |
|
1897 |
]. |
|
1898 |
]. |
|
1899 |
defaultName := defaultName , '.chg'. |
|
2856 | 1900 |
]. |
11453 | 1901 |
f := Dialog |
1902 |
requestFileNameForSave:'Name of patchFile:' |
|
1903 |
default:defaultName. |
|
2856 | 1904 |
self warn:'Sorry: This function is not yet implemented'. |
2730 | 1905 |
^ self. |
1906 |
||
11453 | 1907 |
"/ vsnMthdA := self changeSetA |
3103 | 1908 |
"/ detect:[:ch | ch isMethodChange |
1909 |
"/ and:[ch changeClass isMeta |
|
1910 |
"/ and:[ch changeSelector = #version]]] |
|
1911 |
"/ ifNone:nil. |
|
11453 | 1912 |
"/ vsnMthdB := self changeSetA |
3103 | 1913 |
"/ detect:[:ch | ch isMethodChange |
1914 |
"/ and:[ch changeClass isMeta |
|
1915 |
"/ and:[ch changeSelector = #version]]] |
|
1916 |
"/ ifNone:nil. |
|
1917 |
"/ |
|
1918 |
"/ vsnMthdA notNil ifTrue:[ |
|
11453 | 1919 |
"/ "/ extract the version |
3103 | 1920 |
"/ vsnA := Class revisionStringFromSource:vsnMthdA source. |
1921 |
"/ vsnA notNil ifTrue:[ |
|
1922 |
"/ info := Class revisionInfoFromString:vsnA. |
|
1923 |
"/ info notNil ifTrue:[ |
|
1924 |
"/ vsnA := info at:#revision ifAbsent:nil. |
|
1925 |
"/ ] ifFalse:[ |
|
1926 |
"/ vsnA := nil. |
|
1927 |
"/ ]. |
|
1928 |
"/ ]. |
|
1929 |
"/ ]. |
|
1930 |
"/ vsnMthdB notNil ifTrue:[ |
|
11453 | 1931 |
"/ "/ extract the version |
3103 | 1932 |
"/ vsnB := Class revisionStringFromSource:vsnMthdB source. |
1933 |
"/ vsnB notNil ifTrue:[ |
|
1934 |
"/ info := Class revisionInfoFromString:vsnB. |
|
1935 |
"/ info notNil ifTrue:[ |
|
1936 |
"/ vsnB := info at:#revision ifAbsent:nil. |
|
1937 |
"/ ] ifFalse:[ |
|
1938 |
"/ vsnB := nil. |
|
1939 |
"/ ]. |
|
1940 |
"/ ]. |
|
1941 |
"/ ]. |
|
1942 |
"/ |
|
1943 |
"/ (vsnA isNil or:[vsnB isNil or:[vsnA = vsnB]]) ifTrue:[ |
|
1944 |
"/ self warn:'The generated patch file will not be able to validate/update the class version'. |
|
1945 |
"/ ]. |
|
1946 |
"/ |
|
1947 |
"/self halt:'not yet finished'. |
|
6828 | 1948 |
|
9602 | 1949 |
"Modified: / 27-10-2010 / 11:34:58 / cg" |
2469 | 1950 |
! |
1951 |
||
2465 | 1952 |
inspectSelectedChangeInA |
6828 | 1953 |
"inspect the selected method change for the 'method only in version A'." |
2507 | 1954 |
|
2465 | 1955 |
self selectedChangeInA inspect. |
6828 | 1956 |
|
1957 |
"Modified: / 25-07-2006 / 11:13:30 / cg" |
|
2221 | 1958 |
! |
1959 |
||
1960 |
inspectSelectedChangeInB |
|
6828 | 1961 |
"inspect the selected method change for the 'method only in version B'." |
2507 | 1962 |
|
2465 | 1963 |
self selectedChangeInB inspect. |
6828 | 1964 |
|
1965 |
"Modified: / 25-07-2006 / 11:13:22 / cg" |
|
2465 | 1966 |
! |
1967 |
||
1968 |
inspectSelectedChangeInM |
|
6828 | 1969 |
"inspect the two method changes for the selected 'changed method'." |
2507 | 1970 |
|
2465 | 1971 |
|changes| |
1972 |
||
1973 |
changes := self selectedChangesInM. |
|
1974 |
changes do:[:change | |
|
11453 | 1975 |
change inspect |
2465 | 1976 |
]. |
6828 | 1977 |
|
1978 |
"Modified: / 25-07-2006 / 11:13:13 / cg" |
|
2465 | 1979 |
! |
1980 |
||
2501 | 1981 |
mainMenu |
6828 | 1982 |
"if this application runs as an subapplication, |
1983 |
the menu bar should not be used." |
|
2507 | 1984 |
|
2501 | 1985 |
self masterApplication isNil ifTrue:[ |
11453 | 1986 |
^ self class mainMenu |
2501 | 1987 |
]. |
1988 |
^ nil |
|
6828 | 1989 |
|
1990 |
"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
|
1991 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1992 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1993 |
openDocumentation |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1994 |
HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF' |
11855
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
1995 |
! |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
1996 |
|
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
1997 |
removeClassFromChangeSet |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
1998 |
|cls ok changedClasses| |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
1999 |
|
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2000 |
classChangeSet notNil ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2001 |
"/ only do if we compare a single class |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2002 |
(cls := classChangeSet classBeingCompared) notNil ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2003 |
ok := classChangeSet diffSet isEmptyOrNil. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2004 |
ok ifFalse:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2005 |
changedClasses := classChangeSet diffSet changedClasses. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2006 |
(changedClasses size == 1 |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2007 |
and:[ changedClasses anElement theNonMetaclass == cls theNonMetaclass]) ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2008 |
(methodsChangedFiltered isEmptyOrNil |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2009 |
and:[ methodsOnlyInAFiltered isEmptyOrNil |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2010 |
and:[ methodsOnlyInBFiltered isEmptyOrNil ]]) ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2011 |
ok := true. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2012 |
] |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2013 |
] |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2014 |
]. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2015 |
ok ifTrue:[ |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2016 |
ChangeSet current condenseChangesForClass:cls |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2017 |
]. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2018 |
]. |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
2019 |
]. |
2221 | 2020 |
! ! |
2021 |
||
2022 |
!VersionDiffBrowser methodsFor:'private'! |
|
2023 |
||
2745 | 2024 |
addAcceptToTextViewMenus |
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2025 |
"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
|
2026 |
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
|
2027 |
(not the shown text) |
2745 | 2028 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2029 |
<return: self> |
3147 | 2030 |
" |
2745 | 2031 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
2032 |
|diffTextView leftView rightView singleView| |
2745 | 2033 |
|
2034 |
diffTextView := self diffTextView. |
|
2035 |
leftView := diffTextView leftTextView. |
|
2036 |
rightView := diffTextView rightTextView. |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2037 |
singleView := self componentAt:#singleTextView. |
2745 | 2038 |
|
11453 | 2039 |
(Array |
13547 | 2040 |
with:leftView |
2041 |
with:rightView |
|
2042 |
with:singleView) |
|
2745 | 2043 |
do:[:v | |
13547 | 2044 |
|mGen| |
2045 |
||
2046 |
mGen := [ |
|
2047 |
|m| |
|
2048 |
||
2049 |
m := v editMenu. |
|
2050 |
||
2051 |
(m selectorAt:#accept) isNil ifTrue:[ |
|
2052 |
m addLabels:(resources array:#('-' 'Accept')) |
|
2053 |
selectors:#(nil #accept) |
|
2054 |
after:#copySelection. |
|
2055 |
]. |
|
2056 |
m |
|
2057 |
actionAt:#accept |
|
2058 |
put:[ |
|
2059 |
v == singleView ifTrue:[ |
|
2060 |
self acceptInSingleView |
|
2061 |
] ifFalse:[ |
|
2062 |
v == leftView ifTrue:[ |
|
2063 |
self acceptInLeftView |
|
2064 |
] ifFalse:[ |
|
2065 |
self acceptInRightView |
|
2066 |
]. |
|
2067 |
]. |
|
2068 |
]. |
|
2069 |
m selectorAt:#accept put:nil. |
|
2070 |
m enable:#copySelection. |
|
2071 |
m setEnable:#accept to:[self canAcceptInCodeView]. |
|
2072 |
m |
|
2073 |
]. |
|
2074 |
v menuHolder:mGen. |
|
2075 |
v menuMessage:#value. |
|
2745 | 2076 |
] |
2077 |
! |
|
2078 |
||
3753 | 2079 |
applyChange:change |
2080 |
change notNil ifTrue:[ |
|
11453 | 2081 |
change apply |
3753 | 2082 |
] |
2083 |
! |
|
2084 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2085 |
printStringForChange:aChange |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2086 |
"generate a print string for a change." |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2087 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2088 |
|m changeClassName classOrMetaString useChangesString selectorString |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2089 |
singleComparedClass singleComparedClassesName singleComparedMetaclassesName |
13137 | 2090 |
printString class1 class2| |
2091 |
||
2092 |
class1 := self classChangeSet class1BeingCompared. |
|
2093 |
class2 := self classChangeSet class2BeingCompared. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2094 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2095 |
(singleComparedClass := self classBeingCompared) notNil ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2096 |
singleComparedClassesName := singleComparedClass name. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2097 |
singleComparedMetaclassesName := singleComparedClass theMetaclass name. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2098 |
]. |
2497 | 2099 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2100 |
aChange isClassDefinitionChange ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2101 |
^ aChange printStringWithoutClassName |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2102 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2103 |
aChange isDoIt ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2104 |
^ aChange source , ' (doIt)' |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2105 |
]. |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2106 |
aChange isNameSpaceCreationChange ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2107 |
^ aChange source |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2108 |
]. |
3678 | 2109 |
|
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2110 |
changeClassName := aChange className. |
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2111 |
changeClassName isNil ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2112 |
^ aChange source |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2113 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2114 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2115 |
useChangesString := false. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2116 |
classOrMetaString := ''. |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
2117 |
|
13137 | 2118 |
(class1 notNil |
2119 |
and:[ class2 notNil |
|
2120 |
and:[ class1 ~= class2 ]]) ifTrue:[ |
|
2121 |
changeClassName := ''. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2122 |
] ifFalse:[ |
13137 | 2123 |
(changeClassName = singleComparedClassesName) ifTrue:[ |
2124 |
"/ changeClassName := ''. |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2125 |
useChangesString := true. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2126 |
] ifFalse:[ |
13137 | 2127 |
(changeClassName = singleComparedMetaclassesName) ifTrue:[ |
2128 |
"/ classOrMetaString := ' class'. |
|
2129 |
useChangesString := true. |
|
2130 |
] ifFalse:[ |
|
2131 |
((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[ |
|
2132 |
changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1. |
|
2133 |
]. |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2134 |
]. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2135 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2136 |
]. |
6272 | 2137 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2138 |
selectorString := ''. |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2139 |
(aChange isMethodChange) ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2140 |
selectorString := aChange selector. |
13137 | 2141 |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2142 |
aChange changeClass notNil ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2143 |
m := aChange changeMethod. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2144 |
m notNil ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2145 |
m := m originalMethodIfWrapped. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2146 |
selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2147 |
]. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
2148 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2149 |
changeClassName notEmptyOrNil ifTrue:[ |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2150 |
selectorString := ' >> ',selectorString |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2151 |
] |
2497 | 2152 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2153 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2154 |
printString := changeClassName,classOrMetaString,selectorString. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2155 |
aChange isMethodCategoryChange ifTrue:[ |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2156 |
^ printString, ' (category)' |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2157 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2158 |
^ printString |
9587
9f33d5c62efa
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
9550
diff
changeset
|
2159 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2160 |
"Modified: / 17-07-2012 / 18:43:27 / cg" |
2497 | 2161 |
! |
2162 |
||
2501 | 2163 |
resetSelectionHolders |
3147 | 2164 |
" |
2165 |
reset all selection holders when a new change set is given. |
|
11453 | 2166 |
First set the selection to nil. |
2507 | 2167 |
|
3147 | 2168 |
<return: self> |
2169 |
" |
|
2501 | 2170 |
|
2171 |
self methodsChangedSelection value:nil. |
|
2172 |
self methodsOnlyInASelection value:nil. |
|
2173 |
self methodsOnlyInBSelection value:nil. |
|
2507 | 2174 |
self diffTextView text1:'' text2:''. |
2175 |
self methodText value:''. |
|
2176 |
||
2177 |
"/ self methodsChangedSelectionChanged. |
|
2178 |
"/ self methodsOnlyInASelectionChanged. |
|
2179 |
"/ self methodsOnlyInBSelectionChanged. |
|
2501 | 2180 |
! |
2181 |
||
2221 | 2182 |
showDiffTextView |
3147 | 2183 |
" |
2184 |
if a method change is selected, then show the diff text view. |
|
2185 |
Add an accept entry to the popup menu. |
|
2507 | 2186 |
|
3147 | 2187 |
<return: self> |
2188 |
" |
|
2694 | 2189 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2190 |
(self componentAt:#diffTextViewBox) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2191 |
(self componentAt:#singleTextView) beInvisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2192 |
(self componentAt:#diffTextView) realizeAllSubViews. |
2694 | 2193 |
|
2465 | 2194 |
self addAcceptToTextViewMenus. |
2221 | 2195 |
! |
2196 |
||
2197 |
showSingleTextView |
|
3147 | 2198 |
" |
2199 |
if a method is selected which is only in version A or B of the class, |
|
2200 |
then show the text view. |
|
2201 |
Add an accept entry to the popup menu. |
|
2507 | 2202 |
|
3147 | 2203 |
<return: self> |
2204 |
" |
|
2507 | 2205 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2206 |
(self componentAt:#singleTextView) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2207 |
(self componentAt:#diffTextViewBox) beInvisible. |
2501 | 2208 |
self addAcceptToTextViewMenus. |
2221 | 2209 |
! |
2210 |
||
2497 | 2211 |
updateLabels |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2212 |
"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
|
2213 |
of the class." |
2221 | 2214 |
|
2694 | 2215 |
|theVersionA theVersionB builder| |
2224 | 2216 |
|
2694 | 2217 |
builder := self builder. |
2497 | 2218 |
(theVersionA := self versionA) notNil ifTrue:[ |
11453 | 2219 |
self diffTextLabelA value:theVersionA. |
2220 |
self onlyInALabelHolder value:('Only in ' , theVersionA). |
|
2221 |
(self componentAt:#OnlyInALabel) |
|
2222 |
foregroundColor:Color white; |
|
2223 |
backgroundColor:Color green darkened. |
|
2224 | 2224 |
]. |
2497 | 2225 |
(theVersionB :=self versionB) notNil ifTrue:[ |
11453 | 2226 |
self diffTextLabelB value:theVersionB. |
2227 |
self onlyInBLabelHolder value:('Only in ' , theVersionB). |
|
2228 |
(self componentAt:#OnlyInBLabel) |
|
2229 |
foregroundColor:Color white; |
|
2230 |
backgroundColor:Color red darkened. |
|
2224 | 2231 |
]. |
7396 | 2232 |
|
2233 |
self changedLabelHolder value:('Different'). |
|
2234 |
||
2235 |
"Modified: / 13-10-2006 / 01:07:08 / cg" |
|
2224 | 2236 |
! |
2237 |
||
2238 |
updateLists |
|
13137 | 2239 |
"walk over the changeSet and setup the 3 lists: |
2240 |
onlyInA, changed, onlyInB, |
|
2241 |
Optionally filter extensions, categoryChanges and versionMethods" |
|
2242 |
||
11453 | 2243 |
|classChangeSet listOnlyInA listOnlyInB listChanged |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2244 |
printStringGenerator sortBlockForChangeLists filteredList |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2245 |
isIgnoredChange numIgnoredExtensions numIgnoredVersionMethods |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2246 |
info needFilter| |
2230
5e10eebb1de2
move change-compare code to where it belongs (Change-hierarchy)
Claus Gittinger <cg@exept.de>
parents:
2229
diff
changeset
|
2247 |
|
2585 | 2248 |
classChangeSet := self classChangeSet. |
2249 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2250 |
printStringGenerator := [:aChange | self printStringForChange:aChange]. |
3839 | 2251 |
sortBlockForChangeLists := [:a :b | (printStringGenerator value:a) < (printStringGenerator value:b)]. |
2252 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2253 |
numIgnoredExtensions := numIgnoredVersionMethods := 0. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2254 |
needFilter := self includeExtensions not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2255 |
or:[self includeCategoryChanges not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2256 |
or:[self includeVersionMethods not]]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2257 |
|
11962 | 2258 |
needFilter ifTrue:[ |
2259 |
isIgnoredChange := |
|
2260 |
[:change | |
|
2261 |
|packageOfMethodInChange packageOfMethodInImage changeMethod ignored| |
|
2262 |
||
2263 |
ignored := false. |
|
2264 |
change isMethodCodeChange ifTrue:[ |
|
2265 |
self includeExtensions ifFalse:[ |
|
2266 |
packageOfMethodInChange := change package. |
|
2267 |
(packageOfMethodInChange notNil |
|
2268 |
and:[ packageOfMethodInChange ~= PackageId noProjectID |
|
12865 | 2269 |
and:[ change changeClass notNil |
2270 |
and:[ packageOfMethodInChange ~= change changeClass package ]]]) ifTrue:[ |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2271 |
ignored := true |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2272 |
]. |
11962 | 2273 |
|
2274 |
changeMethod := change changeMethod. |
|
2275 |
changeMethod notNil ifTrue:[ |
|
2276 |
packageOfMethodInImage := changeMethod package. |
|
2277 |
(true "packageOfMethodInImage notNil" |
|
2278 |
and:[ packageOfMethodInImage ~= PackageId noProjectID |
|
2279 |
and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[ |
|
2280 |
ignored := true |
|
2281 |
]. |
|
2282 |
]. |
|
2283 |
numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]). |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2284 |
]. |
11962 | 2285 |
self includeVersionMethods ifFalse:[ |
2286 |
(change isMethodChangeForVersionMethod |
|
2287 |
or:[ change isMethodChangeForExtensionsVersionMethod ]) ifTrue:[ |
|
2288 |
ignored := true. |
|
2289 |
numIgnoredVersionMethods := numIgnoredVersionMethods + 1 |
|
2290 |
]. |
|
2291 |
]. |
|
2292 |
] ifFalse:[ |
|
2293 |
change isMethodCategoryChange ifTrue:[ |
|
2294 |
self includeCategoryChanges ifFalse:[ |
|
2295 |
ignored := true |
|
2296 |
] |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2297 |
]. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2298 |
]. |
11962 | 2299 |
ignored. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2300 |
]. |
11962 | 2301 |
] ifFalse:[ |
2302 |
isIgnoredChange := [:change | false]. |
|
2303 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2304 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2305 |
listOnlyInA := filteredList := self methodsOnlyInA. |
2731 | 2306 |
listOnlyInA removeAll. |
2307 |
classChangeSet notNil ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2308 |
"/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists. |
11962 | 2309 |
filteredList := classChangeSet methodsOnlyInA reject:isIgnoredChange. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2310 |
listOnlyInA addAll: (filteredList collect:printStringGenerator). |
2731 | 2311 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2312 |
methodsOnlyInAFiltered := filteredList. |
2585 | 2313 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2314 |
listOnlyInB := filteredList := self methodsOnlyInB. |
2731 | 2315 |
listOnlyInB removeAll. |
2316 |
classChangeSet notNil ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2317 |
"/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists. |
11962 | 2318 |
filteredList := classChangeSet methodsOnlyInB reject:isIgnoredChange. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2319 |
listOnlyInB addAll: (filteredList collect:printStringGenerator). |
2731 | 2320 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2321 |
methodsOnlyInBFiltered := filteredList. |
2221 | 2322 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2323 |
listChanged := filteredList := self methodsChanged. |
2731 | 2324 |
listChanged removeAll. |
2325 |
classChangeSet notNil ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2326 |
"/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first]. |
11962 | 2327 |
filteredList := classChangeSet methodsChanged reject:[:entry | isIgnoredChange value:entry first]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2328 |
listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]). |
2731 | 2329 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2330 |
methodsChangedFiltered := filteredList. |
2221 | 2331 |
|
2731 | 2332 |
self boxAVisible value:(listOnlyInA notEmpty). |
2333 |
self boxBVisible value:(listOnlyInB notEmpty). |
|
2221 | 2334 |
|
11453 | 2335 |
self boxMVisible value:(listChanged isEmpty |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2336 |
and: [(listOnlyInA notEmpty |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2337 |
or:[listOnlyInB notEmpty])]) not. |
11453 | 2338 |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2339 |
info := ''. |
11453 | 2340 |
numIgnoredExtensions ~~ 0 ifTrue:[ |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2341 |
info := info , ('%1 extension methods ignored. ' bindWith:numIgnoredExtensions). |
11453 | 2342 |
]. |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2343 |
numIgnoredVersionMethods ~~ 0 ifTrue:[ |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2344 |
info := info , ('%1 version methods ignored.' bindWith:numIgnoredVersionMethods). |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2345 |
]. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
2346 |
self infoHolder value:info |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2347 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2348 |
"Modified: / 17-07-2012 / 18:34:36 / cg" |
14076 | 2349 |
! |
2350 |
||
2351 |
updateVersionList |
|
2352 |
|cls sourceCodeManager numShown newNumShown numOverallRevisions |
|
2353 |
partialLog newestRev revisions symbolicNames |
|
2354 |
stableRevision releasedRevision tagList logMessages items| |
|
2355 |
||
2356 |
cls := classHolder value. |
|
2357 |
sourceCodeManager := cls sourceCodeManager. |
|
2358 |
||
2359 |
numShown := versionList size - 1. |
|
2360 |
newNumShown := (numShown + 50) max:30. |
|
2361 |
partialLog := sourceCodeManager revisionLogOf:cls numberOfRevisions:newNumShown. |
|
2362 |
||
2363 |
partialLog isNil ifTrue:[ |
|
2364 |
self warn:'Could not find/access the container for class ',cls name,' in the repository. |
|
2365 |
This could be due to: |
|
2366 |
- invalid/wrong CVS-Root setting |
|
2367 |
- missing CVS access rights |
|
2368 |
(no access / not logged in) |
|
2369 |
- changed CVSRoot after compilation |
|
2370 |
(i.e. wrong CVS-path in classes version method) |
|
2371 |
'. |
|
2372 |
^ nil |
|
2373 |
]. |
|
2374 |
numOverallRevisions := partialLog at:#numberOfRevisions. |
|
2375 |
newestRev := partialLog at:#newestRevision. |
|
2376 |
revisions := partialLog at:#revisions. |
|
2377 |
symbolicNames := partialLog at:#symbolicNames ifAbsent:[]. |
|
2378 |
symbolicNames notNil ifTrue:[ |
|
2379 |
stableRevision := symbolicNames at:'stable' ifAbsent:[]. |
|
2380 |
releasedRevision := symbolicNames at:'released' ifAbsent:[]. |
|
2381 |
tagList := ((symbolicNames associations sort:[:a :b | a key < b key "self versionString:(a value) isLessThan:(b value)"]) |
|
2382 |
collect:[:assoc | assoc key]) reverse. |
|
2383 |
tagList remove:'stable' ifAbsent:[]. |
|
2384 |
tagList notEmpty ifTrue:[tagList addFirst:'-']. |
|
2385 |
tagList addFirst:'stable'. |
|
2386 |
]. |
|
2387 |
logMessages := Dictionary new. |
|
2388 |
||
2389 |
items := revisions collect:[:each | |rev date who flag| |
|
2390 |
rev := each at:#revision. |
|
2391 |
logMessages at:rev put:(each at:#logMessage). |
|
2392 |
date := (each at:#date ifAbsent:nil) ? '?'. |
|
2393 |
who := (each at:#author ifAbsent:nil) ? '?'. |
|
2394 |
rev = stableRevision ifTrue:[ |
|
2395 |
flag := ' Stable' allBold. |
|
2396 |
] ifFalse:[rev = releasedRevision ifTrue:[ |
|
2397 |
flag := ' Released' allBold. |
|
2398 |
] ifFalse:[ |
|
2399 |
flag := ' ' |
|
2400 |
]]. |
|
2401 |
rev allBold , flag, ' [' , date , ' by ' , who , ']' |
|
2402 |
]. |
|
2403 |
revisions := revisions collect:[:each | each at:#revision]. |
|
2404 |
revisions size < numOverallRevisions ifTrue:[ |
|
2405 |
revisions add:'...' |
|
2406 |
]. |
|
2407 |
symbolicToVersionMapping := symbolicNames. |
|
2408 |
self symbolicVersionList contents:tagList. |
|
2409 |
self versionList contents:revisions. |
|
2221 | 2410 |
! ! |
2411 |
||
2501 | 2412 |
!VersionDiffBrowser methodsFor:'setup'! |
2413 |
||
2695 | 2414 |
setupForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2415 |
"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
|
2416 |
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
|
2417 |
are updated." |
2695 | 2418 |
|
2731 | 2419 |
|changeSet| |
2420 |
||
2745 | 2421 |
aClass isNil ifTrue:[ |
11453 | 2422 |
changeSet := nil |
2745 | 2423 |
] ifFalse:[ |
11453 | 2424 |
aClass isNameSpace ifFalse:[ |
2425 |
aClass isLoaded ifTrue:[ |
|
2426 |
changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA). |
|
2427 |
] |
|
2428 |
]. |
|
2731 | 2429 |
]. |
2856 | 2430 |
self classChangeSet:changeSet. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
2431 |
aVersionA isNil ifTrue:[ |
11453 | 2432 |
self class:aClass versionA:'Repository' versionB:'Current'. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
2433 |
] ifFalse:[ |
11453 | 2434 |
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
|
2435 |
] |
2695 | 2436 |
! |
2437 |
||
2949 | 2438 |
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
|
2439 |
"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
|
2440 |
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
|
2441 |
are updated." |
2949 | 2442 |
|
2443 |
|changeSet| |
|
2444 |
||
2445 |
changeSet := (ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB). |
|
2446 |
self classChangeSet:changeSet |
|
2447 |
! |
|
2448 |
||
2510 | 2449 |
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
|
2450 |
"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
|
2451 |
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
|
2452 |
are updated." |
2510 | 2453 |
|
2731 | 2454 |
|changeSet| |
2455 |
||
9383 | 2456 |
aClass isRealNameSpace ifFalse:[ |
11453 | 2457 |
aClass isLoaded ifTrue:[ |
2458 |
changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB). |
|
2459 |
] |
|
2731 | 2460 |
]. |
2461 |
self classChangeSet:changeSet |
|
7499 | 2462 |
|
2463 |
"Modified: / 10-11-2006 / 17:15:26 / cg" |
|
2510 | 2464 |
! |
2465 |
||
2501 | 2466 |
setupForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2467 |
"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
|
2468 |
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
|
2469 |
are updated." |
2501 | 2470 |
|
2731 | 2471 |
|changeSet| |
2472 |
||
2473 |
aClass isNameSpace ifFalse:[ |
|
11453 | 2474 |
aClass isLoaded ifTrue:[ |
2475 |
changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB). |
|
2476 |
] |
|
2731 | 2477 |
]. |
2856 | 2478 |
self classChangeSet:changeSet. |
2479 |
self class:aClass versionA:aVersionA versionB:aVersionB. |
|
3678 | 2480 |
! |
2481 |
||
2482 |
setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB |
|
2483 |
|changeSet| |
|
2484 |
||
2485 |
changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB). |
|
2486 |
self classChangeSet:changeSet |
|
2501 | 2487 |
! ! |
2488 |
||
2497 | 2489 |
!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'! |
2490 |
||
11453 | 2491 |
changeSetForClass:aClass |
3756 | 2492 |
"return a ChangeSet for the class aClass and its current source. |
2493 |
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
|
2494 |
from the source stream." |
2695 | 2495 |
|
3756 | 2496 |
^ ChangeSet forExistingClass:aClass. |
2695 | 2497 |
! |
2498 |
||
2497 | 2499 |
changeSetForClass:aClass andRevision:aVersion |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2500 |
"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
|
2501 |
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
|
2502 |
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
|
2503 |
|
2497 | 2504 |
|theSourceCodeManager theSourceStream theChangeSet| |
2505 |
||
13305 | 2506 |
theSourceCodeManager := SourceCodeManagerUtilities sourceCodeManagerFor:aClass. |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2507 |
[ |
13305 | 2508 |
theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion. |
2509 |
theSourceStream notNil |
|
2510 |
ifTrue:[theChangeSet := ChangeSet fromStream:theSourceStream] |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2511 |
] ensure:[ |
13305 | 2512 |
theSourceStream notNil ifTrue:[theSourceStream close] |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2513 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2514 |
self sortChangeSet:theChangeSet. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2515 |
^ theChangeSet |
7108 | 2516 |
|
2517 |
"Modified: / 12-09-2006 / 14:24:51 / cg" |
|
2497 | 2518 |
! |
2519 |
||
11453 | 2520 |
changeSetForClass:aClass andSource:aSource |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2521 |
"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
|
2522 |
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
|
2523 |
from the source stream. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2524 |
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
|
2525 |
|
2497 | 2526 |
|theChangeSet theSourceStream| |
2527 |
||
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2528 |
[ |
11453 | 2529 |
theSourceStream := aSource readStream. |
2530 |
theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream) |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2531 |
] ensure:[ |
11453 | 2532 |
theSourceStream notNil ifTrue:[ |
2533 |
theSourceStream close |
|
2534 |
] |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
2535 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2536 |
self sortChangeSet:theChangeSet. |
4653
0a97ce41f5bd
More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents:
4638
diff
changeset
|
2537 |
^ theChangeSet |
2497 | 2538 |
! |
2539 |
||
2695 | 2540 |
newForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2541 |
"return a ClassChangeSet for the class aClass against some verson in the repository. |
11453 | 2542 |
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
|
2543 |
the correspondenting changes." |
2695 | 2544 |
|
8891 | 2545 |
|theClassChangeSet| |
2695 | 2546 |
|
2547 |
theClassChangeSet := self new. |
|
8891 | 2548 |
theClassChangeSet setupForClass:aClass againstVersion:aVersionA. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2549 |
^ theClassChangeSet |
2695 | 2550 |
! |
2551 |
||
2949 | 2552 |
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
|
2553 |
"return a ClassChangeSet for two classes. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2554 |
A new instance of ClassChangeSet is generated containing the correspondenting changes." |
2949 | 2555 |
|
2556 |
|aStream sourceA sourceB theChangeSetA theChangeSetB theClassChangeSet| |
|
2557 |
||
2558 |
theClassChangeSet := self new. |
|
13137 | 2559 |
theClassChangeSet class1BeingCompared:classA class2BeingCompared:classB. |
2949 | 2560 |
theClassChangeSet labelA:aLabelA. |
2561 |
theClassChangeSet labelB:aLabelB. |
|
2562 |
||
2563 |
aStream := '' writeStream. |
|
2564 |
Method flushSourceStreamCache. |
|
2565 |
classA fileOutOn:aStream withTimeStamp:false. |
|
2566 |
sourceA := aStream contents asString. |
|
2567 |
||
2568 |
aStream := '' writeStream. |
|
2569 |
Method flushSourceStreamCache. |
|
2570 |
classB fileOutOn:aStream withTimeStamp:false. |
|
2571 |
sourceB := aStream contents asString. |
|
2572 |
||
11453 | 2573 |
theChangeSetA:=self changeSetForClass:classA andSource:sourceA. |
2949 | 2574 |
theChangeSetB:=self changeSetForClass:classB andSource:sourceB. |
2575 |
theChangeSetA isNil |
|
13137 | 2576 |
ifTrue: [theChangeSetA := ChangeSet new]. |
2949 | 2577 |
theChangeSetB isNil |
13137 | 2578 |
ifTrue: [theChangeSetB := ChangeSet new]. |
2949 | 2579 |
|
2580 |
"/ just in case (if comparing a class against another), |
|
2581 |
"/ unify the classes of the changes (to avoid that all changes are detected as different) |
|
2582 |
||
2583 |
theChangeSetB do:[:eachChange | |
|
13137 | 2584 |
eachChange isMethodChange ifTrue:[ |
2585 |
eachChange changeClass isMeta ifTrue:[ |
|
2586 |
eachChange changeClass ~~ classA theMetaclass ifTrue:[ |
|
2587 |
eachChange changeClass:classA theMetaclass. |
|
2588 |
] |
|
2589 |
] ifFalse:[ |
|
2590 |
eachChange changeClass ~~ classA theNonMetaclass ifTrue:[ |
|
2591 |
eachChange changeClass:classA theNonMetaclass. |
|
2592 |
] |
|
2593 |
]. |
|
2594 |
]. |
|
2949 | 2595 |
]. |
2596 |
"/ remove all #initialize doIts |
|
2597 |
theChangeSetA := theChangeSetA select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]]. |
|
2598 |
theChangeSetB := theChangeSetB select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]]. |
|
2599 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2600 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2601 |
^ theClassChangeSet |
2949 | 2602 |
! |
2603 |
||
2497 | 2604 |
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
|
2605 |
"return a ClassChangeSet for the class aClass and the two sources. |
11453 | 2606 |
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
|
2607 |
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
|
2608 |
|
4128 | 2609 |
|theChangeSetA theChangeSetB theClassChangeSet className metaClassName| |
2497 | 2610 |
|
2611 |
theClassChangeSet := self new. |
|
2612 |
theClassChangeSet classBeingCompared:aClass. |
|
2613 |
theClassChangeSet labelA:aLabelA. |
|
2614 |
theClassChangeSet labelB:aLabelB. |
|
11453 | 2615 |
theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA. |
2497 | 2616 |
theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2617 |
|
4128 | 2618 |
className := aClass name. |
2619 |
metaClassName := aClass class name. |
|
2620 |
||
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2621 |
aClass isPrivate ifTrue:[ |
11453 | 2622 |
theChangeSetA := theChangeSetA select:[:change | change isMethodChange not |
2623 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2624 |
theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not |
|
2625 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2626 |
theChangeSetA := theChangeSetA select:[:change | change isDoIt not |
|
2627 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
|
2628 |
theChangeSetB := theChangeSetB select:[:change | change isMethodChange not |
|
2629 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2630 |
theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not |
|
2631 |
or:[change className = className or:[change className = metaClassName]]]. |
|
2632 |
theChangeSetB := theChangeSetB select:[:change | change isDoIt not |
|
2633 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
|
2634 |
"/ there might be more needed... |
|
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2635 |
]. |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2636 |
|
2497 | 2637 |
theChangeSetA isNil |
11453 | 2638 |
ifTrue: [theChangeSetA := ChangeSet new]. |
2497 | 2639 |
theChangeSetB isNil |
11453 | 2640 |
ifTrue: [theChangeSetB := ChangeSet new]. |
2947 | 2641 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2642 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2643 |
^ theClassChangeSet |
2465 | 2644 |
! |
2645 |
||
2497 | 2646 |
newForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2647 |
"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
|
2648 |
The two class version are checked out from the repository and then being |
11453 | 2649 |
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
|
2650 |
the correspondenting changes." |
2497 | 2651 |
|
2652 |
|theChangeSetA theChangeSetB theClassChangeSet| |
|
2653 |
||
2654 |
theClassChangeSet := self new. |
|
2655 |
theClassChangeSet classBeingCompared:aClass. |
|
2856 | 2656 |
theClassChangeSet versionA:aVersionA. |
2657 |
theClassChangeSet versionB:aVersionB. |
|
2497 | 2658 |
theClassChangeSet labelA:aVersionA. |
2659 |
theClassChangeSet labelB:aVersionB. |
|
2660 |
theChangeSetA := self changeSetForClass: aClass andRevision: aVersionA. |
|
2661 |
theChangeSetB := self changeSetForClass: aClass andRevision: aVersionB. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2662 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2663 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2664 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2665 |
^ theClassChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2666 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2667 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2668 |
sortChangeSet:aChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2669 |
"/ sort by meta and selector |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2670 |
|
11453 | 2671 |
aChangeSet |
2672 |
sort:[:a :b | |
|
2673 |
a == b ifTrue:[ |
|
2674 |
false |
|
2675 |
] ifFalse:[ |
|
2676 |
a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[ |
|
2677 |
a isClassChange == b isClassChange ifTrue:[ |
|
2678 |
a isClassChange ifTrue:[ |
|
2679 |
a isForMeta == b isForMeta ifTrue:[ |
|
2680 |
a isMethodChange == b isMethodChange ifTrue:[ |
|
2681 |
a className < b className |
|
2682 |
or:[ a className = b className |
|
2683 |
and:[ a isPrimitiveChange not |
|
2684 |
and:[ b isPrimitiveChange not |
|
2685 |
and:[ a selector < b selector ]]]] |
|
2686 |
] ifFalse:[ |
|
2687 |
a isMethodChange not |
|
2688 |
]. |
|
2689 |
] ifFalse:[ |
|
2690 |
a isForMeta |
|
2691 |
]. |
|
2692 |
] ifFalse:[ |
|
2693 |
a printString < b printString |
|
2694 |
]. |
|
2695 |
] ifFalse:[ |
|
2696 |
a isClassChange |
|
2697 |
]. |
|
2698 |
] ifFalse:[ |
|
2699 |
a isClassDefinitionChange |
|
2700 |
]. |
|
2701 |
] |
|
2702 |
]. |
|
2497 | 2703 |
! ! |
2704 |
||
2705 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'! |
|
2706 |
||
13137 | 2707 |
class1BeingCompared |
2708 |
"returns the class which is compared" |
|
2709 |
||
2710 |
^ class1BeingCompared |
|
2711 |
! |
|
2712 |
||
2713 |
class1BeingCompared:class1 class2BeingCompared:class2 |
|
2714 |
"returns the class which is compared" |
|
2715 |
||
2716 |
class1BeingCompared := class1. |
|
2717 |
class2BeingCompared := class2 |
|
2718 |
! |
|
2719 |
||
2720 |
class2BeingCompared |
|
2721 |
"returns the class which is compared" |
|
2722 |
||
2723 |
^ class2BeingCompared |
|
2724 |
! |
|
2725 |
||
2497 | 2726 |
classBeingCompared |
13137 | 2727 |
"returns the class which is compared" |
2728 |
||
2729 |
^ class1BeingCompared |
|
2497 | 2730 |
! |
2221 | 2731 |
|
2497 | 2732 |
classBeingCompared:something |
3756 | 2733 |
"set the value of the class which is compared" |
2497 | 2734 |
|
13137 | 2735 |
class1BeingCompared := class2BeingCompared := something. |
2497 | 2736 |
! |
2737 |
||
2695 | 2738 |
diffSet |
3756 | 2739 |
"returns a diffSet containing the different changes. |
2740 |
it responds to: |
|
2695 | 2741 |
|
11453 | 2742 |
changed OrderedCollection of arrays containing ChangeSets for methods |
2743 |
which are changed and exists in the class versionA and versionB |
|
3756 | 2744 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
2745 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
11453 | 2746 |
" |
3756 | 2747 |
|
2695 | 2748 |
^ diffSet |
2749 |
! |
|
2750 |
||
2751 |
diffSet:something |
|
3756 | 2752 |
"sets the diffSet containing the different changes. |
2753 |
it responds to: |
|
2695 | 2754 |
|
11453 | 2755 |
changed OrderedCollection of arrays containing ChangeSets for methods |
2756 |
which are changed and exists in the class versionA and versionB |
|
3756 | 2757 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
2758 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
11453 | 2759 |
" |
2695 | 2760 |
|
2761 |
diffSet := something. |
|
2762 |
! |
|
2763 |
||
2497 | 2764 |
labelA |
3756 | 2765 |
"returns the label for the class versionA" |
2497 | 2766 |
|
2767 |
^ labelA |
|
2768 |
! |
|
2769 |
||
2770 |
labelA:something |
|
3756 | 2771 |
"sets the label for the class versionA" |
2497 | 2772 |
|
2773 |
labelA := something. |
|
2774 |
! |
|
2775 |
||
2776 |
labelB |
|
3756 | 2777 |
"returns the label for the class versionB" |
2497 | 2778 |
|
2779 |
^ labelB |
|
2780 |
! |
|
2465 | 2781 |
|
2497 | 2782 |
labelB:something |
3756 | 2783 |
"sets the label for the class versionB" |
2497 | 2784 |
|
2785 |
labelB := something. |
|
2786 |
! |
|
2787 |
||
2788 |
methodsChanged |
|
11453 | 2789 |
"returns an OrderedCollection of arrays containing ChangeSets for methods |
3756 | 2790 |
which are changed and exists in the class versionA and versionB |
2497 | 2791 |
|
3756 | 2792 |
<return: OrderedCollection of Array(2)> |
2793 |
" |
|
2794 |
||
2795 |
^ self diffSet changed |
|
2497 | 2796 |
! |
2797 |
||
2798 |
methodsOnlyInA |
|
11453 | 2799 |
"returns a ChangeSet for the methods which exists only in the class versionA" |
2497 | 2800 |
|
3756 | 2801 |
^ self diffSet onlyInReceiver |
2497 | 2802 |
! |
2803 |
||
2804 |
methodsOnlyInB |
|
11453 | 2805 |
"returns a ChangeSet for the methods which exists only in the class versionB" |
2497 | 2806 |
|
3756 | 2807 |
^ self diffSet onlyInArg |
2856 | 2808 |
! |
2809 |
||
2810 |
versionA |
|
2811 |
^ versionA |
|
2812 |
! |
|
2813 |
||
2814 |
versionA:something |
|
2815 |
versionA := something. |
|
2816 |
! |
|
2817 |
||
2818 |
versionB |
|
2819 |
^ versionB |
|
2820 |
! |
|
2821 |
||
2822 |
versionB:something |
|
2823 |
versionB := something. |
|
2221 | 2824 |
! ! |
2825 |
||
8891 | 2826 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'misc'! |
2827 |
||
2828 |
removeAllVersionMethods |
|
2829 |
diffSet removeAllVersionMethods. |
|
2830 |
! ! |
|
2831 |
||
2832 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'setup'! |
|
2833 |
||
2834 |
setupForClass:aClass againstVersion:aVersionA |
|
2835 |
"return a ClassChangeSet for the class aClass against some verison in the repository. |
|
11453 | 2836 |
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
|
2837 |
the correspondenting changes." |
8891 | 2838 |
|
2839 |
|theChangeSetA theChangeSetB versionCompared| |
|
2840 |
||
2841 |
self classBeingCompared:aClass. |
|
2842 |
versionCompared := aVersionA. |
|
2843 |
aVersionA isNil ifTrue:[ |
|
11453 | 2844 |
self labelA:(versionCompared := aClass revision). |
2845 |
self versionA:versionCompared. |
|
8891 | 2846 |
] ifFalse:[ |
11453 | 2847 |
aVersionA == #newest ifTrue:[ |
2848 |
self labelA:(VersionDiffBrowser resources string:'Newest'). |
|
2849 |
] ifFalse:[ |
|
2850 |
self labelA:versionCompared. |
|
2851 |
self versionA:versionCompared. |
|
2852 |
] |
|
8891 | 2853 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2854 |
self labelB:(VersionDiffBrowser resources string:'Current'). |
8891 | 2855 |
theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared. |
2856 |
theChangeSetB := self class changeSetForClass: aClass. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2857 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2858 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2859 |
|
8891 | 2860 |
"/ if we are comparing a private class, prune out other changes |
2861 |
aClass isPrivate ifTrue:[ |
|
11453 | 2862 |
theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
2863 |
theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
|
8891 | 2864 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2865 |
self activityNotification:'Generating diff-set...'. |
8891 | 2866 |
self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
2867 |
self activityNotification:nil. |
|
2868 |
^ diffSet |
|
2869 |
! ! |
|
2870 |
||
2221 | 2871 |
!VersionDiffBrowser class methodsFor:'documentation'! |
2872 |
||
2873 |
version |
|
14078 | 2874 |
^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.120 2014-02-28 18:58:16 cg Exp $' |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2875 |
! |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2876 |
|
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2877 |
version_CVS |
14078 | 2878 |
^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.120 2014-02-28 18:58:16 cg Exp $' |
2221 | 2879 |
! ! |
12512 | 2880 |