author | Claus Gittinger <cg@exept.de> |
Fri, 19 Jan 2018 23:42:23 +0100 | |
changeset 17952 | b78dac4d2a4c |
parent 17944 | 58da3a446bc2 |
child 17954 | cf28096d3fa4 |
permissions | -rw-r--r-- |
17952 | 1 |
"{ Encoding: utf8 }" |
2 |
||
2626 | 3 |
" |
4 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
11453 | 5 |
All Rights Reserved |
2626 | 6 |
|
7 |
This software is furnished under a license and may be used |
|
8 |
only in accordance with the terms of that license and with the |
|
9 |
inclusion of the above copyright notice. This software may not |
|
10 |
be provided or otherwise made available to, or used by, any |
|
11 |
other person. No title to or ownership of the software is |
|
12 |
hereby transferred. |
|
13 |
" |
|
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
14 |
"{ Package: 'stx:libtool' }" |
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
15 |
|
15167 | 16 |
"{ NameSpace: Smalltalk }" |
17 |
||
2221 | 18 |
ApplicationModel subclass:#VersionDiffBrowser |
2856 | 19 |
instanceVariableNames:'classChangeSet diffTextView boxAVisible boxBVisible boxMVisible |
20 |
classIfSingleClassDiff versionAIfSingleClassDiff |
|
3147 | 21 |
versionBIfSingleClassDiff changedLabelHolder diffTextLabelA |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
22 |
diffTextLabelB methodText methodsChanged methodsChangedFiltered |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
23 |
methodsChangedSelection methodsOnlyInA methodsOnlyInAFiltered |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
24 |
methodsOnlyInASelection methodsOnlyInB methodsOnlyInBFiltered |
5182 | 25 |
methodsOnlyInBSelection onlyInALabelHolder onlyInBLabelHolder |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
26 |
classHolder versionAHolder versionBHolder infoHolder |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
27 |
includeExtensionsHolder canIncludeExtensionsHolder |
14076 | 28 |
includeCategoryChangesHolder includeVersionMethodsHolder |
15621 | 29 |
isMultipleVersionBrowser versionInfoList versionList |
17827 | 30 |
versionEntriesList selectedVersionHolder symbolicVersionList |
17341 | 31 |
selectedSymbolicVersionHolder symbolicToVersionMapping |
17347 | 32 |
filteredClasses filteredMethods filteredSelectors |
17827 | 33 |
classPatternFilters selectorPatternFilters |
34 |
selectedVersionIndexHolder' |
|
17931 | 35 |
classVariableNames:'RememberedFilters LastSearchString' |
2221 | 36 |
poolDictionaries:'' |
37 |
category:'Interface-Browsers' |
|
38 |
! |
|
39 |
||
2497 | 40 |
HierarchicalItem subclass:#ClassChangeSet |
13137 | 41 |
instanceVariableNames:'class1BeingCompared class2BeingCompared labelA labelB diffSet |
42 |
versionA versionB' |
|
2497 | 43 |
classVariableNames:'' |
44 |
poolDictionaries:'' |
|
45 |
privateIn:VersionDiffBrowser |
|
46 |
! |
|
47 |
||
17341 | 48 |
Object subclass:#FilterParameters |
49 |
instanceVariableNames:'filteredMethodNames filteredClassNames filteredSelectors |
|
50 |
filteredClassNameMatchPattern filteredSelectorMatchPattern' |
|
51 |
classVariableNames:'' |
|
52 |
poolDictionaries:'' |
|
53 |
privateIn:VersionDiffBrowser |
|
54 |
! |
|
55 |
||
2626 | 56 |
!VersionDiffBrowser class methodsFor:'documentation'! |
57 |
||
58 |
copyright |
|
59 |
" |
|
60 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
11453 | 61 |
All Rights Reserved |
2626 | 62 |
|
63 |
This software is furnished under a license and may be used |
|
64 |
only in accordance with the terms of that license and with the |
|
65 |
inclusion of the above copyright notice. This software may not |
|
66 |
be provided or otherwise made available to, or used by, any |
|
67 |
other person. No title to or ownership of the software is |
|
68 |
hereby transferred. |
|
69 |
" |
|
70 |
||
71 |
! |
|
72 |
||
73 |
documentation |
|
74 |
" |
|
75 |
This is not yet finished (work in progress). |
|
76 |
||
15621 | 77 |
A quickly hacked up browser to show differences between class versions, |
2626 | 78 |
allowing easy comparison; will also eventually add capabilities |
79 |
to checkIn / load classes into / from the repository. |
|
80 |
||
81 |
[see also:] |
|
82 |
||
83 |
[instance variables:] |
|
84 |
||
85 |
[class variables:] |
|
86 |
" |
|
87 |
! ! |
|
2221 | 88 |
|
89 |
!VersionDiffBrowser class methodsFor:'interface specs'! |
|
90 |
||
91 |
windowSpec |
|
92 |
"This resource specification was automatically generated |
|
93 |
by the UIPainter of ST/X." |
|
94 |
||
95 |
"Do not manually edit this!! If it is corrupted, |
|
96 |
the UIPainter may not be able to read the specification." |
|
97 |
||
98 |
" |
|
99 |
UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpec |
|
100 |
VersionDiffBrowser new openInterface:#windowSpec |
|
101 |
VersionDiffBrowser open |
|
102 |
" |
|
103 |
||
104 |
<resource: #canvas> |
|
105 |
||
17397 | 106 |
^ |
107 |
#(FullSpec |
|
108 |
name: windowSpec |
|
109 |
window: |
|
110 |
(WindowSpec |
|
111 |
label: 'Version DiffBrowser' |
|
112 |
name: 'Version DiffBrowser' |
|
113 |
min: (Point 10 10) |
|
114 |
bounds: (Rectangle 0 0 865 504) |
|
115 |
menu: mainMenu |
|
116 |
) |
|
117 |
component: |
|
118 |
(SpecCollection |
|
119 |
collection: ( |
|
120 |
(VariableVerticalPanelSpec |
|
121 |
name: 'VariableVerticalPanel1' |
|
122 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0) |
|
123 |
component: |
|
124 |
(SpecCollection |
|
125 |
collection: ( |
|
126 |
(HorizontalPanelViewSpec |
|
127 |
name: 'TopHorizontalPanel' |
|
128 |
horizontalLayout: fit |
|
129 |
verticalLayout: fit |
|
130 |
horizontalSpace: 3 |
|
131 |
verticalSpace: 3 |
|
132 |
component: |
|
133 |
(SpecCollection |
|
134 |
collection: ( |
|
135 |
(ViewSpec |
|
136 |
name: 'BoxA' |
|
137 |
level: 0 |
|
138 |
visibilityChannel: boxAVisible |
|
139 |
component: |
|
140 |
(SpecCollection |
|
141 |
collection: ( |
|
142 |
(LabelSpec |
|
143 |
label: 'Only in A' |
|
144 |
name: 'OnlyInALabel' |
|
145 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
146 |
translateLabel: true |
|
147 |
labelChannel: onlyInALabelHolder |
|
17341 | 148 |
) |
17397 | 149 |
(SequenceViewSpec |
150 |
name: 'ListA' |
|
151 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
152 |
model: methodsOnlyInASelection |
|
153 |
menu: menuAHolder |
|
154 |
hasHorizontalScrollBar: true |
|
155 |
hasVerticalScrollBar: true |
|
156 |
miniScrollerHorizontal: true |
|
157 |
doubleClickSelector: methodInADoubleClicked: |
|
158 |
valueChangeSelector: methodsOnlyInASelectionChanged |
|
159 |
useIndex: true |
|
160 |
sequenceList: methodsOnlyInA |
|
161 |
) |
|
162 |
) |
|
163 |
||
164 |
) |
|
165 |
extent: (Point 286 199) |
|
166 |
) |
|
167 |
(ViewSpec |
|
168 |
name: 'BoxM' |
|
169 |
visibilityChannel: boxMVisible |
|
170 |
component: |
|
171 |
(SpecCollection |
|
172 |
collection: ( |
|
173 |
(LabelSpec |
|
174 |
label: 'Changed' |
|
175 |
name: 'ChangedLabel' |
|
176 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
177 |
translateLabel: true |
|
178 |
labelChannel: changedLabelHolder |
|
179 |
) |
|
180 |
(SequenceViewSpec |
|
181 |
name: 'ListM' |
|
182 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
183 |
model: methodsChangedSelection |
|
184 |
menu: menuMHolder |
|
185 |
hasHorizontalScrollBar: true |
|
186 |
hasVerticalScrollBar: true |
|
187 |
miniScrollerHorizontal: true |
|
188 |
doubleClickSelector: methodInChangedDoubleClicked: |
|
189 |
valueChangeSelector: methodsChangedSelectionChanged |
|
190 |
useIndex: true |
|
191 |
sequenceList: methodsChanged |
|
17341 | 192 |
) |
17397 | 193 |
) |
194 |
||
195 |
) |
|
196 |
extent: (Point 286 199) |
|
197 |
) |
|
198 |
(ViewSpec |
|
199 |
name: 'BoxB' |
|
200 |
visibilityChannel: boxBVisible |
|
201 |
component: |
|
202 |
(SpecCollection |
|
203 |
collection: ( |
|
204 |
(LabelSpec |
|
205 |
label: 'Only in B' |
|
206 |
name: 'OnlyInBLabel' |
|
207 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
208 |
translateLabel: true |
|
209 |
labelChannel: onlyInBLabelHolder |
|
17341 | 210 |
) |
17397 | 211 |
(SequenceViewSpec |
212 |
name: 'ListB' |
|
213 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
214 |
model: methodsOnlyInBSelection |
|
215 |
menu: menuBHolder |
|
216 |
hasHorizontalScrollBar: true |
|
217 |
hasVerticalScrollBar: true |
|
218 |
miniScrollerHorizontal: true |
|
219 |
doubleClickSelector: methodInBDoubleClicked: |
|
220 |
valueChangeSelector: methodsOnlyInBSelectionChanged |
|
221 |
useIndex: true |
|
222 |
sequenceList: methodsOnlyInB |
|
223 |
) |
|
224 |
) |
|
225 |
||
226 |
) |
|
227 |
extent: (Point 287 199) |
|
17341 | 228 |
) |
17397 | 229 |
) |
230 |
||
231 |
) |
|
232 |
) |
|
233 |
(ViewSpec |
|
234 |
name: 'DiffOrSingleMethodCodeBox' |
|
235 |
component: |
|
236 |
(SpecCollection |
|
237 |
collection: ( |
|
238 |
(ViewSpec |
|
239 |
name: 'diffTextViewBox' |
|
240 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
241 |
initiallyInvisible: true |
|
242 |
component: |
|
243 |
(SpecCollection |
|
244 |
collection: ( |
|
245 |
(LabelSpec |
|
246 |
label: 'A' |
|
247 |
name: 'DiffTextLabelA' |
|
248 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0) |
|
249 |
translateLabel: true |
|
250 |
labelChannel: diffTextLabelA |
|
251 |
) |
|
252 |
(LabelSpec |
|
253 |
label: 'B' |
|
254 |
name: 'DiffTextLabelB' |
|
255 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0) |
|
256 |
translateLabel: true |
|
257 |
labelChannel: diffTextLabelB |
|
258 |
) |
|
259 |
(ArbitraryComponentSpec |
|
260 |
name: 'diffTextView' |
|
261 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0) |
|
262 |
hasBorder: false |
|
263 |
component: diffTextView |
|
17341 | 264 |
) |
17397 | 265 |
) |
266 |
||
267 |
) |
|
17341 | 268 |
) |
17397 | 269 |
(CodeViewSpec |
270 |
name: 'singleTextView' |
|
271 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
272 |
model: methodText |
|
273 |
hasHorizontalScrollBar: true |
|
274 |
hasVerticalScrollBar: true |
|
275 |
miniScrollerHorizontal: true |
|
276 |
isReadOnly: true |
|
277 |
hasKeyboardFocusInitially: false |
|
278 |
) |
|
279 |
) |
|
280 |
||
281 |
) |
|
17341 | 282 |
) |
17397 | 283 |
) |
284 |
||
285 |
) |
|
286 |
handles: (Any 0.41999999999999998 1.0) |
|
17341 | 287 |
) |
17397 | 288 |
(LabelSpec |
289 |
name: 'InfoLabel' |
|
290 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1) |
|
291 |
level: -1 |
|
292 |
translateLabel: true |
|
293 |
labelChannel: infoHolder |
|
294 |
adjust: left |
|
295 |
) |
|
296 |
) |
|
297 |
||
298 |
) |
|
299 |
) |
|
14076 | 300 |
! |
301 |
||
302 |
windowSpecForMultipleVersions |
|
303 |
"This resource specification was automatically generated |
|
304 |
by the UIPainter of ST/X." |
|
305 |
||
306 |
"Do not manually edit this!! If it is corrupted, |
|
307 |
the UIPainter may not be able to read the specification." |
|
308 |
||
309 |
" |
|
310 |
UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpecForMultipleVersions |
|
311 |
VersionDiffBrowser new openInterface:#windowSpecForMultipleVersions |
|
312 |
" |
|
313 |
||
314 |
<resource: #canvas> |
|
315 |
||
316 |
^ |
|
317 |
#(FullSpec |
|
318 |
name: windowSpecForMultipleVersions |
|
17827 | 319 |
uuid: '55cb9d62-d4fd-11e7-af82-c42c033b4871' |
14076 | 320 |
window: |
321 |
(WindowSpec |
|
322 |
label: 'Version DiffBrowser' |
|
323 |
name: 'Version DiffBrowser' |
|
17827 | 324 |
uuid: '2b3f2546-d4fd-11e7-af82-c42c033b4871' |
14076 | 325 |
min: (Point 10 10) |
326 |
bounds: (Rectangle 0 0 865 504) |
|
327 |
menu: mainMenu |
|
328 |
) |
|
329 |
component: |
|
330 |
(SpecCollection |
|
331 |
collection: ( |
|
332 |
(VariableVerticalPanelSpec |
|
333 |
name: 'VariableVerticalPanel1' |
|
334 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0) |
|
17827 | 335 |
uuid: '2b3f297e-d4fd-11e7-af82-c42c033b4871' |
14076 | 336 |
component: |
337 |
(SpecCollection |
|
338 |
collection: ( |
|
339 |
(ViewSpec |
|
340 |
name: 'Box1' |
|
17827 | 341 |
uuid: '2b3f2c08-d4fd-11e7-af82-c42c033b4871' |
14076 | 342 |
component: |
343 |
(SpecCollection |
|
344 |
collection: ( |
|
345 |
(SequenceViewSpec |
|
346 |
name: 'VersionList' |
|
347 |
layout: (LayoutFrame 0 0 0 0 0 0.5 0 1) |
|
17827 | 348 |
uuid: '2b3f2d20-d4fd-11e7-af82-c42c033b4871' |
349 |
model: selectedVersionIndexHolder |
|
14076 | 350 |
hasHorizontalScrollBar: true |
351 |
hasVerticalScrollBar: true |
|
17827 | 352 |
useIndex: true |
353 |
sequenceList: versionEntriesList |
|
14076 | 354 |
) |
355 |
(SequenceViewSpec |
|
356 |
name: 'List1' |
|
357 |
layout: (LayoutFrame 0 0.5 0 0 0 1 0 1) |
|
17827 | 358 |
uuid: '2b3f3086-d4fd-11e7-af82-c42c033b4871' |
14076 | 359 |
model: selectedSymbolicVersionHolder |
360 |
hasHorizontalScrollBar: true |
|
361 |
hasVerticalScrollBar: true |
|
362 |
useIndex: false |
|
363 |
sequenceList: symbolicVersionList |
|
364 |
) |
|
365 |
) |
|
366 |
||
367 |
) |
|
368 |
) |
|
369 |
(HorizontalPanelViewSpec |
|
370 |
name: 'TopHorizontalPanel' |
|
17827 | 371 |
uuid: '2b3f3234-d4fd-11e7-af82-c42c033b4871' |
14076 | 372 |
horizontalLayout: fit |
373 |
verticalLayout: fit |
|
374 |
horizontalSpace: 3 |
|
375 |
verticalSpace: 3 |
|
376 |
component: |
|
377 |
(SpecCollection |
|
378 |
collection: ( |
|
379 |
(ViewSpec |
|
380 |
name: 'BoxA' |
|
17827 | 381 |
uuid: '2b3f3464-d4fd-11e7-af82-c42c033b4871' |
14076 | 382 |
level: 0 |
383 |
visibilityChannel: boxAVisible |
|
384 |
component: |
|
385 |
(SpecCollection |
|
386 |
collection: ( |
|
387 |
(LabelSpec |
|
388 |
label: 'Only in A' |
|
389 |
name: 'OnlyInALabel' |
|
390 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
17827 | 391 |
uuid: '2b3f3568-d4fd-11e7-af82-c42c033b4871' |
14076 | 392 |
translateLabel: true |
393 |
labelChannel: onlyInALabelHolder |
|
394 |
) |
|
395 |
(SequenceViewSpec |
|
396 |
name: 'ListA' |
|
397 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
17827 | 398 |
uuid: '2b3f37c0-d4fd-11e7-af82-c42c033b4871' |
14076 | 399 |
model: methodsOnlyInASelection |
17341 | 400 |
menu: menuAHolder |
14076 | 401 |
hasHorizontalScrollBar: true |
402 |
hasVerticalScrollBar: true |
|
403 |
miniScrollerHorizontal: true |
|
404 |
doubleClickSelector: methodInADoubleClicked: |
|
405 |
valueChangeSelector: methodsOnlyInASelectionChanged |
|
406 |
useIndex: true |
|
407 |
sequenceList: methodsOnlyInA |
|
408 |
) |
|
409 |
) |
|
410 |
||
411 |
) |
|
412 |
extent: (Point 286 207) |
|
413 |
) |
|
414 |
(ViewSpec |
|
415 |
name: 'BoxM' |
|
17827 | 416 |
uuid: '2b3f39a0-d4fd-11e7-af82-c42c033b4871' |
14076 | 417 |
visibilityChannel: boxMVisible |
418 |
component: |
|
419 |
(SpecCollection |
|
420 |
collection: ( |
|
421 |
(LabelSpec |
|
422 |
label: 'Changed' |
|
423 |
name: 'ChangedLabel' |
|
424 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
17827 | 425 |
uuid: '2b3f3a86-d4fd-11e7-af82-c42c033b4871' |
14076 | 426 |
translateLabel: true |
427 |
labelChannel: changedLabelHolder |
|
428 |
) |
|
429 |
(SequenceViewSpec |
|
430 |
name: 'ListM' |
|
431 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
17827 | 432 |
uuid: '2b3f3b94-d4fd-11e7-af82-c42c033b4871' |
14076 | 433 |
model: methodsChangedSelection |
17341 | 434 |
menu: menuMHolder |
14076 | 435 |
hasHorizontalScrollBar: true |
436 |
hasVerticalScrollBar: true |
|
437 |
miniScrollerHorizontal: true |
|
438 |
doubleClickSelector: methodInChangedDoubleClicked: |
|
439 |
valueChangeSelector: methodsChangedSelectionChanged |
|
440 |
useIndex: true |
|
441 |
sequenceList: methodsChanged |
|
442 |
) |
|
443 |
) |
|
444 |
||
445 |
) |
|
446 |
extent: (Point 286 207) |
|
447 |
) |
|
448 |
(ViewSpec |
|
449 |
name: 'BoxB' |
|
17827 | 450 |
uuid: '2b3f3d1a-d4fd-11e7-af82-c42c033b4871' |
14076 | 451 |
visibilityChannel: boxBVisible |
452 |
component: |
|
453 |
(SpecCollection |
|
454 |
collection: ( |
|
455 |
(LabelSpec |
|
456 |
label: 'Only in B' |
|
457 |
name: 'OnlyInBLabel' |
|
458 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
|
17827 | 459 |
uuid: '2b3f3dec-d4fd-11e7-af82-c42c033b4871' |
14076 | 460 |
translateLabel: true |
461 |
labelChannel: onlyInBLabelHolder |
|
462 |
) |
|
463 |
(SequenceViewSpec |
|
464 |
name: 'ListB' |
|
465 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
|
17827 | 466 |
uuid: '2b3f3f04-d4fd-11e7-af82-c42c033b4871' |
14076 | 467 |
model: methodsOnlyInBSelection |
17341 | 468 |
menu: menuBHolder |
14076 | 469 |
hasHorizontalScrollBar: true |
470 |
hasVerticalScrollBar: true |
|
471 |
miniScrollerHorizontal: true |
|
472 |
doubleClickSelector: methodInBDoubleClicked: |
|
473 |
valueChangeSelector: methodsOnlyInBSelectionChanged |
|
474 |
useIndex: true |
|
475 |
sequenceList: methodsOnlyInB |
|
476 |
) |
|
477 |
) |
|
478 |
||
479 |
) |
|
480 |
extent: (Point 287 207) |
|
481 |
) |
|
482 |
) |
|
483 |
||
484 |
) |
|
485 |
) |
|
486 |
(ViewSpec |
|
487 |
name: 'DiffBox' |
|
17827 | 488 |
uuid: '2b3f408a-d4fd-11e7-af82-c42c033b4871' |
14076 | 489 |
component: |
490 |
(SpecCollection |
|
491 |
collection: ( |
|
492 |
(ViewSpec |
|
493 |
name: 'diffTextViewBox' |
|
494 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
17827 | 495 |
uuid: '2b3f415c-d4fd-11e7-af82-c42c033b4871' |
14076 | 496 |
initiallyInvisible: true |
497 |
component: |
|
498 |
(SpecCollection |
|
499 |
collection: ( |
|
500 |
(LabelSpec |
|
501 |
label: 'A' |
|
502 |
name: 'DiffTextLabelA' |
|
503 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0) |
|
17827 | 504 |
uuid: '2b3f426a-d4fd-11e7-af82-c42c033b4871' |
14076 | 505 |
translateLabel: true |
506 |
labelChannel: diffTextLabelA |
|
507 |
) |
|
508 |
(LabelSpec |
|
509 |
label: 'B' |
|
510 |
name: 'DiffTextLabelB' |
|
511 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0) |
|
17827 | 512 |
uuid: '2b3f43d2-d4fd-11e7-af82-c42c033b4871' |
14076 | 513 |
translateLabel: true |
514 |
labelChannel: diffTextLabelB |
|
515 |
) |
|
516 |
(ArbitraryComponentSpec |
|
517 |
name: 'diffTextView' |
|
518 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0) |
|
17827 | 519 |
uuid: '2b3f4508-d4fd-11e7-af82-c42c033b4871' |
14076 | 520 |
hasBorder: false |
521 |
component: diffTextView |
|
522 |
) |
|
523 |
) |
|
524 |
||
525 |
) |
|
526 |
) |
|
527 |
(CodeViewSpec |
|
528 |
name: 'singleTextView' |
|
529 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
|
17827 | 530 |
uuid: '2b3f4738-d4fd-11e7-af82-c42c033b4871' |
14076 | 531 |
model: methodText |
532 |
hasHorizontalScrollBar: true |
|
533 |
hasVerticalScrollBar: true |
|
534 |
miniScrollerHorizontal: true |
|
535 |
isReadOnly: true |
|
536 |
hasKeyboardFocusInitially: false |
|
537 |
) |
|
538 |
) |
|
539 |
||
540 |
) |
|
541 |
) |
|
542 |
) |
|
543 |
||
544 |
) |
|
17827 | 545 |
handles: (Any 0.22 0.67000000000000004 1.0) |
14076 | 546 |
) |
547 |
(LabelSpec |
|
548 |
name: 'InfoLabel' |
|
549 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1) |
|
17827 | 550 |
uuid: '2b3f4a44-d4fd-11e7-af82-c42c033b4871' |
14076 | 551 |
level: -1 |
552 |
translateLabel: true |
|
553 |
labelChannel: infoHolder |
|
554 |
adjust: left |
|
555 |
) |
|
556 |
) |
|
557 |
||
558 |
) |
|
559 |
) |
|
2221 | 560 |
! ! |
561 |
||
562 |
!VersionDiffBrowser class methodsFor:'menu specs'! |
|
563 |
||
17341 | 564 |
filterMenu |
565 |
"This resource specification was automatically generated |
|
566 |
by the MenuEditor of ST/X." |
|
567 |
||
568 |
"Do not manually edit this!! If it is corrupted, |
|
569 |
the MenuEditor may not be able to read the specification." |
|
570 |
||
571 |
||
572 |
" |
|
573 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu |
|
574 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp |
|
575 |
" |
|
576 |
||
577 |
<resource: #menu> |
|
578 |
||
579 |
^ |
|
580 |
#(Menu |
|
581 |
( |
|
582 |
(MenuItem |
|
583 |
label: 'Filter Classes Matching...' |
|
584 |
itemValue: filterClassesMatching |
|
585 |
) |
|
586 |
(MenuItem |
|
17348 | 587 |
label: 'Filter Selectors Matching...' |
588 |
itemValue: filterSelectorsMatching |
|
589 |
) |
|
590 |
(MenuItem |
|
17952 | 591 |
label: 'Remove Class Filter' |
592 |
itemValue: removeClassFilter |
|
593 |
) |
|
594 |
(MenuItem |
|
595 |
label: 'Remove Selector Filter' |
|
596 |
itemValue: removeSelectorFilter |
|
597 |
) |
|
598 |
(MenuItem |
|
17341 | 599 |
label: '-' |
600 |
) |
|
601 |
(MenuItem |
|
602 |
label: 'Remember Filter As...' |
|
603 |
itemValue: rememberFilterAs |
|
604 |
) |
|
605 |
(MenuItem |
|
17344 | 606 |
label: 'Load Filter Named...' |
607 |
itemValue: loadFilterNamed |
|
608 |
) |
|
609 |
(MenuItem |
|
610 |
label: '-' |
|
611 |
) |
|
612 |
(MenuItem |
|
17349 | 613 |
label: 'Export Filter Settings' |
614 |
itemValue: exportFilterParameters |
|
615 |
) |
|
616 |
(MenuItem |
|
617 |
label: 'Import Filter Settings From...' |
|
618 |
itemValue: importFilterParameters |
|
619 |
) |
|
620 |
(MenuItem |
|
621 |
label: '-' |
|
622 |
) |
|
623 |
(MenuItem |
|
17341 | 624 |
label: 'Forget Filter Named...' |
625 |
itemValue: forgetFilterNamed |
|
626 |
) |
|
17344 | 627 |
(MenuItem |
628 |
label: '-' |
|
629 |
) |
|
630 |
(MenuItem |
|
631 |
label: 'Inspect Current Filter Settings' |
|
632 |
itemValue: inspectFilterParameters |
|
633 |
) |
|
634 |
||
17341 | 635 |
) |
636 |
nil |
|
637 |
nil |
|
638 |
) |
|
639 |
||
640 |
"Created: / 05-02-2017 / 11:11:30 / cg" |
|
17349 | 641 |
"Modified: / 06-02-2017 / 09:27:22 / cg" |
17341 | 642 |
! |
643 |
||
2221 | 644 |
mainMenu |
645 |
"This resource specification was automatically generated |
|
646 |
by the MenuEditor of ST/X." |
|
647 |
||
648 |
"Do not manually edit this!! If it is corrupted, |
|
649 |
the MenuEditor may not be able to read the specification." |
|
650 |
||
10703 | 651 |
|
2221 | 652 |
" |
653 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu |
|
654 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp |
|
655 |
" |
|
656 |
||
657 |
<resource: #menu> |
|
658 |
||
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
659 |
^ |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
660 |
#(Menu |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
661 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
662 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
663 |
label: 'File' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
664 |
submenu: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
665 |
(Menu |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
666 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
667 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
668 |
label: 'Create PatchFile...' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
669 |
itemValue: createPatchFile |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
670 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
671 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
672 |
label: '-' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
673 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
674 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
675 |
label: 'Exit' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
676 |
itemValue: closeRequest |
11853
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
677 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
678 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
679 |
nil |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
680 |
nil |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
681 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
682 |
) |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
683 |
(MenuItem |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
684 |
label: 'Class' |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
685 |
submenu: |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
686 |
(Menu |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
687 |
( |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
688 |
(MenuItem |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
689 |
label: 'Remove from Changeset' |
fe611dbb05ca
added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11596
diff
changeset
|
690 |
itemValue: removeClassFromChangeSet |
17341 | 691 |
enabled: showingClassChangeSet |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
692 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
693 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
694 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
695 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
696 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
697 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
698 |
(MenuItem |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
699 |
label: 'View' |
17341 | 700 |
submenuChannel: viewMenu |
701 |
) |
|
702 |
(MenuItem |
|
703 |
label: 'Filter' |
|
704 |
submenuChannel: filterMenu |
|
705 |
) |
|
706 |
(MenuItem |
|
707 |
label: 'MENU_Help' |
|
708 |
startGroup: conditionalRight |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
709 |
submenu: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
710 |
(Menu |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
711 |
( |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
712 |
(MenuItem |
17341 | 713 |
label: 'Documentation' |
714 |
itemValue: openDocumentation |
|
715 |
) |
|
716 |
(MenuItem |
|
717 |
label: '-' |
|
718 |
) |
|
719 |
(MenuItem |
|
720 |
label: 'About this Application...' |
|
721 |
itemValue: openAboutThisApplication |
|
722 |
) |
|
723 |
) |
|
724 |
nil |
|
725 |
nil |
|
726 |
) |
|
727 |
) |
|
728 |
) |
|
729 |
nil |
|
730 |
nil |
|
731 |
) |
|
732 |
||
733 |
"Modified: / 05-02-2017 / 11:09:50 / cg" |
|
734 |
! |
|
735 |
||
736 |
menuA |
|
737 |
"This resource specification was automatically generated |
|
738 |
by the MenuEditor of ST/X." |
|
739 |
||
740 |
"Do not manually edit this!! If it is corrupted, |
|
741 |
the MenuEditor may not be able to read the specification." |
|
742 |
||
743 |
" |
|
744 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
745 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
746 |
" |
|
747 |
||
748 |
<resource: #menu> |
|
749 |
||
750 |
^ |
|
751 |
#(#Menu |
|
752 |
#( |
|
753 |
#(#MenuItem |
|
754 |
#label: 'Apply' |
|
755 |
#translateLabel: true |
|
756 |
#value: #applySelectedChangeInA |
|
757 |
#enabled: #hasChangeSelectedInA |
|
758 |
) |
|
759 |
#(#MenuItem |
|
760 |
#label: 'Browse' |
|
761 |
#translateLabel: true |
|
762 |
#value: #browseClassInA |
|
763 |
#enabled: #hasChangeSelectedInA |
|
764 |
) |
|
765 |
#(#MenuItem |
|
766 |
#label: '-' |
|
767 |
) |
|
768 |
#(#MenuItem |
|
769 |
#label: 'Filter this Change' |
|
770 |
#translateLabel: true |
|
771 |
#value: #filterMethodInA |
|
772 |
#enabled: #hasChangeSelectedInA |
|
773 |
) |
|
774 |
#(#MenuItem |
|
775 |
#label: 'Filter Class' |
|
776 |
#translateLabel: true |
|
777 |
#value: #filterClassInA |
|
778 |
#enabled: #hasChangeSelectedInA |
|
779 |
) |
|
780 |
#(#MenuItem |
|
17931 | 781 |
#label: 'Filter Selector' |
17341 | 782 |
#translateLabel: true |
783 |
#value: #filterSelectorFromA |
|
784 |
#enabled: #hasChangeSelectedInA |
|
785 |
) |
|
786 |
#(#MenuItem |
|
787 |
#label: '-' |
|
788 |
) |
|
789 |
#(#MenuItem |
|
17931 | 790 |
#label: 'Find Next Change with String...' |
791 |
#translateLabel: true |
|
792 |
#value: #findNextChangeWithStringInA |
|
793 |
#enabled: #hasChangeSelectedInA |
|
794 |
) |
|
795 |
#(#MenuItem |
|
796 |
#label: '-' |
|
797 |
) |
|
798 |
#(#MenuItem |
|
17341 | 799 |
#label: 'Inspect' |
800 |
#translateLabel: true |
|
801 |
#value: #inspectSelectedChangeInA |
|
802 |
#choiceValue: 'nil "UndefinedObject" ' |
|
803 |
#enabled: #hasChangeSelectedInA |
|
804 |
) |
|
805 |
) |
|
806 |
nil |
|
807 |
nil |
|
808 |
) |
|
809 |
||
810 |
"Modified: / 05-02-2017 / 11:21:54 / cg" |
|
811 |
! |
|
812 |
||
813 |
menuB |
|
814 |
"This resource specification was automatically generated |
|
815 |
by the MenuEditor of ST/X." |
|
816 |
||
817 |
"Do not manually edit this!! If it is corrupted, |
|
818 |
the MenuEditor may not be able to read the specification." |
|
819 |
||
820 |
" |
|
821 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menuB |
|
822 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menuB)) startUp |
|
823 |
" |
|
824 |
||
825 |
<resource: #menu> |
|
826 |
||
827 |
^ |
|
828 |
#(#Menu |
|
829 |
#( |
|
830 |
#(#MenuItem |
|
831 |
#label: 'Apply' |
|
832 |
#translateLabel: true |
|
833 |
#value: #applySelectedChangeInB |
|
834 |
#enabled: #hasChangeSelectedInB |
|
835 |
) |
|
836 |
#(#MenuItem |
|
837 |
#label: 'Browse' |
|
838 |
#translateLabel: true |
|
839 |
#value: #browseClassInB |
|
840 |
#enabled: #hasChangeSelectedInB |
|
841 |
) |
|
842 |
#(#MenuItem |
|
843 |
#label: '-' |
|
844 |
) |
|
845 |
#(#MenuItem |
|
846 |
#label: 'Remove in Image' |
|
847 |
#translateLabel: true |
|
848 |
#value: #removeSelectedChangeInBFromImage |
|
849 |
#enabled: #hasChangeSelectedInB |
|
850 |
) |
|
851 |
#(#MenuItem |
|
852 |
#label: '-' |
|
853 |
) |
|
854 |
#(#MenuItem |
|
855 |
#label: 'Filter this Change' |
|
856 |
#translateLabel: true |
|
857 |
#value: #filterMethodInB |
|
858 |
#enabled: #hasChangeSelectedInB |
|
859 |
) |
|
860 |
#(#MenuItem |
|
861 |
#label: 'Filter Class' |
|
862 |
#translateLabel: true |
|
863 |
#value: #filterClassInB |
|
864 |
#enabled: #hasChangeSelectedInB |
|
865 |
) |
|
866 |
#(#MenuItem |
|
867 |
#label: 'Filter Selector ' |
|
868 |
#translateLabel: true |
|
869 |
#value: #filterSelectorFromB |
|
870 |
#enabled: #hasChangeSelectedInB |
|
871 |
) |
|
872 |
#(#MenuItem |
|
873 |
#label: '-' |
|
874 |
) |
|
875 |
#(#MenuItem |
|
17931 | 876 |
#label: '-' |
877 |
) |
|
878 |
#(#MenuItem |
|
879 |
#label: 'Find Next Change with String...' |
|
880 |
#translateLabel: true |
|
881 |
#value: #findNextChangeWithStringInB |
|
882 |
#enabled: #hasChangeSelectedInB |
|
883 |
) |
|
884 |
#(#MenuItem |
|
17341 | 885 |
#label: 'Inspect' |
886 |
#translateLabel: true |
|
887 |
#value: #inspectSelectedChangeInB |
|
888 |
#choiceValue: 'nil "UndefinedObject" ' |
|
889 |
#enabled: #hasChangeSelectedInB |
|
890 |
) |
|
891 |
) |
|
892 |
nil |
|
893 |
nil |
|
894 |
) |
|
895 |
||
896 |
"Modified: / 05-02-2017 / 11:22:10 / cg" |
|
897 |
! |
|
898 |
||
899 |
menuM |
|
900 |
"This resource specification was automatically generated |
|
901 |
by the MenuEditor of ST/X." |
|
902 |
||
903 |
"Do not manually edit this!! If it is corrupted, |
|
904 |
the MenuEditor may not be able to read the specification." |
|
905 |
||
906 |
" |
|
907 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
908 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
909 |
" |
|
910 |
||
911 |
<resource: #menu> |
|
912 |
||
913 |
^ |
|
914 |
#(#Menu |
|
915 |
#( |
|
916 |
#(#MenuItem |
|
917 |
#label: 'Browse' |
|
918 |
#translateLabel: true |
|
919 |
#value: #browseClassInM |
|
920 |
#enabled: #hasChangeSelectedInM |
|
921 |
) |
|
922 |
#(#MenuItem |
|
923 |
#label: '-' |
|
924 |
) |
|
925 |
#(#MenuItem |
|
926 |
#label: 'Apply Left Version' |
|
927 |
#translateLabel: true |
|
928 |
#value: #acceptInLeftView |
|
929 |
#enabled: #hasChangeSelectedInM |
|
930 |
) |
|
931 |
#(#MenuItem |
|
932 |
#label: 'Apply Right Version' |
|
933 |
#translateLabel: true |
|
934 |
#value: #acceptInRightView |
|
935 |
#enabled: #hasChangeSelectedInM |
|
936 |
) |
|
937 |
#(#MenuItem |
|
938 |
#label: '-' |
|
939 |
) |
|
940 |
#(#MenuItem |
|
941 |
#label: 'Filter this Change' |
|
942 |
#translateLabel: true |
|
943 |
#value: #filterMethodInM |
|
944 |
#enabled: #hasChangeSelectedInM |
|
945 |
) |
|
946 |
#(#MenuItem |
|
947 |
#label: 'Filter Class' |
|
948 |
#translateLabel: true |
|
949 |
#value: #filterClassInM |
|
950 |
#enabled: #hasChangeSelectedInM |
|
951 |
) |
|
952 |
#(#MenuItem |
|
953 |
#label: 'Filter Selector ' |
|
954 |
#translateLabel: true |
|
955 |
#value: #filterSelectorFromM |
|
956 |
#enabled: #hasChangeSelectedInM |
|
957 |
) |
|
958 |
#(#MenuItem |
|
959 |
#label: '-' |
|
960 |
) |
|
961 |
#(#MenuItem |
|
17931 | 962 |
#label: 'Find Next Change with String...' |
963 |
#translateLabel: true |
|
964 |
#value: #findNextChangeWithStringInM |
|
965 |
#enabled: #hasChangeSelectedInM |
|
966 |
) |
|
967 |
#(#MenuItem |
|
968 |
#label: '-' |
|
969 |
) |
|
970 |
#(#MenuItem |
|
17341 | 971 |
#label: 'Inspect both' |
972 |
#translateLabel: true |
|
973 |
#value: #inspectSelectedChangeInM |
|
974 |
#choiceValue: 'nil "UndefinedObject" ' |
|
975 |
#enabled: #hasChangeSelectedInM |
|
976 |
) |
|
977 |
) |
|
978 |
nil |
|
979 |
nil |
|
980 |
) |
|
981 |
||
982 |
"Modified: / 05-02-2017 / 11:21:44 / cg" |
|
983 |
! |
|
984 |
||
985 |
viewMenu |
|
986 |
"This resource specification was automatically generated |
|
987 |
by the MenuEditor of ST/X." |
|
988 |
||
989 |
"Do not manually edit this!! If it is corrupted, |
|
990 |
the MenuEditor may not be able to read the specification." |
|
991 |
||
992 |
||
993 |
" |
|
994 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu |
|
995 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp |
|
996 |
" |
|
997 |
||
998 |
<resource: #menu> |
|
999 |
||
1000 |
^ |
|
1001 |
#(Menu |
|
1002 |
( |
|
1003 |
(MenuItem |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1004 |
enabled: canIncludeExtensionsHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1005 |
label: 'Include Extensions' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1006 |
itemValue: includeExtensions: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1007 |
indication: includeExtensionsHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1008 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1009 |
(MenuItem |
11958 | 1010 |
enabled: canIncludeExtensionsHolder |
1011 |
label: 'Include Version Methods' |
|
1012 |
itemValue: includeVersionMethods: |
|
1013 |
indication: includeVersionMethodsHolder |
|
1014 |
) |
|
1015 |
(MenuItem |
|
1016 |
label: '-' |
|
1017 |
) |
|
1018 |
(MenuItem |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1019 |
label: 'Include Category Changes' |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1020 |
itemValue: includeCategoryChanges: |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1021 |
indication: includeCategoryChangesHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1022 |
) |
15632 | 1023 |
(MenuItem |
17334 | 1024 |
label: 'Hide Comment- and Formatting-Only Changes' |
1025 |
itemValue: hideDiffsWithCommentOrFormattingChangeOnlyHolder: |
|
1026 |
indication: hideDiffsWithCommentOrFormattingChangeOnlyHolder |
|
1027 |
) |
|
1028 |
(MenuItem |
|
15632 | 1029 |
label: '-' |
1030 |
) |
|
1031 |
(MenuItem |
|
1032 |
label: 'Show Log Messages' |
|
1033 |
itemValue: showLogMessages |
|
1034 |
) |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1035 |
) |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1036 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1037 |
nil |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1038 |
) |
17341 | 1039 |
|
1040 |
"Created: / 05-02-2017 / 11:06:24 / cg" |
|
2221 | 1041 |
! ! |
1042 |
||
2695 | 1043 |
!VersionDiffBrowser class methodsFor:'plugIn spec'! |
1044 |
||
1045 |
aspectSelectors |
|
1046 |
"This resource specification was automatically generated |
|
1047 |
by the UIPainter of ST/X." |
|
1048 |
||
1049 |
"Do not manually edit this. If it is corrupted, |
|
1050 |
the UIPainter may not be able to read the specification." |
|
1051 |
||
1052 |
"Return a description of exported aspects; |
|
1053 |
these can be connected to aspects of an embedding application |
|
1054 |
(if this app is embedded in a subCanvas)." |
|
1055 |
||
1056 |
^ #( |
|
14076 | 1057 |
#changedLabelHolder |
1058 |
#onlyInALabelHolder |
|
1059 |
#onlyInBLabelHolder |
|
2695 | 1060 |
). |
1061 |
||
1062 |
! ! |
|
1063 |
||
2221 | 1064 |
!VersionDiffBrowser class methodsFor:'startup'! |
1065 |
||
14076 | 1066 |
openOnAllVersionsOfClass:aClass |
1067 |
"create a VersionDiffBrowser instance and set the class change set of the |
|
1068 |
browser. The class diff set is generated from aClasses current version against |
|
1069 |
the selected version in the top selection list" |
|
1070 |
||
1071 |
|theBrowser| |
|
1072 |
||
1073 |
theBrowser := self new. |
|
1074 |
theBrowser allButOpenInterface:#windowSpecForMultipleVersions. |
|
1075 |
theBrowser beMultipleVersionBrowser. |
|
1076 |
theBrowser classHolder:(ValueHolder with:aClass). |
|
1077 |
theBrowser setupForClass:aClass againstVersion:nil. |
|
17334 | 1078 |
theBrowser window label:(self resources string:'Versions of %1' with:aClass name). |
14076 | 1079 |
theBrowser openWindow. |
1080 |
^ theBrowser. |
|
1081 |
||
1082 |
" |
|
1083 |
self openOnAllVersionsOfClass:Object |
|
1084 |
" |
|
17334 | 1085 |
|
1086 |
"Modified: / 04-02-2017 / 19:52:33 / cg" |
|
14076 | 1087 |
! |
1088 |
||
11453 | 1089 |
openOnClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1090 |
"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
|
1091 |
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
|
1092 |
via the source code manager." |
2507 | 1093 |
|
2497 | 1094 |
|theBrowser| |
2224 | 1095 |
|
2497 | 1096 |
theBrowser := self new. |
1097 |
theBrowser allButOpen. |
|
2695 | 1098 |
theBrowser setupForClass:aClass againstVersion:aVersionA. |
17334 | 1099 |
theBrowser window label:(self resources string:'Diffs of %1 %2 against current' with:aClass name with:aVersionA). |
2497 | 1100 |
theBrowser openWindow. |
1101 |
^ theBrowser. |
|
2224 | 1102 |
|
2695 | 1103 |
" |
1104 |
self openOnClass:Array againstVersion:'1.116' |
|
1105 |
self openOnClass:Array againstVersion:nil - against the version on which Array is based upon |
|
1106 |
self openOnClass:Array againstVersion:#newest - against the newest repository version |
|
1107 |
||
1108 |
self openOnClass:VersionDiffBrowser againstVersion:nil |
|
1109 |
self openOnClass:VersionDiffBrowser againstVersion:#newest |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1110 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1111 |
(self openOnClass:ByteArray againstVersion:'1.116') includeExtensionsHolder value:true |
2695 | 1112 |
" |
17334 | 1113 |
|
1114 |
"Modified: / 04-02-2017 / 19:58:16 / cg" |
|
2695 | 1115 |
! |
1116 |
||
17334 | 1117 |
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:title |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1118 |
"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
|
1119 |
browser. The class diff set is generated from two classes." |
2949 | 1120 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1121 |
^ self |
17334 | 1122 |
openOnClass:classA labelA:aLabelA |
1123 |
andClass:classB labelB:aLabelB |
|
1124 |
title:title ifSame:nil |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1125 |
|
3147 | 1126 |
" |
11453 | 1127 |
self |
17334 | 1128 |
openOnClass:Array labelA:'Array' |
1129 |
andClass:Collection labelB:'Collection' |
|
1130 |
title:'Array vs. Collection' |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1131 |
" |
17334 | 1132 |
|
1133 |
"Modified (comment): / 04-02-2017 / 20:02:38 / cg" |
|
2949 | 1134 |
! |
1135 |
||
17334 | 1136 |
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:title ifSame:sameAction |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1137 |
"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
|
1138 |
browser. The class diff set is generated from two classes." |
2949 | 1139 |
|
8891 | 1140 |
|classChangeSet| |
2949 | 1141 |
|
8891 | 1142 |
classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB. |
1143 |
classChangeSet removeAllVersionMethods. |
|
2949 | 1144 |
sameAction notNil ifTrue:[ |
17334 | 1145 |
"/ check if same ... |
1146 |
(classChangeSet methodsOnlyInA isEmpty |
|
1147 |
and:[classChangeSet methodsOnlyInB isEmpty |
|
1148 |
and:[classChangeSet diffSet isEmpty]]) ifTrue:[ |
|
1149 |
sameAction value. |
|
1150 |
^ self "/ do not open |
|
1151 |
] |
|
2949 | 1152 |
]. |
8891 | 1153 |
|
17334 | 1154 |
^ self openOnClassChangeSet:classChangeSet title:title |
1155 |
||
1156 |
"Modified (format): / 04-02-2017 / 19:59:16 / cg" |
|
2949 | 1157 |
! |
1158 |
||
11453 | 1159 |
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
|
1160 |
"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
|
1161 |
browser. The class diff set is generated from two source files." |
2695 | 1162 |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
1163 |
^ self |
11453 | 1164 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
1165 |
title:nil |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
1166 |
! |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
1167 |
|
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
1168 |
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
|
1169 |
"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
|
1170 |
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
|
1171 |
|
11453 | 1172 |
^ self |
1173 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA |
|
1174 |
labelB:aLabelB sourceB:aSourceB |
|
1175 |
title:ignoredTitle ifSame:nil |
|
2849 | 1176 |
! |
1177 |
||
1178 |
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
|
1179 |
"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
|
1180 |
browser. The class diff set is generated from two source files." |
8891 | 1181 |
|
1182 |
|diffs hasChangedMethods classChangeSet versionMethodChanges| |
|
2695 | 1183 |
|
8891 | 1184 |
classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB. |
1185 |
classChangeSet removeAllVersionMethods. |
|
2849 | 1186 |
sameAction notNil ifTrue:[ |
17347 | 1187 |
"/ check if same ... |
1188 |
(classChangeSet methodsOnlyInA isEmpty |
|
1189 |
and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[ |
|
1190 |
diffs := classChangeSet diffSet. |
|
1191 |
||
1192 |
hasChangedMethods := diffs changed notEmpty. |
|
1193 |
hasChangedMethods ifTrue:[ |
|
1194 |
versionMethodChanges := diffs changed select:[:eachDifference | |
|
1195 |
|eachChange| |
|
1196 |
eachChange := eachDifference first. |
|
1197 |
(eachChange isMethodChange |
|
1198 |
and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange changeSelector) |
|
1199 |
and:[ eachChange changeClass isMeta ]]). |
|
1200 |
]. |
|
1201 |
diffs changed size == versionMethodChanges size ifTrue: [ |
|
1202 |
hasChangedMethods := false. |
|
1203 |
]. |
|
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1204 |
"/ diffs changed size == 1 ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1205 |
"/ theOnlyDifference := diffs changed first. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1206 |
"/ theOnlyChange := theOnlyDifference first. |
11453 | 1207 |
"/ (theOnlyChange isMethodChange |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1208 |
"/ and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_']) |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1209 |
"/ and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1210 |
"/ hasChangedMethods := false |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1211 |
"/ ] |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
1212 |
"/ ] |
17347 | 1213 |
]. |
1214 |
||
1215 |
(hasChangedMethods not |
|
1216 |
and:[diffs onlyInArg isEmpty |
|
1217 |
and:[diffs onlyInReceiver isEmpty]]) ifTrue:[ |
|
1218 |
sameAction value. |
|
1219 |
^ self "/ do not open |
|
1220 |
]. |
|
1221 |
] |
|
2849 | 1222 |
]. |
8891 | 1223 |
|
1224 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
7396 | 1225 |
|
17347 | 1226 |
"Modified: / 06-02-2017 / 02:31:51 / cg" |
2224 | 1227 |
! |
1228 |
||
2497 | 1229 |
openOnClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1230 |
"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
|
1231 |
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
|
1232 |
the source code manager." |
2507 | 1233 |
|
2497 | 1234 |
|theBrowser| |
2221 | 1235 |
|
2497 | 1236 |
theBrowser := self new. |
1237 |
theBrowser allButOpen. |
|
2695 | 1238 |
theBrowser setupForClass:aClass versionA:aVersionA versionB:aVersionB. |
2497 | 1239 |
theBrowser openWindow. |
1240 |
^ theBrowser. |
|
2221 | 1241 |
|
1242 |
" |
|
1243 |
self openOnClass:Array versionA:'1.116' versionB:'1.113' |
|
1244 |
" |
|
3678 | 1245 |
! |
1246 |
||
17334 | 1247 |
openOnClassChangeSet:classChangeSet title:title |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1248 |
"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
|
1249 |
browser. The class diff set is generated from two classes." |
8891 | 1250 |
|
1251 |
|theBrowser| |
|
1252 |
||
1253 |
theBrowser := self new. |
|
1254 |
theBrowser allButOpen. |
|
1255 |
theBrowser classChangeSet:classChangeSet. |
|
1256 |
theBrowser openWindow. |
|
17334 | 1257 |
theBrowser window label:title. |
8891 | 1258 |
^ theBrowser. |
17334 | 1259 |
|
1260 |
"Modified: / 04-02-2017 / 19:59:06 / cg" |
|
8891 | 1261 |
! |
1262 |
||
3678 | 1263 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle |
10691 | 1264 |
^ self |
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1265 |
openOnDiffSet:diffSet |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1266 |
labelA:aLabelA labelB:aLabelB |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1267 |
title:ignoredTitle |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1268 |
ignoreExtensions:false |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1269 |
ignoreVersionMethods:false |
10691 | 1270 |
|
1271 |
"Modified: / 12-09-2011 / 11:52:44 / cg" |
|
1272 |
! |
|
1273 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1274 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1275 |
^ self |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1276 |
openOnDiffSet:diffSet |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1277 |
labelA:aLabelA labelB:aLabelB |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1278 |
title:ignoredTitle |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1279 |
ignoreExtensions:ignoreExtensionsBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1280 |
ignoreVersionMethods:false |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1281 |
! |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1282 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1283 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean ignoreVersionMethods:ignoreVersionMethodsBoolean |
3678 | 1284 |
|theBrowser| |
1285 |
||
1286 |
theBrowser := self new. |
|
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1287 |
theBrowser ignoreExtensions:ignoreExtensionsBoolean. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1288 |
theBrowser ignoreVersionMethods:ignoreVersionMethodsBoolean. |
3678 | 1289 |
theBrowser allButOpen. |
1290 |
theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB. |
|
1291 |
theBrowser window label:ignoredTitle. |
|
1292 |
theBrowser openWindow. |
|
1293 |
^ theBrowser. |
|
10691 | 1294 |
|
1295 |
"Created: / 12-09-2011 / 11:50:18 / cg" |
|
5520 | 1296 |
! |
1297 |
||
1298 |
openOnDiffsBetweenFile:file1 and:file2 |
|
1299 |
|set1 set2 diffset theBrowser| |
|
1300 |
||
1301 |
set1 := ChangeSet fromFile:file1. |
|
1302 |
set2 := ChangeSet fromFile:file2. |
|
1303 |
diffset := set1 diffSetsAgainst:set2. |
|
1304 |
||
1305 |
theBrowser := self new. |
|
1306 |
theBrowser allButOpen. |
|
1307 |
theBrowser setupForDiffSet:diffset labelA:file1 asFilename baseName labelB:file2 asFilename baseName. |
|
1308 |
theBrowser window label:('%1 vs. %2' bindWith:file1 asFilename baseName with:file2 asFilename baseName). |
|
1309 |
theBrowser openWindow. |
|
1310 |
^ theBrowser. |
|
1311 |
||
1312 |
" |
|
11453 | 1313 |
VersionDiffBrowser |
1314 |
openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st' |
|
1315 |
and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st' |
|
5520 | 1316 |
" |
2221 | 1317 |
! ! |
1318 |
||
1319 |
!VersionDiffBrowser methodsFor:'accessing'! |
|
1320 |
||
14076 | 1321 |
beMultipleVersionBrowser |
1322 |
isMultipleVersionBrowser := true |
|
1323 |
! |
|
1324 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1325 |
canIncludeExtensions:something |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1326 |
self canIncludeExtensionsHolder value:something. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1327 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1328 |
|
2497 | 1329 |
changeSetA |
3147 | 1330 |
" |
1331 |
gets the change set which contains only the new methods |
|
1332 |
in versionA of the class |
|
2221 | 1333 |
|
3147 | 1334 |
<return: ChangeSet> |
1335 |
" |
|
2221 | 1336 |
|
2497 | 1337 |
^ self classChangeSet methodsOnlyInA |
2221 | 1338 |
! |
1339 |
||
2497 | 1340 |
changeSetB |
3147 | 1341 |
" |
1342 |
gets the change set which contains only the new methods |
|
1343 |
in versionB of the class |
|
2497 | 1344 |
|
3147 | 1345 |
<return: ChangeSet> |
1346 |
" |
|
2497 | 1347 |
|
1348 |
^ self classChangeSet methodsOnlyInB |
|
1349 |
! |
|
1350 |
||
2856 | 1351 |
class:aClass versionA:revA versionB:revB |
1352 |
classIfSingleClassDiff := aClass. |
|
1353 |
versionAIfSingleClassDiff := revA. |
|
1354 |
versionBIfSingleClassDiff := revB. |
|
1355 |
! |
|
1356 |
||
2497 | 1357 |
classBeingCompared |
13137 | 1358 |
"returns the class from the change set which is compared. |
2224 | 1359 |
|
3147 | 1360 |
<return: Class> |
11453 | 1361 |
" |
2497 | 1362 |
^ self classChangeSet classBeingCompared |
1363 |
! |
|
1364 |
||
1365 |
classChangeSet |
|
11453 | 1366 |
"returns the class change set which is the model of the version diff browser." |
2224 | 1367 |
|
2507 | 1368 |
^ classChangeSet |
1369 |
! |
|
2497 | 1370 |
|
2507 | 1371 |
classChangeSet:aClassChangeSet |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1372 |
"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
|
1373 |
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
|
1374 |
when a new change set is given." |
2497 | 1375 |
|
2507 | 1376 |
classChangeSet := aClassChangeSet. |
2501 | 1377 |
self updateLabels. |
1378 |
self updateLists. |
|
1379 |
self resetSelectionHolders. |
|
1380 |
! |
|
2224 | 1381 |
|
10691 | 1382 |
ignoreExtensions |
1383 |
"if true, extension methods are suppressed. |
|
1384 |
Ignoring is useful when comparing for baseClass checkin, |
|
1385 |
as opposed to extension-checking, where extensions should not be ignored. |
|
1386 |
the default is false" |
|
1387 |
||
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1388 |
^ self includeExtensions not |
10691 | 1389 |
|
1390 |
"Created: / 12-09-2011 / 11:54:11 / cg" |
|
1391 |
! |
|
1392 |
||
1393 |
ignoreExtensions:aBoolean |
|
1394 |
"if true, extension methods are suppressed. |
|
1395 |
Ignoring is useful when comparing for baseClass checkin, |
|
1396 |
as opposed to extension-checking, where extensions should not be ignored. |
|
1397 |
the default is false" |
|
1398 |
||
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1399 |
self includeExtensions:aBoolean not |
10691 | 1400 |
|
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1401 |
"Modified: / 06-03-2012 / 15:37:32 / cg" |
10691 | 1402 |
! |
1403 |
||
11961
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1404 |
ignoreVersionMethods:aBoolean |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1405 |
"if true, version methods (version and version_XXX) are suppressed. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1406 |
Ignoring is useful when comparing for real code changes. |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1407 |
the default is false" |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1408 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1409 |
self includeVersionMethods:aBoolean not |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1410 |
|
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1411 |
"Modified: / 06-03-2012 / 15:37:32 / cg" |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1412 |
! |
094f448dc1f0
added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents:
11958
diff
changeset
|
1413 |
|
14076 | 1414 |
isMultipleVersionBrowser |
14078 | 1415 |
^ isMultipleVersionBrowser ? false |
14076 | 1416 |
! |
1417 |
||
2507 | 1418 |
selectedChangeInA |
3147 | 1419 |
" |
1420 |
gets the selected method change for the 'method only in version A'. |
|
2507 | 1421 |
|
3147 | 1422 |
<return: MethodChange | nil> |
1423 |
" |
|
11962 | 1424 |
|selIndex change| |
1425 |
||
1426 |
selIndex := self methodsOnlyInASelection value. |
|
1427 |
selIndex notNil ifTrue:[ |
|
1428 |
change := methodsOnlyInAFiltered "self changeSetA" at:selIndex. |
|
2507 | 1429 |
]. |
3753 | 1430 |
^ change |
2507 | 1431 |
! |
1432 |
||
1433 |
selectedChangeInB |
|
3147 | 1434 |
" |
1435 |
gets the selected method change for the 'method only in version B'. |
|
2507 | 1436 |
|
3147 | 1437 |
<return: MethodChange | nil> |
1438 |
" |
|
11962 | 1439 |
|selIndex change| |
1440 |
||
1441 |
selIndex := self methodsOnlyInBSelection value. |
|
1442 |
selIndex notNil ifTrue:[ |
|
1443 |
change := methodsOnlyInBFiltered "self changeSetB" at:selIndex. |
|
2507 | 1444 |
]. |
3753 | 1445 |
^ change |
2507 | 1446 |
! |
1447 |
||
1448 |
selectedChangesInM |
|
3147 | 1449 |
" |
1450 |
get the two method changes for the selected 'changed method'. |
|
2507 | 1451 |
|
3147 | 1452 |
<return: <Array with:MethodChange with:MethodChange | nil>> |
1453 |
" |
|
11962 | 1454 |
|selIndex theTwoChanges| |
1455 |
||
1456 |
selIndex := self methodsChangedSelection value. |
|
1457 |
selIndex notNil ifTrue:[ |
|
1458 |
theTwoChanges := methodsChangedFiltered "self classChangeSet methodsChanged" at:selIndex. |
|
1459 |
^ theTwoChanges. |
|
2507 | 1460 |
]. |
3753 | 1461 |
^ #(nil nil) |
2507 | 1462 |
! |
1463 |
||
2221 | 1464 |
versionA |
3147 | 1465 |
" |
1466 |
gets the first class version to be compared |
|
2221 | 1467 |
|
3147 | 1468 |
<return: String> |
1469 |
" |
|
2731 | 1470 |
classChangeSet isNil ifTrue:[^ 'A']. |
1471 |
^ classChangeSet labelA |
|
2221 | 1472 |
! |
1473 |
||
1474 |
versionB |
|
3147 | 1475 |
" |
1476 |
gets the second class version to be compared |
|
2221 | 1477 |
|
3147 | 1478 |
<return: String> |
1479 |
" |
|
2731 | 1480 |
classChangeSet isNil ifTrue:[^ 'B']. |
1481 |
^ classChangeSet labelB |
|
2221 | 1482 |
! ! |
1483 |
||
1484 |
!VersionDiffBrowser methodsFor:'actions'! |
|
1485 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1486 |
acceptInLeftView |
11453 | 1487 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1488 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1489 |
change := self selectedChangesInM first. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1490 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1491 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1492 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1493 |
acceptInRightView |
11453 | 1494 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1495 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1496 |
change := self selectedChangesInM second. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1497 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1498 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1499 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1500 |
acceptInSingleView |
11453 | 1501 |
|change| |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1502 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1503 |
change := self selectedChangeInA. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1504 |
change isNil ifTrue:[ |
11453 | 1505 |
change := self selectedChangeInB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1506 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1507 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1508 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1509 |
|
17342 | 1510 |
applyChange:change |
1511 |
change notNil ifTrue:[ |
|
1512 |
change apply |
|
1513 |
] |
|
1514 |
! |
|
1515 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1516 |
applySelectedChangeInA |
11453 | 1517 |
self applyChange:(self selectedChangeInA) |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1518 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1519 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1520 |
applySelectedChangeInB |
11453 | 1521 |
self applyChange:(self selectedChangeInB) |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1522 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1523 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1524 |
methodInADoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1525 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1526 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1527 |
"/ change := self changeSetA at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1528 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1529 |
self browseClassInA |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1530 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1531 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1532 |
methodInBDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1533 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1534 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1535 |
"/ change := self changeSetB at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1536 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1537 |
self browseClassInB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1538 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1539 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1540 |
methodInChangedDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1541 |
self browseClassInM. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1542 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1543 |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1544 |
removeSelectedChangeInBFromImage |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1545 |
|change cls sel op| |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1546 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1547 |
change := self selectedChangeInB. |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1548 |
change isMethodChange ifTrue:[ |
17347 | 1549 |
(cls := change changeClass) notNil ifTrue:[ |
1550 |
(sel := change changeSelector) notNil ifTrue:[ |
|
1551 |
RefactoryChangeManager notNil ifTrue:[ |
|
1552 |
op := RemoveMethodChange remove:sel from:cls. |
|
1553 |
RefactoryChangeManager performChange: op. |
|
1554 |
] ifFalse:[ |
|
1555 |
cls removeSelector:sel |
|
1556 |
] |
|
1557 |
] |
|
1558 |
] |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1559 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1560 |
|
17347 | 1561 |
"Modified: / 06-02-2017 / 02:31:40 / cg" |
15632 | 1562 |
! |
1563 |
||
1564 |
showLogMessages |
|
15633 | 1565 |
"the UI shows code-diffs if any change is selected, and version log entries otherwise. |
1566 |
But there is no way to deselect any of the method-change-lists, to go back to log-messages, |
|
1567 |
once a method has been looked at. |
|
1568 |
This view-menu entry helps." |
|
1569 |
||
15632 | 1570 |
methodsOnlyInASelection value:nil. |
1571 |
methodsOnlyInBSelection value:nil. |
|
1572 |
methodsChangedSelection value:nil. |
|
2221 | 1573 |
! ! |
1574 |
||
1575 |
!VersionDiffBrowser methodsFor:'aspects'! |
|
1576 |
||
2585 | 1577 |
boxAVisible |
2745 | 1578 |
boxAVisible isNil ifTrue:[ |
11453 | 1579 |
boxAVisible := true asValue. |
2585 | 1580 |
]. |
2745 | 1581 |
^ boxAVisible. |
2585 | 1582 |
! |
1583 |
||
1584 |
boxBVisible |
|
2745 | 1585 |
boxBVisible isNil ifTrue:[ |
11453 | 1586 |
boxBVisible := true asValue. |
2585 | 1587 |
]. |
2745 | 1588 |
^ boxBVisible. |
2585 | 1589 |
! |
1590 |
||
1591 |
boxMVisible |
|
2745 | 1592 |
boxMVisible isNil ifTrue:[ |
11453 | 1593 |
boxMVisible := true asValue. |
2585 | 1594 |
]. |
2745 | 1595 |
^ boxMVisible. |
2585 | 1596 |
! |
1597 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1598 |
canIncludeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1599 |
"can include extensions ? (menu item enabler)" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1600 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1601 |
canIncludeExtensionsHolder isNil ifTrue:[ |
11453 | 1602 |
canIncludeExtensionsHolder := true asValue. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1603 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1604 |
^ canIncludeExtensionsHolder. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1605 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1606 |
|
2221 | 1607 |
changedLabelHolder |
3147 | 1608 |
" |
1609 |
aspect for the label of the changed method box. |
|
2221 | 1610 |
|
3147 | 1611 |
<return: ValueHolder on: nil> |
1612 |
" |
|
2221 | 1613 |
|
3147 | 1614 |
changedLabelHolder isNil ifTrue:[ |
11453 | 1615 |
changedLabelHolder := ValueHolder new. |
2221 | 1616 |
]. |
3147 | 1617 |
^ changedLabelHolder. |
2221 | 1618 |
! |
1619 |
||
1620 |
diffTextLabelA |
|
3147 | 1621 |
" |
1622 |
aspect for the label for version A. |
|
2221 | 1623 |
|
3147 | 1624 |
<return: ValueHolder on: nil> |
1625 |
" |
|
2221 | 1626 |
|
3147 | 1627 |
diffTextLabelA isNil ifTrue:[ |
11453 | 1628 |
diffTextLabelA := ValueHolder new. |
2221 | 1629 |
]. |
3147 | 1630 |
^ diffTextLabelA. |
2221 | 1631 |
! |
1632 |
||
1633 |
diffTextLabelB |
|
3147 | 1634 |
" |
1635 |
aspect for the label for version B. |
|
2221 | 1636 |
|
3147 | 1637 |
<return: ValueHolder on: nil> |
1638 |
" |
|
2221 | 1639 |
|
3147 | 1640 |
diffTextLabelB isNil ifTrue:[ |
11453 | 1641 |
diffTextLabelB := ValueHolder new. |
2221 | 1642 |
]. |
3147 | 1643 |
^ diffTextLabelB. |
2221 | 1644 |
! |
1645 |
||
2497 | 1646 |
diffTextView |
3147 | 1647 |
" |
1648 |
return the component for the diff text view. |
|
2497 | 1649 |
|
3147 | 1650 |
<return: HVScrollableView> |
1651 |
" |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1652 |
|v| |
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1653 |
|
2497 | 1654 |
diffTextView isNil ifTrue:[ |
13951 | 1655 |
v := DiffCodeView new. |
1656 |
v textViewClass:CodeView. |
|
1657 |
v initialize. |
|
1658 |
diffTextView := HVScrollableView |
|
1659 |
forView:v |
|
1660 |
miniScrollerH:true miniScrollerV:false. |
|
1661 |
diffTextView addNextPreviousButtons. |
|
2497 | 1662 |
]. |
1663 |
^ diffTextView |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1664 |
|
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1665 |
"Modified: / 06-10-2006 / 14:30:42 / cg" |
2497 | 1666 |
! |
1667 |
||
17334 | 1668 |
hideDiffsWithCommentOrFormattingChangeOnly |
1669 |
^ self hideDiffsWithCommentOrFormattingChangeOnlyHolder value |
|
1670 |
||
1671 |
"Created: / 04-02-2017 / 22:54:07 / cg" |
|
1672 |
! |
|
1673 |
||
1674 |
hideDiffsWithCommentOrFormattingChangeOnlyHolder |
|
1675 |
"hide changes which have no semantic effect?" |
|
1676 |
||
1677 |
^ self builder booleanValueAspectFor:#hideDiffsWithCommentOrFormattingChangeOnlyHolder |
|
1678 |
||
1679 |
"Created: / 04-02-2017 / 16:55:12 / cg" |
|
1680 |
! |
|
1681 |
||
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1682 |
includeCategoryChanges |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1683 |
^ self includeCategoryChangesHolder value |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1684 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1685 |
"Created: / 17-07-2012 / 18:22:34 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1686 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1687 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1688 |
includeCategoryChanges:aBoolean |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1689 |
self includeCategoryChangesHolder value:aBoolean |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1690 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1691 |
"Created: / 17-07-2012 / 17:50:41 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1692 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1693 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1694 |
includeCategoryChangesHolder |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1695 |
includeCategoryChangesHolder isNil ifTrue:[ |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1696 |
includeCategoryChangesHolder := true asValue. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1697 |
includeCategoryChangesHolder addDependent:self. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1698 |
]. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1699 |
^ includeCategoryChangesHolder. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1700 |
|
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1701 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1702 |
"Created: / 17-07-2012 / 16:47:58 / cg" |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1703 |
! |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
1704 |
|
10703 | 1705 |
includeExtensions |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1706 |
^ self includeExtensionsHolder value |
10703 | 1707 |
|
1708 |
"Created: / 13-09-2011 / 11:48:51 / cg" |
|
1709 |
! |
|
1710 |
||
1711 |
includeExtensions:aBoolean |
|
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1712 |
self includeExtensionsHolder value:aBoolean |
10703 | 1713 |
|
1714 |
"Created: / 13-09-2011 / 11:48:41 / cg" |
|
1715 |
! |
|
1716 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1717 |
includeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1718 |
"only compare base-methods or include extensions ?" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1719 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1720 |
includeExtensionsHolder isNil ifTrue:[ |
11453 | 1721 |
includeExtensionsHolder := false asValue. |
1722 |
includeExtensionsHolder addDependent:self. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1723 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1724 |
^ includeExtensionsHolder. |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1725 |
|
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
1726 |
"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
|
1727 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1728 |
|
11958 | 1729 |
includeVersionMethods |
1730 |
^ self includeVersionMethodsHolder value |
|
1731 |
||
1732 |
"Created: / 13-09-2011 / 11:48:51 / cg" |
|
1733 |
! |
|
1734 |
||
1735 |
includeVersionMethods:aBoolean |
|
1736 |
self includeVersionMethodsHolder value:aBoolean |
|
1737 |
||
1738 |
"Created: / 13-09-2011 / 11:48:41 / cg" |
|
1739 |
! |
|
1740 |
||
1741 |
includeVersionMethodsHolder |
|
1742 |
includeVersionMethodsHolder isNil ifTrue:[ |
|
1743 |
includeVersionMethodsHolder := true asValue. |
|
1744 |
includeVersionMethodsHolder addDependent:self. |
|
1745 |
]. |
|
1746 |
^ includeVersionMethodsHolder. |
|
1747 |
||
1748 |
"Modified: / 06-03-2012 / 15:36:52 / cg" |
|
1749 |
"Created: / 17-07-2012 / 16:47:58 / cg" |
|
1750 |
! |
|
1751 |
||
8602 | 1752 |
infoHolder |
1753 |
infoHolder isNil ifTrue:[ |
|
11453 | 1754 |
infoHolder := ValueHolder new. |
8602 | 1755 |
]. |
1756 |
^ infoHolder. |
|
1757 |
! |
|
1758 |
||
2221 | 1759 |
methodText |
3147 | 1760 |
" |
1761 |
aspect for the text in the method text view. |
|
2221 | 1762 |
|
3147 | 1763 |
<return: ValueHolder on: nil> |
1764 |
" |
|
2221 | 1765 |
|
3147 | 1766 |
methodText isNil ifTrue:[ |
11453 | 1767 |
methodText := ValueHolder new. |
2221 | 1768 |
]. |
3147 | 1769 |
^ methodText. |
2221 | 1770 |
! |
1771 |
||
1772 |
methodsChanged |
|
3147 | 1773 |
" |
1774 |
aspect for the 'changed method' list. |
|
2221 | 1775 |
|
3147 | 1776 |
<return: List> |
1777 |
" |
|
2221 | 1778 |
|
3147 | 1779 |
methodsChanged isNil ifTrue:[ |
11453 | 1780 |
methodsChanged := List new. |
2221 | 1781 |
]. |
3147 | 1782 |
^ methodsChanged. |
2221 | 1783 |
! |
1784 |
||
1785 |
methodsChangedSelection |
|
3147 | 1786 |
" |
1787 |
aspect for the selection holder of 'changed method'-list. |
|
2221 | 1788 |
|
3147 | 1789 |
<return: ValueHolder on: nil> |
1790 |
" |
|
2221 | 1791 |
|
3147 | 1792 |
methodsChangedSelection isNil ifTrue:[ |
11453 | 1793 |
methodsChangedSelection := ValueHolder new. |
2221 | 1794 |
]. |
3147 | 1795 |
^ methodsChangedSelection. |
2221 | 1796 |
! |
1797 |
||
1798 |
methodsOnlyInA |
|
6828 | 1799 |
"aspect for the 'method only in version A' list." |
2221 | 1800 |
|
3147 | 1801 |
methodsOnlyInA isNil ifTrue:[ |
11453 | 1802 |
methodsOnlyInA := List new. |
2221 | 1803 |
]. |
3147 | 1804 |
^ methodsOnlyInA. |
6828 | 1805 |
|
1806 |
"Modified: / 25-07-2006 / 11:14:43 / cg" |
|
2221 | 1807 |
! |
1808 |
||
1809 |
methodsOnlyInASelection |
|
6828 | 1810 |
"aspect for the selection holder of 'method only in version A'-list." |
2221 | 1811 |
|
3147 | 1812 |
methodsOnlyInASelection isNil ifTrue:[ |
11453 | 1813 |
methodsOnlyInASelection := ValueHolder new. |
2221 | 1814 |
]. |
3147 | 1815 |
^ methodsOnlyInASelection. |
6828 | 1816 |
|
1817 |
"Modified: / 25-07-2006 / 11:14:53 / cg" |
|
2221 | 1818 |
! |
1819 |
||
1820 |
methodsOnlyInB |
|
6828 | 1821 |
"aspect for the 'method only in version B' list" |
2221 | 1822 |
|
3147 | 1823 |
methodsOnlyInB isNil ifTrue:[ |
11453 | 1824 |
methodsOnlyInB := List new. |
2221 | 1825 |
]. |
3147 | 1826 |
^ methodsOnlyInB. |
6828 | 1827 |
|
1828 |
"Modified: / 25-07-2006 / 11:14:48 / cg" |
|
2221 | 1829 |
! |
1830 |
||
1831 |
methodsOnlyInBSelection |
|
6828 | 1832 |
"aspect for the selection holder of 'method only in version B'-list." |
2221 | 1833 |
|
3147 | 1834 |
methodsOnlyInBSelection isNil ifTrue:[ |
11453 | 1835 |
methodsOnlyInBSelection := ValueHolder new. |
2221 | 1836 |
]. |
3147 | 1837 |
^ methodsOnlyInBSelection. |
6828 | 1838 |
|
1839 |
"Modified: / 25-07-2006 / 11:15:00 / cg" |
|
2221 | 1840 |
! |
1841 |
||
1842 |
onlyInALabelHolder |
|
6828 | 1843 |
"aspect for the label for 'method only in version A'." |
2221 | 1844 |
|
3147 | 1845 |
onlyInALabelHolder isNil ifTrue:[ |
11453 | 1846 |
onlyInALabelHolder := ValueHolder new. |
2221 | 1847 |
]. |
3147 | 1848 |
^ onlyInALabelHolder. |
6828 | 1849 |
|
1850 |
"Modified: / 25-07-2006 / 11:15:12 / cg" |
|
2221 | 1851 |
! |
1852 |
||
1853 |
onlyInBLabelHolder |
|
6828 | 1854 |
"aspect for the label for 'method only in version B'." |
2221 | 1855 |
|
3147 | 1856 |
onlyInBLabelHolder isNil ifTrue:[ |
11453 | 1857 |
onlyInBLabelHolder := ValueHolder new. |
2221 | 1858 |
]. |
3147 | 1859 |
^ onlyInBLabelHolder. |
6828 | 1860 |
|
1861 |
"Modified: / 25-07-2006 / 11:15:07 / cg" |
|
14076 | 1862 |
! |
1863 |
||
1864 |
selectedSymbolicVersionHolder |
|
1865 |
selectedSymbolicVersionHolder isNil ifTrue:[ |
|
1866 |
selectedSymbolicVersionHolder := nil asValue. |
|
1867 |
selectedSymbolicVersionHolder onChangeSend:#selectedSymbolicVersionHolderChanged to:self. |
|
1868 |
]. |
|
1869 |
^ selectedSymbolicVersionHolder |
|
1870 |
! |
|
1871 |
||
1872 |
selectedVersionHolder |
|
1873 |
selectedVersionHolder isNil ifTrue:[ |
|
15621 | 1874 |
selectedVersionHolder := nil asValue. |
14076 | 1875 |
selectedVersionHolder onChangeSend:#selectedVersionHolderChanged to:self. |
1876 |
]. |
|
1877 |
^ selectedVersionHolder |
|
1878 |
! |
|
1879 |
||
17827 | 1880 |
selectedVersionIndexHolder |
1881 |
selectedVersionIndexHolder isNil ifTrue:[ |
|
1882 |
selectedVersionIndexHolder := nil asValue. |
|
1883 |
selectedVersionIndexHolder onChangeSend:#selectedVersionIndexHolderChanged to:self. |
|
1884 |
]. |
|
1885 |
^ selectedVersionIndexHolder |
|
1886 |
||
1887 |
"Created: / 29-11-2017 / 13:02:49 / cg" |
|
1888 |
! |
|
1889 |
||
14076 | 1890 |
symbolicVersionList |
1891 |
symbolicVersionList isNil ifTrue:[ |
|
1892 |
symbolicVersionList := List new. |
|
1893 |
]. |
|
1894 |
^ symbolicVersionList |
|
1895 |
! |
|
1896 |
||
17827 | 1897 |
versionEntriesList |
1898 |
versionEntriesList isNil ifTrue:[ |
|
1899 |
versionEntriesList := List new. |
|
1900 |
]. |
|
1901 |
^ versionEntriesList |
|
1902 |
||
1903 |
"Created: / 29-11-2017 / 13:06:14 / cg" |
|
1904 |
! |
|
1905 |
||
14076 | 1906 |
versionList |
1907 |
versionList isNil ifTrue:[ |
|
1908 |
versionList := List new. |
|
1909 |
]. |
|
1910 |
^ versionList |
|
2221 | 1911 |
! ! |
1912 |
||
2725 | 1913 |
!VersionDiffBrowser methodsFor:'aspects-exported'! |
2695 | 1914 |
|
1915 |
changedLabelHolder:aValueHolder |
|
1916 |
builder aspectAt:#changedLabelHolder put:aValueHolder. |
|
1917 |
||
1918 |
! |
|
1919 |
||
1920 |
classHolder:aValueHolder |
|
5182 | 1921 |
classHolder notNil ifTrue:[ |
11453 | 1922 |
classHolder removeDependent:self |
2695 | 1923 |
]. |
5182 | 1924 |
classHolder := aValueHolder. |
1925 |
classHolder notNil ifTrue:[ |
|
11453 | 1926 |
classHolder addDependent:self |
2695 | 1927 |
] |
1928 |
! |
|
1929 |
||
1930 |
onlyInALabelHolder:aValueHolder |
|
1931 |
builder aspectAt:#onlyInALabelHolder put:aValueHolder. |
|
1932 |
! |
|
1933 |
||
1934 |
onlyInBLabelHolder:aValueHolder |
|
1935 |
builder aspectAt:#onlyInBLabelHolder put:aValueHolder. |
|
1936 |
! |
|
1937 |
||
1938 |
versionAHolder:aValueHolder |
|
5182 | 1939 |
versionAHolder notNil ifTrue:[ |
11453 | 1940 |
versionAHolder removeDependent:self |
2695 | 1941 |
]. |
5182 | 1942 |
versionAHolder := aValueHolder. |
1943 |
versionAHolder notNil ifTrue:[ |
|
11453 | 1944 |
versionAHolder addDependent:self |
2695 | 1945 |
] |
1946 |
! |
|
1947 |
||
1948 |
versionBHolder:aValueHolder |
|
5182 | 1949 |
versionBHolder notNil ifTrue:[ |
11453 | 1950 |
versionBHolder removeDependent:self |
2695 | 1951 |
]. |
5182 | 1952 |
versionBHolder := aValueHolder. |
1953 |
versionBHolder notNil ifTrue:[ |
|
11453 | 1954 |
versionBHolder addDependent:self |
2695 | 1955 |
] |
1956 |
! ! |
|
1957 |
||
4359 | 1958 |
!VersionDiffBrowser methodsFor:'aspects-menu'! |
1959 |
||
1960 |
canAcceptInCodeView |
|
1961 |
^ self hasChangeSelectedInA |
|
1962 |
or:[self hasChangeSelectedInB |
|
1963 |
or:[self hasChangeSelectedInM]] |
|
1964 |
! |
|
1965 |
||
1966 |
hasChangeSelectedInA |
|
1967 |
^ self selectedChangeInA notNil |
|
1968 |
! |
|
1969 |
||
1970 |
hasChangeSelectedInB |
|
1971 |
^ self selectedChangeInB notNil |
|
1972 |
! |
|
1973 |
||
1974 |
hasChangeSelectedInM |
|
1975 |
^ self methodsChangedSelection value notNil |
|
17341 | 1976 |
! |
1977 |
||
1978 |
showingClassChangeSet |
|
1979 |
^ classChangeSet notNil |
|
1980 |
||
1981 |
"Created: / 05-02-2017 / 11:09:18 / cg" |
|
4359 | 1982 |
! ! |
1983 |
||
2695 | 1984 |
!VersionDiffBrowser methodsFor:'change & update'! |
1985 |
||
17342 | 1986 |
filterChanged |
1987 |
self withExecuteCursorDo:[ |
|
1988 |
|listA listB listM selA selB selM posA posB posM| |
|
1989 |
||
17463 | 1990 |
"/ remember selection and scroll positions |
17342 | 1991 |
listA := (self componentAt:'ListA') scrolledView. |
1992 |
listB := (self componentAt:'ListB') scrolledView. |
|
1993 |
listM := (self componentAt:'ListM') scrolledView. |
|
1994 |
selA := listA selection. |
|
1995 |
selB := listB selection. |
|
1996 |
selM := listM selection. |
|
1997 |
posA := listA firstLineShown. |
|
1998 |
posB := listB firstLineShown. |
|
1999 |
posM := listM firstLineShown. |
|
2000 |
||
2001 |
self updateLists. |
|
2002 |
self enqueueDelayedAction: |
|
2003 |
[ |
|
2004 |
selA notNil ifTrue:[ |
|
2005 |
listA selection:selA |
|
2006 |
] ifFalse:[ |
|
2007 |
listA scrollToLine:posA |
|
2008 |
]. |
|
2009 |
selB notNil ifTrue:[ |
|
2010 |
listB selection:selB |
|
2011 |
] ifFalse:[ |
|
2012 |
listB scrollToLine:posB |
|
2013 |
]. |
|
2014 |
selM notNil ifTrue:[ |
|
2015 |
listM selection:selM |
|
2016 |
] ifFalse:[ |
|
2017 |
listM scrollToLine:posM |
|
2018 |
]. |
|
2019 |
]. |
|
2020 |
]. |
|
2021 |
||
2022 |
"Created: / 05-02-2017 / 10:19:41 / cg" |
|
17463 | 2023 |
"Modified (format): / 14-03-2017 / 16:30:58 / cg" |
17342 | 2024 |
! |
2025 |
||
12512 | 2026 |
methodsChangedSelectionChanged |
2027 |
" |
|
2028 |
the selection in the list of the 'changed methods' changed. |
|
2029 |
Reset the selection of the two other lists and calc the method change. |
|
2030 |
||
2031 |
<return: self> |
|
2032 |
" |
|
2033 |
|sel changeA changeB methodsChanged parseError treeA treeB| |
|
2034 |
||
17342 | 2035 |
"/ self information:''. |
12512 | 2036 |
|
2037 |
sel := self methodsChangedSelection value. |
|
2038 |
sel notNil ifTrue:[ |
|
2039 |
self methodsOnlyInASelection value:nil. |
|
2040 |
self methodsOnlyInBSelection value:nil. |
|
2041 |
methodsChanged := self classChangeSet methodsChanged. |
|
2042 |
changeA := (methodsChangedFiltered at:sel) first. |
|
2043 |
changeB := (methodsChangedFiltered at:sel) second. |
|
2044 |
self withReadCursorDo:[ |
|
17827 | 2045 |
|info| |
2046 |
||
12512 | 2047 |
"/ see if the semantics have changed (or only prettyPrinted) |
2048 |
RBParser notNil ifTrue:[ |
|
2049 |
(classChangeSet notNil |
|
2050 |
and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[ |
|
2051 |
parseError := false. |
|
17827 | 2052 |
changeA isMethodChange ifTrue:[ |
2053 |
treeA := RBParser parseMethod:(changeA source) onError: [:str :pos | parseError := true]. |
|
2054 |
treeB := RBParser parseMethod:(changeB source) onError: [:str :pos | parseError := true]. |
|
2055 |
parseError ifFalse:[ |
|
2056 |
(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
|
2057 |
info := 'Methods only differ in formatting / comments.'. |
|
2058 |
] ifFalse:[ |
|
2059 |
(treeA semanticallyEqualTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
|
2060 |
info := 'Methods seem to do the same.'. |
|
2061 |
] ifFalse:[ |
|
2062 |
info := 'Methods are different.'. |
|
2063 |
] |
|
2064 |
] |
|
2065 |
] ifTrue:[ |
|
2066 |
self infoHolder value:'ParseError while comparing - please check the code'. |
|
2067 |
]. |
|
2068 |
] ifFalse:[ |
|
2069 |
changeA isClassDefinitionChange ifTrue:[ |
|
2070 |
treeA := RBParser parseExpression:(changeA source) onError: [:str :pos | parseError := true]. |
|
2071 |
treeB := RBParser parseExpression:(changeB source) onError: [:str :pos | parseError := true]. |
|
17353 | 2072 |
(treeA semanticallyEqualTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
17827 | 2073 |
info := 'Class definitions seem to do the same.'. |
17802 | 2074 |
] ifFalse:[ |
17827 | 2075 |
info := 'Class definitions are different.'. |
2076 |
]. |
|
2077 |
treeA receiver = treeB receiver ifFalse:[ |
|
2078 |
info := 'Superclass changed.'. |
|
2079 |
] ifTrue:[ |
|
2080 |
treeA arg1 = treeB arg1 ifFalse:[ |
|
2081 |
info := 'Name changed.'. |
|
2082 |
] ifTrue:[ |
|
2083 |
treeA arg2 = treeB arg2 ifFalse:[ |
|
2084 |
info := 'Instvars changed.'. |
|
2085 |
] ifTrue:[ |
|
2086 |
treeA arg3 = treeB arg3 ifFalse:[ |
|
2087 |
info := 'Classvars changed.'. |
|
2088 |
] ifTrue:[ |
|
2089 |
(treeA arg:4) = (treeB arg:4) ifFalse:[ |
|
2090 |
info := 'Pooldict changed.'. |
|
2091 |
] ifTrue:[ |
|
2092 |
(treeA arg:5) = (treeB arg:5) ifFalse:[ |
|
2093 |
info := 'Category changed.'. |
|
2094 |
]. |
|
2095 |
]. |
|
2096 |
]. |
|
2097 |
]. |
|
2098 |
]. |
|
2099 |
]. |
|
2100 |
] ifFalse:[ |
|
2101 |
self halt. |
|
2102 |
]. |
|
17802 | 2103 |
]. |
12512 | 2104 |
]. |
2105 |
]. |
|
17827 | 2106 |
info notNil ifTrue:[ |
2107 |
self infoHolder value:info |
|
2108 |
]. |
|
12512 | 2109 |
self diffTextView |
2110 |
text1:(changeA prettyPrintedSource) |
|
2111 |
text2:(changeB prettyPrintedSource) |
|
2112 |
]. |
|
2113 |
self showDiffTextView. |
|
2114 |
self diffTextView moveToNextChanged |
|
15621 | 2115 |
] ifFalse:[ |
2116 |
self showVersionInfoIfNothingSelected |
|
12512 | 2117 |
] |
2118 |
||
2119 |
"Modified: / 03-09-1999 / 15:01:30 / ps" |
|
17827 | 2120 |
"Modified: / 29-11-2017 / 12:56:28 / cg" |
12512 | 2121 |
! |
2122 |
||
2123 |
methodsOnlyInASelectionChanged |
|
2124 |
" |
|
2125 |
the selection in the list of the 'method only in version A' changed. |
|
2126 |
Reset the selection of the two other lists and show the method in |
|
2127 |
the text view. |
|
2128 |
||
2129 |
<return: self> |
|
2130 |
" |
|
2131 |
|change sel| |
|
2132 |
||
17342 | 2133 |
"/ self information:''. |
12512 | 2134 |
|
2135 |
sel := self methodsOnlyInASelection value. |
|
2136 |
sel notNil ifTrue:[ |
|
2137 |
self methodsOnlyInBSelection value:nil. |
|
2138 |
self methodsChangedSelection value:nil. |
|
2139 |
change := methodsOnlyInAFiltered "self changeSetA" at:sel. |
|
2140 |
self methodText value:(change prettyPrintedSource). |
|
2141 |
self showSingleTextView. |
|
15621 | 2142 |
] ifFalse:[ |
2143 |
self showVersionInfoIfNothingSelected |
|
2144 |
]. |
|
12512 | 2145 |
|
17342 | 2146 |
"Modified: / 05-02-2017 / 12:08:07 / cg" |
12512 | 2147 |
! |
2148 |
||
2149 |
methodsOnlyInBSelectionChanged |
|
2150 |
" |
|
2151 |
the selection in the list of the 'method only in version B' changed. |
|
2152 |
Reset the selection of the two other lists and show the method in |
|
2153 |
the text view. |
|
2154 |
||
2155 |
<return: self> |
|
2156 |
" |
|
2157 |
|change sel| |
|
2158 |
||
17342 | 2159 |
"/ self information:''. |
12512 | 2160 |
|
2161 |
sel := self methodsOnlyInBSelection value. |
|
2162 |
sel notNil ifTrue:[ |
|
2163 |
self methodsOnlyInASelection value:nil. |
|
2164 |
self methodsChangedSelection value:nil. |
|
2165 |
change := methodsOnlyInBFiltered "self changeSetB" at:sel. |
|
2166 |
self methodText value:(change prettyPrintedSource). |
|
2167 |
self showSingleTextView. |
|
15621 | 2168 |
] ifFalse:[ |
2169 |
self showVersionInfoIfNothingSelected |
|
2170 |
]. |
|
12512 | 2171 |
|
17342 | 2172 |
"Modified: / 05-02-2017 / 11:49:22 / cg" |
12512 | 2173 |
! |
2174 |
||
14076 | 2175 |
selectedSymbolicVersionHolderChanged |
2176 |
self selectedVersionHolder |
|
2177 |
value:(symbolicToVersionMapping at:( self selectedSymbolicVersionHolder value )) |
|
2178 |
! |
|
2179 |
||
2180 |
selectedVersionHolderChanged |
|
2181 |
||
2182 |
self withWaitCursorDo:[ |
|
15621 | 2183 |
|idx prevSelectionIndexA prevSelectionIndexB prevSelectionIndexDifferent |
2184 |
previousChange previousClass previousSelector| |
|
2185 |
||
2186 |
"/ remember the previous selected method |
|
2187 |
(prevSelectionIndexA := methodsOnlyInASelection value) notNil ifTrue:[ |
|
2188 |
previousChange := methodsOnlyInAFiltered at:prevSelectionIndexA. |
|
2189 |
]. |
|
2190 |
(prevSelectionIndexB := methodsOnlyInBSelection value) notNil ifTrue:[ |
|
2191 |
previousChange := methodsOnlyInBFiltered at:prevSelectionIndexB. |
|
2192 |
]. |
|
2193 |
(prevSelectionIndexDifferent := methodsChangedSelection value) notNil ifTrue:[ |
|
2194 |
previousChange := (methodsChangedFiltered at:prevSelectionIndexDifferent) first. |
|
2195 |
]. |
|
2196 |
previousChange notNil ifTrue:[ |
|
2197 |
previousClass := previousChange className. |
|
17347 | 2198 |
previousSelector := previousChange changeSelector. |
15621 | 2199 |
]. |
2200 |
||
2201 |
"/ possibly expand a contracted list |
|
14076 | 2202 |
selectedVersionHolder value = '...' ifTrue:[ |
2203 |
idx := self versionList size. |
|
2204 |
self updateVersionList. |
|
2205 |
selectedVersionHolder setValue:(self versionList at:idx). |
|
2206 |
]. |
|
2207 |
||
15621 | 2208 |
"/ update the view |
14076 | 2209 |
self |
2210 |
setupForClass:classHolder value |
|
2211 |
againstVersion:(selectedVersionHolder value). |
|
15621 | 2212 |
|
2213 |
"/ try to reselect the same method again. |
|
2214 |
previousChange notNil ifTrue:[ |
|
2215 |
"/ search a change for that in the three lists |
|
2216 |
||
2217 |
(idx := methodsChangedFiltered findFirst:[:entry | entry first className = previousClass |
|
17347 | 2218 |
and:[ entry first changeSelector = previousSelector]]) ~= 0 |
15621 | 2219 |
ifTrue:[ |
2220 |
methodsChangedSelection value:idx. self methodsChangedSelectionChanged. |
|
2221 |
] ifFalse:[ |
|
2222 |
(idx := methodsOnlyInAFiltered findFirst:[:chg | chg className = previousClass |
|
17347 | 2223 |
and:[ chg changeSelector = previousSelector]]) ~= 0 |
15621 | 2224 |
ifTrue:[ |
2225 |
methodsOnlyInASelection value:idx. self methodsOnlyInASelectionChanged |
|
2226 |
] ifFalse:[ |
|
2227 |
(idx := methodsOnlyInBFiltered findFirst:[:chg | chg className = previousClass |
|
17347 | 2228 |
and:[ chg changeSelector = previousSelector]]) ~= 0 |
15621 | 2229 |
ifTrue:[ |
2230 |
methodsOnlyInBSelection value:idx. self methodsOnlyInBSelectionChanged. |
|
2231 |
] |
|
2232 |
] |
|
2233 |
]. |
|
2234 |
]. |
|
2235 |
self showVersionInfoIfNothingSelected |
|
14076 | 2236 |
] |
17347 | 2237 |
|
2238 |
"Modified: / 06-02-2017 / 02:32:24 / cg" |
|
14076 | 2239 |
! |
2240 |
||
17827 | 2241 |
selectedVersionIndexHolderChanged |
2242 |
self selectedVersionHolder value:(versionList at:self selectedVersionIndexHolder value) |
|
2243 |
||
2244 |
"Created: / 29-11-2017 / 13:04:12 / cg" |
|
2245 |
! |
|
2246 |
||
2695 | 2247 |
update:something with:parameter from:changedObject |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2248 |
((changedObject == includeExtensionsHolder) |
11958 | 2249 |
or:[ changedObject == includeCategoryChangesHolder |
2250 |
or:[ changedObject == includeVersionMethodsHolder ]]) ifTrue:[ |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2251 |
self updateLists. |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2252 |
^ self |
11371
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
2253 |
]. |
920084723b9c
exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents:
10892
diff
changeset
|
2254 |
|
11453 | 2255 |
(changedObject == classHolder |
2695 | 2256 |
or:[changedObject == versionAHolder |
11453 | 2257 |
or:[changedObject == versionBHolder]]) ifTrue:[ |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2258 |
self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value). |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2259 |
^ self |
2695 | 2260 |
]. |
2261 |
super update:something with:parameter from:changedObject |
|
10703 | 2262 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
2263 |
"Modified: / 17-07-2012 / 17:48:58 / cg" |
17342 | 2264 |
! |
2265 |
||
2266 |
updateLabels |
|
2267 |
"update the labels of the diff text view. Show the version numbers |
|
2268 |
of the class." |
|
2269 |
||
2270 |
|theVersionA theVersionB builder makeLabel| |
|
2271 |
||
2272 |
makeLabel := |
|
2273 |
[:theVersion | |
|
2274 |
|label date author revInfo| |
|
2275 |
||
2276 |
label := theVersion. |
|
2277 |
versionInfoList notNil ifTrue:[ |
|
2278 |
revInfo := versionInfoList detect:[:info | (info at:#revision) = theVersion] ifNone:nil. |
|
2279 |
revInfo notNil ifTrue:[ |
|
2280 |
date := (Timestamp readGeneralizedFrom:(revInfo at:#date)) asDate. |
|
2281 |
author := (revInfo at:#author) ? '?'. |
|
2282 |
label := theVersion , ' [',date printString,' by ',author,']'. |
|
2283 |
]. |
|
2284 |
]. |
|
2285 |
label |
|
2286 |
]. |
|
2287 |
||
2288 |
builder := self builder. |
|
2289 |
(theVersionA := self versionA) notNil ifTrue:[ |
|
2290 |
self diffTextLabelA value:(makeLabel value:theVersionA). |
|
2291 |
self onlyInALabelHolder value:('Only in ' , theVersionA). |
|
2292 |
(self componentAt:#OnlyInALabel) |
|
2293 |
foregroundColor:Color white; |
|
2294 |
backgroundColor:Color green darkened. |
|
2295 |
]. |
|
2296 |
(theVersionB :=self versionB) notNil ifTrue:[ |
|
2297 |
self diffTextLabelB value:(makeLabel value:theVersionB). |
|
2298 |
self onlyInBLabelHolder value:('Only in ' , theVersionB). |
|
2299 |
(self componentAt:#OnlyInBLabel) |
|
2300 |
foregroundColor:Color white; |
|
2301 |
backgroundColor:Color red darkened. |
|
2302 |
]. |
|
2303 |
||
2304 |
self changedLabelHolder value:('Different'). |
|
2305 |
||
2306 |
"Modified: / 13-10-2006 / 01:07:08 / cg" |
|
2307 |
! |
|
2308 |
||
2309 |
updateLists |
|
17944 | 2310 |
"walk over the changeSet(s) and setup the 3 lists: |
17342 | 2311 |
onlyInA, changed, onlyInB, |
2312 |
Optionally filter extensions, categoryChanges and versionMethods, |
|
17350 | 2313 |
changes with same semantic (variable renames) |
17342 | 2314 |
and changes which have been explicitly filtered by the user." |
2315 |
||
2316 |
|listOnlyInA listOnlyInB listChanged |
|
17944 | 2317 |
printStringGenerator "sortBlockForChangeLists" filteredList |
17342 | 2318 |
numIgnoredExtensions numIgnoredVersionMethods |
2319 |
info needFilter entryIsForCommentOrFormatOnly |
|
17347 | 2320 |
isIgnoredChange isIgnored1 isIgnored2 isIgnored3 isIgnored4 isIgnored5| |
17342 | 2321 |
|
2322 |
printStringGenerator := [:aChange | self printStringForChange:aChange]. |
|
17944 | 2323 |
"/ sortBlockForChangeLists := [:a :b | (printStringGenerator value:a) < (printStringGenerator value:b)]. |
17342 | 2324 |
|
2325 |
numIgnoredExtensions := numIgnoredVersionMethods := 0. |
|
2326 |
needFilter := self includeExtensions not |
|
2327 |
or:[self includeCategoryChanges not |
|
2328 |
or:[self includeVersionMethods not]]. |
|
2329 |
||
2330 |
needFilter ifTrue:[ |
|
2331 |
isIgnoredChange := |
|
2332 |
[:change | |
|
2333 |
|packageOfMethodInChange packageOfMethodInImage changeMethod ignored| |
|
2334 |
||
2335 |
ignored := false. |
|
2336 |
change isMethodCodeChange ifTrue:[ |
|
2337 |
self includeExtensions ifFalse:[ |
|
2338 |
packageOfMethodInChange := change package. |
|
2339 |
(packageOfMethodInChange notNil |
|
2340 |
and:[ packageOfMethodInChange ~= PackageId noProjectID |
|
2341 |
and:[ change changeClass notNil |
|
2342 |
and:[ packageOfMethodInChange ~= change changeClass package ]]]) ifTrue:[ |
|
2343 |
ignored := true |
|
2344 |
]. |
|
2345 |
||
2346 |
changeMethod := change changeMethod. |
|
2347 |
changeMethod notNil ifTrue:[ |
|
2348 |
packageOfMethodInImage := changeMethod package. |
|
2349 |
(true "packageOfMethodInImage notNil" |
|
2350 |
and:[ packageOfMethodInImage ~= PackageId noProjectID |
|
2351 |
and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[ |
|
2352 |
ignored := true |
|
2353 |
]. |
|
2354 |
]. |
|
2355 |
numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]). |
|
2356 |
]. |
|
2357 |
self includeVersionMethods ifFalse:[ |
|
2358 |
(change isMethodChangeForVersionMethod |
|
2359 |
or:[ change isMethodChangeForExtensionsVersionMethod ]) ifTrue:[ |
|
2360 |
ignored := true. |
|
2361 |
numIgnoredVersionMethods := numIgnoredVersionMethods + 1 |
|
2362 |
]. |
|
2363 |
]. |
|
2364 |
] ifFalse:[ |
|
2365 |
change isMethodCategoryChange ifTrue:[ |
|
2366 |
self includeCategoryChanges ifFalse:[ |
|
2367 |
ignored := true |
|
2368 |
] |
|
2369 |
]. |
|
2370 |
]. |
|
2371 |
ignored. |
|
2372 |
]. |
|
2373 |
] ifFalse:[ |
|
2374 |
isIgnoredChange := [:change | false]. |
|
2375 |
]. |
|
2376 |
||
2377 |
filteredClasses notEmptyOrNil ifTrue:[ |
|
2378 |
isIgnored1 := isIgnoredChange. |
|
2379 |
isIgnoredChange := |
|
2380 |
[:change | |
|
2381 |
(isIgnored1 value:change) |
|
2382 |
or:[ |
|
2383 |
filteredClasses includes:change nonMetaClassName |
|
2384 |
] |
|
2385 |
]. |
|
2386 |
]. |
|
2387 |
filteredSelectors notEmptyOrNil ifTrue:[ |
|
2388 |
isIgnored2 := isIgnoredChange. |
|
2389 |
isIgnoredChange := |
|
2390 |
[:change | |
|
2391 |
(isIgnored2 value:change) |
|
2392 |
or:[ filteredSelectors includes:change changeSelector ] |
|
2393 |
]. |
|
2394 |
]. |
|
2395 |
filteredMethods notEmptyOrNil ifTrue:[ |
|
2396 |
isIgnored3 := isIgnoredChange. |
|
2397 |
isIgnoredChange := |
|
2398 |
[:change | |
|
2399 |
(isIgnored3 value:change) |
|
17348 | 2400 |
or:[ |
2401 |
filteredMethods contains:[:filter | |
|
2402 |
|filterSelector filterClassName| |
|
2403 |
||
17349 | 2404 |
"/ migration - will be always an assoc |
17348 | 2405 |
filter isAssociation ifTrue:[ |
2406 |
filterClassName := filter key. |
|
2407 |
filterSelector := filter value. |
|
2408 |
] ifFalse:[ |
|
2409 |
filterClassName := filter className. |
|
2410 |
filterSelector := filter changeSelector. |
|
2411 |
]. |
|
2412 |
((change className = filterClassName) |
|
2413 |
and:[change changeSelector = filterSelector]) |
|
2414 |
] |
|
2415 |
] |
|
2416 |
]. |
|
17342 | 2417 |
]. |
2418 |
||
17347 | 2419 |
classPatternFilters notEmptyOrNil ifTrue:[ |
17344 | 2420 |
isIgnored4 := isIgnoredChange. |
2421 |
isIgnoredChange := |
|
2422 |
[:change | |
|
2423 |
(isIgnored4 value:change) |
|
17348 | 2424 |
or:[ |
2425 |
classPatternFilters contains:[:pattern | pattern match:change nonMetaClassName] |
|
2426 |
] |
|
17347 | 2427 |
]. |
2428 |
]. |
|
2429 |
||
2430 |
selectorPatternFilters notEmptyOrNil ifTrue:[ |
|
2431 |
isIgnored5 := isIgnoredChange. |
|
2432 |
isIgnoredChange := |
|
2433 |
[:change | |
|
2434 |
(isIgnored5 value:change) |
|
17348 | 2435 |
or:[ |
2436 |
selectorPatternFilters contains:[:pattern | pattern match:change changeSelector] |
|
2437 |
] |
|
17344 | 2438 |
]. |
2439 |
]. |
|
2440 |
||
17342 | 2441 |
listOnlyInA := filteredList := self methodsOnlyInA. |
2442 |
listOnlyInA removeAll. |
|
2443 |
classChangeSet notNil ifTrue:[ |
|
2444 |
"/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists. |
|
2445 |
filteredList := classChangeSet methodsOnlyInA reject:isIgnoredChange. |
|
2446 |
listOnlyInA addAll: (filteredList collect:printStringGenerator). |
|
2447 |
]. |
|
2448 |
methodsOnlyInAFiltered := filteredList. |
|
2449 |
||
2450 |
listOnlyInB := filteredList := self methodsOnlyInB. |
|
2451 |
listOnlyInB removeAll. |
|
2452 |
classChangeSet notNil ifTrue:[ |
|
2453 |
"/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists. |
|
2454 |
filteredList := classChangeSet methodsOnlyInB reject:isIgnoredChange. |
|
2455 |
listOnlyInB addAll: (filteredList collect:printStringGenerator). |
|
2456 |
]. |
|
2457 |
methodsOnlyInBFiltered := filteredList. |
|
2458 |
||
2459 |
entryIsForCommentOrFormatOnly := |
|
2460 |
[:entry | |
|
2461 |
|commentOnly changeA changeB mthdA mthdB| |
|
2462 |
||
2463 |
commentOnly := false. |
|
2464 |
||
2465 |
changeA := entry first. |
|
2466 |
changeB := entry second. |
|
2467 |
changeA isMethodChange ifTrue:[ |
|
2468 |
changeA isMethodCodeChange ifTrue:[ |
|
17414 | 2469 |
RBCodeDuplicationRule notNil ifTrue:[ |
2470 |
mthdA := RBMethod forMethodChange:changeA. |
|
2471 |
mthdB := RBMethod forMethodChange:changeB. |
|
2472 |
commentOnly := RBCodeDuplicationRule hasMethod:mthdA sameSemanticAs:mthdB. |
|
2473 |
]. |
|
17342 | 2474 |
] ifFalse:[ |
2475 |
changeA isMethodCategoryChange ifTrue:[ |
|
2476 |
commentOnly := true |
|
2477 |
] ifFalse:[ |
|
2478 |
self breakPoint:#cg |
|
2479 |
]. |
|
2480 |
]. |
|
2481 |
] ifFalse:[ |
|
2482 |
changeA isClassDefinitionChange ifTrue:[ |
|
2483 |
changeA source = changeB source ifTrue:[ |
|
2484 |
commentOnly := true |
|
2485 |
] ifFalse:[ |
|
2486 |
self breakPoint:#cg |
|
2487 |
]. |
|
2488 |
] ifFalse:[ |
|
2489 |
self breakPoint:#cg |
|
2490 |
]. |
|
2491 |
]. |
|
2492 |
commentOnly |
|
2493 |
]. |
|
2494 |
||
2495 |
listChanged := filteredList := self methodsChanged. |
|
2496 |
listChanged removeAll. |
|
2497 |
classChangeSet notNil ifTrue:[ |
|
2498 |
"/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first]. |
|
2499 |
filteredList := classChangeSet methodsChanged reject:[:entry | isIgnoredChange value:entry first]. |
|
2500 |
||
2501 |
(self hideDiffsWithCommentOrFormattingChangeOnly) ifTrue:[ |
|
2502 |
filteredList := filteredList reject:entryIsForCommentOrFormatOnly. |
|
2503 |
listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]). |
|
2504 |
] ifFalse:[ |
|
2505 |
filteredList do:[:entry| |
|
2506 |
|string| |
|
2507 |
||
2508 |
string := printStringGenerator value:(entry first). |
|
2509 |
(entryIsForCommentOrFormatOnly value:entry) ifTrue:[ |
|
2510 |
string := string withColor:Color grey. |
|
2511 |
]. |
|
2512 |
listChanged add:string |
|
2513 |
]. |
|
2514 |
]. |
|
2515 |
]. |
|
2516 |
methodsChangedFiltered := filteredList. |
|
2517 |
||
2518 |
self boxAVisible value:(listOnlyInA notEmpty). |
|
2519 |
self boxBVisible value:(listOnlyInB notEmpty). |
|
2520 |
||
2521 |
self boxMVisible value:(listChanged isEmpty |
|
2522 |
and: [(listOnlyInA notEmpty |
|
2523 |
or:[listOnlyInB notEmpty])]) not. |
|
2524 |
||
2525 |
info := '%1 changed, %2 added, %3 removed%4' |
|
2526 |
bindWith:methodsChangedFiltered size |
|
2527 |
with:methodsOnlyInB size |
|
2528 |
with:methodsOnlyInA size |
|
2529 |
with:(isIgnoredChange isNil |
|
2530 |
ifTrue:[''] |
|
2531 |
ifFalse:[' (filtered)']). |
|
2532 |
||
2533 |
numIgnoredExtensions ~~ 0 ifTrue:[ |
|
2534 |
info := info , ('; %1 extension methods ignored. ' bindWith:numIgnoredExtensions). |
|
2535 |
]. |
|
2536 |
numIgnoredVersionMethods ~~ 0 ifTrue:[ |
|
2537 |
info := info , ('; %1 version methods ignored.' bindWith:numIgnoredVersionMethods). |
|
2538 |
]. |
|
2539 |
self information:info |
|
2540 |
||
17350 | 2541 |
"Modified (comment): / 06-02-2017 / 10:09:11 / cg" |
17414 | 2542 |
"Modified (format): / 16-02-2017 / 11:11:49 / stefan" |
17342 | 2543 |
! |
2544 |
||
2545 |
updateVersionList |
|
2546 |
"asks the classes source code manager for a list of revisions; |
|
2547 |
construct versionInfoList (containing the full info), versionList (containing version numbers only) |
|
2548 |
and tagList (containing symbolic names only). |
|
2549 |
This is only used when comparing multiple versions." |
|
2550 |
||
2551 |
|cls sourceCodeManager numShown newNumShown numOverallRevisions |
|
17827 | 2552 |
partialLog newestRev revisions revisionEntries symbolicNames |
17342 | 2553 |
stableRevision releasedRevision tagList logMessages| |
2554 |
||
2555 |
cls := classHolder value. |
|
2556 |
sourceCodeManager := cls sourceCodeManager. |
|
2557 |
||
2558 |
numShown := versionList size - 1. |
|
2559 |
newNumShown := (numShown + 50) max:30. |
|
2560 |
partialLog := sourceCodeManager revisionLogOf:cls numberOfRevisions:newNumShown. |
|
2561 |
||
2562 |
partialLog isNil ifTrue:[ |
|
2563 |
self warn:'Could not find/access the container for class ',cls name,' in the repository. |
|
2564 |
This could be due to: |
|
2565 |
- invalid/wrong CVS-Root setting |
|
2566 |
- missing CVS access rights |
|
2567 |
(no access / not logged in) |
|
2568 |
- changed CVSRoot after compilation |
|
2569 |
(i.e. wrong CVS-path in classes version method) |
|
2570 |
'. |
|
2571 |
^ nil |
|
2572 |
]. |
|
2573 |
||
2574 |
numOverallRevisions := partialLog at:#numberOfRevisions. |
|
2575 |
newestRev := partialLog at:#newestRevision. |
|
2576 |
revisions := partialLog at:#revisions. |
|
2577 |
||
2578 |
"/ fetch the symbolic (tag) version list |
|
2579 |
symbolicNames := partialLog at:#symbolicNames ifAbsent:[]. |
|
2580 |
symbolicNames notNil ifTrue:[ |
|
2581 |
stableRevision := symbolicNames at:'stable' ifAbsent:[]. |
|
2582 |
releasedRevision := symbolicNames at:'released' ifAbsent:[]. |
|
2583 |
tagList := ((symbolicNames associations sort:[:a :b | a key < b key "self versionString:(a value) isLessThan:(b value)"]) |
|
2584 |
collect:[:assoc | assoc key]) reverse. |
|
2585 |
tagList remove:'stable' ifAbsent:[]. |
|
2586 |
tagList notEmpty ifTrue:[tagList addFirst:'-']. |
|
2587 |
tagList addFirst:'stable'. |
|
2588 |
]. |
|
2589 |
logMessages := Dictionary new. |
|
2590 |
||
2591 |
versionInfoList := revisions. |
|
2592 |
||
2593 |
"/ items := versionInfoList collect:[:each | |rev date who flag| |
|
2594 |
"/ rev := each at:#revision. |
|
2595 |
"/ logMessages at:rev put:(each at:#logMessage). |
|
2596 |
"/ date := (each at:#date ifAbsent:nil) ? '?'. |
|
2597 |
"/ who := (each at:#author ifAbsent:nil) ? '?'. |
|
2598 |
"/ rev = stableRevision ifTrue:[ |
|
2599 |
"/ flag := ' Stable' allBold. |
|
2600 |
"/ ] ifFalse:[rev = releasedRevision ifTrue:[ |
|
2601 |
"/ flag := ' Released' allBold. |
|
2602 |
"/ ] ifFalse:[ |
|
2603 |
"/ flag := ' ' |
|
2604 |
"/ ]]. |
|
2605 |
"/ rev allBold , flag, ' [' , date , ' by ' , who , ']' |
|
2606 |
"/ ]. |
|
2607 |
"/ |
|
2608 |
"/ revisions := revisions collect:[:eachItem | eachItem at:#revision]. |
|
17827 | 2609 |
revisions := OrderedCollection new. |
2610 |
revisionEntries := OrderedCollection new. |
|
2611 |
versionInfoList do:[:eachVersionInfo | |
|
2612 |
revisions add:eachVersionInfo revision. |
|
2613 |
revisionEntries add:( |
|
2614 |
'%1 (by %2 at %3)' |
|
2615 |
bindWith:(eachVersionInfo revision) |
|
2616 |
with:(eachVersionInfo user) |
|
2617 |
with:(eachVersionInfo date)). |
|
2618 |
]. |
|
17342 | 2619 |
|
2620 |
revisions size < numOverallRevisions ifTrue:[ |
|
17931 | 2621 |
revisions add:'...'. |
2622 |
revisionEntries add:'...'. |
|
17342 | 2623 |
]. |
2624 |
symbolicToVersionMapping := symbolicNames. |
|
2625 |
self symbolicVersionList contents:tagList. |
|
2626 |
self versionList contents:revisions. |
|
17827 | 2627 |
self versionEntriesList contents:revisionEntries. |
2628 |
||
2629 |
"Modified: / 29-11-2017 / 13:06:21 / cg" |
|
2695 | 2630 |
! ! |
2631 |
||
2221 | 2632 |
!VersionDiffBrowser methodsFor:'initialization & release'! |
2633 |
||
2634 |
postBuildWith:aBuilder |
|
3147 | 2635 |
" |
2636 |
components which are invisible should be ignored by the panel. |
|
2637 |
Cannot be set via the interface builder. |
|
2221 | 2638 |
|
3147 | 2639 |
<return: self> |
2640 |
" |
|
2641 |
||
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
2642 |
(self componentAt:#TopHorizontalPanel) ignoreInvisibleComponents:true. |
6642 | 2643 |
super postBuildWith:aBuilder |
14076 | 2644 |
! |
2645 |
||
2646 |
postOpenWith:aBuilder |
|
2647 |
super postOpenWith:aBuilder. |
|
2648 |
||
2649 |
self isMultipleVersionBrowser ifTrue:[ |
|
2650 |
self withWaitCursorDo:[ |
|
2651 |
self updateVersionList. |
|
2652 |
] |
|
2653 |
] |
|
2221 | 2654 |
! ! |
2655 |
||
2656 |
!VersionDiffBrowser methodsFor:'menu action'! |
|
2657 |
||
2465 | 2658 |
browseChange:aChange |
6828 | 2659 |
"browse the change in aChange" |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2660 |
|
17663 | 2661 |
|cls sel| |
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
2662 |
|
2578
29264fb3847e
avoid debugger in browse-menu
Claus Gittinger <cg@exept.de>
parents:
2536
diff
changeset
|
2663 |
aChange isNil ifTrue:[^ self]. |
7396 | 2664 |
|
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
2665 |
cls := aChange changeClass. |
11962 | 2666 |
cls isNil ifTrue:[ |
2667 |
Dialog information:'The class is not present in the image'. |
|
2668 |
^ self |
|
2669 |
]. |
|
7396 | 2670 |
aChange isMethodChange ifTrue:[ |
11962 | 2671 |
sel := aChange changeSelector. |
7396 | 2672 |
"/ (cls compiledMethodAt:sel) isNil ifTrue:[ |
2673 |
"/ (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[ |
|
2674 |
"/ browserClass openInClass:cls |
|
2675 |
"/ ]. |
|
2676 |
"/ sel := nil. |
|
2677 |
"/ ] |
|
2678 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2679 |
self withWaitCursorDo:[ |
17663 | 2680 |
SystemBrowser default openInClass:cls selector:sel. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2681 |
] |
6828 | 2682 |
|
17663 | 2683 |
"Modified (format): / 01-09-2017 / 14:23:56 / cg" |
2465 | 2684 |
! |
2685 |
||
2686 |
browseClassInA |
|
6828 | 2687 |
"browse the selected method." |
2688 |
self browseChange:(self selectedChangeInA). |
|
2507 | 2689 |
|
6828 | 2690 |
"Modified: / 25-07-2006 / 11:14:02 / cg" |
2465 | 2691 |
! |
2221 | 2692 |
|
2465 | 2693 |
browseClassInB |
6828 | 2694 |
"browse the selected method." |
2695 |
self browseChange:(self selectedChangeInB). |
|
2507 | 2696 |
|
6828 | 2697 |
"Modified: / 25-07-2006 / 11:13:58 / cg" |
2465 | 2698 |
! |
2699 |
||
2700 |
browseClassInM |
|
6828 | 2701 |
"browse the selected method." |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2702 |
|
6828 | 2703 |
self browseChange:(self selectedChangesInM first). |
2507 | 2704 |
|
6828 | 2705 |
"Modified: / 25-07-2006 / 11:13:54 / cg" |
2465 | 2706 |
! |
2707 |
||
2469 | 2708 |
createPatchFile |
15621 | 2709 |
"create a patchFile, to patch the old version (versionA) into the new version (versionB). |
2856 | 2710 |
I.e. a little changeFile to transport those changes." |
2711 |
||
15621 | 2712 |
|defaultName diffSet f oldVersion newVersion vsnMthdA vsnMthdB vsnA vsnB info classBeingCompared| |
2713 |
||
2714 |
self warn:'Sorry: This function is not yet implemented'. |
|
2856 | 2715 |
defaultName := 'patchFile.chg'. |
2469 | 2716 |
|
6828 | 2717 |
classBeingCompared := classChangeSet classBeingCompared. |
15621 | 2718 |
defaultName := '%1-%2-to-%3.chg' |
2719 |
bindWith:(classBeingCompared isNil ifTrue:['unknown'] ifFalse:[classBeingCompared nameWithoutPrefix]) |
|
2720 |
with:(classChangeSet versionA ? 'old') |
|
2721 |
with:(classChangeSet versionB ? 'new'). |
|
11453 | 2722 |
f := Dialog |
15621 | 2723 |
requestFileNameForSave:'Name of patchFile:' |
2724 |
default:defaultName. |
|
2725 |
self halt. |
|
2726 |
diffSet := classChangeSet diffSet. |
|
2730 | 2727 |
^ self. |
2728 |
||
11453 | 2729 |
"/ vsnMthdA := self changeSetA |
3103 | 2730 |
"/ detect:[:ch | ch isMethodChange |
2731 |
"/ and:[ch changeClass isMeta |
|
2732 |
"/ and:[ch changeSelector = #version]]] |
|
2733 |
"/ ifNone:nil. |
|
11453 | 2734 |
"/ vsnMthdB := self changeSetA |
3103 | 2735 |
"/ detect:[:ch | ch isMethodChange |
2736 |
"/ and:[ch changeClass isMeta |
|
2737 |
"/ and:[ch changeSelector = #version]]] |
|
2738 |
"/ ifNone:nil. |
|
2739 |
"/ |
|
2740 |
"/ vsnMthdA notNil ifTrue:[ |
|
11453 | 2741 |
"/ "/ extract the version |
3103 | 2742 |
"/ vsnA := Class revisionStringFromSource:vsnMthdA source. |
2743 |
"/ vsnA notNil ifTrue:[ |
|
2744 |
"/ info := Class revisionInfoFromString:vsnA. |
|
2745 |
"/ info notNil ifTrue:[ |
|
2746 |
"/ vsnA := info at:#revision ifAbsent:nil. |
|
2747 |
"/ ] ifFalse:[ |
|
2748 |
"/ vsnA := nil. |
|
2749 |
"/ ]. |
|
2750 |
"/ ]. |
|
2751 |
"/ ]. |
|
2752 |
"/ vsnMthdB notNil ifTrue:[ |
|
11453 | 2753 |
"/ "/ extract the version |
3103 | 2754 |
"/ vsnB := Class revisionStringFromSource:vsnMthdB source. |
2755 |
"/ vsnB notNil ifTrue:[ |
|
2756 |
"/ info := Class revisionInfoFromString:vsnB. |
|
2757 |
"/ info notNil ifTrue:[ |
|
2758 |
"/ vsnB := info at:#revision ifAbsent:nil. |
|
2759 |
"/ ] ifFalse:[ |
|
2760 |
"/ vsnB := nil. |
|
2761 |
"/ ]. |
|
2762 |
"/ ]. |
|
2763 |
"/ ]. |
|
2764 |
"/ |
|
2765 |
"/ (vsnA isNil or:[vsnB isNil or:[vsnA = vsnB]]) ifTrue:[ |
|
2766 |
"/ self warn:'The generated patch file will not be able to validate/update the class version'. |
|
2767 |
"/ ]. |
|
2768 |
"/ |
|
2769 |
"/self halt:'not yet finished'. |
|
6828 | 2770 |
|
9602 | 2771 |
"Modified: / 27-10-2010 / 11:34:58 / cg" |
2469 | 2772 |
! |
2773 |
||
17344 | 2774 |
hideDiffsWithCommentOrFormattingChangeOnlyHolder:newValue |
2775 |
"state of hide changes which have no semantic effect has changed" |
|
2776 |
||
2777 |
self updateLists. |
|
2778 |
||
2779 |
"Created: / 04-02-2017 / 19:50:51 / cg" |
|
2780 |
"Modified: / 04-02-2017 / 23:14:45 / cg" |
|
2781 |
! |
|
2782 |
||
2783 |
inspectSelectedChangeInA |
|
2784 |
"inspect the selected method change for the 'method only in version A'." |
|
2785 |
||
2786 |
self selectedChangeInA inspect. |
|
2787 |
||
2788 |
"Modified: / 25-07-2006 / 11:13:30 / cg" |
|
2789 |
! |
|
2790 |
||
2791 |
inspectSelectedChangeInB |
|
2792 |
"inspect the selected method change for the 'method only in version B'." |
|
2793 |
||
2794 |
self selectedChangeInB inspect. |
|
2795 |
||
2796 |
"Modified: / 25-07-2006 / 11:13:22 / cg" |
|
2797 |
! |
|
2798 |
||
2799 |
inspectSelectedChangeInM |
|
2800 |
"inspect the two method changes for the selected 'changed method'." |
|
2801 |
||
2802 |
|changes| |
|
2803 |
||
2804 |
changes := self selectedChangesInM. |
|
2805 |
changes do:[:change | |
|
2806 |
change inspect |
|
2807 |
]. |
|
2808 |
||
2809 |
"Modified: / 25-07-2006 / 11:13:13 / cg" |
|
2810 |
! |
|
2811 |
||
2812 |
mainMenu |
|
2813 |
"if this application runs as an subapplication, |
|
2814 |
the menu bar should not be used." |
|
2815 |
||
2816 |
self masterApplication isNil ifTrue:[ |
|
2817 |
^ self class mainMenu |
|
2818 |
]. |
|
2819 |
^ nil |
|
2820 |
||
2821 |
"Modified: / 25-07-2006 / 11:13:44 / cg" |
|
2822 |
! |
|
2823 |
||
2824 |
menuAHolder |
|
2825 |
^ [ self class menuA ] |
|
2826 |
||
2827 |
"Created: / 05-02-2017 / 10:07:15 / cg" |
|
2828 |
! |
|
2829 |
||
2830 |
menuBHolder |
|
2831 |
^ [ self class menuB ] |
|
2832 |
||
2833 |
"Created: / 05-02-2017 / 10:07:22 / cg" |
|
2834 |
! |
|
2835 |
||
2836 |
menuMHolder |
|
2837 |
^ [ self class menuM ] |
|
2838 |
||
2839 |
"Created: / 05-02-2017 / 10:07:36 / cg" |
|
2840 |
! |
|
2841 |
||
2842 |
openDocumentation |
|
2843 |
HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF' |
|
2844 |
! |
|
2845 |
||
2846 |
removeClassFromChangeSet |
|
2847 |
|cls ok changedClasses| |
|
2848 |
||
2849 |
classChangeSet notNil ifTrue:[ |
|
2850 |
"/ only do if we compare a single class |
|
2851 |
(cls := classChangeSet classBeingCompared) notNil ifTrue:[ |
|
2852 |
ok := classChangeSet diffSet isEmptyOrNil. |
|
2853 |
ok ifFalse:[ |
|
2854 |
changedClasses := classChangeSet diffSet changedClasses. |
|
2855 |
(changedClasses size == 1 |
|
2856 |
and:[ changedClasses anElement theNonMetaclass == cls theNonMetaclass]) ifTrue:[ |
|
2857 |
(methodsChangedFiltered isEmptyOrNil |
|
2858 |
and:[ methodsOnlyInAFiltered isEmptyOrNil |
|
2859 |
and:[ methodsOnlyInBFiltered isEmptyOrNil ]]) ifTrue:[ |
|
2860 |
ok := true. |
|
2861 |
] |
|
2862 |
] |
|
2863 |
]. |
|
2864 |
ok ifTrue:[ |
|
2865 |
ChangeSet current condenseChangesForClass:cls |
|
2866 |
]. |
|
2867 |
]. |
|
2868 |
]. |
|
2869 |
! ! |
|
2870 |
||
2871 |
!VersionDiffBrowser methodsFor:'menu action - filters'! |
|
2872 |
||
17349 | 2873 |
currentFilterParameters |
2874 |
"get the current settings" |
|
2875 |
||
2876 |
|filterParameters| |
|
2877 |
||
2878 |
"/ migration - will be removed |
|
2879 |
filteredMethods notEmptyOrNil ifTrue:[ |
|
2880 |
filteredMethods := filteredMethods |
|
2881 |
collect:[:filter | |
|
2882 |
filter isAssociation ifTrue:[ |
|
2883 |
filter. |
|
2884 |
] ifFalse:[ |
|
2885 |
filter className ->filter changeSelector. |
|
2886 |
]. |
|
2887 |
]. |
|
2888 |
]. |
|
2889 |
||
2890 |
filterParameters := FilterParameters new. |
|
2891 |
filterParameters filteredClassNameMatchPattern:classPatternFilters. |
|
2892 |
filterParameters filteredSelectorMatchPattern:selectorPatternFilters. |
|
2893 |
filterParameters filteredClassNames:filteredClasses. |
|
2894 |
filterParameters filteredMethodNames:filteredMethods. |
|
2895 |
filterParameters filteredSelectors:filteredSelectors. |
|
2896 |
||
2897 |
^ filterParameters. |
|
2898 |
||
2899 |
"Created: / 06-02-2017 / 09:20:07 / cg" |
|
2900 |
! |
|
2901 |
||
2902 |
exportFilterParameters |
|
2903 |
"generate XML with the current settings |
|
2904 |
(to be pasted into Jabber for interchange)" |
|
2905 |
||
2906 |
|filterParameters| |
|
2907 |
||
2908 |
filterParameters := self currentFilterParameters. |
|
2909 |
Workspace |
|
2910 |
openWith:(XMLStandardCoder encode:filterParameters) |
|
2911 |
title:'Current Filter' |
|
2912 |
||
2913 |
"Created: / 06-02-2017 / 09:19:52 / cg" |
|
2914 |
! |
|
2915 |
||
17341 | 2916 |
filterClassInA |
17348 | 2917 |
"filter all changes for the selected change's class (don't show it)." |
17341 | 2918 |
|
2919 |
filteredClasses isNil ifTrue:[ |
|
2920 |
filteredClasses := Set new. |
|
2921 |
]. |
|
2922 |
filteredClasses add:(self selectedChangeInA nonMetaClassName). |
|
2923 |
self filterChanged. |
|
2924 |
||
2925 |
"Created: / 05-02-2017 / 10:17:22 / cg" |
|
2926 |
"Modified: / 05-02-2017 / 11:19:05 / cg" |
|
17348 | 2927 |
"Modified (comment): / 06-02-2017 / 09:13:23 / cg" |
17341 | 2928 |
! |
2929 |
||
2930 |
filterClassInB |
|
17348 | 2931 |
"filter all changes for the selected change's class (don't show it)." |
17341 | 2932 |
|
2933 |
filteredClasses isNil ifTrue:[ |
|
2934 |
filteredClasses := Set new. |
|
2935 |
]. |
|
2936 |
filteredClasses add:(self selectedChangeInB nonMetaClassName). |
|
2937 |
self filterChanged. |
|
2938 |
||
2939 |
"Created: / 05-02-2017 / 10:16:45 / cg" |
|
2940 |
"Modified: / 05-02-2017 / 11:19:02 / cg" |
|
17348 | 2941 |
"Modified (comment): / 06-02-2017 / 09:13:29 / cg" |
17341 | 2942 |
! |
2943 |
||
2944 |
filterClassInM |
|
17348 | 2945 |
"filter all changes for the selected change's class (don't show it)." |
17341 | 2946 |
|
2947 |
filteredClasses isNil ifTrue:[ |
|
2948 |
filteredClasses := Set new. |
|
2949 |
]. |
|
2950 |
filteredClasses add:(self selectedChangesInM first nonMetaClassName). |
|
2951 |
self filterChanged. |
|
2952 |
||
2953 |
"Created: / 05-02-2017 / 10:38:06 / cg" |
|
17348 | 2954 |
"Modified (comment): / 06-02-2017 / 09:13:33 / cg" |
17341 | 2955 |
! |
2956 |
||
2957 |
filterClassesMatching |
|
17348 | 2958 |
"ask for a GLOB pattern; |
2959 |
filter all changes with matching classnames ." |
|
2960 |
||
2961 |
|pattern| |
|
2962 |
||
2963 |
pattern := Dialog request:'Matchpattern for Classname Filter (will hide changes with matching classes):'. |
|
17344 | 2964 |
pattern isEmptyOrNil ifTrue:[^ self]. |
17347 | 2965 |
|
2966 |
classPatternFilters isNil ifTrue:[ |
|
2967 |
classPatternFilters := OrderedCollection new. |
|
17344 | 2968 |
]. |
17347 | 2969 |
classPatternFilters add:pattern. |
17344 | 2970 |
self filterChanged |
17341 | 2971 |
|
2972 |
"Created: / 05-02-2017 / 11:11:42 / cg" |
|
17348 | 2973 |
"Modified: / 06-02-2017 / 09:18:15 / cg" |
2974 |
! |
|
2975 |
||
2976 |
filterMethod:aChange |
|
2977 |
"filter this change (don't show it)." |
|
2978 |
||
2979 |
filteredMethods isNil ifTrue:[ |
|
2980 |
filteredMethods := Set new. |
|
2981 |
]. |
|
2982 |
aChange isMethodChange ifTrue:[ |
|
2983 |
filteredMethods add:(aChange className -> aChange changeSelector). |
|
2984 |
] ifFalse:[ |
|
2985 |
]. |
|
2986 |
||
2987 |
self filterChanged. |
|
2988 |
||
2989 |
"Created: / 06-02-2017 / 08:58:17 / cg" |
|
17341 | 2990 |
! |
2991 |
||
2992 |
filterMethodInA |
|
2993 |
"filter this entry (don't show it)." |
|
2994 |
||
17348 | 2995 |
self filterMethod:(self selectedChangeInA) |
17341 | 2996 |
|
2997 |
"Created: / 05-02-2017 / 10:11:48 / cg" |
|
17348 | 2998 |
"Modified: / 06-02-2017 / 08:58:38 / cg" |
17341 | 2999 |
! |
3000 |
||
3001 |
filterMethodInB |
|
3002 |
"filter this entry (don't show it)." |
|
3003 |
||
17348 | 3004 |
self filterMethod:(self selectedChangeInB) |
17341 | 3005 |
|
3006 |
"Created: / 05-02-2017 / 10:15:57 / cg" |
|
17348 | 3007 |
"Modified: / 06-02-2017 / 08:58:46 / cg" |
17341 | 3008 |
! |
3009 |
||
3010 |
filterMethodInM |
|
3011 |
"filter this entry (don't show it)." |
|
3012 |
||
17348 | 3013 |
self filterMethod:(self selectedChangesInM first) |
17341 | 3014 |
|
3015 |
"Created: / 05-02-2017 / 10:39:10 / cg" |
|
17348 | 3016 |
"Modified: / 06-02-2017 / 08:58:59 / cg" |
17341 | 3017 |
! |
3018 |
||
3019 |
filterSelectorFromA |
|
17348 | 3020 |
"filter all changes for the selected change's selector(don't show it)." |
17341 | 3021 |
|
17931 | 3022 |
self filterSelectorFromSet:self selectedChangeInA |
17341 | 3023 |
|
3024 |
"Created: / 05-02-2017 / 10:36:08 / cg" |
|
17348 | 3025 |
"Modified (comment): / 06-02-2017 / 09:13:48 / cg" |
17341 | 3026 |
! |
3027 |
||
3028 |
filterSelectorFromB |
|
17348 | 3029 |
"filter all changes for the selected change's selector(don't show it)." |
17341 | 3030 |
|
17931 | 3031 |
self filterSelectorFromSet:self selectedChangeInB |
17341 | 3032 |
|
3033 |
"Created: / 05-02-2017 / 10:36:14 / cg" |
|
17348 | 3034 |
"Modified (comment): / 06-02-2017 / 09:13:52 / cg" |
17341 | 3035 |
! |
3036 |
||
17931 | 3037 |
filterSelectorFromChange:aChange |
3038 |
"common to set a filter; |
|
3039 |
gets the change as argument, |
|
3040 |
takes its selector and adds it to the filters" |
|
17341 | 3041 |
|
3042 |
filteredSelectors isNil ifTrue:[ |
|
3043 |
filteredSelectors := Set new. |
|
3044 |
]. |
|
17931 | 3045 |
filteredSelectors add:(aChange changeSelector). |
3046 |
self filterChanged. |
|
3047 |
||
3048 |
"Created: / 05-02-2017 / 10:39:28 / cg" |
|
3049 |
"Modified (comment): / 06-02-2017 / 09:13:55 / cg" |
|
3050 |
! |
|
3051 |
||
3052 |
filterSelectorFromM |
|
3053 |
"filter all changes for the selected change's selector(don't show it)." |
|
3054 |
||
3055 |
self filterSelectorFromSet:(self selectedChangesInM first) |
|
3056 |
||
3057 |
"Created: / 05-02-2017 / 10:39:28 / cg" |
|
3058 |
"Modified (comment): / 06-02-2017 / 09:13:55 / cg" |
|
3059 |
! |
|
3060 |
||
3061 |
filterSelectorFromSet:setOfChanges |
|
3062 |
"common to set a filter; |
|
3063 |
get the sub-set (A,B,M as argument), |
|
3064 |
takes its first selection and adds it to the filters" |
|
3065 |
||
3066 |
filteredSelectors isNil ifTrue:[ |
|
3067 |
filteredSelectors := Set new. |
|
3068 |
]. |
|
3069 |
filteredSelectors add:(setOfChanges first changeSelector). |
|
17341 | 3070 |
self filterChanged. |
3071 |
||
3072 |
"Created: / 05-02-2017 / 10:39:28 / cg" |
|
17348 | 3073 |
"Modified (comment): / 06-02-2017 / 09:13:55 / cg" |
17341 | 3074 |
! |
3075 |
||
17347 | 3076 |
filterSelectorsMatching |
17348 | 3077 |
"ask for a GLOB pattern; |
3078 |
filter all changes with matching selectors." |
|
3079 |
||
17347 | 3080 |
|pattern| |
3081 |
||
17348 | 3082 |
pattern := Dialog request:'Matchpattern for Selector Filter (will hide changes with matching selectors):'. |
17347 | 3083 |
pattern isEmptyOrNil ifTrue:[^ self]. |
3084 |
||
3085 |
selectorPatternFilters isNil ifTrue:[ |
|
3086 |
selectorPatternFilters := OrderedCollection new. |
|
3087 |
]. |
|
3088 |
selectorPatternFilters add:pattern. |
|
3089 |
self filterChanged |
|
3090 |
||
3091 |
"Created: / 06-02-2017 / 02:29:07 / cg" |
|
17348 | 3092 |
"Modified: / 06-02-2017 / 09:18:20 / cg" |
17347 | 3093 |
! |
3094 |
||
17341 | 3095 |
forgetFilterNamed |
17344 | 3096 |
"forget a remembered named filter" |
3097 |
||
3098 |
|filterName| |
|
3099 |
||
17952 | 3100 |
RememberedFilters isNil ifTrue:[ |
3101 |
Dialog warn:'No filter was defined'. |
|
3102 |
^ self |
|
3103 |
]. |
|
3104 |
||
17345 | 3105 |
filterName := Dialog |
3106 |
request:'Forget Filter Named:' |
|
3107 |
list:(RememberedFilters keys asNewOrderedCollection sort). |
|
17344 | 3108 |
filterName isEmptyOrNil ifTrue:[^ self]. |
3109 |
||
3110 |
(Dialog confirm:'Shure to Forget the Filter Named: ',filterName) ifFalse:[^ self]. |
|
3111 |
||
3112 |
RememberedFilters removeKey:filterName. |
|
17341 | 3113 |
|
3114 |
"Created: / 05-02-2017 / 11:12:08 / cg" |
|
17345 | 3115 |
"Modified: / 06-02-2017 / 02:17:47 / cg" |
17334 | 3116 |
! |
3117 |
||
17349 | 3118 |
importFilterParameters |
3119 |
"ask for XML representation as exported previously. |
|
3120 |
(to be pasted from Jabber for interchange)" |
|
3121 |
||
3122 |
|xml filterParameters| |
|
3123 |
||
3124 |
xml := Dialog requestText:'Paste XML Exported Filter Here and Accept'. |
|
3125 |
xml isEmptyOrNil ifTrue:[^ self]. |
|
3126 |
||
3127 |
filterParameters := XMLStandardCoder decode:xml. |
|
3128 |
(filterParameters isKindOf:FilterParameters) ifTrue:[ |
|
3129 |
self setFilterParameters:filterParameters |
|
3130 |
]. |
|
3131 |
||
3132 |
"Created: / 06-02-2017 / 09:51:11 / cg" |
|
3133 |
! |
|
3134 |
||
17344 | 3135 |
inspectFilterParameters |
3136 |
"inspect the current settings" |
|
3137 |
||
17349 | 3138 |
self currentFilterParameters inspect. |
17344 | 3139 |
|
3140 |
"Created: / 06-02-2017 / 02:00:55 / cg" |
|
17349 | 3141 |
"Modified: / 06-02-2017 / 09:20:15 / cg" |
2465 | 3142 |
! |
3143 |
||
17344 | 3144 |
loadFilterNamed |
3145 |
"load a remembered named filter" |
|
3146 |
||
3147 |
|filterName filterParameters| |
|
3148 |
||
17345 | 3149 |
filterName := Dialog |
3150 |
request:'Load Filter Named:' |
|
3151 |
list:(RememberedFilters keys asNewOrderedCollection sort). |
|
17344 | 3152 |
filterName isEmptyOrNil ifTrue:[^ self]. |
3153 |
||
3154 |
filterParameters := RememberedFilters at:filterName. |
|
17349 | 3155 |
self setFilterParameters:filterParameters. |
17344 | 3156 |
|
3157 |
"Created: / 06-02-2017 / 01:57:48 / cg" |
|
17349 | 3158 |
"Modified: / 06-02-2017 / 09:51:47 / cg" |
11855
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
3159 |
! |
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
3160 |
|
17341 | 3161 |
rememberFilterAs |
17344 | 3162 |
"remember the current settings under a named filter" |
3163 |
||
3164 |
|filterName filterParameters| |
|
3165 |
||
17346 | 3166 |
filterName := Dialog |
3167 |
request:'Name of Filter:' |
|
3168 |
list:(RememberedFilters keys asNewOrderedCollection sort). |
|
17344 | 3169 |
filterName isEmptyOrNil ifTrue:[^ self]. |
3170 |
||
17349 | 3171 |
filterParameters := self currentFilterParameters. |
17344 | 3172 |
|
3173 |
RememberedFilters isNil ifTrue:[ |
|
3174 |
RememberedFilters := Dictionary new. |
|
11855
52fd36ba842f
changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents:
11853
diff
changeset
|
3175 |
]. |
17344 | 3176 |
RememberedFilters at:filterName put:filterParameters. |
3177 |
||
17349 | 3178 |
"Modified: / 06-02-2017 / 09:20:35 / cg" |
3179 |
! |
|
3180 |
||
17952 | 3181 |
removeClassFilter |
3182 |
"clear the current class filter (but not named ones)" |
|
3183 |
||
3184 |
classPatternFilters := nil. |
|
3185 |
self filterChanged |
|
3186 |
! |
|
3187 |
||
3188 |
removeSelectorFilter |
|
3189 |
"clear the current selector filter (but not named ones)" |
|
3190 |
||
3191 |
selectorPatternFilters := nil. |
|
3192 |
self filterChanged |
|
3193 |
||
3194 |
"Created: / 06-02-2017 / 02:29:07 / cg" |
|
3195 |
"Modified: / 06-02-2017 / 09:18:20 / cg" |
|
3196 |
! |
|
3197 |
||
17349 | 3198 |
setFilterParameters:filterParameters |
3199 |
"setup from a remembered filter" |
|
3200 |
||
3201 |
selectorPatternFilters := filterParameters filteredSelectorMatchPattern. |
|
3202 |
classPatternFilters := filterParameters filteredClassNameMatchPattern. |
|
3203 |
filteredClasses := filterParameters filteredClassNames. |
|
3204 |
filteredMethods := filterParameters filteredMethodNames. |
|
3205 |
filteredSelectors := filterParameters filteredSelectors. |
|
3206 |
||
3207 |
self filterChanged. |
|
3208 |
||
3209 |
"Created: / 06-02-2017 / 09:51:37 / cg" |
|
2221 | 3210 |
! ! |
3211 |
||
17931 | 3212 |
!VersionDiffBrowser methodsFor:'menu action - searching'! |
3213 |
||
3214 |
findNextChangeWithStringIn:listOfchanges selectionHolder:whichMethodSelectionHolder |
|
3215 |
"common code to select the next change which contains some string" |
|
3216 |
||
3217 |
|string startIdx| |
|
3218 |
||
3219 |
string := Dialog request:'Search for:' initialAnswer:LastSearchString. |
|
3220 |
string isEmptyOrNil ifTrue:[^ false]. |
|
3221 |
||
3222 |
LastSearchString := string. |
|
3223 |
||
3224 |
startIdx := whichMethodSelectionHolder value. |
|
3225 |
listOfchanges from:startIdx+1 keysAndValuesDo:[:index :eachChange | |
|
3226 |
(eachChange source includesString:string caseSensitive:false) ifTrue:[ |
|
3227 |
whichMethodSelectionHolder value:index. |
|
3228 |
^ true. |
|
3229 |
] |
|
3230 |
]. |
|
3231 |
^ false |
|
3232 |
! |
|
3233 |
||
3234 |
findNextChangeWithStringInA |
|
3235 |
"select the next change which contains some string" |
|
3236 |
||
3237 |
(self findNextChangeWithStringIn:methodsOnlyInAFiltered selectionHolder:methodsOnlyInASelection) ifTrue:[ |
|
3238 |
self methodsOnlyInASelectionChanged |
|
3239 |
] ifFalse:[ |
|
3240 |
self beepInEditor |
|
3241 |
]. |
|
3242 |
! |
|
3243 |
||
3244 |
findNextChangeWithStringInB |
|
3245 |
"select the next change which contains some string" |
|
3246 |
||
3247 |
(self findNextChangeWithStringIn:methodsOnlyInBFiltered selectionHolder:methodsOnlyInBSelection) ifTrue:[ |
|
3248 |
self methodsOnlyInASelectionChanged |
|
3249 |
] |
|
3250 |
! |
|
3251 |
||
3252 |
findNextChangeWithStringInM |
|
3253 |
"select the next change which contains some string" |
|
3254 |
||
3255 |
(self findNextChangeWithStringInPairs:methodsChangedFiltered selectionHolder:methodsChangedSelection) ifTrue:[ |
|
3256 |
self methodsChangedSelectionChanged |
|
3257 |
] |
|
3258 |
! |
|
3259 |
||
3260 |
findNextChangeWithStringInPairs:listOfchangePairs selectionHolder:whichMethodSelectionHolder |
|
3261 |
"select the next change which contains some string" |
|
3262 |
||
3263 |
|string startIdx| |
|
3264 |
||
3265 |
string := Dialog request:'Search for:' initialAnswer:LastSearchString. |
|
3266 |
string isEmptyOrNil ifTrue:[^ false]. |
|
3267 |
||
3268 |
LastSearchString := string. |
|
3269 |
||
3270 |
startIdx := whichMethodSelectionHolder value. |
|
3271 |
listOfchangePairs from:startIdx+1 keysAndValuesDo:[:index :eachChangePair | |
|
3272 |
(eachChangePair first source includesString:string caseSensitive:false) ifTrue:[ |
|
3273 |
whichMethodSelectionHolder value:index. |
|
3274 |
^ true. |
|
3275 |
]. |
|
3276 |
(eachChangePair second source includesString:string caseSensitive:false) ifTrue:[ |
|
3277 |
whichMethodSelectionHolder value:index. |
|
3278 |
^ true. |
|
3279 |
] |
|
3280 |
]. |
|
3281 |
^ false. |
|
3282 |
! ! |
|
3283 |
||
2221 | 3284 |
!VersionDiffBrowser methodsFor:'private'! |
3285 |
||
2745 | 3286 |
addAcceptToTextViewMenus |
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
3287 |
"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
|
3288 |
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
|
3289 |
(not the shown text) |
2745 | 3290 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
3291 |
<return: self> |
3147 | 3292 |
" |
2745 | 3293 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
3294 |
|diffTextView leftView rightView singleView| |
2745 | 3295 |
|
3296 |
diffTextView := self diffTextView. |
|
3297 |
leftView := diffTextView leftTextView. |
|
3298 |
rightView := diffTextView rightTextView. |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
3299 |
singleView := self componentAt:#singleTextView. |
2745 | 3300 |
|
11453 | 3301 |
(Array |
13547 | 3302 |
with:leftView |
3303 |
with:rightView |
|
3304 |
with:singleView) |
|
2745 | 3305 |
do:[:v | |
13547 | 3306 |
|mGen| |
3307 |
||
3308 |
mGen := [ |
|
3309 |
|m| |
|
3310 |
||
3311 |
m := v editMenu. |
|
3312 |
||
3313 |
(m selectorAt:#accept) isNil ifTrue:[ |
|
3314 |
m addLabels:(resources array:#('-' 'Accept')) |
|
3315 |
selectors:#(nil #accept) |
|
3316 |
after:#copySelection. |
|
3317 |
]. |
|
3318 |
m |
|
3319 |
actionAt:#accept |
|
3320 |
put:[ |
|
3321 |
v == singleView ifTrue:[ |
|
3322 |
self acceptInSingleView |
|
3323 |
] ifFalse:[ |
|
3324 |
v == leftView ifTrue:[ |
|
3325 |
self acceptInLeftView |
|
3326 |
] ifFalse:[ |
|
3327 |
self acceptInRightView |
|
3328 |
]. |
|
3329 |
]. |
|
3330 |
]. |
|
3331 |
m selectorAt:#accept put:nil. |
|
3332 |
m enable:#copySelection. |
|
3333 |
m setEnable:#accept to:[self canAcceptInCodeView]. |
|
3334 |
m |
|
3335 |
]. |
|
3336 |
v menuHolder:mGen. |
|
3337 |
v menuMessage:#value. |
|
2745 | 3338 |
] |
3339 |
! |
|
3340 |
||
17342 | 3341 |
information:msg |
3342 |
self infoHolder value:msg |
|
3343 |
||
3344 |
"Created: / 05-02-2017 / 11:42:27 / cg" |
|
17341 | 3345 |
! |
3346 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3347 |
printStringForChange:aChange |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3348 |
"generate a print string for a change." |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3349 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3350 |
|m changeClassName classOrMetaString useChangesString selectorString |
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3351 |
singleComparedClass singleComparedClassesName singleComparedMetaclassesName |
13137 | 3352 |
printString class1 class2| |
3353 |
||
3354 |
class1 := self classChangeSet class1BeingCompared. |
|
3355 |
class2 := self classChangeSet class2BeingCompared. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3356 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3357 |
(singleComparedClass := self classBeingCompared) notNil ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3358 |
singleComparedClassesName := singleComparedClass name. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3359 |
singleComparedMetaclassesName := singleComparedClass theMetaclass name. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3360 |
]. |
2497 | 3361 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3362 |
aChange isClassDefinitionChange ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3363 |
^ aChange printStringWithoutClassName |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3364 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3365 |
aChange isDoIt ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3366 |
^ aChange source , ' (doIt)' |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3367 |
]. |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
3368 |
aChange isNameSpaceCreationChange ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3369 |
^ aChange source |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
3370 |
]. |
3678 | 3371 |
|
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
3372 |
changeClassName := aChange className. |
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
3373 |
changeClassName isNil ifTrue:[ |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3374 |
^ aChange source |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
3375 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3376 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3377 |
useChangesString := false. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3378 |
classOrMetaString := ''. |
10892
98a427ae867b
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
10829
diff
changeset
|
3379 |
|
13137 | 3380 |
(class1 notNil |
3381 |
and:[ class2 notNil |
|
3382 |
and:[ class1 ~= class2 ]]) ifTrue:[ |
|
3383 |
changeClassName := ''. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3384 |
] ifFalse:[ |
13137 | 3385 |
(changeClassName = singleComparedClassesName) ifTrue:[ |
3386 |
"/ changeClassName := ''. |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3387 |
useChangesString := true. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3388 |
] ifFalse:[ |
13137 | 3389 |
(changeClassName = singleComparedMetaclassesName) ifTrue:[ |
3390 |
"/ classOrMetaString := ' class'. |
|
3391 |
useChangesString := true. |
|
3392 |
] ifFalse:[ |
|
3393 |
((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[ |
|
3394 |
changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1. |
|
3395 |
]. |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3396 |
]. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3397 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3398 |
]. |
6272 | 3399 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3400 |
selectorString := ''. |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3401 |
(aChange isMethodChange) ifTrue:[ |
17347 | 3402 |
selectorString := aChange changeSelector. |
13137 | 3403 |
|
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3404 |
aChange changeClass notNil ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3405 |
m := aChange changeMethod. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3406 |
m notNil ifTrue:[ |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3407 |
m := m originalMethodIfWrapped. |
17347 | 3408 |
selectorString := m printStringForBrowserWithSelector:aChange changeSelector inClass:aChange changeClass. |
11533
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3409 |
]. |
106faef31ef5
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
11453
diff
changeset
|
3410 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3411 |
changeClassName notEmptyOrNil ifTrue:[ |
17952 | 3412 |
selectorString := ' » ',selectorString |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3413 |
] |
2497 | 3414 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3415 |
|
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3416 |
printString := changeClassName,classOrMetaString,selectorString. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3417 |
aChange isMethodCategoryChange ifTrue:[ |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3418 |
^ printString, ' (category)' |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3419 |
]. |
11596
a82461d12ced
selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents:
11533
diff
changeset
|
3420 |
^ printString |
9587
9f33d5c62efa
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
9550
diff
changeset
|
3421 |
|
17347 | 3422 |
"Modified: / 06-02-2017 / 02:32:08 / cg" |
2497 | 3423 |
! |
3424 |
||
2501 | 3425 |
resetSelectionHolders |
3147 | 3426 |
" |
3427 |
reset all selection holders when a new change set is given. |
|
11453 | 3428 |
First set the selection to nil. |
2507 | 3429 |
|
3147 | 3430 |
<return: self> |
3431 |
" |
|
2501 | 3432 |
|
3433 |
self methodsChangedSelection value:nil. |
|
3434 |
self methodsOnlyInASelection value:nil. |
|
3435 |
self methodsOnlyInBSelection value:nil. |
|
2507 | 3436 |
self diffTextView text1:'' text2:''. |
3437 |
self methodText value:''. |
|
3438 |
||
3439 |
"/ self methodsChangedSelectionChanged. |
|
3440 |
"/ self methodsOnlyInASelectionChanged. |
|
3441 |
"/ self methodsOnlyInBSelectionChanged. |
|
2501 | 3442 |
! |
3443 |
||
2221 | 3444 |
showDiffTextView |
3147 | 3445 |
" |
3446 |
if a method change is selected, then show the diff text view. |
|
3447 |
Add an accept entry to the popup menu. |
|
2507 | 3448 |
|
3147 | 3449 |
<return: self> |
3450 |
" |
|
2694 | 3451 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
3452 |
(self componentAt:#diffTextViewBox) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
3453 |
(self componentAt:#singleTextView) beInvisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
3454 |
(self componentAt:#diffTextView) realizeAllSubViews. |
2694 | 3455 |
|
2465 | 3456 |
self addAcceptToTextViewMenus. |
2221 | 3457 |
! |
3458 |
||
3459 |
showSingleTextView |
|
3147 | 3460 |
" |
3461 |
if a method is selected which is only in version A or B of the class, |
|
3462 |
then show the text view. |
|
3463 |
Add an accept entry to the popup menu. |
|
2507 | 3464 |
|
3147 | 3465 |
<return: self> |
3466 |
" |
|
2507 | 3467 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
3468 |
(self componentAt:#singleTextView) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
3469 |
(self componentAt:#diffTextViewBox) beInvisible. |
2501 | 3470 |
self addAcceptToTextViewMenus. |
2221 | 3471 |
! |
3472 |
||
15621 | 3473 |
showVersionInfoIfNothingSelected |
3474 |
"show the revision info (author, date, time and logMessage), if no method is selected" |
|
3475 |
||
3476 |
|revInfo infoText| |
|
3477 |
||
17342 | 3478 |
"/ self information:''. |
15621 | 3479 |
|
3480 |
(methodsOnlyInASelection value isNil |
|
17334 | 3481 |
and:[ methodsOnlyInBSelection value isNil |
3482 |
and:[ methodsChangedSelection value isNil]] |
|
3483 |
) ifTrue:[ |
|
3484 |
versionInfoList notNil ifTrue:[ |
|
3485 |
revInfo := versionInfoList detect:[:info | (info at:#revision) = selectedVersionHolder value] ifNone:nil. |
|
3486 |
revInfo notNil ifTrue:[ |
|
3487 |
infoText := 'Revision: %1\Author: %2\Date: %3\Log:\\%4' withCRs |
|
3488 |
bindWith:(revInfo at:#revision) |
|
3489 |
with:(revInfo at:#author) |
|
3490 |
with:(revInfo at:#date) |
|
3491 |
with:(revInfo at:#logMessage). |
|
3492 |
]. |
|
3493 |
]. |
|
15621 | 3494 |
self methodText value:infoText. |
3495 |
self showSingleTextView. |
|
3496 |
]. |
|
17334 | 3497 |
|
17342 | 3498 |
"Modified: / 05-02-2017 / 11:49:47 / cg" |
2221 | 3499 |
! ! |
3500 |
||
2501 | 3501 |
!VersionDiffBrowser methodsFor:'setup'! |
3502 |
||
2695 | 3503 |
setupForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3504 |
"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
|
3505 |
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
|
3506 |
are updated." |
2695 | 3507 |
|
2731 | 3508 |
|changeSet| |
3509 |
||
2745 | 3510 |
aClass isNil ifTrue:[ |
16551 | 3511 |
changeSet := nil |
2745 | 3512 |
] ifFalse:[ |
16551 | 3513 |
(aClass isRealNameSpace) ifFalse:[ |
3514 |
aClass isLoaded ifTrue:[ |
|
3515 |
changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA). |
|
3516 |
] |
|
3517 |
]. |
|
2731 | 3518 |
]. |
2856 | 3519 |
self classChangeSet:changeSet. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
3520 |
aVersionA isNil ifTrue:[ |
16551 | 3521 |
self class:aClass versionA:'Repository' versionB:'Current'. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
3522 |
] ifFalse:[ |
16551 | 3523 |
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
|
3524 |
] |
2695 | 3525 |
! |
3526 |
||
2949 | 3527 |
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
|
3528 |
"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
|
3529 |
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
|
3530 |
are updated." |
2949 | 3531 |
|
3532 |
|changeSet| |
|
3533 |
||
3534 |
changeSet := (ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB). |
|
3535 |
self classChangeSet:changeSet |
|
3536 |
! |
|
3537 |
||
2510 | 3538 |
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
|
3539 |
"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
|
3540 |
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
|
3541 |
are updated." |
2510 | 3542 |
|
2731 | 3543 |
|changeSet| |
3544 |
||
9383 | 3545 |
aClass isRealNameSpace ifFalse:[ |
11453 | 3546 |
aClass isLoaded ifTrue:[ |
3547 |
changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB). |
|
3548 |
] |
|
2731 | 3549 |
]. |
3550 |
self classChangeSet:changeSet |
|
7499 | 3551 |
|
3552 |
"Modified: / 10-11-2006 / 17:15:26 / cg" |
|
2510 | 3553 |
! |
3554 |
||
2501 | 3555 |
setupForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3556 |
"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
|
3557 |
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
|
3558 |
are updated." |
2501 | 3559 |
|
2731 | 3560 |
|changeSet| |
3561 |
||
3562 |
aClass isNameSpace ifFalse:[ |
|
11453 | 3563 |
aClass isLoaded ifTrue:[ |
3564 |
changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB). |
|
3565 |
] |
|
2731 | 3566 |
]. |
2856 | 3567 |
self classChangeSet:changeSet. |
3568 |
self class:aClass versionA:aVersionA versionB:aVersionB. |
|
3678 | 3569 |
! |
3570 |
||
3571 |
setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB |
|
3572 |
|changeSet| |
|
3573 |
||
3574 |
changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB). |
|
3575 |
self classChangeSet:changeSet |
|
2501 | 3576 |
! ! |
3577 |
||
2497 | 3578 |
!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'! |
3579 |
||
11453 | 3580 |
changeSetForClass:aClass |
3756 | 3581 |
"return a ChangeSet for the class aClass and its current source. |
3582 |
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
|
3583 |
from the source stream." |
2695 | 3584 |
|
3756 | 3585 |
^ ChangeSet forExistingClass:aClass. |
2695 | 3586 |
! |
3587 |
||
2497 | 3588 |
changeSetForClass:aClass andRevision:aVersion |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3589 |
"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
|
3590 |
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
|
3591 |
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
|
3592 |
|
2497 | 3593 |
|theSourceCodeManager theSourceStream theChangeSet| |
3594 |
||
13305 | 3595 |
theSourceCodeManager := SourceCodeManagerUtilities sourceCodeManagerFor:aClass. |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3596 |
[ |
13305 | 3597 |
theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion. |
15167 | 3598 |
theSourceStream notNil ifTrue:[ |
3599 |
theChangeSet := ChangeSet fromStream:theSourceStream |
|
3600 |
] |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3601 |
] ensure:[ |
13305 | 3602 |
theSourceStream notNil ifTrue:[theSourceStream close] |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3603 |
]. |
15167 | 3604 |
theChangeSet isNil ifTrue:[ |
3605 |
self error:'Could not read source of class ',aClass name mayProceed:true. |
|
3606 |
^ nil |
|
3607 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3608 |
self sortChangeSet:theChangeSet. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3609 |
^ theChangeSet |
7108 | 3610 |
|
3611 |
"Modified: / 12-09-2006 / 14:24:51 / cg" |
|
2497 | 3612 |
! |
3613 |
||
11453 | 3614 |
changeSetForClass:aClass andSource:aSource |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3615 |
"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
|
3616 |
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
|
3617 |
from the source stream. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3618 |
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
|
3619 |
|
2497 | 3620 |
|theChangeSet theSourceStream| |
3621 |
||
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3622 |
[ |
15167 | 3623 |
theSourceStream := aSource readStream. |
17875 | 3624 |
theChangeSet := ChangeSet fromStream:theSourceStream. |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3625 |
] ensure:[ |
15167 | 3626 |
theSourceStream notNil ifTrue:[ |
3627 |
theSourceStream close |
|
3628 |
] |
|
3629 |
]. |
|
3630 |
theChangeSet isNil ifTrue:[ |
|
3631 |
self error:'Could not read source of class ',aClass name mayProceed:true. |
|
3632 |
^ nil |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
3633 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3634 |
self sortChangeSet:theChangeSet. |
4653
0a97ce41f5bd
More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents:
4638
diff
changeset
|
3635 |
^ theChangeSet |
17875 | 3636 |
|
3637 |
"Modified: / 02-01-2018 / 20:41:55 / stefan" |
|
2497 | 3638 |
! |
3639 |
||
2695 | 3640 |
newForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3641 |
"return a ClassChangeSet for the class aClass against some verson in the repository. |
11453 | 3642 |
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
|
3643 |
the correspondenting changes." |
2695 | 3644 |
|
8891 | 3645 |
|theClassChangeSet| |
2695 | 3646 |
|
3647 |
theClassChangeSet := self new. |
|
8891 | 3648 |
theClassChangeSet setupForClass:aClass againstVersion:aVersionA. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3649 |
^ theClassChangeSet |
2695 | 3650 |
! |
3651 |
||
2949 | 3652 |
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
|
3653 |
"return a ClassChangeSet for two classes. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3654 |
A new instance of ClassChangeSet is generated containing the correspondenting changes." |
2949 | 3655 |
|
3656 |
|aStream sourceA sourceB theChangeSetA theChangeSetB theClassChangeSet| |
|
3657 |
||
3658 |
theClassChangeSet := self new. |
|
13137 | 3659 |
theClassChangeSet class1BeingCompared:classA class2BeingCompared:classB. |
2949 | 3660 |
theClassChangeSet labelA:aLabelA. |
3661 |
theClassChangeSet labelB:aLabelB. |
|
3662 |
||
16615 | 3663 |
theChangeSetA := ChangeSet forExistingClass:classA withExtensions:true withLooseMethods:true. |
3664 |
theChangeSetB := ChangeSet forExistingClass:classB withExtensions:true withLooseMethods:true. |
|
3665 |
||
3666 |
"/ aStream := '' writeStream. |
|
3667 |
"/ Method flushSourceStreamCache. |
|
3668 |
"/ classA fileOutOn:aStream withTimeStamp:false. |
|
3669 |
"/ sourceA := aStream contents asString. |
|
3670 |
||
3671 |
"/ aStream := '' writeStream. |
|
3672 |
"/ Method flushSourceStreamCache. |
|
3673 |
"/ classB fileOutOn:aStream withTimeStamp:false. |
|
3674 |
"/ sourceB := aStream contents asString. |
|
3675 |
||
3676 |
"/ theChangeSetA:=self changeSetForClass:classA andSource:sourceA. |
|
3677 |
"/ theChangeSetB:=self changeSetForClass:classB andSource:sourceB. |
|
3678 |
"/ theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
|
3679 |
"/ theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
|
2949 | 3680 |
|
3681 |
"/ just in case (if comparing a class against another), |
|
3682 |
"/ unify the classes of the changes (to avoid that all changes are detected as different) |
|
3683 |
||
16615 | 3684 |
"/ theChangeSetB do:[:eachChange | |
3685 |
"/ eachChange isMethodChange ifTrue:[ |
|
3686 |
"/ eachChange changeClass isMeta ifTrue:[ |
|
3687 |
"/ eachChange changeClass ~~ classA theMetaclass ifTrue:[ |
|
3688 |
"/ eachChange changeClass:classA theMetaclass. |
|
3689 |
"/ ] |
|
3690 |
"/ ] ifFalse:[ |
|
3691 |
"/ eachChange changeClass ~~ classA theNonMetaclass ifTrue:[ |
|
3692 |
"/ eachChange changeClass:classA theNonMetaclass. |
|
3693 |
"/ ] |
|
3694 |
"/ ]. |
|
3695 |
"/ ]. |
|
3696 |
"/ ]. |
|
2949 | 3697 |
"/ remove all #initialize doIts |
16615 | 3698 |
theChangeSetA := theChangeSetA reject:[:eachChange | eachChange isDoIt and:[eachChange isInitialize]]. |
3699 |
theChangeSetB := theChangeSetB reject:[:eachChange | eachChange isDoIt and:[eachChange isInitialize]]. |
|
3700 |
||
3701 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB comparingDifferentClasses:true). |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3702 |
^ theClassChangeSet |
2949 | 3703 |
! |
3704 |
||
2497 | 3705 |
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
|
3706 |
"return a ClassChangeSet for the class aClass and the two sources. |
11453 | 3707 |
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
|
3708 |
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
|
3709 |
|
4128 | 3710 |
|theChangeSetA theChangeSetB theClassChangeSet className metaClassName| |
2497 | 3711 |
|
3712 |
theClassChangeSet := self new. |
|
3713 |
theClassChangeSet classBeingCompared:aClass. |
|
3714 |
theClassChangeSet labelA:aLabelA. |
|
3715 |
theClassChangeSet labelB:aLabelB. |
|
11453 | 3716 |
theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA. |
2497 | 3717 |
theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
3718 |
|
4128 | 3719 |
className := aClass name. |
3720 |
metaClassName := aClass class name. |
|
3721 |
||
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
3722 |
aClass isPrivate ifTrue:[ |
11453 | 3723 |
theChangeSetA := theChangeSetA select:[:change | change isMethodChange not |
3724 |
or:[change className = className or:[change className = metaClassName]]]. |
|
3725 |
theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not |
|
3726 |
or:[change className = className or:[change className = metaClassName]]]. |
|
3727 |
theChangeSetA := theChangeSetA select:[:change | change isDoIt not |
|
3728 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
|
3729 |
theChangeSetB := theChangeSetB select:[:change | change isMethodChange not |
|
3730 |
or:[change className = className or:[change className = metaClassName]]]. |
|
3731 |
theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not |
|
3732 |
or:[change className = className or:[change className = metaClassName]]]. |
|
3733 |
theChangeSetB := theChangeSetB select:[:change | change isDoIt not |
|
3734 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
|
3735 |
"/ there might be more needed... |
|
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
3736 |
]. |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
3737 |
|
2497 | 3738 |
theChangeSetA isNil |
11453 | 3739 |
ifTrue: [theChangeSetA := ChangeSet new]. |
2497 | 3740 |
theChangeSetB isNil |
11453 | 3741 |
ifTrue: [theChangeSetB := ChangeSet new]. |
2947 | 3742 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3743 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3744 |
^ theClassChangeSet |
2465 | 3745 |
! |
3746 |
||
2497 | 3747 |
newForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3748 |
"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
|
3749 |
The two class version are checked out from the repository and then being |
11453 | 3750 |
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
|
3751 |
the correspondenting changes." |
2497 | 3752 |
|
3753 |
|theChangeSetA theChangeSetB theClassChangeSet| |
|
3754 |
||
3755 |
theClassChangeSet := self new. |
|
3756 |
theClassChangeSet classBeingCompared:aClass. |
|
2856 | 3757 |
theClassChangeSet versionA:aVersionA. |
3758 |
theClassChangeSet versionB:aVersionB. |
|
2497 | 3759 |
theClassChangeSet labelA:aVersionA. |
3760 |
theClassChangeSet labelB:aVersionB. |
|
3761 |
theChangeSetA := self changeSetForClass: aClass andRevision: aVersionA. |
|
3762 |
theChangeSetB := self changeSetForClass: aClass andRevision: aVersionB. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3763 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3764 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3765 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3766 |
^ theClassChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3767 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3768 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3769 |
sortChangeSet:aChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3770 |
"/ sort by meta and selector |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3771 |
|
11453 | 3772 |
aChangeSet |
14363 | 3773 |
sort:[:a :b | |
3774 |
a == b ifTrue:[ |
|
3775 |
false |
|
3776 |
] ifFalse:[ |
|
3777 |
a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[ |
|
3778 |
a isClassChange == b isClassChange ifTrue:[ |
|
3779 |
a isClassChange ifTrue:[ |
|
3780 |
a isForMeta == b isForMeta ifTrue:[ |
|
3781 |
(a isMethodChange and:[b isMethodChange]) ifTrue:[ |
|
3782 |
a className < b className |
|
3783 |
or:[ a className = b className |
|
3784 |
and:[ a isPrimitiveChange not |
|
3785 |
and:[ b isPrimitiveChange not |
|
17347 | 3786 |
and:[ a changeSelector < b changeSelector ]]]] |
14363 | 3787 |
] ifFalse:[ |
3788 |
a isMethodChange not |
|
3789 |
]. |
|
3790 |
] ifFalse:[ |
|
3791 |
a isForMeta |
|
3792 |
]. |
|
3793 |
] ifFalse:[ |
|
3794 |
a printString < b printString |
|
3795 |
]. |
|
3796 |
] ifFalse:[ |
|
3797 |
a isClassChange |
|
3798 |
]. |
|
3799 |
] ifFalse:[ |
|
3800 |
a isClassDefinitionChange |
|
3801 |
]. |
|
3802 |
] |
|
3803 |
]. |
|
17347 | 3804 |
|
3805 |
"Modified: / 06-02-2017 / 02:31:57 / cg" |
|
2497 | 3806 |
! ! |
3807 |
||
3808 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'! |
|
3809 |
||
13137 | 3810 |
class1BeingCompared |
3811 |
"returns the class which is compared" |
|
3812 |
||
3813 |
^ class1BeingCompared |
|
3814 |
! |
|
3815 |
||
3816 |
class1BeingCompared:class1 class2BeingCompared:class2 |
|
3817 |
"returns the class which is compared" |
|
3818 |
||
3819 |
class1BeingCompared := class1. |
|
3820 |
class2BeingCompared := class2 |
|
3821 |
! |
|
3822 |
||
3823 |
class2BeingCompared |
|
3824 |
"returns the class which is compared" |
|
3825 |
||
3826 |
^ class2BeingCompared |
|
3827 |
! |
|
3828 |
||
2497 | 3829 |
classBeingCompared |
13137 | 3830 |
"returns the class which is compared" |
3831 |
||
3832 |
^ class1BeingCompared |
|
2497 | 3833 |
! |
2221 | 3834 |
|
2497 | 3835 |
classBeingCompared:something |
3756 | 3836 |
"set the value of the class which is compared" |
2497 | 3837 |
|
13137 | 3838 |
class1BeingCompared := class2BeingCompared := something. |
2497 | 3839 |
! |
3840 |
||
2695 | 3841 |
diffSet |
3756 | 3842 |
"returns a diffSet containing the different changes. |
3843 |
it responds to: |
|
2695 | 3844 |
|
11453 | 3845 |
changed OrderedCollection of arrays containing ChangeSets for methods |
3846 |
which are changed and exists in the class versionA and versionB |
|
3756 | 3847 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
3848 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
11453 | 3849 |
" |
3756 | 3850 |
|
2695 | 3851 |
^ diffSet |
3852 |
! |
|
3853 |
||
3854 |
diffSet:something |
|
3756 | 3855 |
"sets the diffSet containing the different changes. |
3856 |
it responds to: |
|
2695 | 3857 |
|
11453 | 3858 |
changed OrderedCollection of arrays containing ChangeSets for methods |
3859 |
which are changed and exists in the class versionA and versionB |
|
3756 | 3860 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
3861 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
11453 | 3862 |
" |
2695 | 3863 |
|
3864 |
diffSet := something. |
|
3865 |
! |
|
3866 |
||
2497 | 3867 |
labelA |
3756 | 3868 |
"returns the label for the class versionA" |
2497 | 3869 |
|
3870 |
^ labelA |
|
3871 |
! |
|
3872 |
||
3873 |
labelA:something |
|
3756 | 3874 |
"sets the label for the class versionA" |
2497 | 3875 |
|
3876 |
labelA := something. |
|
3877 |
! |
|
3878 |
||
3879 |
labelB |
|
3756 | 3880 |
"returns the label for the class versionB" |
2497 | 3881 |
|
3882 |
^ labelB |
|
3883 |
! |
|
2465 | 3884 |
|
2497 | 3885 |
labelB:something |
3756 | 3886 |
"sets the label for the class versionB" |
2497 | 3887 |
|
3888 |
labelB := something. |
|
3889 |
! |
|
3890 |
||
3891 |
methodsChanged |
|
11453 | 3892 |
"returns an OrderedCollection of arrays containing ChangeSets for methods |
3756 | 3893 |
which are changed and exists in the class versionA and versionB |
2497 | 3894 |
|
3756 | 3895 |
<return: OrderedCollection of Array(2)> |
3896 |
" |
|
3897 |
||
3898 |
^ self diffSet changed |
|
2497 | 3899 |
! |
3900 |
||
3901 |
methodsOnlyInA |
|
11453 | 3902 |
"returns a ChangeSet for the methods which exists only in the class versionA" |
2497 | 3903 |
|
3756 | 3904 |
^ self diffSet onlyInReceiver |
2497 | 3905 |
! |
3906 |
||
3907 |
methodsOnlyInB |
|
11453 | 3908 |
"returns a ChangeSet for the methods which exists only in the class versionB" |
2497 | 3909 |
|
3756 | 3910 |
^ self diffSet onlyInArg |
2856 | 3911 |
! |
3912 |
||
3913 |
versionA |
|
3914 |
^ versionA |
|
3915 |
! |
|
3916 |
||
3917 |
versionA:something |
|
3918 |
versionA := something. |
|
3919 |
! |
|
3920 |
||
3921 |
versionB |
|
3922 |
^ versionB |
|
3923 |
! |
|
3924 |
||
3925 |
versionB:something |
|
3926 |
versionB := something. |
|
2221 | 3927 |
! ! |
3928 |
||
8891 | 3929 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'misc'! |
3930 |
||
3931 |
removeAllVersionMethods |
|
3932 |
diffSet removeAllVersionMethods. |
|
3933 |
! ! |
|
3934 |
||
3935 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'setup'! |
|
3936 |
||
3937 |
setupForClass:aClass againstVersion:aVersionA |
|
3938 |
"return a ClassChangeSet for the class aClass against some verison in the repository. |
|
11453 | 3939 |
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
|
3940 |
the correspondenting changes." |
8891 | 3941 |
|
3942 |
|theChangeSetA theChangeSetB versionCompared| |
|
3943 |
||
3944 |
self classBeingCompared:aClass. |
|
3945 |
versionCompared := aVersionA. |
|
3946 |
aVersionA isNil ifTrue:[ |
|
11453 | 3947 |
self labelA:(versionCompared := aClass revision). |
3948 |
self versionA:versionCompared. |
|
8891 | 3949 |
] ifFalse:[ |
11453 | 3950 |
aVersionA == #newest ifTrue:[ |
3951 |
self labelA:(VersionDiffBrowser resources string:'Newest'). |
|
3952 |
] ifFalse:[ |
|
3953 |
self labelA:versionCompared. |
|
3954 |
self versionA:versionCompared. |
|
3955 |
] |
|
8891 | 3956 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3957 |
self labelB:(VersionDiffBrowser resources string:'Current'). |
8891 | 3958 |
theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared. |
3959 |
theChangeSetB := self class changeSetForClass: aClass. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3960 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3961 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3962 |
|
8891 | 3963 |
"/ if we are comparing a private class, prune out other changes |
3964 |
aClass isPrivate ifTrue:[ |
|
11453 | 3965 |
theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
3966 |
theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
|
8891 | 3967 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
3968 |
self activityNotification:'Generating diff-set...'. |
8891 | 3969 |
self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
3970 |
self activityNotification:nil. |
|
3971 |
^ diffSet |
|
3972 |
! ! |
|
3973 |
||
17341 | 3974 |
!VersionDiffBrowser::FilterParameters methodsFor:'accessing'! |
3975 |
||
3976 |
filteredClassNameMatchPattern |
|
3977 |
^ filteredClassNameMatchPattern |
|
3978 |
! |
|
3979 |
||
3980 |
filteredClassNameMatchPattern:something |
|
3981 |
filteredClassNameMatchPattern := something. |
|
3982 |
! |
|
3983 |
||
3984 |
filteredClassNames |
|
3985 |
^ filteredClassNames |
|
3986 |
! |
|
3987 |
||
3988 |
filteredClassNames:something |
|
3989 |
filteredClassNames := something. |
|
3990 |
! |
|
3991 |
||
3992 |
filteredMethodNames |
|
3993 |
^ filteredMethodNames |
|
3994 |
! |
|
3995 |
||
3996 |
filteredMethodNames:something |
|
3997 |
filteredMethodNames := something. |
|
3998 |
! |
|
3999 |
||
4000 |
filteredSelectorMatchPattern |
|
4001 |
^ filteredSelectorMatchPattern |
|
4002 |
! |
|
4003 |
||
4004 |
filteredSelectorMatchPattern:something |
|
4005 |
filteredSelectorMatchPattern := something. |
|
4006 |
! |
|
4007 |
||
4008 |
filteredSelectors |
|
4009 |
^ filteredSelectors |
|
4010 |
! |
|
4011 |
||
4012 |
filteredSelectors:something |
|
4013 |
filteredSelectors := something. |
|
4014 |
! ! |
|
4015 |
||
2221 | 4016 |
!VersionDiffBrowser class methodsFor:'documentation'! |
4017 |
||
4018 |
version |
|
16530 | 4019 |
^ '$Header$' |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
4020 |
! |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
4021 |
|
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
4022 |
version_CVS |
16530 | 4023 |
^ '$Header$' |
2221 | 4024 |
! ! |
12512 | 4025 |