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