|
0
|
1 |
"
|
|
4
|
2 |
COPYRIGHT (c) 1990 by Claus Gittinger
|
|
45
|
3 |
All Rights Reserved
|
|
0
|
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 |
"
|
|
|
12 |
|
|
73
|
13 |
'From Smalltalk/X, Version:2.10.4 on 26-feb-1995 at 5:18:24 am'!
|
|
45
|
14 |
|
|
0
|
15 |
StandardSystemView subclass:#ChangesBrowser
|
|
45
|
16 |
instanceVariableNames:'changeListView codeView changeFileName changeChunks
|
|
|
17 |
changePositions changeClassNames changeHeaderLines anyChanges
|
|
89
|
18 |
changeNrShown changeNrProcessed skipSignal compareChanges compareCheckBox'
|
|
58
|
19 |
classVariableNames:'CompressSnapshotInfo'
|
|
45
|
20 |
poolDictionaries:''
|
|
|
21 |
category:'Interface-Browsers'
|
|
0
|
22 |
!
|
|
|
23 |
|
|
|
24 |
ChangesBrowser comment:'
|
|
4
|
25 |
COPYRIGHT (c) 1990 by Claus Gittinger
|
|
45
|
26 |
All Rights Reserved
|
|
0
|
27 |
|
|
107
|
28 |
$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.37 1995-07-03 02:36:59 claus Exp $
|
|
29
|
29 |
'!
|
|
|
30 |
|
|
|
31 |
!ChangesBrowser class methodsFor:'documentation'!
|
|
|
32 |
|
|
|
33 |
copyright
|
|
|
34 |
"
|
|
|
35 |
COPYRIGHT (c) 1990 by Claus Gittinger
|
|
45
|
36 |
All Rights Reserved
|
|
0
|
37 |
|
|
29
|
38 |
This software is furnished under a license and may be used
|
|
|
39 |
only in accordance with the terms of that license and with the
|
|
|
40 |
inclusion of the above copyright notice. This software may not
|
|
|
41 |
be provided or otherwise made available to, or used by, any
|
|
|
42 |
other person. No title to or ownership of the software is
|
|
|
43 |
hereby transferred.
|
|
|
44 |
"
|
|
|
45 |
!
|
|
|
46 |
|
|
|
47 |
version
|
|
|
48 |
"
|
|
107
|
49 |
$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.37 1995-07-03 02:36:59 claus Exp $
|
|
31
|
50 |
"
|
|
29
|
51 |
!
|
|
|
52 |
|
|
|
53 |
documentation
|
|
|
54 |
"
|
|
|
55 |
this implements a browser for the changes-file.
|
|
|
56 |
See the extra document 'doc/misc/cbrowser.doc' for how to use this browser.
|
|
|
57 |
|
|
|
58 |
written jan 90 by claus
|
|
51
|
59 |
|
|
58
|
60 |
Class variables:
|
|
|
61 |
CompressSnapshotInfo if true (the default), snapshot entries
|
|
|
62 |
are also compressed in the compress function.
|
|
|
63 |
Some users prefer them to be not compressed.
|
|
|
64 |
Set it to false for this.
|
|
|
65 |
|
|
51
|
66 |
Notice:
|
|
|
67 |
this needs a total rewrite, to build up a changeSet from the file
|
|
|
68 |
(which did not exist when the ChangesBrowser was written) and
|
|
|
69 |
manipulate that changeSet.
|
|
58
|
70 |
This way, we get a browser for any upcoming incore changeSets for
|
|
|
71 |
free. Also, this will put the chunk analyzation code into Change and
|
|
|
72 |
subclasses (where it belongs) and give a better encapsulation and
|
|
|
73 |
overall structure. Do not take this as an example for good style ;-)
|
|
29
|
74 |
"
|
|
|
75 |
! !
|
|
0
|
76 |
|
|
45
|
77 |
!ChangesBrowser class methodsFor:'instance creation'!
|
|
|
78 |
|
|
|
79 |
new
|
|
|
80 |
"create a new changes browser"
|
|
|
81 |
|
|
|
82 |
^ super label:'Changes Browser'
|
|
|
83 |
icon:(Form fromFile:'CBrowser.xbm' resolution:100)
|
|
|
84 |
!
|
|
|
85 |
|
|
|
86 |
openOn:aFileName
|
|
|
87 |
"create c changes browser on a change file"
|
|
|
88 |
|
|
49
|
89 |
^ ((self new label:'Changes Browser: ', aFileName) changeFileName:aFileName) open
|
|
45
|
90 |
! !
|
|
|
91 |
|
|
0
|
92 |
!ChangesBrowser class methodsFor:'behavior'!
|
|
|
93 |
|
|
|
94 |
autoSelectNext
|
|
|
95 |
"returning true here, makes a Delete operation automatically
|
|
|
96 |
select the next change"
|
|
|
97 |
|
|
|
98 |
^ true
|
|
|
99 |
! !
|
|
|
100 |
|
|
73
|
101 |
!ChangesBrowser class methodsFor:'defaults'!
|
|
0
|
102 |
|
|
73
|
103 |
defaultLabel
|
|
|
104 |
^ 'Changes Browser'
|
|
28
|
105 |
! !
|
|
|
106 |
|
|
0
|
107 |
!ChangesBrowser methodsFor:'private'!
|
|
|
108 |
|
|
|
109 |
streamForChange:changeNr
|
|
|
110 |
"answer a stream for change"
|
|
|
111 |
|
|
|
112 |
|aStream|
|
|
|
113 |
|
|
56
|
114 |
(changeNr between:1 and:changePositions size) ifFalse:[^ nil].
|
|
0
|
115 |
aStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
116 |
aStream isNil ifTrue:[^ nil].
|
|
|
117 |
aStream position:(changePositions at:changeNr).
|
|
|
118 |
^ aStream
|
|
|
119 |
!
|
|
|
120 |
|
|
73
|
121 |
autoSelect:changeNr
|
|
|
122 |
"select a change"
|
|
|
123 |
|
|
|
124 |
self class autoSelectNext ifTrue:[
|
|
|
125 |
(changeNr <= changePositions size) ifTrue:[
|
|
|
126 |
changeListView selection:changeNr.
|
|
|
127 |
self changeSelection:changeNr.
|
|
|
128 |
^ self
|
|
|
129 |
]
|
|
|
130 |
].
|
|
|
131 |
self clearCodeView.
|
|
|
132 |
changeListView selection:nil.
|
|
|
133 |
!
|
|
|
134 |
|
|
|
135 |
clearCodeView
|
|
|
136 |
self unselect "changeListView deselect".
|
|
|
137 |
codeView contents:nil.
|
|
|
138 |
changeNrShown := nil
|
|
|
139 |
!
|
|
|
140 |
|
|
51
|
141 |
applyChange:changeNr
|
|
|
142 |
"fileIn a change"
|
|
|
143 |
|
|
|
144 |
|aStream upd nm|
|
|
45
|
145 |
|
|
51
|
146 |
aStream := self streamForChange:changeNr.
|
|
|
147 |
aStream isNil ifTrue:[^ self].
|
|
|
148 |
|
|
|
149 |
nm := self classNameOfChange:changeNr.
|
|
|
150 |
nm notNil ifTrue:[
|
|
|
151 |
|cls|
|
|
45
|
152 |
|
|
51
|
153 |
cls := Smalltalk at:(nm asSymbol) ifAbsent:[].
|
|
|
154 |
cls notNil ifTrue:[
|
|
|
155 |
cls isLoaded ifFalse:[
|
|
|
156 |
cls autoload
|
|
|
157 |
]
|
|
|
158 |
]
|
|
|
159 |
].
|
|
45
|
160 |
|
|
51
|
161 |
changeNrProcessed := changeNr.
|
|
45
|
162 |
|
|
51
|
163 |
upd := Class updateChanges:false.
|
|
|
164 |
[
|
|
|
165 |
|sig|
|
|
45
|
166 |
|
|
51
|
167 |
(skipSignal notNil) ifTrue:[
|
|
|
168 |
sig := skipSignal
|
|
|
169 |
] ifFalse:[
|
|
|
170 |
sig := Object abortSignal
|
|
|
171 |
].
|
|
|
172 |
sig catch:[
|
|
|
173 |
aStream fileInNextChunkNotifying:self
|
|
|
174 |
].
|
|
|
175 |
changeNrProcessed := nil.
|
|
|
176 |
] valueNowOrOnUnwindDo:[
|
|
|
177 |
Class updateChanges:upd.
|
|
|
178 |
aStream close
|
|
45
|
179 |
].
|
|
|
180 |
!
|
|
|
181 |
|
|
73
|
182 |
unselect
|
|
|
183 |
"common unselect"
|
|
|
184 |
|
|
|
185 |
changeListView deselect.
|
|
|
186 |
!
|
|
|
187 |
|
|
51
|
188 |
setChangeList
|
|
|
189 |
"extract type-information from changes and stuff into top selection
|
|
|
190 |
view"
|
|
0
|
191 |
|
|
51
|
192 |
changeListView setList:changeHeaderLines expandTabs:false.
|
|
|
193 |
"/ changeListView deselect.
|
|
107
|
194 |
! !
|
|
|
195 |
|
|
|
196 |
!ChangesBrowser methodsFor:'private'!
|
|
50
|
197 |
|
|
37
|
198 |
readChangesFileInBackground:inBackground
|
|
|
199 |
"read the changes file, create a list of header-lines (changeChunks)
|
|
51
|
200 |
and a list of chunk-positions (changePositions).
|
|
|
201 |
Starting with 2.10.3, the entries are multi-col entries;
|
|
|
202 |
the cols are:
|
|
|
203 |
1 class/selector
|
|
89
|
204 |
2 delta (only if comparing)
|
|
51
|
205 |
'+' -> new method (w.r.t. current state)
|
|
|
206 |
'-' -> removed method (w.r.t. current state)
|
|
|
207 |
'?' -> class does not exist currently
|
|
81
|
208 |
'=' -> change is same as current methods source
|
|
51
|
209 |
3 type of change
|
|
|
210 |
doit
|
|
|
211 |
method
|
|
|
212 |
category change
|
|
89
|
213 |
|
|
|
214 |
since comparing slows down startup time, it is now disabled by
|
|
|
215 |
default and can be enabled via a toggle.
|
|
51
|
216 |
"
|
|
37
|
217 |
|
|
51
|
218 |
|aStream maxLen|
|
|
50
|
219 |
|
|
|
220 |
maxLen := 60.
|
|
0
|
221 |
|
|
|
222 |
aStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
223 |
aStream isNil ifTrue:[^ nil].
|
|
|
224 |
|
|
|
225 |
self withCursor:(Cursor read) do:[
|
|
51
|
226 |
|tabSpec myProcess myPriority|
|
|
|
227 |
|
|
49
|
228 |
tabSpec := TabulatorSpecification new.
|
|
|
229 |
tabSpec unit:#inch.
|
|
51
|
230 |
tabSpec positions:#(0 4.5 4.65 5.5 ).
|
|
|
231 |
" cls>>sel +/- type info"
|
|
|
232 |
tabSpec align: #(#left #left #left #left).
|
|
49
|
233 |
|
|
45
|
234 |
"
|
|
|
235 |
this is a time consuming operation (especially, if reading an
|
|
|
236 |
NFS-mounted directory; therefore lower my priority ...
|
|
|
237 |
"
|
|
|
238 |
inBackground ifTrue:[
|
|
|
239 |
myProcess := Processor activeProcess.
|
|
|
240 |
myPriority := myProcess priority.
|
|
|
241 |
myProcess priority:(Processor userBackgroundPriority).
|
|
|
242 |
].
|
|
51
|
243 |
|
|
45
|
244 |
[
|
|
51
|
245 |
|excla|
|
|
50
|
246 |
|
|
45
|
247 |
changeChunks := OrderedCollection new.
|
|
|
248 |
changeHeaderLines := OrderedCollection new.
|
|
|
249 |
changePositions := OrderedCollection new.
|
|
|
250 |
excla := aStream class chunkSeparator.
|
|
0
|
251 |
|
|
45
|
252 |
[aStream atEnd] whileFalse:[
|
|
51
|
253 |
|entry changeDelta changeString changeType
|
|
|
254 |
line s l changeClass sawExcla category
|
|
|
255 |
chunkText chunkPos|
|
|
|
256 |
|
|
45
|
257 |
"
|
|
|
258 |
get a chunk (separated by excla)
|
|
|
259 |
"
|
|
|
260 |
aStream skipSeparators.
|
|
|
261 |
chunkPos := aStream position.
|
|
73
|
262 |
|
|
|
263 |
|
|
45
|
264 |
sawExcla := aStream peekFor:excla.
|
|
|
265 |
chunkText := aStream nextChunk.
|
|
|
266 |
chunkText notNil ifTrue:[
|
|
51
|
267 |
|index headerLine|
|
|
|
268 |
|
|
45
|
269 |
"
|
|
|
270 |
only first line is saved in changeChunks ...
|
|
|
271 |
"
|
|
|
272 |
index := chunkText indexOf:(Character cr).
|
|
|
273 |
(index ~~ 0) ifTrue:[
|
|
|
274 |
chunkText := chunkText copyTo:(index - 1).
|
|
|
275 |
|
|
|
276 |
"take care for comment changes - must still be a
|
|
|
277 |
valid expression for classNameOfChange: to work"
|
|
|
278 |
|
|
|
279 |
(chunkText endsWith:'comment:''') ifTrue:[
|
|
|
280 |
chunkText := chunkText , '...'''
|
|
107
|
281 |
].
|
|
|
282 |
(chunkText endsWith:'primitiveDefinitions:''%{') ifTrue:[
|
|
|
283 |
chunkText := chunkText , '... %}'''
|
|
|
284 |
].
|
|
|
285 |
(chunkText endsWith:'primitiveVariables:''%{') ifTrue:[
|
|
|
286 |
chunkText := chunkText , '... %}'''
|
|
|
287 |
].
|
|
|
288 |
(chunkText endsWith:'primitiveFunctions:''%{') ifTrue:[
|
|
|
289 |
chunkText := chunkText , '... %}'''
|
|
|
290 |
].
|
|
45
|
291 |
].
|
|
|
292 |
|
|
|
293 |
changeChunks add:chunkText.
|
|
|
294 |
changePositions add:chunkPos.
|
|
50
|
295 |
headerLine := nil.
|
|
51
|
296 |
changeDelta := ' '.
|
|
29
|
297 |
|
|
45
|
298 |
sawExcla ifFalse:[
|
|
51
|
299 |
(chunkText startsWith:'''---- snap') ifTrue:[
|
|
|
300 |
changeType := ''.
|
|
|
301 |
headerLine := chunkText.
|
|
|
302 |
changeString := (chunkText contractTo:maxLen).
|
|
|
303 |
] ifFalse:[
|
|
|
304 |
|p sel cls|
|
|
|
305 |
|
|
49
|
306 |
headerLine := chunkText , ' (doIt)'.
|
|
50
|
307 |
|
|
51
|
308 |
"
|
|
|
309 |
first, assume doIt - then lets have a more detailed look ...
|
|
|
310 |
"
|
|
73
|
311 |
(chunkText startsWith:'''---- file') ifTrue:[
|
|
|
312 |
changeType := ''.
|
|
|
313 |
] ifFalse:[
|
|
|
314 |
changeType := '(doIt)'.
|
|
|
315 |
].
|
|
50
|
316 |
changeString := (chunkText contractTo:maxLen).
|
|
51
|
317 |
|
|
50
|
318 |
p := Parser parseExpression:chunkText.
|
|
51
|
319 |
(p notNil
|
|
|
320 |
and:[p ~~ #Error
|
|
|
321 |
and:[p isMessage]]) ifTrue:[
|
|
50
|
322 |
sel := p selector.
|
|
51
|
323 |
].
|
|
|
324 |
(sel == #removeSelector:) ifTrue:[
|
|
|
325 |
p receiver isUnaryMessage ifTrue:[
|
|
|
326 |
cls := p receiver receiver name.
|
|
|
327 |
changeClass := (Smalltalk classNamed:cls) class.
|
|
|
328 |
cls := cls , ' class'.
|
|
|
329 |
] ifFalse:[
|
|
|
330 |
cls := p receiver name.
|
|
|
331 |
changeClass := (Smalltalk classNamed:cls)
|
|
|
332 |
].
|
|
|
333 |
sel := (p args at:1) evaluate.
|
|
89
|
334 |
|
|
|
335 |
compareChanges ifTrue:[
|
|
|
336 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
|
|
|
337 |
changeDelta := '?'
|
|
|
338 |
] ifFalse:[
|
|
|
339 |
(changeClass implements:sel asSymbol) ifTrue:[
|
|
|
340 |
changeDelta := '-'.
|
|
|
341 |
]
|
|
51
|
342 |
]
|
|
|
343 |
].
|
|
|
344 |
changeType := '(remove)'.
|
|
|
345 |
changeString := self contractClass:cls selector:sel to:maxLen.
|
|
|
346 |
].
|
|
|
347 |
(sel == #category:) ifTrue:[
|
|
|
348 |
(p receiver isMessage
|
|
|
349 |
and:[p receiver selector == #compiledMethodAt:]) ifTrue:[
|
|
|
350 |
p receiver receiver isUnaryMessage ifTrue:[
|
|
|
351 |
cls := p receiver receiver receiver name.
|
|
|
352 |
changeClass := (Smalltalk classNamed:cls) class.
|
|
|
353 |
cls := cls , ' class'.
|
|
|
354 |
] ifFalse:[
|
|
50
|
355 |
cls := p receiver receiver name.
|
|
51
|
356 |
changeClass := (Smalltalk classNamed:cls)
|
|
50
|
357 |
].
|
|
51
|
358 |
sel := (p receiver args at:1) evaluate.
|
|
|
359 |
changeType := '(category change)'.
|
|
50
|
360 |
changeString := self contractClass:cls selector:sel to:maxLen.
|
|
|
361 |
]
|
|
73
|
362 |
].
|
|
|
363 |
(#(#'subclass:'
|
|
|
364 |
#'variableSubclass:'
|
|
|
365 |
#'variableByteSubclass:'
|
|
|
366 |
#'variableWordSubclass:'
|
|
|
367 |
#'variableLongSubclass:'
|
|
|
368 |
#'variableFloatSubclass:'
|
|
|
369 |
#'variableDoubleSubclass:'
|
|
|
370 |
) includes:sel) ifTrue:[
|
|
|
371 |
changeType := '(class definition)'.
|
|
|
372 |
].
|
|
45
|
373 |
].
|
|
|
374 |
] ifTrue:[
|
|
51
|
375 |
|done first p sel cls text|
|
|
|
376 |
|
|
45
|
377 |
"
|
|
|
378 |
method definitions actually consist of
|
|
|
379 |
two (or more) chunks; skip next chunk(s)
|
|
|
380 |
up to an empty one.
|
|
|
381 |
The system only writes one chunk,
|
|
|
382 |
and we cannot handle more in this ChangesBrowser ....
|
|
|
383 |
"
|
|
|
384 |
cls := nil.
|
|
|
385 |
p := Parser parseExpression:chunkText.
|
|
37
|
386 |
|
|
45
|
387 |
(p notNil and:[p ~~ #Error]) ifTrue:[
|
|
|
388 |
sel := p selector.
|
|
|
389 |
(sel == #methodsFor:) ifTrue:[
|
|
|
390 |
p receiver isUnaryMessage ifTrue:[
|
|
|
391 |
cls := p receiver receiver name.
|
|
51
|
392 |
changeClass := (Smalltalk classNamed:cls) class.
|
|
|
393 |
cls := cls , ' class'.
|
|
45
|
394 |
] ifFalse:[
|
|
51
|
395 |
cls := p receiver name.
|
|
|
396 |
changeClass := Smalltalk classNamed:cls
|
|
45
|
397 |
].
|
|
50
|
398 |
category := (p args at:1) evaluate.
|
|
|
399 |
].
|
|
45
|
400 |
].
|
|
|
401 |
done := false.
|
|
|
402 |
first := true.
|
|
|
403 |
[done] whileFalse:[
|
|
|
404 |
text := aStream nextChunk.
|
|
|
405 |
text isNil ifTrue:[
|
|
|
406 |
done := true
|
|
|
407 |
] ifFalse:[
|
|
|
408 |
done := text isEmpty
|
|
|
409 |
].
|
|
|
410 |
done ifFalse:[
|
|
|
411 |
first ifFalse:[
|
|
|
412 |
Transcript showCr:'only one method per ''methodsFor:'' handled'.
|
|
|
413 |
] ifTrue:[
|
|
|
414 |
first := false.
|
|
|
415 |
"
|
|
|
416 |
try to find the selector
|
|
|
417 |
"
|
|
|
418 |
sel := nil.
|
|
|
419 |
cls notNil ifTrue:[
|
|
|
420 |
p := Parser
|
|
|
421 |
parseMethodSpecification:text
|
|
|
422 |
in:nil
|
|
|
423 |
ignoreErrors:true
|
|
|
424 |
ignoreWarnings:true.
|
|
|
425 |
(p notNil and:[p ~~ #Error]) ifTrue:[
|
|
|
426 |
sel := p selector.
|
|
|
427 |
]
|
|
|
428 |
].
|
|
50
|
429 |
|
|
|
430 |
sel isNil ifTrue:[
|
|
|
431 |
changeString := (chunkText contractTo:maxLen).
|
|
|
432 |
changeType := '(change)'.
|
|
|
433 |
] ifFalse:[
|
|
|
434 |
changeString := self contractClass:cls selector:sel to:maxLen.
|
|
|
435 |
changeType := '(method in: ''' , category , ''')'.
|
|
|
436 |
].
|
|
45
|
437 |
sel isNil ifTrue:[
|
|
49
|
438 |
headerLine := chunkText , ' (change)'.
|
|
45
|
439 |
] ifFalse:[
|
|
49
|
440 |
headerLine := cls , ' ' , sel , ' ' , '(change category: ''' , category , ''')'.
|
|
51
|
441 |
].
|
|
81
|
442 |
|
|
89
|
443 |
compareChanges ifTrue:[
|
|
|
444 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
|
|
|
445 |
changeDelta := '?'
|
|
|
446 |
] ifFalse:[
|
|
|
447 |
(changeClass implements:sel asSymbol) ifFalse:[
|
|
|
448 |
changeDelta := '+'.
|
|
|
449 |
] ifTrue:[
|
|
|
450 |
|m currentText|
|
|
|
451 |
|
|
|
452 |
m := changeClass compiledMethodAt:sel asSymbol.
|
|
|
453 |
currentText := m source.
|
|
|
454 |
currentText notNil ifTrue:[
|
|
|
455 |
text asString = currentText asString ifTrue:[
|
|
|
456 |
changeDelta := '='
|
|
|
457 |
]
|
|
81
|
458 |
]
|
|
|
459 |
]
|
|
51
|
460 |
]
|
|
45
|
461 |
]
|
|
|
462 |
]
|
|
|
463 |
]
|
|
|
464 |
]
|
|
49
|
465 |
].
|
|
51
|
466 |
changeString notNil ifTrue:[
|
|
|
467 |
entry := MultiColListEntry new.
|
|
50
|
468 |
entry tabulatorSpecification:tabSpec.
|
|
|
469 |
entry colAt:1 put:changeString.
|
|
51
|
470 |
entry colAt:2 put:changeDelta.
|
|
|
471 |
entry colAt:3 put:changeType.
|
|
49
|
472 |
changeHeaderLines add:entry
|
|
|
473 |
] ifFalse:[
|
|
|
474 |
headerLine notNil ifTrue:[
|
|
|
475 |
changeHeaderLines add:headerLine
|
|
|
476 |
]
|
|
45
|
477 |
]
|
|
|
478 |
]
|
|
|
479 |
].
|
|
|
480 |
changeClassNames := OrderedCollection new grow:(changeChunks size).
|
|
|
481 |
aStream close.
|
|
|
482 |
anyChanges := false
|
|
|
483 |
] valueNowOrOnUnwindDo:[
|
|
|
484 |
inBackground ifTrue:[myProcess priority:myPriority].
|
|
|
485 |
].
|
|
|
486 |
]
|
|
|
487 |
!
|
|
37
|
488 |
|
|
51
|
489 |
contractClass:className selector:selector to:maxLen
|
|
|
490 |
|s l|
|
|
|
491 |
|
|
|
492 |
s := className , ' ', selector.
|
|
|
493 |
s size > maxLen ifTrue:[
|
|
|
494 |
l := maxLen - 1 - selector size max:20.
|
|
|
495 |
s := (className contractTo:l) , ' ' , selector.
|
|
|
496 |
|
|
|
497 |
s size > maxLen ifTrue:[
|
|
|
498 |
l := maxLen - 1 - className size max:20.
|
|
|
499 |
s := className , ' ', (selector contractTo:l).
|
|
45
|
500 |
|
|
51
|
501 |
s size > maxLen ifTrue:[
|
|
|
502 |
s := (className contractTo:(maxLen // 2 - 1)) , ' ' , (selector contractTo:maxLen // 2)
|
|
|
503 |
]
|
|
|
504 |
]
|
|
|
505 |
].
|
|
|
506 |
^ s
|
|
|
507 |
!
|
|
|
508 |
|
|
73
|
509 |
silentDeleteChange:changeNr
|
|
|
510 |
"delete a change do not update changeListView"
|
|
57
|
511 |
|
|
73
|
512 |
anyChanges := true.
|
|
|
513 |
changeChunks removeIndex:changeNr.
|
|
|
514 |
changePositions removeIndex:changeNr.
|
|
|
515 |
changeClassNames removeIndex:changeNr.
|
|
|
516 |
changeHeaderLines removeIndex:changeNr
|
|
45
|
517 |
!
|
|
|
518 |
|
|
51
|
519 |
classNameOfChange:changeNr
|
|
|
520 |
"return the classname of a change (for xxx class - changes xxx is returned)
|
|
|
521 |
- since parsing ascii methods is slow, keep result cached in
|
|
|
522 |
changeClassNames for the next query"
|
|
|
523 |
|
|
|
524 |
|chunk aParseTree recTree sel name arg1Tree|
|
|
|
525 |
|
|
|
526 |
changeNr isNil ifTrue:[^ nil].
|
|
|
527 |
|
|
|
528 |
"
|
|
|
529 |
first look, if not already known
|
|
|
530 |
"
|
|
|
531 |
name := changeClassNames at:changeNr.
|
|
|
532 |
name notNil ifTrue:[^ name].
|
|
45
|
533 |
|
|
51
|
534 |
"
|
|
|
535 |
get the chunk
|
|
|
536 |
"
|
|
|
537 |
chunk := changeChunks at:changeNr.
|
|
|
538 |
chunk isNil ifTrue:[^ nil]. "mhmh - empty"
|
|
45
|
539 |
|
|
51
|
540 |
"
|
|
|
541 |
use parser to construct a parseTree
|
|
|
542 |
"
|
|
|
543 |
aParseTree := Parser parseExpression:chunk.
|
|
|
544 |
(aParseTree isNil or:[aParseTree == #Error]) ifTrue:[
|
|
|
545 |
^ nil "seems strange ... (could be a comment)"
|
|
|
546 |
].
|
|
|
547 |
aParseTree isMessage ifFalse:[
|
|
|
548 |
^ nil "very strange ... (whats that ?)"
|
|
|
549 |
].
|
|
|
550 |
|
|
|
551 |
"
|
|
|
552 |
ask parser for selector
|
|
|
553 |
"
|
|
|
554 |
sel := aParseTree selector.
|
|
|
555 |
recTree := aParseTree receiver.
|
|
45
|
556 |
|
|
51
|
557 |
"
|
|
|
558 |
is it a method-change, methodRemove or comment-change ?
|
|
|
559 |
"
|
|
|
560 |
(#(#'methodsFor:'
|
|
|
561 |
#'privateMethodsFor:'
|
|
|
562 |
#'protectedMethodsFor:'
|
|
|
563 |
#'publicMethodsFor:'
|
|
|
564 |
#'removeSelector:'
|
|
|
565 |
#'comment:'
|
|
107
|
566 |
#'primitiveDefinitions:'
|
|
|
567 |
#'primitiveFunctions:'
|
|
|
568 |
#'primitiveVariables:'
|
|
51
|
569 |
#'renameCategory:to:'
|
|
61
|
570 |
#'instanceVariableNames:'
|
|
51
|
571 |
) includes:sel) ifTrue:[
|
|
|
572 |
"
|
|
|
573 |
yes, the className is the receiver
|
|
|
574 |
"
|
|
|
575 |
(recTree notNil and:[recTree ~~ #Error]) ifTrue:[
|
|
|
576 |
recTree isUnaryMessage ifTrue:[
|
|
|
577 |
(recTree selector ~~ #class) ifTrue:[^ nil].
|
|
|
578 |
"id class methodsFor:..."
|
|
|
579 |
recTree := recTree receiver
|
|
|
580 |
].
|
|
|
581 |
recTree isPrimary ifTrue:[
|
|
|
582 |
name := recTree name.
|
|
|
583 |
changeClassNames at:changeNr put:name.
|
|
|
584 |
^ name
|
|
45
|
585 |
]
|
|
51
|
586 |
].
|
|
|
587 |
"more strange things"
|
|
|
588 |
^ nil
|
|
|
589 |
].
|
|
|
590 |
|
|
|
591 |
"
|
|
|
592 |
is it a change in a class-description ?
|
|
|
593 |
"
|
|
73
|
594 |
(('subclass:*' match:sel)
|
|
|
595 |
or:[('variable*subclass:*' match:sel)]) ifTrue:[
|
|
51
|
596 |
arg1Tree := aParseTree arg1.
|
|
|
597 |
(arg1Tree notNil and:[arg1Tree isConstant]) ifTrue:[
|
|
|
598 |
name := arg1Tree value asString.
|
|
|
599 |
changeClassNames at:changeNr put:name.
|
|
|
600 |
^ name
|
|
|
601 |
].
|
|
|
602 |
"very strange"
|
|
|
603 |
^ nil
|
|
|
604 |
].
|
|
|
605 |
|
|
|
606 |
"
|
|
|
607 |
is it a class remove ?
|
|
|
608 |
"
|
|
|
609 |
(sel == #removeClass:) ifTrue:[
|
|
|
610 |
(recTree notNil
|
|
|
611 |
and:[recTree ~~ #Error
|
|
|
612 |
and:[recTree isPrimary
|
|
|
613 |
and:[recTree name = 'Smalltalk']]]) ifTrue:[
|
|
|
614 |
arg1Tree := aParseTree arg1.
|
|
|
615 |
(arg1Tree notNil and:[arg1Tree isPrimary]) ifTrue:[
|
|
|
616 |
name := arg1Tree name.
|
|
|
617 |
changeClassNames at:changeNr put:name.
|
|
|
618 |
^ name
|
|
|
619 |
].
|
|
45
|
620 |
]
|
|
|
621 |
].
|
|
|
622 |
|
|
51
|
623 |
"
|
|
|
624 |
is it a method category change ?
|
|
|
625 |
"
|
|
|
626 |
(sel == #category:) ifTrue:[
|
|
|
627 |
(recTree notNil
|
|
|
628 |
and:[recTree ~~ #Error
|
|
|
629 |
and:[recTree isMessage
|
|
|
630 |
and:[recTree selector == #compiledMethodAt:]]]) ifTrue:[
|
|
|
631 |
recTree := recTree receiver.
|
|
|
632 |
recTree isUnaryMessage ifTrue:[
|
|
|
633 |
(recTree selector ~~ #class) ifTrue:[^ nil].
|
|
|
634 |
"id class "
|
|
|
635 |
recTree := recTree receiver
|
|
|
636 |
].
|
|
|
637 |
recTree isPrimary ifTrue:[
|
|
|
638 |
name := recTree name.
|
|
|
639 |
changeClassNames at:changeNr put:name.
|
|
|
640 |
^ name
|
|
|
641 |
]
|
|
|
642 |
]
|
|
45
|
643 |
].
|
|
51
|
644 |
^ nil
|
|
45
|
645 |
!
|
|
|
646 |
|
|
73
|
647 |
autoSelectOrEnd:changeNr
|
|
|
648 |
"select the next change or the last"
|
|
|
649 |
|
|
|
650 |
|last|
|
|
|
651 |
|
|
|
652 |
last := changePositions size.
|
|
|
653 |
changeNr < last ifTrue:[
|
|
|
654 |
self autoSelect:changeNr
|
|
|
655 |
] ifFalse:[
|
|
|
656 |
changeListView selection:last .
|
|
|
657 |
self changeSelection:last.
|
|
|
658 |
]
|
|
|
659 |
!
|
|
|
660 |
|
|
|
661 |
withSelectedChangeDo:aBlock
|
|
|
662 |
"just a helper, check for a selected change and evaluate aBlock
|
|
|
663 |
with busy cursor"
|
|
|
664 |
|
|
|
665 |
|changeNr|
|
|
|
666 |
|
|
|
667 |
changeNr := changeListView selection.
|
|
|
668 |
changeNr notNil ifTrue:[
|
|
|
669 |
self withCursor:(Cursor execute) do:[
|
|
|
670 |
aBlock value:changeNr
|
|
|
671 |
]
|
|
|
672 |
]
|
|
|
673 |
!
|
|
|
674 |
|
|
|
675 |
autoSelectLast
|
|
|
676 |
"select the last change"
|
|
|
677 |
|
|
|
678 |
self autoSelect:(changePositions size)
|
|
|
679 |
!
|
|
|
680 |
|
|
|
681 |
compareChange:changeNr
|
|
|
682 |
"compare a change with current version"
|
|
|
683 |
|
|
|
684 |
|aStream chunk sawExcla parseTree thisClass cat oldSource newSource
|
|
|
685 |
parser sel oldMethod outcome showDiff d t1 t2|
|
|
|
686 |
|
|
|
687 |
aStream := self streamForChange:changeNr.
|
|
|
688 |
aStream isNil ifTrue:[^ self].
|
|
|
689 |
|
|
|
690 |
sawExcla := aStream peekFor:(aStream class chunkSeparator).
|
|
|
691 |
chunk := aStream nextChunk.
|
|
|
692 |
sawExcla ifFalse:[
|
|
|
693 |
outcome := 'not comparable ...'
|
|
|
694 |
] ifTrue:[
|
|
|
695 |
parseTree := Parser parseExpression:chunk.
|
|
|
696 |
(parseTree notNil and:[parseTree isMessage]) ifTrue:[
|
|
|
697 |
(parseTree selector == #methodsFor:) ifTrue:[
|
|
|
698 |
thisClass := (parseTree receiver evaluate).
|
|
|
699 |
thisClass isBehavior ifTrue:[
|
|
|
700 |
showDiff := false.
|
|
|
701 |
|
|
|
702 |
cat := parseTree arg1 evaluate.
|
|
|
703 |
newSource := aStream nextChunk.
|
|
|
704 |
parser := Parser parseMethod:newSource in:thisClass.
|
|
|
705 |
(parser notNil and:[parser ~~ #Error]) ifTrue:[
|
|
|
706 |
sel := parser selector.
|
|
|
707 |
oldMethod := thisClass compiledMethodAt:sel.
|
|
|
708 |
oldMethod notNil ifTrue:[
|
|
|
709 |
(oldMethod category = cat) ifFalse:[
|
|
|
710 |
Transcript showCr:'category changed.'.
|
|
|
711 |
].
|
|
|
712 |
oldSource := oldMethod source.
|
|
|
713 |
(oldSource = newSource) ifTrue:[
|
|
|
714 |
outcome := 'same source'
|
|
|
715 |
] ifFalse:[
|
|
89
|
716 |
oldSource isNil ifTrue:[
|
|
|
717 |
outcome := 'no source for compare.'
|
|
73
|
718 |
] ifFalse:[
|
|
89
|
719 |
"/
|
|
|
720 |
"/ compare for tabulator <-> space changes
|
|
|
721 |
"/ before showing diff ...
|
|
|
722 |
"/
|
|
|
723 |
t1 := oldSource asString withTabsExpanded.
|
|
|
724 |
t2 := newSource asString withTabsExpanded.
|
|
|
725 |
t1 = t2 ifTrue:[
|
|
|
726 |
outcome := 'same source (tabs <-> spaces)'
|
|
|
727 |
] ifFalse:[
|
|
|
728 |
outcome := 'source changed.'.
|
|
|
729 |
showDiff := true
|
|
|
730 |
]
|
|
73
|
731 |
]
|
|
|
732 |
]
|
|
|
733 |
] ifFalse:[
|
|
|
734 |
outcome := 'method does not exist.'
|
|
|
735 |
]
|
|
|
736 |
] ifFalse:[
|
|
|
737 |
outcome := 'change unparsable.'
|
|
|
738 |
].
|
|
|
739 |
(showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[
|
|
|
740 |
d := DiffTextView openOn:oldSource and:newSource.
|
|
|
741 |
d label:'differences (current left; change right)'.
|
|
|
742 |
]
|
|
|
743 |
] ifFalse:[
|
|
|
744 |
outcome := 'class does not exist.'
|
|
|
745 |
]
|
|
|
746 |
] ifFalse:[
|
|
|
747 |
outcome := 'not comparable.'
|
|
|
748 |
]
|
|
|
749 |
] ifFalse:[
|
|
|
750 |
outcome := 'not comparable.'
|
|
|
751 |
]
|
|
|
752 |
].
|
|
|
753 |
aStream close.
|
|
89
|
754 |
showDiff ifFalse:[
|
|
|
755 |
self information:outcome.
|
|
|
756 |
"/ Transcript showCr:outcome.
|
|
|
757 |
].
|
|
73
|
758 |
!
|
|
|
759 |
|
|
45
|
760 |
writeBackChanges
|
|
|
761 |
"write back the changes file"
|
|
|
762 |
|
|
51
|
763 |
|inStream outStream|
|
|
45
|
764 |
|
|
|
765 |
outStream := FileStream newFileNamed:'n_changes'.
|
|
|
766 |
outStream isNil ifTrue:[
|
|
|
767 |
self warn:'cannot create temporary file'.
|
|
|
768 |
^ self
|
|
|
769 |
].
|
|
|
770 |
|
|
|
771 |
inStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
772 |
inStream isNil ifTrue:[^ nil].
|
|
|
773 |
|
|
|
774 |
self withCursor:(Cursor write) do:[
|
|
51
|
775 |
|excla sawExcla done dir chunk
|
|
|
776 |
nChanges "{Class:SmallInteger}" |
|
|
|
777 |
|
|
45
|
778 |
excla := inStream class chunkSeparator.
|
|
51
|
779 |
nChanges := changePositions size.
|
|
|
780 |
|
|
|
781 |
1 to:nChanges do:[:index |
|
|
45
|
782 |
inStream position:(changePositions at:index).
|
|
|
783 |
sawExcla := inStream peekFor:excla.
|
|
|
784 |
chunk := inStream nextChunk.
|
|
|
785 |
|
|
|
786 |
sawExcla ifTrue:[
|
|
|
787 |
outStream nextPut:excla.
|
|
|
788 |
outStream nextChunkPut:chunk.
|
|
|
789 |
outStream cr.
|
|
51
|
790 |
"
|
|
|
791 |
a method-definition chunk - skip followups
|
|
|
792 |
"
|
|
45
|
793 |
done := false.
|
|
|
794 |
[done] whileFalse:[
|
|
|
795 |
chunk := inStream nextChunk.
|
|
|
796 |
chunk isNil ifTrue:[
|
|
|
797 |
done := true
|
|
|
798 |
] ifFalse:[
|
|
|
799 |
outStream nextChunkPut:chunk.
|
|
|
800 |
outStream cr.
|
|
|
801 |
done := chunk isEmpty
|
|
|
802 |
]
|
|
|
803 |
].
|
|
|
804 |
] ifFalse:[
|
|
|
805 |
outStream nextChunkPut:chunk.
|
|
|
806 |
outStream cr
|
|
|
807 |
]
|
|
|
808 |
].
|
|
|
809 |
outStream close.
|
|
|
810 |
inStream close.
|
|
|
811 |
dir := FileDirectory currentDirectory.
|
|
51
|
812 |
dir renameFile:changeFileName newName:'changes.bak'.
|
|
45
|
813 |
dir renameFile:'n_changes' newName:changeFileName.
|
|
|
814 |
anyChanges := false
|
|
|
815 |
]
|
|
|
816 |
!
|
|
0
|
817 |
|
|
|
818 |
deleteChange:changeNr
|
|
|
819 |
"delete a change"
|
|
|
820 |
|
|
|
821 |
changeListView deselect.
|
|
|
822 |
self silentDeleteChange:changeNr.
|
|
51
|
823 |
self setChangeList
|
|
45
|
824 |
|
|
|
825 |
!
|
|
|
826 |
|
|
51
|
827 |
deleteChangesFrom:start to:stop
|
|
|
828 |
"delete a range of changes"
|
|
|
829 |
|
|
|
830 |
changeListView deselect.
|
|
|
831 |
stop to:start by:-1 do:[:changeNr |
|
|
|
832 |
self silentDeleteChange:changeNr
|
|
|
833 |
].
|
|
|
834 |
self setChangeList
|
|
|
835 |
|
|
|
836 |
!
|
|
|
837 |
|
|
73
|
838 |
queryCloseText
|
|
|
839 |
"made this a method for easy redefinition in subclasses"
|
|
|
840 |
|
|
|
841 |
^ 'Quit without updating changeFile ?'
|
|
|
842 |
!
|
|
|
843 |
|
|
51
|
844 |
changeFileName:aFileName
|
|
|
845 |
changeFileName := aFileName
|
|
|
846 |
!
|
|
|
847 |
|
|
|
848 |
readChangesFile
|
|
|
849 |
"read the changes file, create a list of header-lines (changeChunks)
|
|
|
850 |
and a list of chunk-positions (changePositions)"
|
|
|
851 |
|
|
|
852 |
^ self readChangesFileInBackground:false
|
|
|
853 |
!
|
|
|
854 |
|
|
28
|
855 |
appendChange:changeNr toFile:fileName
|
|
37
|
856 |
"append change to a file. return true if ok."
|
|
0
|
857 |
|
|
37
|
858 |
|aStream outStream chunk sawExcla separator|
|
|
0
|
859 |
|
|
28
|
860 |
outStream := FileStream oldFileNamed:fileName.
|
|
0
|
861 |
outStream isNil ifTrue:[
|
|
45
|
862 |
outStream isNil ifTrue:[
|
|
|
863 |
outStream := FileStream newFileNamed:fileName.
|
|
|
864 |
outStream isNil ifTrue:[
|
|
|
865 |
self warn:'cannot update file ''%1''' with:fileName.
|
|
|
866 |
^ false
|
|
|
867 |
]
|
|
|
868 |
]
|
|
0
|
869 |
].
|
|
37
|
870 |
|
|
0
|
871 |
outStream setToEnd.
|
|
28
|
872 |
|
|
0
|
873 |
aStream := self streamForChange:changeNr.
|
|
37
|
874 |
aStream isNil ifTrue:[
|
|
45
|
875 |
self warn:'oops cannot read change'.
|
|
|
876 |
^ false
|
|
37
|
877 |
].
|
|
|
878 |
|
|
|
879 |
separator := aStream class chunkSeparator.
|
|
|
880 |
sawExcla := aStream peekFor:separator.
|
|
0
|
881 |
sawExcla ifTrue:[
|
|
45
|
882 |
outStream nextPut:separator
|
|
0
|
883 |
].
|
|
|
884 |
chunk := aStream nextChunk.
|
|
|
885 |
outStream nextChunkPut:chunk.
|
|
|
886 |
outStream cr.
|
|
|
887 |
sawExcla ifTrue:[
|
|
45
|
888 |
chunk := aStream nextChunk.
|
|
|
889 |
outStream nextChunkPut:chunk.
|
|
|
890 |
outStream space
|
|
0
|
891 |
].
|
|
|
892 |
sawExcla ifTrue:[
|
|
45
|
893 |
outStream nextPut:separator
|
|
0
|
894 |
].
|
|
|
895 |
outStream cr.
|
|
|
896 |
aStream close.
|
|
37
|
897 |
outStream close.
|
|
|
898 |
^ true
|
|
0
|
899 |
!
|
|
|
900 |
|
|
28
|
901 |
makeChangeAPatch:changeNr
|
|
|
902 |
"append change to patchfile"
|
|
|
903 |
|
|
|
904 |
self appendChange:changeNr toFile:'patches'
|
|
|
905 |
!
|
|
|
906 |
|
|
0
|
907 |
makeChangePermanent:changeNr
|
|
28
|
908 |
"rewrite the source file where change changeNr lies"
|
|
0
|
909 |
|
|
|
910 |
self notify:'this is not yet implemented'
|
|
|
911 |
!
|
|
|
912 |
|
|
45
|
913 |
silentDeleteChangesFor:aClassName from:start to:stop
|
|
|
914 |
"delete changes for a given class in a range"
|
|
|
915 |
|
|
|
916 |
|thisClassName index|
|
|
0
|
917 |
|
|
45
|
918 |
index := stop.
|
|
|
919 |
[index >= start] whileTrue:[
|
|
|
920 |
thisClassName := self classNameOfChange:index.
|
|
|
921 |
thisClassName = aClassName ifTrue:[
|
|
|
922 |
self silentDeleteChange:index
|
|
|
923 |
].
|
|
|
924 |
index := index - 1
|
|
|
925 |
]
|
|
0
|
926 |
|
|
|
927 |
! !
|
|
|
928 |
|
|
73
|
929 |
!ChangesBrowser methodsFor:'user interaction'!
|
|
51
|
930 |
|
|
73
|
931 |
doApply
|
|
|
932 |
"user wants a change to be applied"
|
|
51
|
933 |
|
|
73
|
934 |
self withSelectedChangeDo:[:changeNr |
|
|
|
935 |
skipSignal := nil.
|
|
|
936 |
self applyChange:changeNr.
|
|
|
937 |
self autoSelect:(changeNr + 1)
|
|
|
938 |
]
|
|
57
|
939 |
!
|
|
|
940 |
|
|
0
|
941 |
changeSelection:lineNr
|
|
|
942 |
"show a change in the codeView"
|
|
|
943 |
|
|
|
944 |
|aStream sawExcla chunk|
|
|
|
945 |
|
|
|
946 |
aStream := self streamForChange:lineNr.
|
|
|
947 |
aStream isNil ifTrue:[^ self].
|
|
|
948 |
sawExcla := aStream peekFor:(aStream class chunkSeparator).
|
|
|
949 |
chunk := aStream nextChunk.
|
|
|
950 |
sawExcla ifTrue:[
|
|
45
|
951 |
chunk := aStream nextChunk
|
|
0
|
952 |
].
|
|
|
953 |
aStream close.
|
|
|
954 |
codeView contents:chunk.
|
|
13
|
955 |
codeView acceptAction:[:theCode | self doApply "noChangesAllowed"].
|
|
15
|
956 |
changeNrShown := lineNr.
|
|
0
|
957 |
|
|
51
|
958 |
!
|
|
|
959 |
|
|
45
|
960 |
noChangesAllowed
|
|
|
961 |
"show a warning that changes cannot be changed"
|
|
|
962 |
|
|
|
963 |
self warn:'changes are not allowed to be changed'
|
|
|
964 |
!
|
|
|
965 |
|
|
37
|
966 |
doSaveClass
|
|
|
967 |
"user wants changes for some class from current to end to be appended to a file"
|
|
|
968 |
|
|
|
969 |
self doSaveClassFrom:1
|
|
|
970 |
!
|
|
|
971 |
|
|
|
972 |
doSaveClassAll
|
|
|
973 |
"user wants changes for some class from current to end to be appended to a file"
|
|
|
974 |
|
|
|
975 |
self doSaveClassFrom:1
|
|
|
976 |
!
|
|
|
977 |
|
|
|
978 |
doSaveClassRest
|
|
|
979 |
"user wants changes for some class from current to end to be appended to a file"
|
|
28
|
980 |
|
|
|
981 |
|changeNr|
|
|
|
982 |
|
|
|
983 |
changeNr := changeListView selection.
|
|
|
984 |
changeNr notNil ifTrue:[
|
|
45
|
985 |
self doSaveClassFrom:changeNr
|
|
37
|
986 |
]
|
|
|
987 |
!
|
|
|
988 |
|
|
45
|
989 |
doBrowse
|
|
|
990 |
"user wants a browser on the class of a change"
|
|
|
991 |
|
|
|
992 |
|changeNr className cls|
|
|
|
993 |
|
|
|
994 |
changeNr := changeListView selection.
|
|
|
995 |
changeNr notNil ifTrue:[
|
|
|
996 |
className := self classNameOfChange:changeNr.
|
|
|
997 |
className notNil ifTrue:[
|
|
|
998 |
(cls := Smalltalk classNamed:className) notNil ifTrue:[
|
|
|
999 |
SystemBrowser browseClass:cls
|
|
|
1000 |
]
|
|
|
1001 |
]
|
|
37
|
1002 |
]
|
|
|
1003 |
!
|
|
|
1004 |
|
|
73
|
1005 |
doCompare
|
|
|
1006 |
"compare change with current system version
|
|
|
1007 |
- give a note in transcript"
|
|
|
1008 |
|
|
|
1009 |
|changeNr|
|
|
|
1010 |
|
|
|
1011 |
changeNr := changeListView selection.
|
|
|
1012 |
changeNr notNil ifTrue:[
|
|
|
1013 |
self withCursor:(Cursor execute) do:[
|
|
|
1014 |
self compareChange:changeNr
|
|
|
1015 |
]
|
|
|
1016 |
]
|
|
|
1017 |
!
|
|
|
1018 |
|
|
51
|
1019 |
saveClass:aClassName from:startNr
|
|
|
1020 |
"user wants changes from current to end to be appended to a file"
|
|
|
1021 |
|
|
73
|
1022 |
|changeNr fileName|
|
|
51
|
1023 |
|
|
|
1024 |
changeNr := changeListView selection.
|
|
|
1025 |
changeNr notNil ifTrue:[
|
|
77
|
1026 |
fileName := Dialog
|
|
73
|
1027 |
requestFileName:'append changes for class to:'
|
|
|
1028 |
default:''
|
|
|
1029 |
ok:'append'
|
|
|
1030 |
abort:'abort'
|
|
|
1031 |
pattern:'*.chg'.
|
|
|
1032 |
|
|
|
1033 |
fileName notNil ifTrue:[
|
|
|
1034 |
self withCursor:(Cursor write) do:[
|
|
|
1035 |
startNr to:(changePositions size) do:[:changeNr |
|
|
|
1036 |
|thisClassName|
|
|
51
|
1037 |
|
|
73
|
1038 |
thisClassName := self classNameOfChange:changeNr.
|
|
|
1039 |
thisClassName = aClassName ifTrue:[
|
|
|
1040 |
changeListView selection:changeNr.
|
|
|
1041 |
(self appendChange:changeNr toFile:fileName) ifFalse:[
|
|
|
1042 |
^ self
|
|
|
1043 |
]
|
|
|
1044 |
]
|
|
|
1045 |
]
|
|
|
1046 |
]
|
|
|
1047 |
].
|
|
|
1048 |
]
|
|
|
1049 |
!
|
|
51
|
1050 |
|
|
73
|
1051 |
doDelete
|
|
|
1052 |
"delete currently selected change"
|
|
|
1053 |
|
|
|
1054 |
|changeNr|
|
|
|
1055 |
|
|
|
1056 |
changeNr := changeListView selection.
|
|
|
1057 |
changeNr notNil ifTrue:[
|
|
|
1058 |
self deleteChange:changeNr.
|
|
|
1059 |
self autoSelectOrEnd:changeNr
|
|
51
|
1060 |
]
|
|
|
1061 |
!
|
|
|
1062 |
|
|
37
|
1063 |
doSaveClassFrom:startNr
|
|
|
1064 |
"user wants changes from current to end to be appended to a file"
|
|
|
1065 |
|
|
|
1066 |
|changeNr classNameToSave|
|
|
|
1067 |
|
|
|
1068 |
changeNr := changeListView selection.
|
|
|
1069 |
changeNr notNil ifTrue:[
|
|
45
|
1070 |
classNameToSave := self classNameOfChange:changeNr.
|
|
|
1071 |
classNameToSave notNil ifTrue:[
|
|
|
1072 |
self saveClass:classNameToSave from:startNr
|
|
|
1073 |
]
|
|
37
|
1074 |
]
|
|
|
1075 |
!
|
|
|
1076 |
|
|
|
1077 |
doSaveRest
|
|
|
1078 |
"user wants changes from current to end to be appended to a file"
|
|
|
1079 |
|
|
73
|
1080 |
|changeNr fileName|
|
|
37
|
1081 |
|
|
|
1082 |
changeNr := changeListView selection.
|
|
|
1083 |
changeNr notNil ifTrue:[
|
|
77
|
1084 |
fileName := Dialog
|
|
73
|
1085 |
requestFileName:'append changes to:'
|
|
|
1086 |
default:''
|
|
|
1087 |
ok:'append'
|
|
|
1088 |
abort:'abort'
|
|
|
1089 |
pattern:'*.chg'.
|
|
37
|
1090 |
|
|
73
|
1091 |
fileName notNil ifTrue:[
|
|
|
1092 |
self withCursor:(Cursor write) do:[
|
|
|
1093 |
changeNr to:(changePositions size) do:[:changeNr |
|
|
|
1094 |
changeListView selection:changeNr.
|
|
|
1095 |
(self appendChange:changeNr toFile:fileName) ifFalse:[
|
|
|
1096 |
^ self
|
|
|
1097 |
]
|
|
|
1098 |
]
|
|
|
1099 |
]
|
|
|
1100 |
].
|
|
51
|
1101 |
]
|
|
|
1102 |
!
|
|
|
1103 |
|
|
37
|
1104 |
doSave
|
|
|
1105 |
"user wants a change to be appended to a file"
|
|
|
1106 |
|
|
73
|
1107 |
|changeNr fileName|
|
|
37
|
1108 |
|
|
|
1109 |
changeNr := changeListView selection.
|
|
|
1110 |
changeNr notNil ifTrue:[
|
|
77
|
1111 |
fileName := Dialog
|
|
73
|
1112 |
requestFileName:'append change to:'
|
|
|
1113 |
default:''
|
|
|
1114 |
ok:'append'
|
|
|
1115 |
abort:'abort'
|
|
|
1116 |
pattern:'*.chg'.
|
|
28
|
1117 |
|
|
73
|
1118 |
fileName notNil ifTrue:[
|
|
|
1119 |
self withCursor:(Cursor write) do:[
|
|
|
1120 |
self appendChange:changeNr toFile:fileName.
|
|
|
1121 |
].
|
|
|
1122 |
self autoSelect:(changeNr + 1)
|
|
|
1123 |
].
|
|
28
|
1124 |
]
|
|
|
1125 |
!
|
|
|
1126 |
|
|
51
|
1127 |
doUpdate
|
|
|
1128 |
"reread the changes-file"
|
|
|
1129 |
|
|
|
1130 |
self readChangesFileInBackground:true.
|
|
|
1131 |
realized ifTrue:[
|
|
|
1132 |
self setChangeList.
|
|
|
1133 |
]
|
|
73
|
1134 |
|
|
51
|
1135 |
!
|
|
|
1136 |
|
|
0
|
1137 |
doMakePermanent
|
|
|
1138 |
"user wants a change to be made permanent
|
|
|
1139 |
- rewrite the source file where this change has to go"
|
|
|
1140 |
|
|
51
|
1141 |
|yesNoBox|
|
|
0
|
1142 |
|
|
28
|
1143 |
yesNoBox := YesNoBox new.
|
|
1
|
1144 |
yesNoBox title:(resources at:'Warning: this operation cannot be undone').
|
|
28
|
1145 |
yesNoBox okText:(resources at:'continue').
|
|
1
|
1146 |
yesNoBox noText:(resources at:'abort').
|
|
51
|
1147 |
yesNoBox okAction:[ |changeNr|
|
|
|
1148 |
|
|
45
|
1149 |
changeNr := changeListView selection.
|
|
|
1150 |
changeNr notNil ifTrue:[
|
|
|
1151 |
self makeChangePermanent:changeNr.
|
|
|
1152 |
self autoSelect:(changeNr + 1)
|
|
|
1153 |
]
|
|
|
1154 |
].
|
|
0
|
1155 |
yesNoBox showAtPointer
|
|
|
1156 |
!
|
|
|
1157 |
|
|
|
1158 |
doMakePatch
|
|
|
1159 |
"user wants a change to be made a patch
|
|
|
1160 |
- copy it over to the patches file"
|
|
|
1161 |
|
|
|
1162 |
|changeNr|
|
|
|
1163 |
|
|
|
1164 |
changeNr := changeListView selection.
|
|
|
1165 |
changeNr notNil ifTrue:[
|
|
45
|
1166 |
self makeChangeAPatch:changeNr.
|
|
|
1167 |
self autoSelect:(changeNr + 1)
|
|
0
|
1168 |
]
|
|
|
1169 |
!
|
|
|
1170 |
|
|
49
|
1171 |
doDeleteRest
|
|
|
1172 |
"delete all changes from current to the end"
|
|
|
1173 |
|
|
|
1174 |
|changeNr|
|
|
|
1175 |
|
|
|
1176 |
changeNr := changeListView selection.
|
|
|
1177 |
changeNr notNil ifTrue:[
|
|
|
1178 |
self deleteChangesFrom:changeNr to:(changePositions size).
|
|
|
1179 |
self clearCodeView.
|
|
|
1180 |
self autoSelectOrEnd:changeNr-1
|
|
|
1181 |
]
|
|
|
1182 |
!
|
|
|
1183 |
|
|
45
|
1184 |
doCompress
|
|
|
1185 |
"compress the change-set; this replaces multiple method-changes by the last
|
|
|
1186 |
(i.e. the most recent) change"
|
|
|
1187 |
|
|
51
|
1188 |
|aStream searchIndex anyMore deleteSet index
|
|
|
1189 |
str snapshotProto snapshotPrefix snapshotNameIndex fileName|
|
|
45
|
1190 |
|
|
|
1191 |
aStream := FileStream readonlyFileNamed:changeFileName.
|
|
|
1192 |
aStream isNil ifTrue:[^ self].
|
|
|
1193 |
|
|
58
|
1194 |
CompressSnapshotInfo == true ifTrue:[
|
|
|
1195 |
"
|
|
|
1196 |
get a prototype snapshot record (to be independent of
|
|
|
1197 |
the actual format ..
|
|
|
1198 |
"
|
|
|
1199 |
str := WriteStream on:String new.
|
|
|
1200 |
Class addChangeRecordForSnapshot:'foo' to:str.
|
|
|
1201 |
snapshotProto := str contents.
|
|
|
1202 |
snapshotPrefix := snapshotProto copyTo:10.
|
|
|
1203 |
snapshotNameIndex := snapshotProto findString:'foo'.
|
|
|
1204 |
].
|
|
45
|
1205 |
|
|
|
1206 |
self withCursor:(Cursor execute) do:[
|
|
51
|
1207 |
|numChanges classes selectors types excla sawExcla
|
|
|
1208 |
changeNr chunk aParseTree parseTreeChunk
|
|
|
1209 |
thisClass thisSelector codeChunk codeParser|
|
|
|
1210 |
|
|
45
|
1211 |
numChanges := changePositions size.
|
|
|
1212 |
classes := Array new:numChanges.
|
|
|
1213 |
selectors := Array new:numChanges.
|
|
|
1214 |
types := Array new:numChanges.
|
|
|
1215 |
|
|
|
1216 |
"starting at the end, get the change class and change selector;
|
|
|
1217 |
collect all in classes / selectors"
|
|
|
1218 |
|
|
|
1219 |
changeNr := numChanges.
|
|
|
1220 |
excla := aStream class chunkSeparator.
|
|
|
1221 |
|
|
|
1222 |
[changeNr >= 1] whileTrue:[
|
|
|
1223 |
aStream position:(changePositions at:changeNr).
|
|
|
1224 |
sawExcla := aStream peekFor:excla.
|
|
|
1225 |
chunk := aStream nextChunk.
|
|
|
1226 |
sawExcla ifTrue:[
|
|
|
1227 |
"optimize a bit if multiple methods for same category arrive"
|
|
|
1228 |
(chunk = parseTreeChunk) ifFalse:[
|
|
|
1229 |
aParseTree := Parser parseExpression:chunk.
|
|
|
1230 |
parseTreeChunk := chunk
|
|
|
1231 |
].
|
|
|
1232 |
(aParseTree notNil
|
|
|
1233 |
and:[(aParseTree ~~ #Error)
|
|
|
1234 |
and:[aParseTree isMessage]]) ifTrue:[
|
|
|
1235 |
(aParseTree selector == #methodsFor:) ifTrue:[
|
|
|
1236 |
thisClass := (aParseTree receiver evaluate).
|
|
|
1237 |
codeChunk := aStream nextChunk.
|
|
|
1238 |
codeParser := Parser
|
|
|
1239 |
parseMethodSpecification:codeChunk
|
|
|
1240 |
in:thisClass
|
|
|
1241 |
ignoreErrors:true
|
|
|
1242 |
ignoreWarnings:true.
|
|
|
1243 |
codeParser notNil ifTrue:[
|
|
|
1244 |
selectors at:changeNr put:(codeParser selector).
|
|
|
1245 |
classes at:changeNr put:thisClass.
|
|
|
1246 |
types at:changeNr put:#methodsFor
|
|
|
1247 |
]
|
|
|
1248 |
]
|
|
|
1249 |
]
|
|
|
1250 |
] ifFalse:[
|
|
|
1251 |
aParseTree := Parser parseExpression:chunk.
|
|
|
1252 |
parseTreeChunk := chunk.
|
|
|
1253 |
(aParseTree notNil
|
|
|
1254 |
and:[(aParseTree ~~ #Error)
|
|
|
1255 |
and:[aParseTree isMessage]]) ifTrue:[
|
|
|
1256 |
(aParseTree selector == #removeSelector:) ifTrue:[
|
|
|
1257 |
selectors at:changeNr put:(aParseTree arg1 value ).
|
|
|
1258 |
classes at:changeNr put:(aParseTree receiver evaluate).
|
|
|
1259 |
types at:changeNr put:#removeSelector
|
|
|
1260 |
]
|
|
|
1261 |
] ifFalse:[
|
|
58
|
1262 |
CompressSnapshotInfo == true ifTrue:[
|
|
|
1263 |
(chunk startsWith:snapshotPrefix) ifTrue:[
|
|
|
1264 |
str := chunk readStream position:snapshotNameIndex.
|
|
|
1265 |
fileName := str upTo:(Character space).
|
|
|
1266 |
"
|
|
|
1267 |
kludge to allow use of match-check below
|
|
|
1268 |
"
|
|
|
1269 |
selectors at:changeNr put:snapshotPrefix.
|
|
|
1270 |
classes at:changeNr put:fileName.
|
|
|
1271 |
]
|
|
45
|
1272 |
]
|
|
|
1273 |
]
|
|
|
1274 |
].
|
|
|
1275 |
changeNr := changeNr - 1
|
|
|
1276 |
].
|
|
|
1277 |
aStream close.
|
|
|
1278 |
|
|
|
1279 |
"for all changes, look for another class/selector occurence later
|
|
|
1280 |
in the list and, if there is one, add change number to the delete set"
|
|
|
1281 |
|
|
|
1282 |
deleteSet := OrderedCollection new.
|
|
|
1283 |
changeNr := 1.
|
|
|
1284 |
[changeNr < changePositions size] whileTrue:[
|
|
|
1285 |
thisClass := classes at:changeNr.
|
|
|
1286 |
thisSelector := selectors at:changeNr.
|
|
|
1287 |
searchIndex := changeNr.
|
|
|
1288 |
anyMore := true.
|
|
|
1289 |
[anyMore] whileTrue:[
|
|
|
1290 |
searchIndex := classes indexOf:thisClass
|
|
|
1291 |
startingAt:(searchIndex + 1).
|
|
|
1292 |
(searchIndex ~~ 0) ifTrue:[
|
|
|
1293 |
((selectors at:searchIndex) == thisSelector) ifTrue:[
|
|
|
1294 |
thisClass notNil ifTrue:[
|
|
|
1295 |
deleteSet add:changeNr.
|
|
|
1296 |
anyMore := false
|
|
|
1297 |
]
|
|
|
1298 |
]
|
|
|
1299 |
] ifFalse:[
|
|
|
1300 |
anyMore := false
|
|
|
1301 |
]
|
|
|
1302 |
].
|
|
|
1303 |
changeNr := changeNr + 1
|
|
|
1304 |
].
|
|
|
1305 |
|
|
|
1306 |
"finally delete what has been found"
|
|
|
1307 |
|
|
|
1308 |
(deleteSet size > 0) ifTrue:[
|
|
51
|
1309 |
changeListView deselect.
|
|
45
|
1310 |
index := deleteSet size.
|
|
|
1311 |
[index > 0] whileTrue:[
|
|
|
1312 |
self silentDeleteChange:(deleteSet at:index).
|
|
|
1313 |
index := index - 1
|
|
|
1314 |
].
|
|
|
1315 |
self setChangeList.
|
|
51
|
1316 |
"
|
|
|
1317 |
scroll back a bit, if we are left way behind the list
|
|
|
1318 |
"
|
|
49
|
1319 |
changeListView firstLineShown > changePositions size ifTrue:[
|
|
|
1320 |
changeListView makeLineVisible:changePositions size
|
|
45
|
1321 |
].
|
|
|
1322 |
self clearCodeView
|
|
|
1323 |
]
|
|
|
1324 |
]
|
|
|
1325 |
!
|
|
|
1326 |
|
|
73
|
1327 |
doApplyRest
|
|
|
1328 |
"user wants all changes from changeNr to be applied"
|
|
|
1329 |
|
|
|
1330 |
self withSelectedChangeDo:[:changeNr |
|
|
|
1331 |
self clearCodeView.
|
|
|
1332 |
skipSignal isNil ifTrue:[skipSignal := Signal new].
|
|
|
1333 |
changeNr to:(changePositions size) do:[:changeNr |
|
|
|
1334 |
changeListView selection:changeNr.
|
|
|
1335 |
self applyChange:changeNr
|
|
|
1336 |
].
|
|
|
1337 |
self autoSelect:changePositions size.
|
|
|
1338 |
]
|
|
|
1339 |
!
|
|
|
1340 |
|
|
51
|
1341 |
doApplyAll
|
|
|
1342 |
"user wants all changes to be applied"
|
|
45
|
1343 |
|
|
51
|
1344 |
self withCursor:(Cursor execute) do:[
|
|
|
1345 |
self clearCodeView.
|
|
|
1346 |
skipSignal isNil ifTrue:[skipSignal := Signal new].
|
|
|
1347 |
1 to:(changePositions size) do:[:changeNr |
|
|
|
1348 |
changeListView selection:changeNr.
|
|
|
1349 |
self applyChange:changeNr
|
|
|
1350 |
].
|
|
57
|
1351 |
self autoSelectLast
|
|
0
|
1352 |
]
|
|
|
1353 |
!
|
|
|
1354 |
|
|
51
|
1355 |
doWriteBack
|
|
|
1356 |
"write back the list onto the changes file"
|
|
|
1357 |
|
|
|
1358 |
anyChanges ifTrue:[
|
|
|
1359 |
self writeBackChanges.
|
|
|
1360 |
realized ifTrue:[
|
|
|
1361 |
self readChangesFileInBackground:false.
|
|
|
1362 |
realized ifTrue:[
|
|
|
1363 |
self setChangeList
|
|
|
1364 |
]
|
|
|
1365 |
]
|
|
|
1366 |
]
|
|
|
1367 |
!
|
|
|
1368 |
|
|
73
|
1369 |
doDeleteClassRest
|
|
|
1370 |
"delete rest of changes with same class as currently selected change"
|
|
|
1371 |
|
|
|
1372 |
self withSelectedChangeDo:[:changeNr |
|
|
|
1373 |
| classNameToDelete |
|
|
|
1374 |
|
|
|
1375 |
classNameToDelete := self classNameOfChange:changeNr.
|
|
|
1376 |
classNameToDelete notNil ifTrue:[
|
|
|
1377 |
changeListView selection:nil.
|
|
|
1378 |
self silentDeleteChangesFor:classNameToDelete
|
|
|
1379 |
from:changeNr
|
|
|
1380 |
to:(changePositions size).
|
|
|
1381 |
self setChangeList.
|
|
|
1382 |
self autoSelectOrEnd:changeNr
|
|
|
1383 |
]
|
|
|
1384 |
]
|
|
|
1385 |
!
|
|
|
1386 |
|
|
51
|
1387 |
doDeleteClassAll
|
|
|
1388 |
"delete all changes with same class as currently selected change"
|
|
|
1389 |
|
|
73
|
1390 |
self withSelectedChangeDo:[:changeNr |
|
|
|
1391 |
| classNameToDelete |
|
|
51
|
1392 |
|
|
73
|
1393 |
classNameToDelete := self classNameOfChange:changeNr.
|
|
|
1394 |
classNameToDelete notNil ifTrue:[
|
|
|
1395 |
changeListView selection:nil.
|
|
|
1396 |
self silentDeleteChangesFor:classNameToDelete
|
|
|
1397 |
from:1
|
|
|
1398 |
to:(changePositions size).
|
|
|
1399 |
self setChangeList.
|
|
|
1400 |
self autoSelectOrEnd:changeNr
|
|
51
|
1401 |
]
|
|
|
1402 |
]
|
|
|
1403 |
!
|
|
|
1404 |
|
|
|
1405 |
doApplyClassRest
|
|
|
1406 |
"user wants all changes for this class from changeNr to be applied"
|
|
|
1407 |
|
|
73
|
1408 |
self withSelectedChangeDo:[:changeNr |
|
|
|
1409 |
|thisClassName classNameToApply lastChange|
|
|
51
|
1410 |
|
|
73
|
1411 |
classNameToApply := self classNameOfChange:changeNr.
|
|
|
1412 |
classNameToApply notNil ifTrue:[
|
|
|
1413 |
self clearCodeView.
|
|
|
1414 |
skipSignal isNil ifTrue:[skipSignal := Signal new].
|
|
|
1415 |
changeNr to:(changePositions size) do:[:changeNr |
|
|
|
1416 |
thisClassName := self classNameOfChange:changeNr.
|
|
|
1417 |
thisClassName = classNameToApply ifTrue:[
|
|
|
1418 |
changeListView selection:changeNr.
|
|
|
1419 |
self applyChange:changeNr.
|
|
|
1420 |
lastChange := changeNr
|
|
51
|
1421 |
].
|
|
73
|
1422 |
].
|
|
|
1423 |
self autoSelect:lastChange.
|
|
51
|
1424 |
]
|
|
|
1425 |
]
|
|
|
1426 |
! !
|
|
|
1427 |
|
|
73
|
1428 |
!ChangesBrowser methodsFor:'initialize / release'!
|
|
|
1429 |
|
|
|
1430 |
initialize
|
|
89
|
1431 |
|panel v upperFrame buttonPanel|
|
|
73
|
1432 |
|
|
|
1433 |
super initialize.
|
|
|
1434 |
|
|
|
1435 |
changeFileName := 'changes'.
|
|
89
|
1436 |
compareChanges := false.
|
|
73
|
1437 |
|
|
89
|
1438 |
panel := VariableVerticalPanel origin:(0.0 @ 0.0)
|
|
73
|
1439 |
corner:(1.0 @ 1.0)
|
|
|
1440 |
borderWidth:0
|
|
|
1441 |
in:self.
|
|
|
1442 |
|
|
89
|
1443 |
upperFrame := View origin:(0.0 @ 0.0) corner:(1.0 @ 0.3) in:panel.
|
|
|
1444 |
|
|
|
1445 |
v := ScrollableView for:SelectionInListView in:upperFrame.
|
|
|
1446 |
v origin:(0.0 @ 0.0) corner:(0.8 @ 1.0).
|
|
73
|
1447 |
changeListView := v scrolledView.
|
|
|
1448 |
changeListView delegate:self.
|
|
98
|
1449 |
changeListView menuHolder:self; menuPerformer:self; menuMessage:#changeListMenu.
|
|
73
|
1450 |
|
|
89
|
1451 |
buttonPanel := VerticalPanelView in:upperFrame.
|
|
|
1452 |
buttonPanel origin:(0.8 @ 0.0) corner:(1.0 @ 1.0).
|
|
105
|
1453 |
buttonPanel verticalLayout:#topSpace.
|
|
89
|
1454 |
|
|
|
1455 |
compareCheckBox := CheckBox new.
|
|
|
1456 |
compareCheckBox label:(resources string:'compare').
|
|
93
|
1457 |
compareCheckBox action:[:val | self compare:val].
|
|
89
|
1458 |
buttonPanel addSubView:compareCheckBox.
|
|
|
1459 |
|
|
|
1460 |
v := HVScrollableView for:CodeView miniScrollerH:true miniScrollerV:false in:panel.
|
|
73
|
1461 |
v origin:(0.0 @ 0.3) corner:(1.0 @ 1.0).
|
|
|
1462 |
codeView := v scrolledView.
|
|
|
1463 |
codeView readOnly.
|
|
|
1464 |
|
|
|
1465 |
anyChanges := false.
|
|
|
1466 |
ObjectMemory addDependent:self. "to get shutdown-update"
|
|
|
1467 |
!
|
|
|
1468 |
|
|
|
1469 |
focusSequence
|
|
|
1470 |
^ Array with:changeListView with:codeView
|
|
|
1471 |
!
|
|
|
1472 |
|
|
|
1473 |
realize
|
|
|
1474 |
super realize.
|
|
|
1475 |
self readChangesFileInBackground:true.
|
|
|
1476 |
self setChangeList.
|
|
|
1477 |
changeListView action:[:lineNr | self changeSelection:lineNr].
|
|
|
1478 |
|
|
|
1479 |
!
|
|
|
1480 |
|
|
|
1481 |
update:what
|
|
|
1482 |
|box|
|
|
|
1483 |
|
|
|
1484 |
(what == #aboutToExit) ifTrue:[
|
|
|
1485 |
"
|
|
|
1486 |
smalltalk is about to shut down -
|
|
|
1487 |
- if change list was modified, ask user and save if requested.
|
|
|
1488 |
"
|
|
|
1489 |
anyChanges ifTrue:[
|
|
105
|
1490 |
self raiseDeiconified.
|
|
73
|
1491 |
|
|
|
1492 |
box := YesNoBox new.
|
|
75
|
1493 |
box title:(resources at:'changefile has not been updated from the modified changelist.\\Update before exiting ?') withCRs.
|
|
73
|
1494 |
box noText:(resources at:'don''t update').
|
|
|
1495 |
box okText:(resources at:'update').
|
|
|
1496 |
box yesAction:[self writeBackChanges]
|
|
|
1497 |
noAction:[].
|
|
|
1498 |
box showAtPointer
|
|
|
1499 |
].
|
|
|
1500 |
^ self
|
|
|
1501 |
].
|
|
|
1502 |
super update:what
|
|
|
1503 |
!
|
|
|
1504 |
|
|
89
|
1505 |
compare:aBoolean
|
|
|
1506 |
"sent from the compare-toggle"
|
|
|
1507 |
|
|
|
1508 |
aBoolean ~~ compareChanges ifTrue:[
|
|
|
1509 |
compareChanges := aBoolean.
|
|
|
1510 |
compareChanges ifTrue:[
|
|
|
1511 |
self doUpdate
|
|
|
1512 |
]
|
|
|
1513 |
]
|
|
|
1514 |
!
|
|
|
1515 |
|
|
73
|
1516 |
changeListMenu
|
|
|
1517 |
|labels selectors m|
|
|
|
1518 |
|
|
|
1519 |
labels := #(
|
|
|
1520 |
'apply change'
|
|
|
1521 |
'apply changes to end'
|
|
|
1522 |
'apply changes for this class to end'
|
|
|
1523 |
'apply all changes'
|
|
|
1524 |
'-'
|
|
|
1525 |
'delete'
|
|
|
1526 |
'delete to end'
|
|
|
1527 |
'delete changes for this class to end'
|
|
|
1528 |
'delete all changes for this class'
|
|
|
1529 |
'-'
|
|
|
1530 |
'update'
|
|
|
1531 |
'compress'
|
|
|
1532 |
'compare with current version'
|
|
|
1533 |
'browse class'
|
|
|
1534 |
'-'
|
|
|
1535 |
'make change a patch'
|
|
|
1536 |
"/ 'update sourcefile from change'
|
|
|
1537 |
"/ '-'
|
|
|
1538 |
'save change in file ...'
|
|
|
1539 |
'save changes to end in file ...'
|
|
|
1540 |
'save changes for this class to end in file ...'
|
|
|
1541 |
'save all changes for this class in file ...'
|
|
|
1542 |
'-'
|
|
|
1543 |
'writeback changeFile').
|
|
|
1544 |
|
|
|
1545 |
selectors := #(
|
|
|
1546 |
doApply
|
|
|
1547 |
doApplyRest
|
|
|
1548 |
doApplyClassRest
|
|
|
1549 |
doApplyAll
|
|
|
1550 |
nil
|
|
|
1551 |
doDelete
|
|
|
1552 |
doDeleteRest
|
|
|
1553 |
doDeleteClassRest
|
|
|
1554 |
doDeleteClassAll
|
|
|
1555 |
nil
|
|
|
1556 |
doUpdate
|
|
|
1557 |
doCompress
|
|
|
1558 |
doCompare
|
|
|
1559 |
doBrowse
|
|
|
1560 |
nil
|
|
|
1561 |
doMakePatch
|
|
|
1562 |
"/ doMakePermanent
|
|
|
1563 |
"/ nil
|
|
|
1564 |
doSave
|
|
|
1565 |
doSaveRest
|
|
|
1566 |
doSaveClassRest
|
|
|
1567 |
doSaveClassAll
|
|
|
1568 |
nil
|
|
|
1569 |
doWriteBack
|
|
|
1570 |
).
|
|
|
1571 |
|
|
|
1572 |
m := PopUpMenu
|
|
|
1573 |
labels:(resources array:labels)
|
|
|
1574 |
selectors:selectors.
|
|
|
1575 |
|
|
|
1576 |
changeListView hasSelection ifFalse:[
|
|
106
|
1577 |
m disableAll:#(doApply doApplyClassRest doApplyRest doDelete doDeleteRest doDeleteClassRest
|
|
|
1578 |
doDeleteClassAll doCompare doMakePatch doSaveChangeInFile doMakePermanent
|
|
|
1579 |
doSave doSaveRest doSaveClassAll doSaveClassRest doBrowse)
|
|
73
|
1580 |
].
|
|
|
1581 |
^ m
|
|
|
1582 |
! !
|
|
|
1583 |
|
|
|
1584 |
!ChangesBrowser methodsFor:'event handling '!
|
|
|
1585 |
|
|
81
|
1586 |
handlesKeyPress:key inView:view
|
|
|
1587 |
"this method is reached via delegation: are we prepared to handle
|
|
|
1588 |
a keyPress in some other view ?"
|
|
|
1589 |
|
|
|
1590 |
view == changeListView ifTrue:[
|
|
98
|
1591 |
(key == #Delete or:[key == #BackSpace]) ifTrue:[^ true].
|
|
81
|
1592 |
].
|
|
|
1593 |
^ false
|
|
|
1594 |
!
|
|
|
1595 |
|
|
73
|
1596 |
keyPress:key x:x y:y view:view
|
|
|
1597 |
"this method is reached via delegation from the changeListView"
|
|
|
1598 |
|
|
98
|
1599 |
(key == #Delete or:[key == #BackSpace]) ifTrue:[
|
|
73
|
1600 |
self doDelete.
|
|
|
1601 |
^ self
|
|
|
1602 |
].
|
|
|
1603 |
changeListView keyPress:key x:x y:y
|
|
|
1604 |
! !
|
|
|
1605 |
|
|
51
|
1606 |
!ChangesBrowser methodsFor:'termination'!
|
|
|
1607 |
|
|
|
1608 |
terminate
|
|
|
1609 |
"window manager wants us to go away"
|
|
|
1610 |
|
|
107
|
1611 |
|action|
|
|
51
|
1612 |
|
|
|
1613 |
anyChanges ifTrue:[
|
|
73
|
1614 |
action := OptionBox
|
|
|
1615 |
request:(resources at:'changefile has not been updated from the modified changelist.\\Update before closing ?') withCRs
|
|
|
1616 |
label:'ChangesBrowser'
|
|
|
1617 |
form:(WarningBox iconBitmap)
|
|
75
|
1618 |
buttonLabels:(resources array:#('abort' 'don''t update' 'update'))
|
|
73
|
1619 |
values:#(#abort #ignore #save).
|
|
|
1620 |
action == #abort ifTrue:[^ self].
|
|
|
1621 |
action == #save ifTrue:[
|
|
|
1622 |
self writeBackChanges
|
|
|
1623 |
].
|
|
|
1624 |
].
|
|
|
1625 |
self destroy
|
|
51
|
1626 |
!
|
|
|
1627 |
|
|
|
1628 |
destroy
|
|
|
1629 |
"destroy the receiver; make certain, that boxes are destroyed too"
|
|
|
1630 |
|
|
|
1631 |
ObjectMemory removeDependent:self.
|
|
|
1632 |
super destroy
|
|
|
1633 |
!
|
|
|
1634 |
|
|
|
1635 |
saveAndTerminate
|
|
|
1636 |
"update the changes file and quit.
|
|
|
1637 |
Dont depend on this being sent, not all window managers
|
|
|
1638 |
send it; instead, they simply destroy the view."
|
|
|
1639 |
|
|
|
1640 |
anyChanges ifTrue:[
|
|
|
1641 |
self writeBackChanges.
|
|
|
1642 |
].
|
|
|
1643 |
self destroy
|
|
45
|
1644 |
! !
|
|
|
1645 |
|
|
89
|
1646 |
!ChangesBrowser methodsFor:'help '!
|
|
|
1647 |
|
|
|
1648 |
helpTextFor:aComponent
|
|
|
1649 |
aComponent == codeView ifTrue:[
|
|
|
1650 |
^ resources string:'HELP_CODEVIEW'
|
|
|
1651 |
].
|
|
|
1652 |
aComponent == changeListView ifTrue:[
|
|
|
1653 |
^ resources string:'HELP_CHANGELIST'
|
|
|
1654 |
].
|
|
90
|
1655 |
((aComponent == compareCheckBox)
|
|
|
1656 |
or:[aComponent superView == compareCheckBox]) ifTrue:[
|
|
89
|
1657 |
^ resources string:'HELP_CHECK_COMPARE'
|
|
|
1658 |
].
|
|
|
1659 |
^ nil
|
|
|
1660 |
! !
|
|
|
1661 |
|
|
93
|
1662 |
!ChangesBrowser methodsFor:'compiler interface'!
|
|
|
1663 |
|
|
|
1664 |
wantChangeLog
|
|
|
1665 |
"sent by the compiler to ask if a changeLog entry should
|
|
|
1666 |
be written. Return false here."
|
|
|
1667 |
|
|
|
1668 |
^ false
|
|
|
1669 |
! !
|
|
|
1670 |
|
|
45
|
1671 |
!ChangesBrowser methodsFor:'error handling'!
|
|
|
1672 |
|
|
92
|
1673 |
correctableError:aString position:relPos to:relEndPos from:aCompiler
|
|
45
|
1674 |
"compiler notifys us of an error - this should really not happen since
|
|
|
1675 |
changes ought to be correct (did someone edit the changes file ??).
|
|
|
1676 |
Show the bad change in the codeView and let codeView hilight the error;
|
|
|
1677 |
no corrections allowed here therefore return false"
|
|
|
1678 |
|
|
92
|
1679 |
self error:aString position:relPos to:relEndPos from:aCompiler.
|
|
45
|
1680 |
^ false
|
|
0
|
1681 |
!
|
|
|
1682 |
|
|
92
|
1683 |
warning:aString position:relPos to:relEndPos from:aCompiler
|
|
51
|
1684 |
"compiler notifys us of a warning - ignore it"
|
|
|
1685 |
|
|
|
1686 |
^ self
|
|
|
1687 |
!
|
|
|
1688 |
|
|
92
|
1689 |
error:aString position:relPos to:relEndPos from:aCompiler
|
|
45
|
1690 |
"compiler notifys us of an error - this should really not happen since
|
|
|
1691 |
changes ought to be correct (did someone edit the changes file ??).
|
|
|
1692 |
Show the bad change in the codeView and let codeView hilight the error"
|
|
0
|
1693 |
|
|
45
|
1694 |
|action|
|
|
0
|
1695 |
|
|
45
|
1696 |
(changeNrProcessed ~~ changeNrShown) ifTrue:[
|
|
|
1697 |
self changeSelection:changeNrProcessed
|
|
|
1698 |
].
|
|
|
1699 |
(skipSignal notNil) ifTrue:[
|
|
0
|
1700 |
|
|
45
|
1701 |
codeView highlightingErrorPosition:relPos to:relEndPos do:[
|
|
|
1702 |
|box|
|
|
0
|
1703 |
|
|
45
|
1704 |
"
|
|
|
1705 |
start dialog - make certain cleanup is done
|
|
|
1706 |
"
|
|
73
|
1707 |
action := OptionBox
|
|
|
1708 |
request:aString
|
|
|
1709 |
label:'Error'
|
|
|
1710 |
form:(WarningBox iconBitmap)
|
|
|
1711 |
buttonLabels:#('abort' 'skip' 'continue')
|
|
|
1712 |
values:#(#abort #skip #continue).
|
|
45
|
1713 |
].
|
|
0
|
1714 |
|
|
45
|
1715 |
action == #abort ifTrue:[
|
|
|
1716 |
Object abortSignal raise.
|
|
|
1717 |
^ false
|
|
|
1718 |
].
|
|
|
1719 |
action == #skip ifTrue:[
|
|
|
1720 |
skipSignal raise.
|
|
|
1721 |
^ false
|
|
|
1722 |
].
|
|
|
1723 |
^ false
|
|
|
1724 |
].
|
|
103
|
1725 |
^ codeView error:aString position:relPos to:relEndPos from:aCompiler
|
|
45
|
1726 |
! !
|