|
28
|
1 |
"{ Package: 'Programming Tools' }"
|
|
|
2 |
|
|
0
|
3 |
"
|
|
4
|
4 |
COPYRIGHT (c) 1990 by Claus Gittinger
|
|
0
|
5 |
All Rights Reserved
|
|
|
6 |
|
|
|
7 |
This software is furnished under a license and may be used
|
|
|
8 |
only in accordance with the terms of that license and with the
|
|
|
9 |
inclusion of the above copyright notice. This software may not
|
|
|
10 |
be provided or otherwise made available to, or used by, any
|
|
|
11 |
other person. No title to or ownership of the software is
|
|
|
12 |
hereby transferred.
|
|
|
13 |
"
|
|
|
14 |
|
|
|
15 |
StandardSystemView subclass:#ChangesBrowser
|
|
|
16 |
instanceVariableNames:'changeListView codeView changeFileName
|
|
|
17 |
changeChunks changePositions
|
|
|
18 |
changeClassNames
|
|
|
19 |
anyChanges changeNrShown changeNrProcessed
|
|
28
|
20 |
fileBox'
|
|
0
|
21 |
classVariableNames:''
|
|
|
22 |
poolDictionaries:''
|
|
|
23 |
category:'Interface-Browsers'
|
|
|
24 |
!
|
|
|
25 |
|
|
|
26 |
ChangesBrowser comment:'
|
|
4
|
27 |
COPYRIGHT (c) 1990 by Claus Gittinger
|
|
0
|
28 |
All Rights Reserved
|
|
|
29 |
|
|
31
|
30 |
$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.13 1994-08-05 10:21:22 claus Exp $
|
|
29
|
31 |
'!
|
|
|
32 |
|
|
|
33 |
!ChangesBrowser class methodsFor:'documentation'!
|
|
|
34 |
|
|
|
35 |
copyright
|
|
|
36 |
"
|
|
|
37 |
COPYRIGHT (c) 1990 by Claus Gittinger
|
|
|
38 |
All Rights Reserved
|
|
0
|
39 |
|
|
29
|
40 |
This software is furnished under a license and may be used
|
|
|
41 |
only in accordance with the terms of that license and with the
|
|
|
42 |
inclusion of the above copyright notice. This software may not
|
|
|
43 |
be provided or otherwise made available to, or used by, any
|
|
|
44 |
other person. No title to or ownership of the software is
|
|
|
45 |
hereby transferred.
|
|
|
46 |
"
|
|
|
47 |
!
|
|
|
48 |
|
|
|
49 |
version
|
|
|
50 |
"
|
|
31
|
51 |
$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.13 1994-08-05 10:21:22 claus Exp $
|
|
|
52 |
"
|
|
29
|
53 |
!
|
|
|
54 |
|
|
|
55 |
documentation
|
|
|
56 |
"
|
|
|
57 |
this implements a browser for the changes-file.
|
|
|
58 |
See the extra document 'doc/misc/cbrowser.doc' for how to use this browser.
|
|
|
59 |
|
|
|
60 |
written jan 90 by claus
|
|
|
61 |
"
|
|
|
62 |
! !
|
|
0
|
63 |
|
|
|
64 |
!ChangesBrowser class methodsFor:'behavior'!
|
|
|
65 |
|
|
|
66 |
autoSelectNext
|
|
|
67 |
"returning true here, makes a Delete operation automatically
|
|
|
68 |
select the next change"
|
|
|
69 |
|
|
|
70 |
^ true
|
|
|
71 |
! !
|
|
|
72 |
|
|
|
73 |
!ChangesBrowser class methodsFor:'instance creation'!
|
|
|
74 |
|
|
|
75 |
new
|
|
|
76 |
"create a new changes browser"
|
|
|
77 |
|
|
|
78 |
^ super label:'Changes Browser'
|
|
|
79 |
icon:(Form fromFile:'CBrowser.xbm' resolution:100)
|
|
|
80 |
!
|
|
|
81 |
|
|
28
|
82 |
openOn:aFileName
|
|
0
|
83 |
"create c changes browser on a change file"
|
|
|
84 |
|
|
6
|
85 |
^ ((self new label:'Changes Browser:', aFileName) changeFileName:aFileName) open
|
|
0
|
86 |
! !
|
|
|
87 |
|
|
|
88 |
!ChangesBrowser methodsFor:'initialize / release'!
|
|
|
89 |
|
|
|
90 |
initialize
|
|
|
91 |
|frame v|
|
|
|
92 |
|
|
|
93 |
super initialize.
|
|
|
94 |
|
|
|
95 |
changeFileName := 'changes'.
|
|
|
96 |
|
|
|
97 |
frame := VariableVerticalPanel origin:(0.0 @ 0.0)
|
|
|
98 |
corner:(1.0 @ 1.0)
|
|
|
99 |
borderWidth:0
|
|
|
100 |
in:self.
|
|
|
101 |
|
|
|
102 |
v := ScrollableView for:SelectionInListView in:frame.
|
|
|
103 |
v origin:(0.0 @ 0.0) corner:(1.0 @ 0.3).
|
|
|
104 |
changeListView := v scrolledView.
|
|
|
105 |
|
|
28
|
106 |
v := HVScrollableView for:CodeView miniScrollerH:true miniScrollerV:false in:frame.
|
|
0
|
107 |
v origin:(0.0 @ 0.3) corner:(1.0 @ 1.0).
|
|
|
108 |
codeView := v scrolledView.
|
|
|
109 |
|
|
|
110 |
anyChanges := false.
|
|
28
|
111 |
ObjectMemory addDependent:self. "to get shutdown-update"
|
|
0
|
112 |
!
|
|
|
113 |
|
|
|
114 |
initializeMiddleButtonMenu
|
|
|
115 |
|labels|
|
|
|
116 |
|
|
1
|
117 |
labels := resources array:#(
|
|
0
|
118 |
'apply change'
|
|
|
119 |
'apply changes to end'
|
|
|
120 |
'apply all changes'
|
|
|
121 |
'-'
|
|
|
122 |
'delete'
|
|
|
123 |
'delete to end'
|
|
|
124 |
'delete changes for this class to end'
|
|
|
125 |
'delete all changes for this class'
|
|
|
126 |
'-'
|
|
|
127 |
'update'
|
|
|
128 |
'compress'
|
|
|
129 |
'compare with current version'
|
|
|
130 |
'-'
|
|
|
131 |
'make change a patch'
|
|
28
|
132 |
'save change in a file'
|
|
0
|
133 |
'update sourcefile from change'
|
|
|
134 |
'-'
|
|
|
135 |
'writeback changeFile').
|
|
|
136 |
|
|
|
137 |
changeListView
|
|
|
138 |
middleButtonMenu:(PopUpMenu
|
|
|
139 |
labels:labels
|
|
|
140 |
selectors:#(
|
|
|
141 |
doApply
|
|
|
142 |
doApplyRest
|
|
|
143 |
doApplyAll
|
|
|
144 |
nil
|
|
|
145 |
doDelete
|
|
|
146 |
doDeleteRest
|
|
|
147 |
doDeleteClassRest
|
|
|
148 |
doDeleteClassAll
|
|
|
149 |
nil
|
|
|
150 |
doUpdate
|
|
|
151 |
doCompress
|
|
|
152 |
doCompare
|
|
|
153 |
nil
|
|
|
154 |
doMakePatch
|
|
28
|
155 |
doSaveChangeInFile
|
|
0
|
156 |
doMakePermanent
|
|
|
157 |
nil
|
|
|
158 |
doWriteBack)
|
|
|
159 |
receiver:self
|
|
|
160 |
for:changeListView)
|
|
|
161 |
!
|
|
|
162 |
|
|
|
163 |
realize
|
|
|
164 |
super realize.
|
|
|
165 |
self readChangesFile.
|
|
28
|
166 |
self setChangeList.
|
|
15
|
167 |
changeListView action:[:lineNr | self changeSelection:lineNr].
|
|
|
168 |
self disableMenuEntries.
|
|
0
|
169 |
!
|
|
|
170 |
|
|
28
|
171 |
update:what
|
|
|
172 |
|box|
|
|
27
|
173 |
|
|
|
174 |
(what == #aboutToExit) ifTrue:[
|
|
28
|
175 |
"
|
|
|
176 |
smalltalk is about to shut down -
|
|
|
177 |
- if change list was modified, ask user and save if requested.
|
|
|
178 |
"
|
|
27
|
179 |
anyChanges ifTrue:[
|
|
|
180 |
shown ifFalse:[
|
|
|
181 |
self unrealize.
|
|
|
182 |
self realize
|
|
|
183 |
].
|
|
|
184 |
self raise.
|
|
28
|
185 |
|
|
|
186 |
box := YesNoBox new.
|
|
|
187 |
box title:(resources at:'ChangesBrowser:\changefile has not been updated from the modified changelist.\\Update before exiting ?') withCRs.
|
|
|
188 |
box noText:(resources at:'don''t update').
|
|
|
189 |
box okText:(resources at:'update').
|
|
|
190 |
box yesAction:[self writeBackChanges]
|
|
|
191 |
noAction:[].
|
|
|
192 |
box showAtPointer
|
|
27
|
193 |
].
|
|
28
|
194 |
^ self
|
|
27
|
195 |
].
|
|
|
196 |
super update:what
|
|
0
|
197 |
! !
|
|
|
198 |
|
|
28
|
199 |
!ChangesBrowser methodsFor:'termination'!
|
|
|
200 |
|
|
|
201 |
destroy
|
|
|
202 |
"destroy the receiver; make certain, that boxes are destroyed too"
|
|
|
203 |
|
|
|
204 |
ObjectMemory removeDependent:self.
|
|
|
205 |
fileBox notNil ifTrue:[fileBox destroy. fileBox := nil].
|
|
|
206 |
super destroy
|
|
|
207 |
!
|
|
|
208 |
|
|
|
209 |
saveAndTerminate
|
|
|
210 |
"update the changes file and quit.
|
|
|
211 |
Dont depend on this being sent, not all window managers
|
|
|
212 |
send it; instead, they simply destroy the view."
|
|
|
213 |
|
|
|
214 |
anyChanges ifTrue:[
|
|
|
215 |
self writeBackChanges.
|
|
|
216 |
].
|
|
|
217 |
self destroy
|
|
|
218 |
!
|
|
|
219 |
|
|
|
220 |
terminate
|
|
|
221 |
"window manager wants us to go away"
|
|
|
222 |
|
|
|
223 |
|box|
|
|
|
224 |
|
|
|
225 |
anyChanges ifTrue:[
|
|
|
226 |
box := OptionBox title:'' numberOfOptions:3.
|
|
|
227 |
box title:(resources at:'ChangesBrowser:\changefile has not been updated from the modified changelist.\\Update before exiting ?') withCRs.
|
|
|
228 |
box buttonTitles:(resources array:#('abort' 'dont''t update' 'update')).
|
|
|
229 |
box actions:(Array with:[^ self]
|
|
|
230 |
with:[self destroy]
|
|
|
231 |
with:[self writeBackChanges. self destroy]
|
|
|
232 |
).
|
|
|
233 |
box showAtPointer.
|
|
|
234 |
] ifFalse:[
|
|
|
235 |
self destroy
|
|
|
236 |
]
|
|
|
237 |
! !
|
|
|
238 |
|
|
0
|
239 |
!ChangesBrowser methodsFor:'private'!
|
|
|
240 |
|
|
15
|
241 |
enableMenuEntries
|
|
|
242 |
"enable all entries refering to a class"
|
|
|
243 |
|
|
28
|
244 |
#(doApply doApplyRest doDelete doDeleteRest doDeleteClassRest
|
|
|
245 |
doDeleteClassAll doCompare doMakePatch doSaveChangeInFile doMakePermanent)
|
|
|
246 |
do:[:sel |
|
|
|
247 |
changeListView middleButtonMenu enable:sel
|
|
|
248 |
].
|
|
15
|
249 |
!
|
|
|
250 |
|
|
|
251 |
disableMenuEntries
|
|
|
252 |
"enable all entries refering to a class"
|
|
|
253 |
|
|
28
|
254 |
#(doApply doApplyRest doDelete doDeleteRest doDeleteClassRest
|
|
|
255 |
doDeleteClassAll doCompare doMakePatch doSaveChangeInFile doMakePermanent)
|
|
|
256 |
do:[:sel |
|
|
|
257 |
changeListView middleButtonMenu disable:sel
|
|
|
258 |
].
|
|
15
|
259 |
!
|
|
|
260 |
|
|
|
261 |
unselect
|
|
|
262 |
"common unselect"
|
|
|
263 |
|
|
|
264 |
changeListView deselect.
|
|
|
265 |
self disableMenuEntries
|
|
|
266 |
!
|
|
|
267 |
|
|
6
|
268 |
queryCloseText
|
|
15
|
269 |
"made this a method for easy redefinition in subclasses"
|
|
|
270 |
|
|
6
|
271 |
^ 'Quit without updating changeFile ?'
|
|
|
272 |
!
|
|
|
273 |
|
|
0
|
274 |
changeFileName:aFileName
|
|
|
275 |
changeFileName := aFileName
|
|
|
276 |
!
|
|
|
277 |
|
|
|
278 |
withCursor:aCursor do:aBlock
|
|
|
279 |
"evaluate aBlock while showing another cursor"
|
|
|
280 |
|
|
|
281 |
|oldListCursor oldCodeViewCursor|
|
|
|
282 |
|
|
|
283 |
oldListCursor := changeListView cursor.
|
|
|
284 |
oldCodeViewCursor := codeView cursor.
|
|
|
285 |
|
|
|
286 |
changeListView cursor:aCursor.
|
|
|
287 |
codeView cursor:aCursor.
|
|
|
288 |
|
|
|
289 |
aBlock valueNowOrOnUnwindDo:[
|
|
|
290 |
changeListView cursor:oldListCursor.
|
|
|
291 |
codeView cursor:oldCodeViewCursor
|
|
|
292 |
]
|
|
|
293 |
!
|
|
|
294 |
|
|
|
295 |
classNameOfChange:changeNr
|
|
|
296 |
"return the classname of a change (for xxx class - changes xxx is returned)
|
|
|
297 |
- since parsing ascii methods is slow, keep result cached in
|
|
|
298 |
changeClassNames for the next query"
|
|
|
299 |
|
|
|
300 |
|chunk aParseTree recTree sel name arg1Tree|
|
|
|
301 |
|
|
|
302 |
changeNr notNil ifTrue:[
|
|
28
|
303 |
"
|
|
|
304 |
first look, if not already known
|
|
|
305 |
"
|
|
0
|
306 |
name := changeClassNames at:changeNr.
|
|
|
307 |
name notNil ifTrue:[^ name].
|
|
|
308 |
|
|
28
|
309 |
"
|
|
|
310 |
get the chunk
|
|
|
311 |
"
|
|
0
|
312 |
chunk := changeChunks at:changeNr.
|
|
|
313 |
chunk notNil ifTrue:[
|
|
28
|
314 |
"
|
|
|
315 |
use parser to construct a parseTree
|
|
|
316 |
"
|
|
0
|
317 |
aParseTree := Parser parseExpression:chunk.
|
|
28
|
318 |
(aParseTree notNil and:[aParseTree isMessage]) ifTrue:[
|
|
|
319 |
"
|
|
|
320 |
ask parser for selector
|
|
|
321 |
"
|
|
0
|
322 |
sel := aParseTree selector.
|
|
28
|
323 |
"
|
|
|
324 |
is it a method-change, methodRemove or comment-change ?
|
|
|
325 |
"
|
|
|
326 |
(#(methodsFor: privateMethodsFor: publicMethodsFor:
|
|
|
327 |
removeSelector: comment:) includes:sel) ifTrue:[
|
|
|
328 |
"
|
|
|
329 |
yes, the className is the receiver
|
|
|
330 |
"
|
|
0
|
331 |
recTree := aParseTree receiver.
|
|
28
|
332 |
(recTree notNil and:[recTree ~~ #Error]) ifTrue:[
|
|
|
333 |
recTree isUnaryMessage ifTrue:[
|
|
|
334 |
(recTree selector ~~ #class) ifTrue:[^ nil].
|
|
|
335 |
"id class methodsFor:..."
|
|
|
336 |
recTree := recTree receiver
|
|
|
337 |
].
|
|
|
338 |
recTree isPrimary ifTrue:[
|
|
|
339 |
name := recTree name.
|
|
|
340 |
changeClassNames at:changeNr put:name.
|
|
|
341 |
^ name
|
|
|
342 |
]
|
|
0
|
343 |
]
|
|
28
|
344 |
] ifFalse:[
|
|
|
345 |
"
|
|
|
346 |
is it a change in a class-description ?
|
|
|
347 |
"
|
|
|
348 |
('subclass:*' match:sel) ifTrue:[
|
|
|
349 |
arg1Tree := aParseTree arg1.
|
|
|
350 |
(arg1Tree notNil and:[arg1Tree isConstant]) ifTrue:[
|
|
|
351 |
name := arg1Tree value asString.
|
|
|
352 |
changeClassNames at:changeNr put:name.
|
|
|
353 |
^ name
|
|
|
354 |
]
|
|
0
|
355 |
]
|
|
|
356 |
]
|
|
|
357 |
]
|
|
|
358 |
]
|
|
|
359 |
].
|
|
|
360 |
^ nil
|
|
|
361 |
!
|
|
|
362 |
|
|
|
363 |
streamForChange:changeNr
|
|
|
364 |
"answer a stream for change"
|
|
|
365 |
|
|
|
366 |
|aStream|
|
|
|
367 |
|
|
|
368 |
aStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
369 |
aStream isNil ifTrue:[^ nil].
|
|
|
370 |
aStream position:(changePositions at:changeNr).
|
|
|
371 |
^ aStream
|
|
|
372 |
!
|
|
|
373 |
|
|
|
374 |
clearCodeView
|
|
15
|
375 |
self unselect "changeListView deselect".
|
|
0
|
376 |
codeView contents:nil.
|
|
|
377 |
changeNrShown := nil
|
|
|
378 |
!
|
|
|
379 |
|
|
|
380 |
autoSelect:changeNr
|
|
|
381 |
self class autoSelectNext ifTrue:[
|
|
|
382 |
(changeNr <= changeChunks size) ifTrue:[
|
|
|
383 |
changeListView selection:changeNr.
|
|
|
384 |
self changeSelection:changeNr.
|
|
|
385 |
^ self
|
|
|
386 |
]
|
|
|
387 |
].
|
|
|
388 |
self clearCodeView
|
|
|
389 |
!
|
|
|
390 |
|
|
|
391 |
writeBackChanges
|
|
|
392 |
"write back the changes file"
|
|
|
393 |
|
|
|
394 |
|inStream outStream chunk sawExcla excla done dir|
|
|
|
395 |
|
|
|
396 |
outStream := FileStream newFileNamed:'n_changes'.
|
|
|
397 |
outStream isNil ifTrue:[
|
|
|
398 |
self warn:'cannot create temporary file'.
|
|
|
399 |
^ self
|
|
|
400 |
].
|
|
|
401 |
|
|
|
402 |
inStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
403 |
inStream isNil ifTrue:[^ nil].
|
|
|
404 |
|
|
|
405 |
self withCursor:(Cursor write) do:[
|
|
|
406 |
excla := inStream class chunkSeparator.
|
|
|
407 |
1 to:(changeChunks size) do:[:index |
|
|
|
408 |
inStream position:(changePositions at:index).
|
|
|
409 |
sawExcla := inStream peekFor:excla.
|
|
|
410 |
chunk := inStream nextChunk.
|
|
|
411 |
|
|
|
412 |
sawExcla ifTrue:[
|
|
|
413 |
outStream nextPut:excla.
|
|
|
414 |
outStream nextChunkPut:chunk.
|
|
|
415 |
outStream cr.
|
|
|
416 |
"a method-definition chunk - skip followups"
|
|
|
417 |
done := false.
|
|
|
418 |
[done] whileFalse:[
|
|
|
419 |
chunk := inStream nextChunk.
|
|
|
420 |
chunk isNil ifTrue:[
|
|
|
421 |
done := true
|
|
|
422 |
] ifFalse:[
|
|
|
423 |
outStream nextChunkPut:chunk.
|
|
|
424 |
outStream cr.
|
|
|
425 |
done := chunk isEmpty
|
|
|
426 |
]
|
|
|
427 |
].
|
|
|
428 |
0 "compiler kludge"
|
|
|
429 |
] ifFalse:[
|
|
|
430 |
outStream nextChunkPut:chunk.
|
|
|
431 |
outStream cr
|
|
|
432 |
]
|
|
|
433 |
].
|
|
|
434 |
outStream close.
|
|
|
435 |
inStream close.
|
|
|
436 |
dir := FileDirectory currentDirectory.
|
|
|
437 |
dir removeFile:changeFileName.
|
|
|
438 |
dir renameFile:'n_changes' newName:changeFileName.
|
|
|
439 |
anyChanges := false
|
|
|
440 |
]
|
|
|
441 |
!
|
|
|
442 |
|
|
28
|
443 |
setChangeList
|
|
|
444 |
"extract type-information from changes and stuff into top selection
|
|
|
445 |
view"
|
|
|
446 |
|
|
|
447 |
changeListView contents:changeChunks.
|
|
|
448 |
!
|
|
|
449 |
|
|
0
|
450 |
readChangesFile
|
|
28
|
451 |
"read the changes file, create a list of header-lines (changeChunks)
|
|
|
452 |
and a list of chunk-positions (changePositions)"
|
|
0
|
453 |
|
|
29
|
454 |
|aStream index text done sawExcla chunkPos excla
|
|
|
455 |
myProcess myPriority p sel cls|
|
|
0
|
456 |
|
|
|
457 |
aStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
458 |
aStream isNil ifTrue:[^ nil].
|
|
|
459 |
|
|
|
460 |
self withCursor:(Cursor read) do:[
|
|
29
|
461 |
"
|
|
|
462 |
this is a time consuming operation (especially, if reading an
|
|
|
463 |
NFS-mounted directory; therefore lower my priority ...
|
|
|
464 |
"
|
|
|
465 |
myProcess := Processor activeProcess.
|
|
|
466 |
myPriority := myProcess priority.
|
|
|
467 |
myProcess priority:(Processor userBackgroundPriority).
|
|
|
468 |
[
|
|
|
469 |
|
|
|
470 |
changeChunks := OrderedCollection new.
|
|
|
471 |
changePositions := OrderedCollection new.
|
|
|
472 |
excla := aStream class chunkSeparator.
|
|
0
|
473 |
|
|
29
|
474 |
[aStream atEnd] whileFalse:[
|
|
|
475 |
"
|
|
|
476 |
get a chunk (separated by excla)
|
|
|
477 |
"
|
|
|
478 |
aStream skipSeparators.
|
|
|
479 |
chunkPos := aStream position.
|
|
|
480 |
sawExcla := aStream peekFor:excla.
|
|
|
481 |
text := aStream nextChunk.
|
|
|
482 |
text notNil ifTrue:[
|
|
|
483 |
changePositions add:chunkPos.
|
|
6
|
484 |
|
|
29
|
485 |
"
|
|
|
486 |
only first line is saved in changeChunks ...
|
|
|
487 |
"
|
|
|
488 |
index := text indexOf:(Character cr).
|
|
|
489 |
(index ~~ 0) ifTrue:[
|
|
|
490 |
text := text copyTo:(index - 1).
|
|
|
491 |
|
|
|
492 |
"take care for comment changes - must still be a
|
|
|
493 |
valid expression for classNameOfChange: to work"
|
|
|
494 |
|
|
|
495 |
(text endsWith:'comment:''') ifTrue:[
|
|
|
496 |
text := text , '...'''
|
|
|
497 |
]
|
|
|
498 |
|
|
|
499 |
].
|
|
6
|
500 |
|
|
29
|
501 |
sawExcla ifFalse:[
|
|
|
502 |
(text startsWith:'''---- snap') ifFalse:[
|
|
|
503 |
"/ text := '(doIt) ' , text.
|
|
|
504 |
].
|
|
|
505 |
changeChunks add:text.
|
|
|
506 |
] ifTrue:[
|
|
|
507 |
"
|
|
|
508 |
method definitions actually consist of
|
|
|
509 |
two (or more) chunks; skip next chunk(s)
|
|
|
510 |
up to an empty one.
|
|
|
511 |
(the system currently only writes one chunk,
|
|
|
512 |
but in theory, more could follow for the same
|
|
|
513 |
class/category).
|
|
|
514 |
"
|
|
|
515 |
cls := nil.
|
|
|
516 |
p := Parser parseExpression:text.
|
|
|
517 |
(p notNil and:[p ~~ #Error]) ifTrue:[
|
|
|
518 |
sel := p selector.
|
|
|
519 |
(sel == #methodsFor:) ifTrue:[
|
|
|
520 |
p receiver isUnaryMessage ifTrue:[
|
|
|
521 |
cls := p receiver receiver name.
|
|
|
522 |
cls := cls , 'class'
|
|
|
523 |
] ifFalse:[
|
|
|
524 |
cls := p receiver name
|
|
|
525 |
]
|
|
|
526 |
]
|
|
|
527 |
].
|
|
|
528 |
cls isNil ifTrue:[
|
|
|
529 |
changeChunks add:text , ' (change)'.
|
|
|
530 |
].
|
|
6
|
531 |
|
|
29
|
532 |
done := false.
|
|
|
533 |
[done] whileFalse:[
|
|
|
534 |
text := aStream nextChunk.
|
|
|
535 |
text isNil ifTrue:[
|
|
|
536 |
done := true
|
|
|
537 |
] ifFalse:[
|
|
|
538 |
done := text isEmpty
|
|
|
539 |
].
|
|
|
540 |
done ifFalse:[
|
|
|
541 |
cls notNil ifTrue:[
|
|
|
542 |
p := Parser parseMethodSpecification:text.
|
|
|
543 |
(p notNil and:[p ~~ #Error]) ifTrue:[
|
|
|
544 |
sel := p selector.
|
|
|
545 |
changeChunks add: cls , ' ' , sel
|
|
|
546 |
]
|
|
|
547 |
]
|
|
|
548 |
]
|
|
0
|
549 |
]
|
|
|
550 |
]
|
|
|
551 |
]
|
|
29
|
552 |
].
|
|
|
553 |
changeClassNames := VariableArray new:(changeChunks size).
|
|
|
554 |
aStream close.
|
|
|
555 |
anyChanges := false
|
|
|
556 |
] valueNowOrOnUnwindDo:[
|
|
|
557 |
myProcess priority:myPriority.
|
|
0
|
558 |
].
|
|
|
559 |
]
|
|
|
560 |
!
|
|
|
561 |
|
|
|
562 |
silentDeleteChange:changeNr
|
|
|
563 |
"delete a change do not update changeListView"
|
|
|
564 |
|
|
|
565 |
anyChanges := true.
|
|
|
566 |
changeChunks removeIndex:changeNr.
|
|
|
567 |
changePositions removeIndex:changeNr.
|
|
|
568 |
changeClassNames removeIndex:changeNr
|
|
|
569 |
!
|
|
|
570 |
|
|
|
571 |
|
|
|
572 |
deleteChange:changeNr
|
|
|
573 |
"delete a change"
|
|
|
574 |
|
|
|
575 |
changeListView deselect.
|
|
|
576 |
self silentDeleteChange:changeNr.
|
|
|
577 |
changeListView setContents:changeChunks
|
|
|
578 |
!
|
|
|
579 |
|
|
|
580 |
deleteChangesFrom:start to:stop
|
|
|
581 |
"delete a range of changes"
|
|
|
582 |
|
|
|
583 |
changeListView deselect.
|
|
|
584 |
stop to:start by:-1 do:[:changeNr |
|
|
|
585 |
self silentDeleteChange:changeNr
|
|
|
586 |
].
|
|
|
587 |
changeListView setContents:changeChunks
|
|
|
588 |
!
|
|
|
589 |
|
|
|
590 |
deleteChangesFor:aClassName from:start to:stop
|
|
|
591 |
"delete changes for a given class in a range"
|
|
|
592 |
|
|
|
593 |
|thisClassName index|
|
|
|
594 |
|
|
|
595 |
index := stop.
|
|
|
596 |
[index >= start] whileTrue:[
|
|
|
597 |
thisClassName := self classNameOfChange:index.
|
|
|
598 |
thisClassName = aClassName ifTrue:[
|
|
|
599 |
self silentDeleteChange:index
|
|
|
600 |
].
|
|
|
601 |
index := index - 1
|
|
|
602 |
]
|
|
|
603 |
!
|
|
|
604 |
|
|
|
605 |
applyChange:changeNr
|
|
|
606 |
"filein a change"
|
|
|
607 |
|
|
29
|
608 |
|aStream chunk sawExcla upd rslt|
|
|
0
|
609 |
|
|
|
610 |
aStream := self streamForChange:changeNr.
|
|
|
611 |
aStream isNil ifTrue:[^ self].
|
|
|
612 |
sawExcla := aStream peekFor:(aStream class chunkSeparator).
|
|
|
613 |
chunk := aStream nextChunk.
|
|
1
|
614 |
upd := Class updateChanges:false.
|
|
29
|
615 |
|
|
1
|
616 |
codeView abortAction:[Class updateChanges:upd.
|
|
0
|
617 |
codeView abortAction:nil.
|
|
|
618 |
aStream close.
|
|
|
619 |
^self].
|
|
22
|
620 |
|
|
0
|
621 |
changeNrProcessed := changeNr.
|
|
|
622 |
[
|
|
22
|
623 |
Object abortSignal catch:[
|
|
29
|
624 |
|rslt|
|
|
|
625 |
|
|
|
626 |
rslt := Compiler evaluate:chunk notifying:self.
|
|
|
627 |
sawExcla ifTrue:[
|
|
|
628 |
rslt fileInFrom:aStream notifying:self
|
|
22
|
629 |
]
|
|
0
|
630 |
].
|
|
|
631 |
changeNrProcessed := nil.
|
|
|
632 |
codeView abortAction:nil
|
|
29
|
633 |
] valueNowOrOnUnwindDo:[
|
|
|
634 |
Class updateChanges:upd.
|
|
|
635 |
aStream close
|
|
|
636 |
].
|
|
0
|
637 |
!
|
|
|
638 |
|
|
|
639 |
compareChange:changeNr
|
|
|
640 |
"compare a change with current version"
|
|
|
641 |
|
|
|
642 |
|aStream chunk sawExcla parseTree thisClass cat oldSource newSource
|
|
29
|
643 |
parser sel oldMethod outcome showDiff d|
|
|
0
|
644 |
|
|
|
645 |
aStream := self streamForChange:changeNr.
|
|
|
646 |
aStream isNil ifTrue:[^ self].
|
|
28
|
647 |
|
|
0
|
648 |
sawExcla := aStream peekFor:(aStream class chunkSeparator).
|
|
|
649 |
chunk := aStream nextChunk.
|
|
|
650 |
sawExcla ifFalse:[
|
|
28
|
651 |
outcome := 'not comparable ...'
|
|
0
|
652 |
] ifTrue:[
|
|
|
653 |
parseTree := Parser parseExpression:chunk.
|
|
28
|
654 |
(parseTree notNil and:[parseTree isMessage]) ifTrue:[
|
|
0
|
655 |
(parseTree selector == #methodsFor:) ifTrue:[
|
|
|
656 |
thisClass := (parseTree receiver evaluate).
|
|
28
|
657 |
thisClass isBehavior ifTrue:[
|
|
|
658 |
showDiff := false.
|
|
0
|
659 |
cat := parseTree arg1 evaluate.
|
|
|
660 |
newSource := aStream nextChunk.
|
|
|
661 |
parser := Parser parseMethod:newSource in:thisClass.
|
|
28
|
662 |
(parser notNil and:[parser ~~ #Error]) ifTrue:[
|
|
0
|
663 |
sel := parser selector.
|
|
|
664 |
oldMethod := thisClass compiledMethodAt:sel.
|
|
|
665 |
oldMethod notNil ifTrue:[
|
|
|
666 |
(oldMethod category = cat) ifFalse:[
|
|
28
|
667 |
Transcript showCr:'category changed.'.
|
|
0
|
668 |
].
|
|
|
669 |
oldSource := oldMethod source.
|
|
|
670 |
(oldSource = newSource) ifTrue:[
|
|
28
|
671 |
outcome := 'same source'
|
|
0
|
672 |
] ifFalse:[
|
|
28
|
673 |
outcome := 'source changed.'.
|
|
|
674 |
showDiff := true
|
|
0
|
675 |
]
|
|
|
676 |
] ifFalse:[
|
|
28
|
677 |
outcome := 'method does not exist.'
|
|
0
|
678 |
]
|
|
|
679 |
] ifFalse:[
|
|
28
|
680 |
outcome := 'change unparsable.'
|
|
|
681 |
].
|
|
|
682 |
(showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[
|
|
29
|
683 |
d := DiffTextView openOn:oldSource and:newSource.
|
|
|
684 |
d label:'differences (current left; change right)'.
|
|
0
|
685 |
]
|
|
|
686 |
] ifFalse:[
|
|
28
|
687 |
outcome := 'class does not exist.'
|
|
0
|
688 |
]
|
|
|
689 |
] ifFalse:[
|
|
28
|
690 |
outcome := 'not comparable.'
|
|
0
|
691 |
]
|
|
|
692 |
] ifFalse:[
|
|
28
|
693 |
outcome := 'not comparable.'
|
|
0
|
694 |
]
|
|
|
695 |
].
|
|
28
|
696 |
Transcript showCr:outcome.
|
|
|
697 |
aStream close.
|
|
0
|
698 |
!
|
|
|
699 |
|
|
28
|
700 |
appendChange:changeNr toFile:fileName
|
|
|
701 |
"append change to a file"
|
|
0
|
702 |
|
|
|
703 |
|aStream outStream chunk sawExcla|
|
|
|
704 |
|
|
28
|
705 |
outStream := FileStream oldFileNamed:fileName.
|
|
0
|
706 |
outStream isNil ifTrue:[
|
|
|
707 |
outStream isNil ifTrue:[
|
|
28
|
708 |
outStream := FileStream newFileNamed:fileName.
|
|
0
|
709 |
outStream isNil ifTrue:[
|
|
28
|
710 |
self warn:'cannot update file ''', fileName , ''''.
|
|
0
|
711 |
^ self
|
|
|
712 |
]
|
|
|
713 |
]
|
|
|
714 |
].
|
|
|
715 |
outStream setToEnd.
|
|
28
|
716 |
|
|
0
|
717 |
aStream := self streamForChange:changeNr.
|
|
|
718 |
aStream isNil ifTrue:[^ self].
|
|
|
719 |
sawExcla := aStream peekFor:(aStream class chunkSeparator).
|
|
|
720 |
sawExcla ifTrue:[
|
|
|
721 |
outStream nextPut:$!!
|
|
|
722 |
].
|
|
|
723 |
chunk := aStream nextChunk.
|
|
|
724 |
outStream nextChunkPut:chunk.
|
|
|
725 |
outStream cr.
|
|
|
726 |
sawExcla ifTrue:[
|
|
|
727 |
chunk := aStream nextChunk.
|
|
|
728 |
outStream nextChunkPut:chunk.
|
|
|
729 |
outStream space
|
|
|
730 |
].
|
|
|
731 |
sawExcla ifTrue:[
|
|
|
732 |
outStream nextPut:$!!
|
|
|
733 |
].
|
|
|
734 |
outStream cr.
|
|
|
735 |
aStream close.
|
|
|
736 |
outStream close
|
|
|
737 |
!
|
|
|
738 |
|
|
28
|
739 |
makeChangeAPatch:changeNr
|
|
|
740 |
"append change to patchfile"
|
|
|
741 |
|
|
|
742 |
self appendChange:changeNr toFile:'patches'
|
|
|
743 |
!
|
|
|
744 |
|
|
0
|
745 |
makeChangePermanent:changeNr
|
|
28
|
746 |
"rewrite the source file where change changeNr lies"
|
|
0
|
747 |
|
|
|
748 |
self notify:'this is not yet implemented'
|
|
|
749 |
! !
|
|
|
750 |
|
|
|
751 |
!ChangesBrowser methodsFor:'error handling'!
|
|
|
752 |
|
|
|
753 |
correctableError:aString position:relPos to:relEndPos
|
|
|
754 |
"compiler notifys us of an error - this should really not happen since
|
|
|
755 |
changes ought to be correct (did someone edit the changes file ??).
|
|
|
756 |
Show the bad change in the codeView and let codeView hilight the error;
|
|
|
757 |
no corrections allowed here therefore return false"
|
|
|
758 |
|
|
|
759 |
(changeNrProcessed ~~ changeNrShown) ifTrue:[
|
|
|
760 |
self changeSelection:changeNrProcessed
|
|
|
761 |
].
|
|
|
762 |
codeView error:aString position:relPos to:relEndPos.
|
|
|
763 |
^ false
|
|
|
764 |
!
|
|
|
765 |
|
|
|
766 |
error:aString position:relPos to:relEndPos
|
|
|
767 |
"compiler notifys us of an error - this should really not happen since
|
|
|
768 |
changes ought to be correct (did someone edit the changes file ??).
|
|
|
769 |
Show the bad change in the codeView and let codeView hilight the error"
|
|
|
770 |
|
|
|
771 |
(changeNrProcessed ~~ changeNrShown) ifTrue:[
|
|
|
772 |
self changeSelection:changeNrProcessed
|
|
|
773 |
].
|
|
|
774 |
^ codeView error:aString position:relPos to:relEndPos
|
|
|
775 |
!
|
|
|
776 |
|
|
|
777 |
warning:aString position:relPos to:relEndPos
|
|
|
778 |
"compiler notifys us of a warning - ignore it"
|
|
|
779 |
|
|
|
780 |
^ self
|
|
|
781 |
! !
|
|
|
782 |
|
|
|
783 |
!ChangesBrowser methodsFor:'user interaction'!
|
|
|
784 |
|
|
|
785 |
noChangesAllowed
|
|
|
786 |
"show a warning that changes cannot be changed"
|
|
|
787 |
|
|
1
|
788 |
self warn:(resources at:'changes are not allowed to be changed')
|
|
0
|
789 |
!
|
|
|
790 |
|
|
|
791 |
changeSelection:lineNr
|
|
|
792 |
"show a change in the codeView"
|
|
|
793 |
|
|
|
794 |
|aStream sawExcla chunk|
|
|
|
795 |
|
|
|
796 |
aStream := self streamForChange:lineNr.
|
|
|
797 |
aStream isNil ifTrue:[^ self].
|
|
|
798 |
sawExcla := aStream peekFor:(aStream class chunkSeparator).
|
|
|
799 |
chunk := aStream nextChunk.
|
|
|
800 |
sawExcla ifTrue:[
|
|
|
801 |
chunk := aStream nextChunk
|
|
|
802 |
].
|
|
|
803 |
aStream close.
|
|
|
804 |
codeView contents:chunk.
|
|
13
|
805 |
codeView acceptAction:[:theCode | self doApply "noChangesAllowed"].
|
|
15
|
806 |
changeNrShown := lineNr.
|
|
|
807 |
self enableMenuEntries
|
|
0
|
808 |
!
|
|
|
809 |
|
|
28
|
810 |
doSaveChangeInFile
|
|
|
811 |
"user wants a change to be appended to a file"
|
|
|
812 |
|
|
|
813 |
|changeNr|
|
|
|
814 |
|
|
|
815 |
changeNr := changeListView selection.
|
|
|
816 |
changeNr notNil ifTrue:[
|
|
|
817 |
fileBox isNil ifTrue:[
|
|
|
818 |
fileBox := FileSelectionBox new.
|
|
|
819 |
].
|
|
|
820 |
fileBox title:'append change to:'.
|
|
|
821 |
fileBox okText:'append'.
|
|
|
822 |
fileBox abortText:'cancel'.
|
|
|
823 |
fileBox action:[:fileName |
|
|
|
824 |
self appendChange:changeNr toFile:fileName.
|
|
|
825 |
self autoSelect:(changeNr + 1)
|
|
|
826 |
].
|
|
|
827 |
|
|
|
828 |
fileBox pattern:'*.chg'.
|
|
|
829 |
fileBox showAtPointer
|
|
|
830 |
]
|
|
|
831 |
!
|
|
|
832 |
|
|
0
|
833 |
doMakePermanent
|
|
|
834 |
"user wants a change to be made permanent
|
|
|
835 |
- rewrite the source file where this change has to go"
|
|
|
836 |
|
|
|
837 |
|changeNr yesNoBox|
|
|
|
838 |
|
|
28
|
839 |
yesNoBox := YesNoBox new.
|
|
1
|
840 |
yesNoBox title:(resources at:'Warning: this operation cannot be undone').
|
|
28
|
841 |
yesNoBox okText:(resources at:'continue').
|
|
1
|
842 |
yesNoBox noText:(resources at:'abort').
|
|
0
|
843 |
yesNoBox okAction:[
|
|
28
|
844 |
changeNr := changeListView selection.
|
|
|
845 |
changeNr notNil ifTrue:[
|
|
|
846 |
self makeChangePermanent:changeNr.
|
|
|
847 |
self autoSelect:(changeNr + 1)
|
|
|
848 |
]
|
|
|
849 |
].
|
|
0
|
850 |
yesNoBox showAtPointer
|
|
|
851 |
!
|
|
|
852 |
|
|
|
853 |
doMakePatch
|
|
|
854 |
"user wants a change to be made a patch
|
|
|
855 |
- copy it over to the patches file"
|
|
|
856 |
|
|
|
857 |
|changeNr|
|
|
|
858 |
|
|
|
859 |
changeNr := changeListView selection.
|
|
|
860 |
changeNr notNil ifTrue:[
|
|
|
861 |
self makeChangeAPatch:changeNr.
|
|
|
862 |
self autoSelect:(changeNr + 1)
|
|
|
863 |
]
|
|
|
864 |
!
|
|
|
865 |
|
|
|
866 |
doApply
|
|
|
867 |
"user wants a change to be applied"
|
|
|
868 |
|
|
|
869 |
|changeNr|
|
|
|
870 |
|
|
|
871 |
changeNr := changeListView selection.
|
|
|
872 |
changeNr notNil ifTrue:[
|
|
|
873 |
self withCursor:(Cursor execute) do:[
|
|
|
874 |
self applyChange:changeNr.
|
|
|
875 |
self autoSelect:(changeNr + 1)
|
|
|
876 |
]
|
|
|
877 |
]
|
|
|
878 |
!
|
|
|
879 |
|
|
|
880 |
doApplyAll
|
|
|
881 |
"user wants all changes to be applied"
|
|
|
882 |
|
|
|
883 |
self withCursor:(Cursor execute) do:[
|
|
|
884 |
self clearCodeView.
|
|
|
885 |
1 to:(changePositions size) do:[:changeNr |
|
|
|
886 |
changeListView selection:changeNr.
|
|
|
887 |
self applyChange:changeNr
|
|
|
888 |
]
|
|
|
889 |
]
|
|
|
890 |
!
|
|
|
891 |
|
|
|
892 |
doApplyRest
|
|
|
893 |
"user wants all changes from changeNr to be applied"
|
|
|
894 |
|
|
|
895 |
|changeNr|
|
|
|
896 |
|
|
|
897 |
changeNr := changeListView selection.
|
|
|
898 |
changeNr notNil ifTrue:[
|
|
|
899 |
self withCursor:(Cursor execute) do:[
|
|
|
900 |
self clearCodeView.
|
|
|
901 |
changeNr to:(changePositions size) do:[:changeNr |
|
|
|
902 |
changeListView selection:changeNr.
|
|
|
903 |
self applyChange:changeNr
|
|
|
904 |
]
|
|
|
905 |
]
|
|
|
906 |
]
|
|
|
907 |
!
|
|
|
908 |
|
|
|
909 |
doDelete
|
|
|
910 |
"delete currently selected change"
|
|
|
911 |
|
|
|
912 |
|changeNr|
|
|
|
913 |
|
|
|
914 |
changeNr := changeListView selection.
|
|
|
915 |
changeNr notNil ifTrue:[
|
|
|
916 |
self deleteChange:changeNr.
|
|
|
917 |
self autoSelect:changeNr
|
|
|
918 |
]
|
|
|
919 |
!
|
|
|
920 |
|
|
|
921 |
doDeleteClassRest
|
|
|
922 |
"delete rest of changes with same class as currently selected change"
|
|
|
923 |
|
|
|
924 |
|changeNr classNameToDelete|
|
|
|
925 |
|
|
|
926 |
changeNr := changeListView selection.
|
|
|
927 |
changeNr notNil ifTrue:[
|
|
|
928 |
self withCursor:(Cursor execute) do:[
|
|
|
929 |
classNameToDelete := self classNameOfChange:changeNr.
|
|
|
930 |
classNameToDelete notNil ifTrue:[
|
|
|
931 |
changeListView selection:nil.
|
|
|
932 |
self deleteChangesFor:classNameToDelete
|
|
|
933 |
from:changeNr
|
|
|
934 |
to:(changeChunks size).
|
|
|
935 |
changeListView setContents:changeChunks.
|
|
|
936 |
self autoSelect:changeNr
|
|
|
937 |
]
|
|
|
938 |
]
|
|
|
939 |
]
|
|
|
940 |
!
|
|
|
941 |
|
|
|
942 |
doDeleteRest
|
|
|
943 |
"delete all changes from current to the end"
|
|
|
944 |
|
|
|
945 |
|changeNr|
|
|
|
946 |
|
|
|
947 |
changeNr := changeListView selection.
|
|
|
948 |
changeNr notNil ifTrue:[
|
|
|
949 |
self deleteChangesFrom:changeNr to:(changeChunks size).
|
|
|
950 |
self clearCodeView
|
|
|
951 |
]
|
|
|
952 |
!
|
|
|
953 |
|
|
|
954 |
doDeleteClassAll
|
|
|
955 |
"delete all changes with same class as currently selected change"
|
|
|
956 |
|
|
|
957 |
|changeNr classNameToDelete|
|
|
|
958 |
|
|
|
959 |
changeNr := changeListView selection.
|
|
|
960 |
changeNr notNil ifTrue:[
|
|
|
961 |
self withCursor:(Cursor execute) do:[
|
|
|
962 |
classNameToDelete := self classNameOfChange:changeNr.
|
|
|
963 |
classNameToDelete notNil ifTrue:[
|
|
|
964 |
changeListView selection:nil.
|
|
|
965 |
self deleteChangesFor:classNameToDelete
|
|
|
966 |
from:1
|
|
|
967 |
to:(changeChunks size).
|
|
|
968 |
changeListView contents:changeChunks.
|
|
|
969 |
self autoSelect:changeNr
|
|
|
970 |
]
|
|
|
971 |
]
|
|
|
972 |
]
|
|
|
973 |
!
|
|
|
974 |
|
|
|
975 |
doWriteBack
|
|
15
|
976 |
"write back the list onto the changes file"
|
|
|
977 |
|
|
0
|
978 |
anyChanges ifTrue:[
|
|
|
979 |
self writeBackChanges.
|
|
|
980 |
self doUpdate
|
|
|
981 |
]
|
|
|
982 |
!
|
|
|
983 |
|
|
|
984 |
doUpdate
|
|
15
|
985 |
"reread the changes-file"
|
|
0
|
986 |
|
|
|
987 |
self readChangesFile.
|
|
15
|
988 |
changeListView setContents:changeChunks
|
|
0
|
989 |
!
|
|
|
990 |
|
|
|
991 |
doCompare
|
|
|
992 |
"compare change with current system version
|
|
|
993 |
- give a note in transcript"
|
|
|
994 |
|
|
|
995 |
|changeNr|
|
|
|
996 |
|
|
|
997 |
changeNr := changeListView selection.
|
|
|
998 |
changeNr notNil ifTrue:[
|
|
28
|
999 |
self withCursor:(Cursor execute) do:[
|
|
|
1000 |
self compareChange:changeNr
|
|
|
1001 |
]
|
|
0
|
1002 |
]
|
|
|
1003 |
!
|
|
|
1004 |
|
|
|
1005 |
doCompress
|
|
|
1006 |
"compress the change-set; this replaces multiple method-changes by the last
|
|
|
1007 |
(i.e. the most recent) change"
|
|
|
1008 |
|
|
|
1009 |
|classes types selectors thisClass thisSelector
|
|
|
1010 |
aStream chunk changeNr sawExcla aParseTree codeChunk codeParser
|
|
|
1011 |
searchIndex anyMore deleteSet index parseTreeChunk numChanges
|
|
|
1012 |
excla|
|
|
|
1013 |
|
|
|
1014 |
aStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
1015 |
aStream isNil ifTrue:[^ self].
|
|
|
1016 |
|
|
|
1017 |
self withCursor:(Cursor execute) do:[
|
|
|
1018 |
numChanges := changePositions size.
|
|
|
1019 |
classes := Array new:numChanges.
|
|
|
1020 |
selectors := Array new:numChanges.
|
|
|
1021 |
types := Array new:numChanges.
|
|
|
1022 |
|
|
|
1023 |
"starting at the end, get the change class and change selector;
|
|
|
1024 |
collect all in classes / selectors"
|
|
|
1025 |
|
|
|
1026 |
changeNr := numChanges.
|
|
|
1027 |
excla := aStream class chunkSeparator.
|
|
|
1028 |
|
|
|
1029 |
[changeNr >= 1] whileTrue:[
|
|
|
1030 |
aStream position:(changePositions at:changeNr).
|
|
|
1031 |
sawExcla := aStream peekFor:excla.
|
|
|
1032 |
chunk := aStream nextChunk.
|
|
|
1033 |
sawExcla ifTrue:[
|
|
|
1034 |
"optimize a bit if multiple methods for same category arrive"
|
|
|
1035 |
(chunk = parseTreeChunk) ifFalse:[
|
|
|
1036 |
aParseTree := Parser parseExpression:chunk.
|
|
|
1037 |
parseTreeChunk := chunk
|
|
|
1038 |
].
|
|
28
|
1039 |
(aParseTree notNil
|
|
|
1040 |
and:[(aParseTree ~~ #Error)
|
|
|
1041 |
and:[aParseTree isMessage]]) ifTrue:[
|
|
0
|
1042 |
(aParseTree selector == #methodsFor:) ifTrue:[
|
|
|
1043 |
thisClass := (aParseTree receiver evaluate).
|
|
|
1044 |
codeChunk := aStream nextChunk.
|
|
|
1045 |
codeParser := Parser parseMethodSpecification:codeChunk
|
|
|
1046 |
in:thisClass.
|
|
|
1047 |
codeParser notNil ifTrue:[
|
|
|
1048 |
selectors at:changeNr put:(codeParser selector).
|
|
|
1049 |
classes at:changeNr put:thisClass.
|
|
|
1050 |
types at:changeNr put:#methodsFor
|
|
|
1051 |
]
|
|
|
1052 |
]
|
|
|
1053 |
]
|
|
|
1054 |
] ifFalse:[
|
|
|
1055 |
aParseTree := Parser parseExpression:chunk.
|
|
|
1056 |
parseTreeChunk := chunk.
|
|
28
|
1057 |
(aParseTree notNil
|
|
|
1058 |
and:[(aParseTree ~~ #Error)
|
|
|
1059 |
and:[aParseTree isMessage]]) ifTrue:[
|
|
0
|
1060 |
(aParseTree selector == #removeSelector:) ifTrue:[
|
|
|
1061 |
selectors at:changeNr put:(aParseTree arg1 value ).
|
|
|
1062 |
classes at:changeNr put:(aParseTree receiver evaluate).
|
|
|
1063 |
types at:changeNr put:#removeSelector
|
|
|
1064 |
]
|
|
|
1065 |
]
|
|
|
1066 |
].
|
|
|
1067 |
changeNr := changeNr - 1
|
|
|
1068 |
].
|
|
|
1069 |
aStream close.
|
|
|
1070 |
|
|
|
1071 |
"for all changes, look for another class/selector occurence and
|
|
|
1072 |
add change number to delete set if found"
|
|
|
1073 |
|
|
|
1074 |
deleteSet := OrderedCollection new.
|
|
|
1075 |
changeNr := 1.
|
|
|
1076 |
[changeNr < changePositions size] whileTrue:[
|
|
|
1077 |
thisClass := classes at:changeNr.
|
|
|
1078 |
thisSelector := selectors at:changeNr.
|
|
|
1079 |
searchIndex := changeNr.
|
|
|
1080 |
anyMore := true.
|
|
|
1081 |
[anyMore] whileTrue:[
|
|
|
1082 |
searchIndex := classes indexOf:thisClass
|
|
|
1083 |
startingAt:(searchIndex + 1).
|
|
|
1084 |
(searchIndex ~~ 0) ifTrue:[
|
|
|
1085 |
((selectors at:searchIndex) == thisSelector) ifTrue:[
|
|
|
1086 |
thisClass notNil ifTrue:[
|
|
|
1087 |
deleteSet add:changeNr.
|
|
|
1088 |
anyMore := false
|
|
|
1089 |
]
|
|
|
1090 |
]
|
|
|
1091 |
] ifFalse:[
|
|
|
1092 |
anyMore := false
|
|
|
1093 |
]
|
|
|
1094 |
].
|
|
|
1095 |
changeNr := changeNr + 1
|
|
|
1096 |
].
|
|
|
1097 |
|
|
|
1098 |
"finally delete what has been found"
|
|
|
1099 |
|
|
|
1100 |
(deleteSet size > 0) ifTrue:[
|
|
|
1101 |
changeListView selection:nil.
|
|
|
1102 |
index := deleteSet size.
|
|
|
1103 |
[index > 0] whileTrue:[
|
|
|
1104 |
self silentDeleteChange:(deleteSet at:index).
|
|
|
1105 |
index := index - 1
|
|
|
1106 |
].
|
|
15
|
1107 |
changeListView setContents:changeChunks.
|
|
|
1108 |
changeListView firstLineShown > changeChunks size ifTrue:[
|
|
|
1109 |
changeListView makeLineVisible:changeChunks size
|
|
|
1110 |
].
|
|
0
|
1111 |
self clearCodeView
|
|
|
1112 |
]
|
|
|
1113 |
]
|
|
|
1114 |
! !
|