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