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