| author | Claus Gittinger <cg@exept.de> |
| Sat, 29 Jan 2011 11:24:38 +0100 | |
| changeset 9715 | 3be7736915bb |
| parent 9689 | 72819fbf329a |
| child 9718 | e6466884cb4e |
| permissions | -rw-r--r-- |
| 0 | 1 |
" |
| 4 | 2 |
COPYRIGHT (c) 1990 by Claus Gittinger |
| 6288 | 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 |
" |
|
|
2664
541f43019451
fixed class-chunk remembering (remember the full chunk,
Claus Gittinger <cg@exept.de>
parents:
2641
diff
changeset
|
12 |
"{ Package: 'stx:libtool' }"
|
|
541f43019451
fixed class-chunk remembering (remember the full chunk,
Claus Gittinger <cg@exept.de>
parents:
2641
diff
changeset
|
13 |
|
| 0 | 14 |
StandardSystemView subclass:#ChangesBrowser |
| 4489 | 15 |
instanceVariableNames:'changeListView codeView diffView changeFileName changeChunks |
16 |
changePositions changeClassNames changeSelectors |
|
17 |
changeHeaderLines changeIsFollowupMethodChange anyChanges |
|
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
18 |
changeNrShown changeNrProcessed multipleApply autoCompare |
| 4489 | 19 |
changeFileSize changeFileTimestamp checkBlock changeTimeStamps |
20 |
tabSpec autoUpdate editingClassSource lastSearchType |
|
21 |
lastSearchString applyInOriginalNameSpace lastSaveFileName |
|
22 |
readOnly enforcedPackage enforcedNameSpace updateChangeSet |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
23 |
showingDiffs diffViewBox autoloadAsRequired |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
24 |
classesNotToBeAutoloaded encodingIfKnown' |
|
7631
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
25 |
classVariableNames:'CompressSnapshotInfo NoColoring ShowWarningDialogs |
| 9168 | 26 |
DefaultAutoCompare DefaultShowingDiffs LastEnforcedNameSpace |
27 |
KeepEnforcedNameSpace' |
|
| 4489 | 28 |
poolDictionaries:'' |
29 |
category:'Interface-Browsers' |
|
| 0 | 30 |
! |
31 |
||
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
32 |
Object subclass:#ChangeFileReader |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
33 |
instanceVariableNames:'browser enforcedNameSpace changeFileName changeFileSize |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
34 |
changeFileTimestamp changeChunks changeClassNames |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
35 |
changeHeaderLines changePositions changeTimeStamps |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
36 |
changeIsFollowupMethodChange autoCompare autoloadAsRequired |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
37 |
tabSpec anyChanges inStream thisIsAClassSource chunkText |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
38 |
chunkPosition sawExcla fullChunkText noColoring timeStampInfo |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
39 |
changeString changeType changeDelta headerLine maxLen' |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
40 |
classVariableNames:'NoColoring' |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
41 |
poolDictionaries:'' |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
42 |
privateIn:ChangesBrowser |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
43 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
44 |
|
| 761 | 45 |
!ChangesBrowser class methodsFor:'documentation'! |
| 29 | 46 |
|
47 |
copyright |
|
48 |
" |
|
49 |
COPYRIGHT (c) 1990 by Claus Gittinger |
|
| 6288 | 50 |
All Rights Reserved |
| 0 | 51 |
|
| 29 | 52 |
This software is furnished under a license and may be used |
53 |
only in accordance with the terms of that license and with the |
|
54 |
inclusion of the above copyright notice. This software may not |
|
55 |
be provided or otherwise made available to, or used by, any |
|
56 |
other person. No title to or ownership of the software is |
|
57 |
hereby transferred. |
|
58 |
" |
|
59 |
! |
|
60 |
||
61 |
documentation |
|
62 |
" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
63 |
this implements a browser for the changes-file (actually, it can display |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
64 |
any sourceFiles contents). |
| 29 | 65 |
See the extra document 'doc/misc/cbrowser.doc' for how to use this browser. |
66 |
||
67 |
written jan 90 by claus |
|
| 51 | 68 |
|
| 5703 | 69 |
This is a very old leftover class (The Merovingian has not yet detected this one ;-) |
70 |
It will be completely replaced by the ChangeSetBrowser class in the near future. |
|
71 |
||
72 |
||
| 508 | 73 |
[Class variables:] |
| 6288 | 74 |
CompressSnapshotInfo if true (the default), snapshot entries |
75 |
are also compressed in the compress function. |
|
76 |
Some users prefer them to be not compressed. |
|
77 |
Set it to false for this. |
|
| 58 | 78 |
|
| 51 | 79 |
Notice: |
| 6288 | 80 |
this needs a total rewrite, to build up a changeSet from the file |
81 |
(which did not exist when the ChangesBrowser was originally written) |
|
82 |
and manipulate that changeSet. |
|
83 |
||
84 |
This way, we get a browser for any upcoming incore changeSets for |
|
85 |
free. Also, this will put the chunk analyzation code into Change and |
|
86 |
subclasses (where it belongs) and give a better encapsulation and |
|
87 |
overall structure. Do not take this as an example for good style ;-) |
|
88 |
||
89 |
The Change hierarchy is currently been completed, and the changes browser |
|
90 |
will be adapted soon. |
|
| 508 | 91 |
|
92 |
[author:] |
|
| 6288 | 93 |
Claus Gittinger |
| 508 | 94 |
|
95 |
[start with:] |
|
| 6288 | 96 |
ChangesBrowser open |
| 1359 | 97 |
|
98 |
[see also:] |
|
| 6288 | 99 |
( Using the ChangesBrowser :html: tools/cbrowser/TOP.html ) |
100 |
||
| 29 | 101 |
" |
102 |
! ! |
|
| 0 | 103 |
|
| 761 | 104 |
!ChangesBrowser class methodsFor:'instance creation'! |
| 45 | 105 |
|
106 |
new |
|
107 |
"create a new changes browser" |
|
108 |
||
| 6288 | 109 |
^ super |
110 |
label:(self defaultLabel) |
|
111 |
icon:(self defaultIcon) |
|
| 1470 | 112 |
|
113 |
"Modified: / 6.2.1998 / 13:25:18 / cg" |
|
| 45 | 114 |
! |
115 |
||
| 8379 | 116 |
openOn:aFilename |
| 9525 | 117 |
"create & open a changes browser on a change file" |
| 5696 | 118 |
|
| 8379 | 119 |
|fileName browser| |
120 |
||
121 |
fileName := aFilename asFilename pathName. |
|
122 |
||
123 |
(self isXMLFile:fileName) ifTrue:[ |
|
124 |
browser := ChangeSetBrowser new |
|
| 5696 | 125 |
] ifFalse:[ |
| 8379 | 126 |
browser := self new |
127 |
]. |
|
128 |
||
129 |
browser label:(self defaultLabel , ': ', fileName). |
|
130 |
browser changeFileName:fileName. |
|
| 5696 | 131 |
browser open. |
132 |
^ browser |
|
| 9525 | 133 |
|
134 |
"Modified: / 18-07-2010 / 10:32:18 / cg" |
|
| 45 | 135 |
! ! |
136 |
||
| 761 | 137 |
!ChangesBrowser class methodsFor:'behavior'! |
| 0 | 138 |
|
139 |
autoSelectNext |
|
140 |
"returning true here, makes a Delete operation automatically |
|
141 |
select the next change" |
|
142 |
||
143 |
^ true |
|
144 |
! ! |
|
145 |
||
| 761 | 146 |
!ChangesBrowser class methodsFor:'defaults'! |
| 0 | 147 |
|
| 489 | 148 |
defaultIcon |
| 1153 | 149 |
"return the browsers default window icon" |
150 |
||
|
7631
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
151 |
<resource: #programImage> |
|
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
152 |
|
|
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
153 |
^ ToolbarIconLibrary startChangesBrowserIcon |
| 489 | 154 |
! |
155 |
||
| 73 | 156 |
defaultLabel |
| 5527 | 157 |
^ self classResources string:'Changes Browser' |
| 2417 | 158 |
! |
159 |
||
160 |
isVisualStartable |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
161 |
"return true, if this application can be started via #open. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
162 |
(to allow start of a change browser via double-click in the browser)" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
163 |
|
| 2417 | 164 |
^ true |
165 |
||
166 |
"Created: / 27.9.1999 / 12:28:27 / cg" |
|
| 28 | 167 |
! ! |
168 |
||
| 3202 | 169 |
!ChangesBrowser class methodsFor:'menu specs'! |
170 |
||
171 |
menuSpec |
|
172 |
"This resource specification was automatically generated |
|
173 |
by the MenuEditor of ST/X." |
|
174 |
||
175 |
"Do not manually edit this!! If it is corrupted, |
|
176 |
the MenuEditor may not be able to read the specification." |
|
177 |
||
178 |
" |
|
179 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpec |
|
180 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpec)) startUp |
|
181 |
" |
|
182 |
||
183 |
<resource: #menu> |
|
184 |
||
| 7360 | 185 |
^ |
| 6216 | 186 |
#(Menu |
| 7096 | 187 |
( |
188 |
(MenuItem |
|
189 |
label: 'File' |
|
190 |
translateLabel: true |
|
| 7360 | 191 |
submenu: |
| 7096 | 192 |
(Menu |
193 |
( |
|
194 |
(MenuItem |
|
195 |
label: 'Compress' |
|
196 |
itemValue: doCompress |
|
197 |
translateLabel: true |
|
198 |
isVisible: notEditingClassSource |
|
199 |
) |
|
200 |
(MenuItem |
|
201 |
enabled: hasSingleSelection |
|
202 |
label: 'Compress for Class' |
|
203 |
itemValue: doCompressClass |
|
204 |
translateLabel: true |
|
205 |
isVisible: notEditingClassSource |
|
206 |
) |
|
207 |
(MenuItem |
|
208 |
enabled: hasSingleSelection |
|
209 |
label: 'Compress for Class && Selector' |
|
210 |
itemValue: doCompressSelector |
|
211 |
translateLabel: true |
|
212 |
isVisible: notEditingClassSource |
|
213 |
) |
|
214 |
(MenuItem |
|
215 |
label: 'Compare and Compress' |
|
216 |
itemValue: doCompareAndCompress |
|
217 |
translateLabel: true |
|
218 |
isVisible: notEditingClassSource |
|
219 |
) |
|
220 |
(MenuItem |
|
221 |
label: '-' |
|
222 |
isVisible: notEditingClassSource |
|
223 |
) |
|
224 |
(MenuItem |
|
225 |
enabled: hasSingleSelection |
|
226 |
label: 'Fileout && Delete all Changes for Class' |
|
227 |
itemValue: doFileoutAndDeleteClassAll |
|
228 |
translateLabel: true |
|
229 |
isVisible: notEditingClassSource |
|
230 |
) |
|
231 |
(MenuItem |
|
232 |
enabled: hasSelection |
|
233 |
label: 'CheckIn && Delete all Changes for Class' |
|
234 |
itemValue: doCheckinAndDeleteClassAll |
|
235 |
translateLabel: true |
|
236 |
isVisible: notEditingClassSource |
|
237 |
) |
|
238 |
(MenuItem |
|
239 |
label: '-' |
|
240 |
isVisible: notEditingClassSource |
|
241 |
) |
|
242 |
(MenuItem |
|
243 |
enabled: hasSelection |
|
244 |
label: 'Save In...' |
|
245 |
itemValue: doSave |
|
246 |
translateLabel: true |
|
247 |
) |
|
248 |
(MenuItem |
|
249 |
enabled: hasSingleSelection |
|
250 |
label: 'Save to End In...' |
|
251 |
itemValue: doSaveRest |
|
252 |
translateLabel: true |
|
253 |
) |
|
254 |
(MenuItem |
|
255 |
enabled: hasSingleSelection |
|
256 |
label: 'Save for Class to End In...' |
|
257 |
itemValue: doSaveClassRest |
|
258 |
translateLabel: true |
|
259 |
) |
|
260 |
(MenuItem |
|
261 |
enabled: hasSingleSelection |
|
262 |
label: 'Save all for Class In...' |
|
263 |
itemValue: doSaveClassAll |
|
264 |
translateLabel: true |
|
265 |
) |
|
266 |
(MenuItem |
|
267 |
label: '-' |
|
268 |
) |
|
269 |
(MenuItem |
|
270 |
label: 'Writeback ClassFile' |
|
271 |
itemValue: doWriteBack |
|
272 |
translateLabel: true |
|
273 |
isVisible: editingClassSource |
|
274 |
) |
|
275 |
(MenuItem |
|
276 |
label: 'Writeback ChangeFile' |
|
277 |
itemValue: doWriteBack |
|
278 |
translateLabel: true |
|
279 |
isVisible: notEditingClassSource |
|
280 |
) |
|
281 |
(MenuItem |
|
282 |
label: '-' |
|
283 |
) |
|
284 |
(MenuItem |
|
285 |
label: 'Update' |
|
286 |
itemValue: doUpdate |
|
287 |
translateLabel: true |
|
288 |
) |
|
289 |
(MenuItem |
|
290 |
label: '-' |
|
291 |
) |
|
292 |
(MenuItem |
|
293 |
label: 'Exit' |
|
294 |
itemValue: menuExit |
|
295 |
translateLabel: true |
|
296 |
) |
|
297 |
) |
|
298 |
nil |
|
299 |
nil |
|
300 |
) |
|
301 |
) |
|
302 |
(MenuItem |
|
303 |
label: 'Change' |
|
304 |
translateLabel: true |
|
| 7360 | 305 |
submenu: |
| 7096 | 306 |
(Menu |
307 |
( |
|
308 |
(MenuItem |
|
309 |
enabled: hasSelection |
|
310 |
label: 'Apply' |
|
311 |
itemValue: doApply |
|
312 |
translateLabel: true |
|
313 |
) |
|
314 |
(MenuItem |
|
315 |
enabled: hasSingleSelection |
|
316 |
label: 'Apply to End' |
|
317 |
itemValue: doApplyRest |
|
318 |
translateLabel: true |
|
319 |
) |
|
320 |
(MenuItem |
|
321 |
enabled: hasSingleSelection |
|
322 |
label: 'Apply from Begin' |
|
323 |
itemValue: doApplyFromBeginning |
|
324 |
translateLabel: true |
|
325 |
) |
|
326 |
(MenuItem |
|
327 |
enabled: hasSingleSelection |
|
328 |
label: 'Apply for Class to End' |
|
329 |
itemValue: doApplyClassRest |
|
330 |
translateLabel: true |
|
331 |
) |
|
332 |
(MenuItem |
|
333 |
enabled: hasSingleSelection |
|
334 |
label: 'Apply for Class from Begin' |
|
335 |
itemValue: doApplyClassFromBeginning |
|
336 |
translateLabel: true |
|
337 |
) |
|
338 |
(MenuItem |
|
339 |
enabled: hasNoSelection |
|
340 |
label: 'Apply All' |
|
341 |
itemValue: doApplyAll |
|
342 |
translateLabel: true |
|
343 |
) |
|
344 |
(MenuItem |
|
345 |
enabled: hasSingleSelection |
|
346 |
label: 'Apply to Conflict or End' |
|
347 |
itemValue: doApplyToConflictOrEnd |
|
348 |
translateLabel: true |
|
349 |
) |
|
350 |
(MenuItem |
|
351 |
label: '-' |
|
352 |
) |
|
353 |
(MenuItem |
|
354 |
enabled: hasSelection |
|
355 |
label: 'Delete' |
|
356 |
itemValue: doDelete |
|
357 |
translateLabel: true |
|
358 |
) |
|
359 |
(MenuItem |
|
360 |
enabled: hasSingleSelection |
|
361 |
label: 'Delete to End' |
|
362 |
itemValue: doDeleteRest |
|
363 |
translateLabel: true |
|
364 |
) |
|
365 |
(MenuItem |
|
366 |
enabled: hasSingleSelection |
|
367 |
label: 'Delete from Begin' |
|
368 |
itemValue: doDeleteFromBeginning |
|
369 |
translateLabel: true |
|
370 |
) |
|
371 |
(MenuItem |
|
372 |
enabled: hasSingleSelection |
|
373 |
label: 'Delete for Class to End' |
|
374 |
itemValue: doDeleteClassRest |
|
375 |
translateLabel: true |
|
376 |
) |
|
377 |
(MenuItem |
|
378 |
enabled: hasSingleSelection |
|
379 |
label: 'Delete for Class from Begin' |
|
380 |
itemValue: doDeleteClassFromBeginning |
|
381 |
translateLabel: true |
|
382 |
) |
|
383 |
(MenuItem |
|
384 |
enabled: hasSelection |
|
385 |
label: 'Delete all for Class' |
|
386 |
itemValue: doDeleteClassAll |
|
387 |
translateLabel: true |
|
388 |
isVisible: hasNoMultiSelection |
|
389 |
) |
|
390 |
(MenuItem |
|
391 |
enabled: hasSelection |
|
392 |
label: 'Delete all for Class && its Private Classes' |
|
393 |
itemValue: doDeleteClassAndPrivateClassesAll |
|
394 |
translateLabel: true |
|
395 |
isVisible: hasNoMultiSelection |
|
396 |
) |
|
397 |
(MenuItem |
|
398 |
enabled: hasSelection |
|
399 |
label: 'Delete all for Classes' |
|
400 |
itemValue: doDeleteClassAll |
|
401 |
translateLabel: true |
|
402 |
isVisible: hasMultiSelection |
|
403 |
) |
|
404 |
(MenuItem |
|
405 |
enabled: hasSelection |
|
406 |
label: 'Delete all for Classes && their Private Classes' |
|
407 |
itemValue: doDeleteClassAndPrivateClassesAll |
|
408 |
translateLabel: true |
|
409 |
isVisible: hasMultiSelection |
|
410 |
) |
|
411 |
(MenuItem |
|
412 |
label: '-' |
|
413 |
) |
|
414 |
(MenuItem |
|
415 |
enabled: hasSelection |
|
416 |
label: 'Delete all Versions of Selected Method' |
|
417 |
itemValue: doDeleteClassSelectorAll |
|
418 |
translateLabel: true |
|
419 |
isVisible: hasNoMultiSelection |
|
420 |
) |
|
421 |
(MenuItem |
|
422 |
enabled: hasSelection |
|
423 |
label: 'Delete all Versions of all Selected Methods' |
|
424 |
itemValue: doDeleteClassSelectorAll |
|
425 |
translateLabel: true |
|
426 |
isVisible: hasMultiSelection |
|
427 |
) |
|
428 |
(MenuItem |
|
429 |
label: '-' |
|
430 |
) |
|
431 |
(MenuItem |
|
432 |
enabled: hasSingleSelection |
|
433 |
label: 'Compare with Current' |
|
434 |
itemValue: doCompare |
|
435 |
translateLabel: true |
|
436 |
) |
|
437 |
(MenuItem |
|
438 |
label: '-' |
|
439 |
) |
|
440 |
(MenuItem |
|
441 |
enabled: hasSelection |
|
442 |
label: 'Make Change a Patch' |
|
443 |
itemValue: doMakePatch |
|
444 |
translateLabel: true |
|
445 |
) |
|
446 |
) |
|
447 |
nil |
|
448 |
nil |
|
449 |
) |
|
450 |
) |
|
451 |
(MenuItem |
|
452 |
label: 'Search' |
|
453 |
translateLabel: true |
|
| 7360 | 454 |
submenu: |
| 7096 | 455 |
(Menu |
456 |
( |
|
457 |
(MenuItem |
|
458 |
label: 'Class...' |
|
459 |
itemValue: findClass |
|
460 |
translateLabel: true |
|
461 |
) |
|
462 |
(MenuItem |
|
463 |
enabled: hasSelection |
|
| 7527 | 464 |
label: 'First for Class' |
465 |
itemValue: findFirstForClass |
|
466 |
translateLabel: true |
|
467 |
) |
|
468 |
(MenuItem |
|
469 |
enabled: hasSelection |
|
| 7096 | 470 |
label: 'Previous for Class' |
471 |
itemValue: findPreviousForClass |
|
472 |
translateLabel: true |
|
473 |
) |
|
474 |
(MenuItem |
|
475 |
enabled: hasSelection |
|
476 |
label: 'Next for Class' |
|
477 |
itemValue: findNextForClass |
|
478 |
translateLabel: true |
|
479 |
) |
|
480 |
(MenuItem |
|
| 7527 | 481 |
enabled: hasSelection |
482 |
label: 'Last for Class' |
|
483 |
itemValue: findLastForClass |
|
484 |
translateLabel: true |
|
485 |
) |
|
486 |
(MenuItem |
|
| 7096 | 487 |
label: '-' |
488 |
) |
|
489 |
(MenuItem |
|
490 |
label: 'Selector...' |
|
491 |
itemValue: findSelector |
|
492 |
translateLabel: true |
|
493 |
) |
|
494 |
(MenuItem |
|
495 |
enabled: hasSelection |
|
496 |
label: 'Previous for Selector' |
|
497 |
itemValue: findPreviousForSelector |
|
498 |
translateLabel: true |
|
499 |
) |
|
500 |
(MenuItem |
|
501 |
enabled: hasSelection |
|
502 |
label: 'Next for Selector' |
|
503 |
itemValue: findNextForSelector |
|
504 |
translateLabel: true |
|
505 |
) |
|
506 |
(MenuItem |
|
507 |
label: '-' |
|
508 |
) |
|
509 |
(MenuItem |
|
510 |
label: 'String...' |
|
511 |
itemValue: findString |
|
512 |
translateLabel: true |
|
513 |
) |
|
514 |
(MenuItem |
|
515 |
enabled: hasSelection |
|
516 |
label: 'Previous with String' |
|
517 |
itemValue: findPreviousForString |
|
518 |
translateLabel: true |
|
519 |
) |
|
520 |
(MenuItem |
|
521 |
enabled: hasSelection |
|
522 |
label: 'Next with String' |
|
523 |
itemValue: findNextForString |
|
524 |
translateLabel: true |
|
525 |
) |
|
526 |
(MenuItem |
|
527 |
label: '-' |
|
528 |
) |
|
529 |
(MenuItem |
|
530 |
enabled: hasSelection |
|
531 |
label: 'Previous Difference' |
|
532 |
itemValue: findPreviousDifference |
|
533 |
translateLabel: true |
|
534 |
) |
|
535 |
(MenuItem |
|
536 |
enabled: hasSelection |
|
537 |
label: 'Next Difference' |
|
538 |
itemValue: findNextDifference |
|
539 |
translateLabel: true |
|
540 |
) |
|
541 |
(MenuItem |
|
542 |
label: '-' |
|
543 |
) |
|
544 |
(MenuItem |
|
545 |
enabled: hasSelection |
|
546 |
label: 'Previous Snapshot' |
|
547 |
itemValue: findPreviousSnapshot |
|
548 |
translateLabel: true |
|
549 |
) |
|
550 |
(MenuItem |
|
551 |
enabled: hasSelection |
|
552 |
label: 'Next Snapshot' |
|
553 |
itemValue: findNextSnapshot |
|
554 |
translateLabel: true |
|
555 |
) |
|
| 7360 | 556 |
(MenuItem |
557 |
label: 'Last Snapshot' |
|
558 |
itemValue: findLastSnapshot |
|
559 |
translateLabel: true |
|
560 |
) |
|
| 7096 | 561 |
) |
562 |
nil |
|
563 |
nil |
|
564 |
) |
|
565 |
) |
|
566 |
(MenuItem |
|
567 |
label: 'Browse' |
|
568 |
translateLabel: true |
|
| 7360 | 569 |
submenu: |
| 7096 | 570 |
(Menu |
571 |
( |
|
572 |
(MenuItem |
|
573 |
enabled: hasSingleSelection |
|
574 |
label: 'Class' |
|
575 |
itemValue: doBrowse |
|
576 |
translateLabel: true |
|
577 |
) |
|
578 |
(MenuItem |
|
579 |
label: '-' |
|
580 |
) |
|
581 |
(MenuItem |
|
582 |
label: 'Senders...' |
|
583 |
itemValue: doBrowseSenders |
|
584 |
translateLabel: true |
|
585 |
) |
|
586 |
(MenuItem |
|
587 |
label: 'Implementors...' |
|
588 |
itemValue: doBrowseImplementors |
|
589 |
translateLabel: true |
|
590 |
) |
|
591 |
) |
|
592 |
nil |
|
593 |
nil |
|
594 |
) |
|
595 |
) |
|
596 |
(MenuItem |
|
597 |
label: 'Settings' |
|
598 |
translateLabel: true |
|
| 7360 | 599 |
submenu: |
| 7096 | 600 |
(Menu |
601 |
( |
|
602 |
(MenuItem |
|
603 |
label: 'Auto Compare' |
|
604 |
translateLabel: true |
|
605 |
indication: autoCompare |
|
606 |
) |
|
607 |
(MenuItem |
|
608 |
label: 'Autoload As Required' |
|
609 |
translateLabel: true |
|
610 |
indication: autoloadAsRequired |
|
611 |
) |
|
612 |
(MenuItem |
|
613 |
label: 'Show Diffs' |
|
614 |
translateLabel: true |
|
615 |
indication: showingDiffs |
|
616 |
) |
|
617 |
(MenuItem |
|
618 |
label: 'Auto Update' |
|
619 |
translateLabel: true |
|
620 |
indication: autoUpdate |
|
621 |
) |
|
622 |
(MenuItem |
|
623 |
label: '-' |
|
624 |
) |
|
625 |
(MenuItem |
|
626 |
label: 'Add to ChangeSet when Applying' |
|
627 |
translateLabel: true |
|
628 |
indication: updateChangeSet |
|
629 |
) |
|
630 |
(MenuItem |
|
631 |
label: '-' |
|
632 |
) |
|
633 |
(MenuItem |
|
634 |
label: 'Apply into Package...' |
|
635 |
itemValue: setEnforcedPackage |
|
636 |
translateLabel: true |
|
637 |
) |
|
638 |
(MenuItem |
|
639 |
label: 'Apply into NameSpace...' |
|
640 |
itemValue: setEnforcedNameSpace |
|
641 |
translateLabel: true |
|
642 |
) |
|
| 9055 | 643 |
(MenuItem |
644 |
label: '-' |
|
645 |
) |
|
646 |
(MenuItem |
|
647 |
label: 'Settings...' |
|
648 |
itemValue: openSettingsDialog |
|
649 |
translateLabel: true |
|
650 |
) |
|
| 7096 | 651 |
) |
652 |
nil |
|
653 |
nil |
|
654 |
) |
|
655 |
) |
|
656 |
(MenuItem |
|
|
7463
e8e74bdbfbda
support '?' as help (for now: controlled by resources)
Claus Gittinger <cg@exept.de>
parents:
7415
diff
changeset
|
657 |
label: 'MENU_Help' |
| 7096 | 658 |
translateLabel: true |
| 7415 | 659 |
startGroup: conditionalRight |
| 7360 | 660 |
submenu: |
| 7096 | 661 |
(Menu |
662 |
( |
|
663 |
(MenuItem |
|
664 |
label: 'ChangesBrowser Documentation' |
|
665 |
itemValue: openHTMLDocument: |
|
666 |
translateLabel: true |
|
667 |
argument: 'tools/cbrowser/TOP.html' |
|
668 |
) |
|
669 |
(MenuItem |
|
670 |
label: '-' |
|
671 |
) |
|
672 |
(MenuItem |
|
673 |
label: 'About ChangesBrowser...' |
|
674 |
itemValue: openAboutThisApplication |
|
675 |
translateLabel: true |
|
676 |
) |
|
677 |
) |
|
678 |
nil |
|
679 |
nil |
|
680 |
) |
|
681 |
) |
|
682 |
) |
|
683 |
nil |
|
684 |
nil |
|
| 3202 | 685 |
) |
686 |
! ! |
|
687 |
||
| 3674 | 688 |
!ChangesBrowser class methodsFor:'private-changeFile access'! |
689 |
||
690 |
readXMLChangesFrom:aStream inBackground:inBackground |
|
691 |
"read an XML source file (format as in campSmalltalk DTD)" |
|
692 |
||
693 |
|changeSet| |
|
694 |
||
695 |
(XML isNil or:[XML::SourceNodeBuilder isNil or:[XML::XMLParser isNil]]) ifTrue:[ |
|
| 6288 | 696 |
Smalltalk loadPackage:'stx:goodies/xml/vw'. |
697 |
(XML isNil or:[XML::SourceNodeBuilder isNil or:[XML::XMLParser isNil]]) ifTrue:[ |
|
698 |
self error:'Could not load XML package(s) from ''stx:goodies/xml/vw'''. |
|
699 |
] |
|
| 3674 | 700 |
]. |
701 |
||
702 |
changeSet := ChangeSet new. |
|
| 6288 | 703 |
XML::SourceScannerNodeBuilder new |
704 |
scanFile:aStream |
|
705 |
do:[:eachChange | |
|
706 |
changeSet addChange:eachChange. |
|
707 |
]. |
|
| 3674 | 708 |
^ changeSet |
709 |
||
710 |
"/ builder := XML::SourceScannerNodeBuilder new. |
|
711 |
"/ parser := XML::XMLParser on:aStream. |
|
712 |
"/ parser builder:builder. |
|
713 |
"/ parser validate:false. |
|
714 |
"/ parser scanDocument. |
|
715 |
! |
|
716 |
||
717 |
readXMLChangesFromFile:changeFileName inBackground:inBackground |
|
718 |
|s set| |
|
719 |
||
720 |
s := changeFileName asFilename readStream. |
|
721 |
set := self readXMLChangesFrom:s inBackground:inBackground. |
|
722 |
s close. |
|
723 |
^ set. |
|
724 |
! ! |
|
725 |
||
726 |
!ChangesBrowser class methodsFor:'utilities'! |
|
727 |
||
728 |
isXMLFile:aFilename |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
729 |
|stream first| |
|
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
730 |
|
|
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
731 |
stream := aFilename asFilename readStreamOrNil. |
| 3674 | 732 |
stream isNil ifTrue:[^ false]. |
733 |
||
734 |
stream skipSeparators. |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
735 |
first := stream peek. |
| 3674 | 736 |
stream close. |
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
737 |
^ first == $< |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
738 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
739 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
740 |
methodDefinitionSelectors |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
741 |
^ #( |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
742 |
#'methodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
743 |
#'privateMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
744 |
#'publicMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
745 |
#'ignoredMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
746 |
#'protectedMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
747 |
#'methodsFor:stamp:' "/ Squeak support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
748 |
#'commentStamp:prior:' "/ Squeak support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
749 |
#methodsFor "/ Dolphin support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
750 |
#categoriesForClass "/ Dolphin support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
751 |
#'categoriesFor:' "/ Dolphin support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
752 |
#methods "/ STV support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
753 |
#publicMethods "/ STV / V'Age support |
| 6532 | 754 |
#privateMethods "/ STV / V'Age support |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
755 |
#'methodsForUndefined:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
756 |
) |
| 3674 | 757 |
! ! |
758 |
||
| 3202 | 759 |
!ChangesBrowser methodsFor:'aspects'! |
760 |
||
761 |
applyInOriginalNameSpace |
|
762 |
^ applyInOriginalNameSpace |
|
763 |
! |
|
764 |
||
| 3472 | 765 |
applyNotInOriginalNameSpace |
| 6288 | 766 |
^ BlockValue forLogicalNot:self applyInOriginalNameSpace |
| 3472 | 767 |
! |
768 |
||
| 3202 | 769 |
autoCompare |
770 |
^ autoCompare |
|
771 |
! |
|
772 |
||
773 |
autoUpdate |
|
774 |
"enabled/disable automatic update from the change-file (for monitoring)" |
|
775 |
||
776 |
^ autoUpdate |
|
777 |
||
778 |
"Created: 3.12.1995 / 14:14:24 / cg" |
|
779 |
"Modified: 3.12.1995 / 14:20:45 / cg" |
|
780 |
! |
|
781 |
||
| 6216 | 782 |
autoloadAsRequired |
783 |
^ autoloadAsRequired |
|
784 |
! |
|
785 |
||
| 3202 | 786 |
editingClassSource |
| 3203 | 787 |
^ editingClassSource ? false |
| 3202 | 788 |
! |
789 |
||
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
790 |
hasMultiSelection |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
791 |
^ self hasSelection and:[self hasSingleSelection not] |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
792 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
793 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
794 |
hasNoMultiSelection |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
795 |
^ self hasMultiSelection not |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
796 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
797 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
798 |
hasNoSelection |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
799 |
^ self hasSelection not |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
800 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
801 |
|
| 3202 | 802 |
hasSelection |
| 6288 | 803 |
^ changeListView hasSelection |
| 3202 | 804 |
! |
805 |
||
| 3211 | 806 |
hasSingleSelection |
807 |
changeListView multipleSelectOk ifTrue:[ |
|
| 6288 | 808 |
^ changeListView selection size == 1 |
| 3211 | 809 |
]. |
810 |
^ changeListView hasSelection |
|
811 |
! |
|
812 |
||
| 3202 | 813 |
notEditingClassSource |
814 |
^ self editingClassSource not |
|
| 3211 | 815 |
! |
816 |
||
|
3224
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
817 |
notEditingClassSourceAndNotReadOnly |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
818 |
^ (self editingClassSource or:[readOnly == true]) not |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
819 |
! |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
820 |
|
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
821 |
notReadOnly |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
822 |
^ (readOnly ~~ true) |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
823 |
! |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
824 |
|
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
825 |
readOnly:aBoolean |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
826 |
readOnly := aBoolean |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
827 |
! |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
828 |
|
| 4487 | 829 |
showingDiffs |
830 |
showingDiffs isNil ifTrue:[ |
|
| 6288 | 831 |
showingDiffs := self showingDiffsDefault asValue. |
832 |
showingDiffs |
|
833 |
onChangeEvaluate:[ |
|
834 |
showingDiffs value ifTrue:[ |
|
835 |
self updateDiffView. |
|
836 |
self makeDiffViewVisible |
|
837 |
] ifFalse:[ |
|
838 |
self makeDiffViewInvisible |
|
839 |
]. |
|
840 |
DefaultShowingDiffs := showingDiffs value. |
|
841 |
] |
|
| 4487 | 842 |
]. |
843 |
^ showingDiffs |
|
844 |
! |
|
845 |
||
| 4943 | 846 |
showingDiffsDefault |
847 |
^ (DefaultShowingDiffs ? true) |
|
848 |
! |
|
849 |
||
| 3211 | 850 |
theSingleSelection |
851 |
|sel| |
|
852 |
||
853 |
sel := changeListView selection. |
|
854 |
changeListView multipleSelectOk ifTrue:[ |
|
| 6288 | 855 |
sel size == 1 ifTrue:[ |
856 |
^ sel first |
|
857 |
]. |
|
858 |
^ nil |
|
| 3211 | 859 |
]. |
860 |
^ sel. |
|
| 3319 | 861 |
! |
862 |
||
863 |
updateChangeSet |
|
864 |
^ updateChangeSet |
|
| 3202 | 865 |
! ! |
866 |
||
| 202 | 867 |
!ChangesBrowser methodsFor:'compiler interface'! |
868 |
||
869 |
wantChangeLog |
|
870 |
"sent by the compiler to ask if a changeLog entry should |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
871 |
be written when compiling. Return false here." |
| 202 | 872 |
|
873 |
^ false |
|
874 |
! ! |
|
875 |
||
| 4869 | 876 |
!ChangesBrowser methodsFor:'compiler interface-error handling'! |
| 202 | 877 |
|
878 |
correctableError:aString position:relPos to:relEndPos from:aCompiler |
|
879 |
"compiler notifys us of an error - this should really not happen since |
|
880 |
changes ought to be correct (did someone edit the changes file ??). |
|
881 |
Show the bad change in the codeView and let codeView hilight the error; |
|
882 |
no corrections allowed here therefore return false" |
|
883 |
||
| 2293 | 884 |
ShowWarningDialogs == true ifTrue:[ |
| 6288 | 885 |
self error:aString position:relPos to:relEndPos from:aCompiler. |
| 2293 | 886 |
] ifFalse:[ |
| 6288 | 887 |
Transcript showCR:aString. |
| 2293 | 888 |
]. |
| 202 | 889 |
^ false |
890 |
! |
|
891 |
||
| 2555 | 892 |
correctableSelectorWarning:aString position:relPos to:relEndPos from:aCompiler |
893 |
"compiler notifys us of a warning" |
|
894 |
||
895 |
^ false |
|
896 |
||
897 |
"Modified: / 19.1.2000 / 16:25:31 / cg" |
|
898 |
"Created: / 19.1.2000 / 16:27:23 / cg" |
|
899 |
! |
|
900 |
||
|
9621
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
901 |
correctableWarning:aString position:relPos to:relEndPos from:aCompiler |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
902 |
"compiler notifys us of an error - this should really not happen since |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
903 |
changes ought to be correct (did someone edit the changes file ??). |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
904 |
Show the bad change in the codeView and let codeView hilight the error; |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
905 |
no corrections allowed here therefore return false" |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
906 |
|
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
907 |
^ self correctableError:aString position:relPos to:relEndPos from:aCompiler |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
908 |
|
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
909 |
"Created: / 02-11-2010 / 13:29:52 / cg" |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
910 |
! |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
911 |
|
| 202 | 912 |
error:aString position:relPos to:relEndPos from:aCompiler |
913 |
"compiler notifys us of an error - this should really not happen since |
|
914 |
changes ought to be correct (did someone edit the changes file ??). |
|
915 |
Show the bad change in the codeView and let codeView hilight the error" |
|
916 |
||
917 |
|action| |
|
918 |
||
919 |
(changeNrProcessed ~~ changeNrShown) ifTrue:[ |
|
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
920 |
self changeSelection:changeNrProcessed |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
921 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
922 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
923 |
"if more than a singe change is applied, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
924 |
ask the user if he wants to abort the whole sequence of operations..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
925 |
multipleApply == true ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
926 |
codeView highlightingErrorPosition:relPos to:relEndPos do:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
927 |
|box| |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
928 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
929 |
" |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
930 |
start dialog - make certain cleanup is done |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
931 |
" |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
932 |
action := OptionBox |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
933 |
request:aString |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
934 |
label:'Error' |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
935 |
image:(WarningBox iconBitmap) |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
936 |
buttonLabels:#('Cancel All' 'Skip this Change' " 'Shut up' " 'Continue')
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
937 |
values:#(abortAll skip "shutUp" continue) |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
938 |
default:#continue |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
939 |
onCancel:#abort. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
940 |
]. |
| 2293 | 941 |
|
942 |
"/ action == #shutUp ifTrue:[ |
|
943 |
"/ aCompiler ignoreWarnings. |
|
| 6288 | 944 |
"/ ^ false |
| 2293 | 945 |
"/ ]. |
946 |
||
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
947 |
action == #abortAll ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
948 |
AbortAllOperationRequest raise. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
949 |
^ false |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
950 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
951 |
action == #skip ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
952 |
AbortOperationRequest raise. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
953 |
^ false |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
954 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
955 |
^ false |
| 202 | 956 |
]. |
957 |
^ codeView error:aString position:relPos to:relEndPos from:aCompiler |
|
| 373 | 958 |
|
|
3436
c4fe19deba58
class based exceptions - abortSignal;
Claus Gittinger <cg@exept.de>
parents:
3406
diff
changeset
|
959 |
"Modified: / 16.11.2001 / 17:38:10 / cg" |
| 202 | 960 |
! |
961 |
||
| 3064 | 962 |
unusedVariableWarning:aString position:relPos to:relEndPos from:aCompiler |
963 |
"compiler notifies us of a (or some) unused variables; |
|
964 |
hilight the error (relPos to relEndPos) and show a Box asking for continue/correct/abort; |
|
965 |
this method should return true to the compiler if user wants the error |
|
966 |
to be corrected; false otherwise" |
|
967 |
||
968 |
^ false |
|
969 |
! |
|
970 |
||
| 202 | 971 |
warning:aString position:relPos to:relEndPos from:aCompiler |
972 |
"compiler notifys us of a warning - ignore it" |
|
973 |
||
974 |
^ self |
|
975 |
! ! |
|
976 |
||
| 2604 | 977 |
!ChangesBrowser methodsFor:'event handling'! |
| 202 | 978 |
|
979 |
handlesKeyPress:key inView:view |
|
980 |
"this method is reached via delegation: are we prepared to handle |
|
981 |
a keyPress in some other view ?" |
|
982 |
||
| 1127 | 983 |
<resource: #keyboard (#Delete #BackSpace #Accept #Find #FindPrev #FindNext)> |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
984 |
|
| 202 | 985 |
view == changeListView ifTrue:[ |
| 6288 | 986 |
(key == #Delete |
987 |
or:[key == #BackSpace |
|
988 |
or:[key == #Accept |
|
989 |
or:[key == #Find |
|
990 |
or:[key == #FindPrev |
|
991 |
or:[key == #FindNext]]]]]) ifTrue:[^ true]. |
|
| 202 | 992 |
]. |
993 |
^ false |
|
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
994 |
|
| 1127 | 995 |
"Modified: 8.4.1997 / 11:01:42 / cg" |
| 0 | 996 |
! |
997 |
||
| 202 | 998 |
keyPress:key x:x y:y view:view |
999 |
"this method is reached via delegation from the changeListView" |
|
1000 |
||
| 1127 | 1001 |
<resource: #keyboard (#Delete #BackSpace #Accept #Find #FindPrev #FindNext)> |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1002 |
|
| 3249 | 1003 |
(key == #Delete) ifTrue:[ |
| 6288 | 1004 |
self sensor shiftDown ifTrue:[ |
1005 |
self doDeleteAndSelectPrevious. |
|
1006 |
] ifFalse:[ |
|
1007 |
self doDelete. |
|
1008 |
]. |
|
1009 |
^ self |
|
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1010 |
]. |
| 3249 | 1011 |
(key == #BackSpace) ifTrue:[ |
| 6288 | 1012 |
self doDeleteAndSelectPrevious. |
1013 |
^ self |
|
| 3249 | 1014 |
]. |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1015 |
(key == #Accept) ifTrue:[ |
| 6288 | 1016 |
self doApply. |
1017 |
^ self |
|
| 202 | 1018 |
]. |
| 1127 | 1019 |
(key == #Find) ifTrue:[ |
| 6288 | 1020 |
self findClass. |
1021 |
^ self |
|
| 1127 | 1022 |
]. |
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1023 |
(key == #FindPrev) ifTrue:[ |
| 6288 | 1024 |
self findPrevious. |
1025 |
^ self |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1026 |
]. |
|
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1027 |
(key == #FindNext) ifTrue:[ |
| 6288 | 1028 |
self findNext. |
1029 |
^ self |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1030 |
]. |
| 202 | 1031 |
changeListView keyPress:key x:x y:y |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1032 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1033 |
"Modified: / 18.6.1998 / 22:15:36 / cg" |
| 202 | 1034 |
! ! |
1035 |
||
| 3327 | 1036 |
!ChangesBrowser methodsFor:'help'! |
| 202 | 1037 |
|
| 394 | 1038 |
showActivity:someMessage |
| 502 | 1039 |
"some activityNotification to be forwarded to the user; |
1040 |
show it in the windows title area here." |
|
1041 |
||
| 394 | 1042 |
self label:someMessage |
1043 |
||
1044 |
"Created: 24.2.1996 / 19:35:42 / cg" |
|
| 502 | 1045 |
"Modified: 23.4.1996 / 21:39:36 / cg" |
| 202 | 1046 |
! ! |
1047 |
||
| 4868 | 1048 |
!ChangesBrowser methodsFor:'initialization & release'! |
| 202 | 1049 |
|
| 3202 | 1050 |
autoCompareChanged |
1051 |
"sent from the compare-toggle" |
|
1052 |
||
| 3534 | 1053 |
|doCompare| |
1054 |
||
1055 |
doCompare := autoCompare value. |
|
1056 |
DefaultAutoCompare := doCompare. |
|
1057 |
self setupTabSpec. |
|
1058 |
doCompare ifTrue:[ |
|
| 6288 | 1059 |
self doUpdate |
| 3202 | 1060 |
] ifFalse:[ |
| 6288 | 1061 |
changeListView invalidate. "/ clear; redraw. |
| 3202 | 1062 |
] |
1063 |
! |
|
1064 |
||
| 202 | 1065 |
changeListMenu |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1066 |
"return the menu for the change (upper) list" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1067 |
|
| 586 | 1068 |
<resource: #keyboard ( #Accept #Delete ) > |
| 1359 | 1069 |
<resource: #programMenu > |
| 586 | 1070 |
|
| 3211 | 1071 |
|items m replNext replPrev sel| |
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1072 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1073 |
self sensor ctrlDown ifTrue:[ |
| 7360 | 1074 |
"/ notice - findNext/prev shortKeys will search for the same thing again. |
1075 |
items := #( |
|
1076 |
('Search Class...' findClass #Find )
|
|
1077 |
('Previous for this Class' findPreviousForClass #FindPrevClass )
|
|
1078 |
('Next for this Class' findNextForClass #FindNextClass )
|
|
1079 |
('-' )
|
|
1080 |
('Search Selector...' findSelector )
|
|
1081 |
('Previous with this Selector' findPreviousForSelector #FindPrevSelector )
|
|
1082 |
('Next with this Selector' findNextForSelector #FindNextSelector )
|
|
1083 |
('-' )
|
|
1084 |
('Search String...' findString )
|
|
1085 |
('Previous with this String' findPreviousForString #FindPrevString )
|
|
1086 |
('Next with this String' findNextForString #FindNextString )
|
|
1087 |
('-' )
|
|
1088 |
('Previous Snapshot' findPreviousSnapshot #FindPrevSnapshot )
|
|
1089 |
('Next Snapshot' findNextSnapshot #FindNextSnapshot )
|
|
1090 |
). |
|
1091 |
||
1092 |
lastSearchType == #selector ifTrue:[ |
|
1093 |
replNext := #FindNextSelector. |
|
1094 |
replPrev := #FindPrevSelector. |
|
1095 |
] ifFalse:[ |
|
1096 |
lastSearchType == #snapshot ifTrue:[ |
|
1097 |
replNext := #FindNextSnapshot. |
|
1098 |
replPrev := #FindPrevSnapshot. |
|
1099 |
] ifFalse:[ |
|
1100 |
lastSearchType == #string ifTrue:[ |
|
1101 |
replNext := #FindNextString. |
|
1102 |
replPrev := #FindPrevString. |
|
1103 |
] ifFalse:[ |
|
1104 |
replNext := #FindNextClass. |
|
1105 |
replPrev := #FindPrevClass. |
|
1106 |
] |
|
1107 |
] |
|
1108 |
]. |
|
1109 |
items := items deepCopy. |
|
1110 |
items do:[:each | |
|
1111 |
each replaceAll:replNext with:#FindNext. |
|
1112 |
each replaceAll:replPrev with:#FindPrev. |
|
1113 |
each replaceAny:#(FindNextClass FindPrevClass |
|
1114 |
FindNextSelector FindPrevSelector |
|
1115 |
FindNextSnapshot FindPrevSnapshot |
|
1116 |
FindNextString FindPrevString) |
|
1117 |
with:nil. |
|
1118 |
]. |
|
1119 |
||
1120 |
^ PopUpMenu itemList:items resources:resources. |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1121 |
]. |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1122 |
|
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1123 |
items := #( |
| 7360 | 1124 |
('Apply' doApply Accept)
|
1125 |
('Apply to End' doApplyRest )
|
|
1126 |
('Apply from Begin' doApplyFromBeginning )
|
|
1127 |
('Apply for Class to End' doApplyClassRest )
|
|
1128 |
('Apply for Class from Begin' doApplyClassFromBeginning )
|
|
1129 |
('Apply All' doApplyAll )
|
|
1130 |
('-' )
|
|
1131 |
('Delete' doDelete Delete)
|
|
1132 |
('Delete to End' doDeleteRest )
|
|
1133 |
('Delete for Class to End' doDeleteClassRest )
|
|
1134 |
('Delete for Class from Begin' doDeleteClassFromBeginning )
|
|
1135 |
). |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1136 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1137 |
(self hasSelection and:[self hasSingleSelection not]) ifTrue:[ |
| 7360 | 1138 |
items := items , |
1139 |
#( |
|
1140 |
('Delete All for Classes' doDeleteClassAll )
|
|
1141 |
('Delete All for Classes & their Private Classes' doDeleteClassAndPrivateClassesAll )
|
|
1142 |
). |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1143 |
] ifFalse:[ |
| 7360 | 1144 |
items := items , |
1145 |
#( |
|
1146 |
('Delete All for Class' doDeleteClassAll )
|
|
1147 |
('Delete All for Class & its Private Classes' doDeleteClassAndPrivateClassesAll )
|
|
1148 |
). |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1149 |
]. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1150 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1151 |
items := items , |
| 7360 | 1152 |
#( |
1153 |
('-' )
|
|
1154 |
('Compress' doCompress )
|
|
1155 |
('Compress for Class' doCompressClass )
|
|
1156 |
('Compare and Compress' doCompareAndCompress )
|
|
1157 |
('-' )
|
|
1158 |
('Compare with current Version' doCompare )
|
|
1159 |
('Browse Class' doBrowse )
|
|
1160 |
('-' )
|
|
1161 |
('Make Change a Patch' doMakePatch )
|
|
1162 |
). |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1163 |
|
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1164 |
editingClassSource ifFalse:[ |
| 7360 | 1165 |
items := items , #( |
1166 |
('Fileout & Delete All for Class' doFileoutAndDeleteClassAll )
|
|
1167 |
('CheckIn & Delete All for Class' doCheckinAndDeleteClassAll )
|
|
1168 |
) |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1169 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1170 |
|
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1171 |
items := items , #( |
| 7360 | 1172 |
('-' )
|
1173 |
('Save in...' doSave )
|
|
1174 |
('Save to End In...' doSaveRest )
|
|
1175 |
('Save for Class to End In...' doSaveClassRest )
|
|
1176 |
('Save all for Class In...' doSaveClassAll )
|
|
1177 |
('-' )
|
|
1178 |
). |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1179 |
|
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1180 |
editingClassSource ifTrue:[ |
| 7360 | 1181 |
items := items , #( |
1182 |
('Writeback ClassFile' doWriteBack )
|
|
1183 |
) |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1184 |
] ifFalse:[ |
| 7360 | 1185 |
items := items , #( |
1186 |
('Writeback ChangeFile' doWriteBack )
|
|
1187 |
) |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1188 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1189 |
|
|
1833
c9b1a30b326d
moved update item to the end
Claus Gittinger <cg@exept.de>
parents:
1788
diff
changeset
|
1190 |
items := items , #( |
| 7360 | 1191 |
('-' )
|
1192 |
('Update' doUpdate )
|
|
1193 |
). |
|
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1194 |
|
|
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1195 |
m := PopUpMenu itemList:items resources:resources. |
| 202 | 1196 |
|
| 255 | 1197 |
"/ |
1198 |
"/ disable those that require a selected entry |
|
1199 |
"/ |
|
| 3202 | 1200 |
self hasSelection ifFalse:[ |
| 7360 | 1201 |
m disableAll:#(doApply doApplyClassRest doApplyRest doDelete doDeleteRest doDeleteClassRest |
1202 |
doDeleteClassFromBeginning doDeleteClassAll doDeleteClassAndPrivateClassesAll |
|
1203 |
doCompare doCompressClass doMakePatch doSaveChangeInFile doMakePermanent |
|
1204 |
doSave doSaveRest doSaveClassAll doSaveClassRest doBrowse |
|
1205 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll) |
|
| 1368 | 1206 |
] ifTrue:[ |
| 7360 | 1207 |
sel := self theSingleSelection. |
1208 |
sel isNil ifTrue:[ |
|
1209 |
"/ multiple selections |
|
1210 |
m disableAll:#(doApplyClassRest doApplyRest doDeleteClassRest doDeleteRest |
|
1211 |
doDeleteClassFromBeginning |
|
1212 |
doCompressClass doCompare |
|
1213 |
doSaveClassAll doSaveClassRest doSaveRest doBrowse |
|
1214 |
doFileoutAndDeleteClassAll) |
|
1215 |
] ifFalse:[ |
|
1216 |
(self classNameOfChange:sel) isNil ifTrue:[ |
|
1217 |
m disableAll:#(doApplyClassRest doDeleteClassRest |
|
1218 |
doDeleteClassFromBeginning doDeleteClassAll doDeleteClassAndPrivateClassesAll |
|
1219 |
doCompressClass doCompare doMakePatch |
|
1220 |
doSaveClassAll doSaveClassRest doBrowse |
|
1221 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll) |
|
1222 |
] |
|
1223 |
] |
|
| 255 | 1224 |
]. |
1225 |
||
1226 |
"/ |
|
1227 |
"/ disable those that do not make sense with autoUpdate |
|
1228 |
"/ ('cause this would be overwritten by next update operation)
|
|
1229 |
"/ |
|
| 3202 | 1230 |
autoUpdate value ifTrue:[ |
| 7360 | 1231 |
m disableAll:#(doDelete doDeleteRest doDeleteClassRest doDeleteClassAll |
1232 |
doDeleteClassAndPrivateClassesAll doCompress |
|
1233 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll |
|
1234 |
doWriteBack) |
|
| 202 | 1235 |
]. |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1236 |
readOnly == true ifTrue:[ |
| 7360 | 1237 |
m disableAll:#(doDelete doDeleteRest doDeleteClassRest doDeleteClassAll |
1238 |
doDeleteClassAndPrivateClassesAll doCompress |
|
1239 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll |
|
1240 |
doWriteBack doSaveBack doUpdate |
|
1241 |
doApplyAll doApplyRest) |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1242 |
]. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1243 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1244 |
self hasSelection ifTrue:[ |
| 7360 | 1245 |
m disable:#doApplyAll |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1246 |
]. |
|
3224
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1247 |
|
| 202 | 1248 |
^ m |
1249 |
||
| 7360 | 1250 |
"Modified: / 06-09-1995 / 17:14:22 / claus" |
1251 |
"Modified: / 06-10-2006 / 11:17:06 / cg" |
|
| 202 | 1252 |
! |
1253 |
||
| 2114 | 1254 |
destroy |
1255 |
"destroy the receiver; make certain, that boxes are destroyed too" |
|
1256 |
||
1257 |
Processor removeTimedBlock:checkBlock. |
|
1258 |
ObjectMemory removeDependent:self. |
|
1259 |
super destroy |
|
1260 |
! |
|
1261 |
||
| 202 | 1262 |
initialize |
| 3202 | 1263 |
|panel v upperFrame buttonPanel menuPanel mH |
| 9168 | 1264 |
checkBox oldStyle codeViewBox lbl applyInOriginal| |
| 3202 | 1265 |
|
| 3211 | 1266 |
"/ oldStyle := true. |
| 3202 | 1267 |
oldStyle := false. |
| 202 | 1268 |
|
1269 |
super initialize. |
|
1270 |
||
| 5702 | 1271 |
changeFileName := ObjectMemory nameForChanges. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
1272 |
encodingIfKnown := nil. |
| 3534 | 1273 |
autoCompare := (DefaultAutoCompare ? false) asValue. |
| 3202 | 1274 |
autoCompare onChangeSend:#autoCompareChanged to:self. |
1275 |
autoUpdate := false asValue. |
|
| 6216 | 1276 |
autoloadAsRequired := false asValue. |
| 9168 | 1277 |
|
1278 |
applyInOriginal := true. |
|
1279 |
KeepEnforcedNameSpace == true ifTrue:[ |
|
1280 |
enforcedNameSpace := LastEnforcedNameSpace. |
|
1281 |
applyInOriginal := false. |
|
1282 |
]. |
|
1283 |
||
1284 |
applyInOriginalNameSpace := applyInOriginal asValue. |
|
| 6288 | 1285 |
applyInOriginalNameSpace |
| 6357 | 1286 |
onChangeEvaluate:[ |
1287 |
autoCompare value ifTrue:[ |
|
1288 |
self doUpdate |
|
1289 |
]. |
|
1290 |
]. |
|
| 9168 | 1291 |
|
| 4897 | 1292 |
updateChangeSet := true "false" asValue. |
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1293 |
classesNotToBeAutoloaded := Set new. |
| 221 | 1294 |
|
|
1099
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1295 |
" |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1296 |
checkBlock is executed by the Processor. |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1297 |
We use #pushEvent: to perform the update |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1298 |
in our windowgroups process. |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1299 |
" |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1300 |
checkBlock := [self pushEvent:#checkIfFileHasChanged]. |
| 202 | 1301 |
|
| 3202 | 1302 |
oldStyle ifFalse:[ |
| 6357 | 1303 |
menuPanel := MenuPanel in:self. |
1304 |
"/ menuPanel level:1. |
|
1305 |
menuPanel verticalLayout:false. |
|
1306 |
menuPanel receiver:self. |
|
1307 |
menuPanel menu:(self pullDownMenu). |
|
1308 |
||
|
8164
ee17624160a6
added preferredWidth & preferredHeight
Claus Gittinger <cg@exept.de>
parents:
8102
diff
changeset
|
1309 |
mH := menuPanel preferredHeight. |
| 6357 | 1310 |
menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)). |
1311 |
mH := mH + 1. |
|
| 3202 | 1312 |
] ifTrue:[ |
| 6357 | 1313 |
mH := 0.0 |
| 3202 | 1314 |
]. |
1315 |
||
1316 |
panel := VariableVerticalPanel origin:(0.0 @ mH) |
|
| 6357 | 1317 |
corner:(1.0 @ 1.0) |
1318 |
borderWidth:0 |
|
1319 |
in:self. |
|
| 202 | 1320 |
|
| 3202 | 1321 |
upperFrame := panel. |
1322 |
oldStyle ifTrue:[ |
|
| 6357 | 1323 |
upperFrame := VariableHorizontalPanel origin:(0.0 @ 0.0) corner:(1.0 @ 0.3) in:panel. |
| 3202 | 1324 |
]. |
| 202 | 1325 |
|
1326 |
v := HVScrollableView for:SelectionInListView miniScrollerH:true in:upperFrame. |
|
| 3202 | 1327 |
oldStyle ifTrue:[ |
| 6357 | 1328 |
v origin:(0.0 @ 0.0) corner:(0.75 @ 1.0). |
| 3202 | 1329 |
] ifFalse:[ |
| 6357 | 1330 |
v origin:(0.0 @ 0.0) corner:(1.0 @ 0.3). |
| 3202 | 1331 |
]. |
| 3090 | 1332 |
|
| 202 | 1333 |
changeListView := v scrolledView. |
1334 |
changeListView delegate:self. |
|
1335 |
changeListView menuHolder:self; menuPerformer:self; menuMessage:#changeListMenu. |
|
| 1471 | 1336 |
changeListView doubleClickAction:[:line | self doubleClickOnChange:line]. |
| 3211 | 1337 |
oldStyle ifFalse:[ |
| 6357 | 1338 |
changeListView multipleSelectOk:true. |
| 3211 | 1339 |
]. |
| 202 | 1340 |
|
| 3202 | 1341 |
oldStyle ifTrue:[ |
| 6357 | 1342 |
buttonPanel := VerticalPanelView in:upperFrame. |
1343 |
buttonPanel origin:(0.75 @ 0.0) corner:(1.0 @ 1.0). |
|
1344 |
buttonPanel verticalLayout:#topSpace; horizontalLayout:#leftSpace. |
|
1345 |
||
1346 |
checkBox := CheckBox new model:autoCompare. |
|
1347 |
checkBox label:(resources string:'Auto Compare'). |
|
1348 |
checkBox action:[:val | autoCompare value:val]. |
|
1349 |
buttonPanel addSubView:checkBox. |
|
1350 |
||
1351 |
checkBox := CheckBox new model:autoUpdate. |
|
1352 |
checkBox label:(resources string:'Auto Update'). |
|
1353 |
checkBox action:[:val | autoUpdate value:val]. |
|
1354 |
buttonPanel addSubView:checkBox. |
|
1355 |
||
1356 |
checkBox := CheckBox new. |
|
1357 |
checkBox label:(resources stringWithCRs:'Apply in original NameSpace'). |
|
1358 |
checkBox model:applyInOriginalNameSpace. |
|
1359 |
buttonPanel addSubView:checkBox. |
|
| 3202 | 1360 |
]. |
| 2301 | 1361 |
|
| 3090 | 1362 |
"/ protectExistingMethods := CheckBox new. |
1363 |
"/ protectExistingMethods label:(resources string:'Protect existing code' withCRs). |
|
1364 |
"/ protectExistingMethods model:protectExistingMethods. |
|
1365 |
"/ buttonPanel addSubView:protectExistingMethods. |
|
1366 |
||
| 4487 | 1367 |
codeViewBox := View in:panel. |
1368 |
codeViewBox origin:(0.0 @ 0.3) corner:(1.0 @ 1.0). |
|
1369 |
||
1370 |
v := HVScrollableView for:CodeView miniScrollerH:true miniScrollerV:false in:codeViewBox. |
|
1371 |
v origin:(0.0 @ 0.0) corner:(1.0 @ 1.0). |
|
| 202 | 1372 |
codeView := v scrolledView. |
| 1996 | 1373 |
codeView readOnly:true. |
| 202 | 1374 |
|
| 4487 | 1375 |
diffViewBox := View in:codeViewBox. |
1376 |
diffViewBox origin:(0.0 @ 0.0) corner:(1.0 @ 1.0). |
|
1377 |
||
1378 |
lbl := Label label:'Current' in:diffViewBox. |
|
1379 |
lbl layout:(LayoutFrame |
|
| 6357 | 1380 |
leftFraction:0.0 offset:0 |
1381 |
rightFraction:0.5 offset:0 |
|
1382 |
topFraction:0.0 offset:0 |
|
1383 |
bottomFraction:0.0 offset:20). |
|
| 4487 | 1384 |
lbl := Label label:'Change' in:diffViewBox. |
1385 |
lbl layout:(LayoutFrame |
|
| 6357 | 1386 |
leftFraction:0.5 offset:0 |
1387 |
rightFraction:1.0 offset:0 |
|
1388 |
topFraction:0.0 offset:0 |
|
1389 |
bottomFraction:0.0 offset:20). |
|
| 4487 | 1390 |
|
1391 |
"/ diffView := DiffTextView in:diffViewBox. |
|
1392 |
"/ diffView layout:(LayoutFrame |
|
1393 |
"/ leftFraction:0.0 offset:0 |
|
1394 |
"/ rightFraction:1.0 offset:0 |
|
1395 |
"/ topFraction:0.0 offset:20 |
|
1396 |
"/ bottomFraction:1.0 offset:0). |
|
1397 |
||
| 8102 | 1398 |
v := HVScrollableView for:DiffCodeView miniScrollerH:true miniScrollerV:false in:diffViewBox. |
| 4487 | 1399 |
v layout:(LayoutFrame |
| 6357 | 1400 |
leftFraction:0.0 offset:0 |
1401 |
rightFraction:1.0 offset:0 |
|
1402 |
topFraction:0.0 offset:20 |
|
1403 |
bottomFraction:1.0 offset:0). |
|
| 4487 | 1404 |
diffView := v scrolledView. |
1405 |
||
1406 |
self showingDiffs value ifFalse:[ |
|
| 6357 | 1407 |
self makeDiffViewInvisible |
| 4487 | 1408 |
]. |
1409 |
||
| 202 | 1410 |
anyChanges := false. |
1411 |
ObjectMemory addDependent:self. "to get shutdown-update" |
|
1412 |
||
1413 |
tabSpec := TabulatorSpecification new. |
|
1414 |
tabSpec unit:#inch. |
|
1415 |
tabSpec positions:#(-1 0 5 8.5 ). |
|
1416 |
" +/- cls>>sel type info" |
|
1417 |
tabSpec align: #(#left #left #left #left). |
|
1418 |
||
| 1471 | 1419 |
"Modified: / 27.3.1997 / 11:07:07 / stefan" |
| 3297 | 1420 |
"Modified: / 11.10.2001 / 21:20:48 / cg" |
| 202 | 1421 |
! |
1422 |
||
|
1246
9ed3722bd2f2
setup in #postRealize instead of #realize
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1423 |
postRealize |
| 3534 | 1424 |
self setupTabSpec. |
| 202 | 1425 |
self readChangesFileInBackground:true. |
1426 |
self setChangeList. |
|
1427 |
changeListView action:[:lineNr | self changeSelection:lineNr]. |
|
1428 |
Processor addTimedBlock:checkBlock afterSeconds:5. |
|
|
1246
9ed3722bd2f2
setup in #postRealize instead of #realize
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1429 |
|
|
9ed3722bd2f2
setup in #postRealize instead of #realize
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1430 |
"Created: 24.7.1997 / 18:06:12 / cg" |
| 202 | 1431 |
! |
1432 |
||
| 3202 | 1433 |
pullDownMenu |
1434 |
"return the top (pullDown) menu" |
|
1435 |
||
1436 |
<resource: #programMenu> |
|
1437 |
||
| 3330 | 1438 |
^ self menuFromSpec:self class menuSpec. |
1439 |
||
1440 |
"/ |m| |
|
1441 |
"/ |
|
1442 |
"/ m := self class menuSpec. |
|
1443 |
"/ m := m decodeAsLiteralArray. |
|
1444 |
"/ m receiver:self. |
|
1445 |
"/ m findGuiResourcesIn:self. |
|
1446 |
"/ ^ m. |
|
| 3202 | 1447 |
! |
1448 |
||
| 3534 | 1449 |
setupTabSpec |
1450 |
autoCompare value ifTrue:[ |
|
| 9515 | 1451 |
tabSpec positions:#(0 0.15 7 9.5 ). |
| 3534 | 1452 |
] ifFalse:[ |
| 9515 | 1453 |
"/ |
1454 |
"/ set tabs to hide compare-column |
|
1455 |
"/ |
|
1456 |
tabSpec positions:#(-1 0 7 9.5 ). |
|
| 3534 | 1457 |
] |
| 9515 | 1458 |
|
1459 |
"Modified: / 10-07-2010 / 10:59:49 / cg" |
|
| 3534 | 1460 |
! |
1461 |
||
| 627 | 1462 |
update:what with:aParameter from:changedObject |
| 202 | 1463 |
|box| |
1464 |
||
|
8558
a85166102cb7
Wait for #aboutToQuit change message instead of obsolete #aboutToExit
Stefan Vogel <sv@exept.de>
parents:
8515
diff
changeset
|
1465 |
(what == #aboutToQuit) ifTrue:[ |
| 6639 | 1466 |
" |
1467 |
smalltalk is about to shut down - |
|
1468 |
- if change list was modified, ask user and save if requested. |
|
1469 |
" |
|
1470 |
anyChanges ifTrue:[ |
|
1471 |
self raiseDeiconified. |
|
1472 |
||
1473 |
box := YesNoBox new. |
|
1474 |
box title:('The modified changelist has not been written back to the change file.\\Write change file before exiting ?') withCRs.
|
|
1475 |
box okText:(resources string:'Write') noText:(resources string:'Don''t write'). |
|
1476 |
box yesAction:[self writeBackChanges] |
|
1477 |
noAction:[]. |
|
1478 |
box showAtPointer. |
|
1479 |
box destroy |
|
1480 |
]. |
|
1481 |
^ self |
|
| 202 | 1482 |
]. |
|
8558
a85166102cb7
Wait for #aboutToQuit change message instead of obsolete #aboutToExit
Stefan Vogel <sv@exept.de>
parents:
8515
diff
changeset
|
1483 |
super update:what with:aParameter from:changedObject |
| 627 | 1484 |
|
|
2353
707dd9391c02
Consistent use of 'update' and 'write' in the user interface
Stefan Vogel <sv@exept.de>
parents:
2343
diff
changeset
|
1485 |
"Created: / 15.6.1996 / 15:26:30 / cg" |
|
707dd9391c02
Consistent use of 'update' and 'write' in the user interface
Stefan Vogel <sv@exept.de>
parents:
2343
diff
changeset
|
1486 |
"Modified: / 7.1.1997 / 23:03:47 / cg" |
|
707dd9391c02
Consistent use of 'update' and 'write' in the user interface
Stefan Vogel <sv@exept.de>
parents:
2343
diff
changeset
|
1487 |
"Modified: / 24.8.1999 / 09:45:06 / stefan" |
| 202 | 1488 |
! ! |
1489 |
||
| 3202 | 1490 |
!ChangesBrowser methodsFor:'menu actions'! |
1491 |
||
1492 |
menuExit |
|
| 3204 | 1493 |
self closeRequest |
| 3202 | 1494 |
! |
1495 |
||
1496 |
openAboutThisApplication |
|
1497 |
"opens an about box for this application." |
|
1498 |
||
| 7115 | 1499 |
Dialog aboutClass:self class. |
1500 |
||
1501 |
"Modified: / 12-09-2006 / 17:20:22 / cg" |
|
| 3202 | 1502 |
! |
1503 |
||
1504 |
openHTMLDocument:relativeDocPath |
|
1505 |
HTMLDocumentView openFullOnDocumentationFile:relativeDocPath |
|
1506 |
! |
|
1507 |
||
| 9055 | 1508 |
openSettingsDialog |
1509 |
|settingsList settingsApp| |
|
1510 |
||
1511 |
settingsList := |
|
1512 |
#( |
|
1513 |
#('Editor' #'AbstractSettingsApplication::EditSettingsAppl' )
|
|
1514 |
"/ #('Syntax Color' #'AbstractSettingsApplication::SyntaxColorSettingsAppl' )
|
|
1515 |
"/ #('Code Format' #'AbstractSettingsApplication::SourceCodeFormatSettingsAppl' )
|
|
1516 |
"/ #('System Browser' #'AbstractSettingsApplication::SystemBrowserSettingsAppl' )
|
|
1517 |
#('Compiler' #'AbstractSettingsApplication::GeneralCompilerSettingsAppl' )
|
|
1518 |
#('Compiler/ByteCode' #'AbstractSettingsApplication::ByteCodeCompilerSettingsAppl' )
|
|
1519 |
"/ #('Source Code Management' #'AbstractSettingsApplication::SourceCodeManagementSettingsAppl')
|
|
1520 |
). |
|
1521 |
||
1522 |
settingsApp := SettingsDialog new. |
|
1523 |
"/ settingsApp requestor:self. |
|
1524 |
settingsApp installSettingsEntries:settingsList. |
|
1525 |
settingsApp allButOpen. |
|
1526 |
settingsApp window label:('Debugger Settings').
|
|
1527 |
settingsApp openWindow. |
|
1528 |
! |
|
1529 |
||
| 3202 | 1530 |
showAboutSTX |
1531 |
ToolApplicationModel openAboutSTX |
|
1532 |
! ! |
|
1533 |
||
| 202 | 1534 |
!ChangesBrowser methodsFor:'private'! |
1535 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1536 |
autoSelect:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1537 |
"select a change" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1538 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1539 |
self class autoSelectNext ifTrue:[ |
| 6288 | 1540 |
(changeNr <= self numberOfChanges) ifTrue:[ |
1541 |
changeListView setSelection:changeNr. |
|
1542 |
self changeSelection:changeNr. |
|
1543 |
^ self |
|
1544 |
] |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1545 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1546 |
self clearCodeView. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1547 |
changeListView setSelection:nil. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1548 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1549 |
"Modified: / 18.5.1998 / 14:26:43 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1550 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1551 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1552 |
autoSelectLast |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1553 |
"select the last change" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1554 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1555 |
self autoSelect:(self numberOfChanges) |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1556 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1557 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1558 |
autoSelectOrEnd:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1559 |
"select the next change or the last" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1560 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1561 |
|last| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1562 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1563 |
last := self numberOfChanges. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1564 |
changeNr < last ifTrue:[ |
| 6288 | 1565 |
self autoSelect:changeNr |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1566 |
] ifFalse:[ |
| 6288 | 1567 |
last == 0 ifTrue:[ |
1568 |
last := nil |
|
1569 |
]. |
|
1570 |
changeListView setSelection:last . |
|
1571 |
self changeSelection:last. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1572 |
] |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1573 |
|
|
3406
8fe22b36fbc2
fixed autoselectNext if list is empty
Claus Gittinger <cg@exept.de>
parents:
3392
diff
changeset
|
1574 |
"Modified: / 13.11.2001 / 13:00:45 / cg" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1575 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1576 |
|
| 8619 | 1577 |
beep |
1578 |
UserPreferences current beepInEditor ifTrue:[ |
|
1579 |
super beep |
|
1580 |
] |
|
1581 |
! |
|
1582 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1583 |
checkClassIsLoaded:aClass |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1584 |
"check for and warn if a class is unloaded (helper for compare-change)" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1585 |
|
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
1586 |
|cls answer| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1587 |
|
|
3359
2cc7eff866e4
isMeta/soleInstance -> theNonMetaclass
Claus Gittinger <cg@exept.de>
parents:
3341
diff
changeset
|
1588 |
cls := aClass theNonMetaclass. |
| 5825 | 1589 |
cls isLoaded ifTrue:[ |
| 6357 | 1590 |
^ true. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1591 |
]. |
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1592 |
(classesNotToBeAutoloaded includes:cls) ifTrue:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1593 |
^ false. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1594 |
]. |
| 5825 | 1595 |
|
| 6216 | 1596 |
autoloadAsRequired value == true ifTrue:[ |
| 6357 | 1597 |
answer := true |
| 6216 | 1598 |
] ifFalse:[ |
| 6357 | 1599 |
answer := (self confirmWithCancel:(resources |
1600 |
stringWithCRs:'%1 is an autoloaded class.\I can only compare the methods source if its loaded first.\\Shall the class be loaded now ?' |
|
1601 |
with:cls name allBold)). |
|
| 6216 | 1602 |
]. |
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
1603 |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1604 |
answer isNil ifTrue:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1605 |
"cancel the operation" |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1606 |
AbortAllOperationRequest raise. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1607 |
"not reached" |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1608 |
]. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1609 |
|
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1610 |
answer ifTrue:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1611 |
Autoload autoloadFailedSignal catch:[ |
| 6357 | 1612 |
^ cls autoload isLoaded |
1613 |
] |
|
| 5825 | 1614 |
]. |
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
1615 |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1616 |
classesNotToBeAutoloaded add:cls. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1617 |
|
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
1618 |
^ false. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1619 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1620 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1621 |
clearCodeView |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1622 |
"clear the (lower) code view." |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1623 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1624 |
self unselect "changeListView deselect". |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1625 |
codeView contents:nil. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1626 |
changeNrShown := nil |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1627 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1628 |
|
| 3203 | 1629 |
isChangeSetBrowser |
1630 |
^ false |
|
1631 |
! |
|
1632 |
||
| 4487 | 1633 |
makeDiffViewInvisible |
1634 |
diffViewBox lower |
|
1635 |
! |
|
1636 |
||
1637 |
makeDiffViewVisible |
|
1638 |
diffViewBox raise |
|
1639 |
! |
|
1640 |
||
| 3472 | 1641 |
nameSpaceForApply |
1642 |
applyInOriginalNameSpace value ifFalse:[ |
|
| 6288 | 1643 |
^ enforcedNameSpace ? Class nameSpaceQuerySignal query. |
| 3472 | 1644 |
]. |
1645 |
^ Smalltalk. |
|
1646 |
! |
|
1647 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1648 |
newLabel:how |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1649 |
|l| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1650 |
|
| 7507 | 1651 |
l := self class defaultLabel. |
1652 |
(changeFileName notNil and:[changeFileName ~= 'changes']) ifTrue:[ |
|
1653 |
l := l , ': ', changeFileName |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1654 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1655 |
l := l , ' ' , how. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1656 |
self label:l |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1657 |
|
| 7507 | 1658 |
"Created: / 08-09-1995 / 19:32:04 / claus" |
1659 |
"Modified: / 12-11-2006 / 16:23:53 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1660 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1661 |
|
| 4857 | 1662 |
oldSourceForParseTree:parseTree |
1663 |
|selector thisClass method superClass thisClassSym ownerClass receiver classGlobalNode| |
|
1664 |
||
| 6288 | 1665 |
(parseTree isNil |
1666 |
or:[parseTree == #Error |
|
| 4857 | 1667 |
or:[ parseTree isMessage not ]]) ifTrue:[ |
| 6614 | 1668 |
^ nil |
| 4857 | 1669 |
]. |
1670 |
||
1671 |
selector := parseTree selector. |
|
1672 |
receiver := parseTree receiver. |
|
1673 |
||
1674 |
selector == #'removeSelector:' ifTrue:[ |
|
|
9570
f81993219003
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9548
diff
changeset
|
1675 |
thisClass := Error handle:[:ex | ] do:[ receiver evaluate ]. |
| 6614 | 1676 |
thisClass isBehavior ifTrue:[ |
1677 |
thisClass isLoaded ifTrue:[ |
|
1678 |
selector := (parseTree arg1 evaluate). |
|
1679 |
(thisClass includesSelector:selector) ifTrue:[ |
|
1680 |
^ (thisClass compiledMethodAt:selector) source. |
|
1681 |
] |
|
1682 |
] ifFalse:[ |
|
1683 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
1684 |
] |
|
1685 |
] ifFalse:[ |
|
1686 |
^ 'Cannot compare this change (class not present)'. |
|
1687 |
]. |
|
| 4857 | 1688 |
]. |
1689 |
selector == #'comment:' ifTrue:[ |
|
|
9715
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
1690 |
Parser undefinedVariableError handle:[:ex | |
|
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
1691 |
] do:[ |
|
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
1692 |
thisClass := receiver evaluate. |
|
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
1693 |
]. |
| 6614 | 1694 |
thisClass isBehavior ifTrue:[ |
1695 |
thisClass isLoaded ifTrue:[ |
|
1696 |
^ thisClass name , ' comment: ' , thisClass comment storeString. |
|
1697 |
] ifFalse:[ |
|
1698 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
1699 |
] |
|
1700 |
] ifFalse:[ |
|
1701 |
^ 'Cannot compare this change (class not present)'. |
|
1702 |
]. |
|
| 4857 | 1703 |
]. |
1704 |
||
| 7953 | 1705 |
(#(#'category:' #'package:') includes:selector) ifTrue:[ |
| 6614 | 1706 |
receiver isMessage ifTrue:[ |
1707 |
receiver selector == #compiledMethodAt: ifTrue:[ |
|
1708 |
classGlobalNode := receiver receiver. |
|
1709 |
(classGlobalNode isMessage and:[classGlobalNode selector == #class]) ifTrue:[ |
|
1710 |
classGlobalNode := classGlobalNode receiver |
|
1711 |
]. |
|
1712 |
classGlobalNode isUndeclared ifTrue:[ |
|
1713 |
^ 'Class does not exist.'. |
|
1714 |
]. |
|
1715 |
Error handle:[method := nil] do:[method := receiver evaluate]. |
|
| 7953 | 1716 |
method isMethod ifFalse:[ |
1717 |
^ 'There is no such method'. |
|
1718 |
]. |
|
1719 |
selector == #category: ifTrue:[ |
|
| 6614 | 1720 |
method category = parseTree arg1 evaluate ifFalse:[ |
| 7953 | 1721 |
^ '(' , method mclass name , ' compiledMethodAt: ' , method selector storeString , ') category: ' , method category storeString.
|
1722 |
]. |
|
| 6614 | 1723 |
] ifFalse:[ |
| 7953 | 1724 |
method package = parseTree arg1 evaluate ifFalse:[ |
1725 |
^ '(' , method mclass name , ' compiledMethodAt: ' , method selector storeString , ') package: ' , method package storeString.
|
|
1726 |
]. |
|
1727 |
]. |
|
1728 |
^ nil |
|
| 6614 | 1729 |
] |
1730 |
] |
|
| 4857 | 1731 |
]. |
1732 |
||
1733 |
selector == #'instanceVariableNames:' ifTrue:[ |
|
| 6614 | 1734 |
receiver isMessage ifTrue:[ |
1735 |
receiver selector == #class ifTrue:[ |
|
1736 |
thisClass := receiver evaluate. |
|
1737 |
thisClass isBehavior ifTrue:[ |
|
1738 |
thisClass isLoaded ifTrue:[ |
|
| 4857 | 1739 |
"/ varsHere := thisClass instanceVariableString asCollectionOfWords. |
1740 |
"/ varsInChange := (parseTree arguments at:1) evaluate asCollectionOfWords. |
|
| 6614 | 1741 |
^ thisClass definition. |
1742 |
] ifFalse:[ |
|
1743 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
1744 |
]. |
|
1745 |
] ifFalse:[ |
|
1746 |
^ 'Cannot compare this change (class not present)'. |
|
1747 |
] |
|
1748 |
]. |
|
1749 |
] |
|
| 4857 | 1750 |
]. |
1751 |
||
1752 |
(Class definitionSelectors includes:selector) |
|
| 6288 | 1753 |
"/ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' |
| 4857 | 1754 |
ifTrue:[ |
| 6614 | 1755 |
"/ Class nameSpaceQuerySignal |
1756 |
"/ answer:(self nameSpaceForApply) |
|
1757 |
"/ do:[ |
|
1758 |
"/ superClass := receiver evaluate. |
|
1759 |
"/ ]. |
|
1760 |
"/ superClass isBehavior ifFalse:[ |
|
1761 |
"/ self nameSpaceForApply classNamed:receiver name |
|
1762 |
"/ ]. |
|
1763 |
"/ superClass isBehavior ifFalse:[ |
|
1764 |
"/ |rest matchingKeys superClassName| |
|
1765 |
"/ |
|
1766 |
"/ rest := '::' , receiver name. |
|
1767 |
"/ matchingKeys := Smalltalk keys select:[:nm | nm endsWith:rest]. |
|
1768 |
"/ superClassName := Dialog choose:'Which Class ?' fromList:matchingKeys lines:10. |
|
1769 |
"/ superClassName notEmptyOrNil ifTrue:[ |
|
1770 |
"/ superClass := Smalltalk at:superClassName asSymbol. |
|
1771 |
"/ ]. |
|
1772 |
"/ ]. |
|
1773 |
"/ superClass isBehavior ifFalse:[ |
|
1774 |
"/ ^ 'Cannot compare this change\\(no such superclass).' withCRs. |
|
1775 |
"/ ]. |
|
1776 |
"/ superClass isLoaded ifFalse:[ |
|
1777 |
"/ ^ 'Cannot compare this change\\(superclass not loaded).' withCRs. |
|
1778 |
"/ ]. |
|
1779 |
||
1780 |
thisClassSym := (parseTree arguments at:1) evaluate. |
|
1781 |
||
1782 |
(selector endsWith:':privateIn:') ifTrue:[ |
|
1783 |
ownerClass := (parseTree arguments at:5). |
|
1784 |
ownerClass isUndeclared ifFalse:[ |
|
1785 |
ownerClass := ownerClass evaluate. |
|
1786 |
] ifTrue:[ |
|
1787 |
ownerClass := nil. |
|
1788 |
]. |
|
1789 |
ownerClass isNil ifTrue:[ |
|
1790 |
^ 'Cannot compare this change\\(owning class is not loaded).' withCRs. |
|
1791 |
]. |
|
1792 |
thisClass := ownerClass privateClassesAt:thisClassSym. |
|
1793 |
] ifFalse:[ |
|
1794 |
thisClass := (self nameSpaceForApply) at:thisClassSym ifAbsent:nil. |
|
1795 |
]. |
|
1796 |
thisClass notNil ifTrue:[ |
|
1797 |
thisClass isLoaded ifFalse:[ |
|
1798 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
1799 |
] ifTrue:[ |
|
1800 |
^ thisClass definition. |
|
1801 |
] |
|
1802 |
] |
|
| 4857 | 1803 |
]. |
1804 |
||
1805 |
^ nil. |
|
|
9570
f81993219003
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9548
diff
changeset
|
1806 |
|
|
9715
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
1807 |
"Modified: / 29-01-2011 / 11:24:09 / cg" |
| 4857 | 1808 |
! |
1809 |
||
| 8665 | 1810 |
parseExpression:chunk |
1811 |
^ self parseExpression:chunk inNameSpace:(self nameSpaceForApply). |
|
1812 |
! |
|
1813 |
||
1814 |
parseExpression:text inNameSpace:nameSpace |
|
1815 |
|parser p| |
|
1816 |
||
1817 |
"/ old: |
|
1818 |
"/ does not care for VW qualified names |
|
1819 |
"/ ^ Parser parseExpression:text inNameSpace:nameSpace. |
|
1820 |
||
1821 |
"/ new: |
|
1822 |
parser := Parser for:(ReadStream on:text). |
|
1823 |
parser parserFlags allowQualifiedNames:true. |
|
|
9228
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1824 |
Error handle:[:ex | |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1825 |
^ nil |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1826 |
] do:[ |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1827 |
p := parser |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1828 |
parseExpressionWithSelf:nil |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1829 |
notifying:nil |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1830 |
ignoreErrors:true |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1831 |
ignoreWarnings:true |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1832 |
inNameSpace:nameSpace. |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
1833 |
]. |
| 8665 | 1834 |
^ p |
1835 |
! |
|
1836 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1837 |
queryCloseText |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1838 |
"made this a method for easy redefinition in subclasses" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1839 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1840 |
^ 'Quit without updating changeFile ?' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1841 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1842 |
|
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1843 |
selectedClassNames |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1844 |
|classes| |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1845 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1846 |
classes := Set new. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1847 |
self withSelectedChangesDo:[:changeNr | |
| 6288 | 1848 |
| classNameToCompress | |
1849 |
||
1850 |
classNameToCompress := self classNameOfChange:changeNr. |
|
1851 |
classNameToCompress notNil ifTrue:[ |
|
1852 |
classes add:classNameToCompress. |
|
1853 |
] |
|
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1854 |
]. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1855 |
^ classes |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1856 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1857 |
"Created: / 19.11.2001 / 21:54:59 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1858 |
! |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
1859 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1860 |
setChangeList |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1861 |
"extract type-information from changes and stuff into top selection |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1862 |
view" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1863 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1864 |
changeListView setList:changeHeaderLines expandTabs:false redraw:false. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1865 |
changeListView invalidate. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1866 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1867 |
"/ changeListView deselect. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1868 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1869 |
"Modified: / 18.5.1998 / 14:29:10 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1870 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1871 |
|
| 3211 | 1872 |
setSingleSelection:changeNr |
1873 |
changeListView multipleSelectOk ifFalse:[ |
|
| 6288 | 1874 |
changeListView setSelection:changeNr. |
| 3211 | 1875 |
] ifTrue:[ |
| 6288 | 1876 |
changeListView setSelection:(Array with:changeNr). |
| 3211 | 1877 |
]. |
1878 |
! |
|
1879 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1880 |
showNotFound |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1881 |
|savedCursor| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1882 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1883 |
savedCursor := cursor. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1884 |
[ |
| 6288 | 1885 |
self cursor:(Cursor cross). |
1886 |
self beep. |
|
1887 |
Delay waitForMilliseconds:300. |
|
|
3597
2e7fc0ae28c9
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3586
diff
changeset
|
1888 |
] ensure:[ |
| 6288 | 1889 |
self cursor:savedCursor |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1890 |
] |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1891 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1892 |
"Modified: / 29.4.1999 / 22:36:54 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1893 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1894 |
|
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1895 |
sourceOfChange:changeNr |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1896 |
|aStream sawExcla chunk| |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1897 |
|
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1898 |
aStream := self streamForChange:changeNr. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1899 |
aStream isNil ifTrue:[ |
| 6288 | 1900 |
^ nil |
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1901 |
]. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1902 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1903 |
chunk := aStream nextChunk. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1904 |
sawExcla ifTrue:[ |
| 6288 | 1905 |
chunk := aStream nextChunk |
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1906 |
]. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1907 |
aStream close. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1908 |
^ chunk |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1909 |
! |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
1910 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1911 |
unselect |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1912 |
"common unselect" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1913 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1914 |
changeListView setSelection:nil. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1915 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1916 |
"Modified: 25.5.1996 / 13:02:49 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1917 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1918 |
|
| 3211 | 1919 |
withSelectedChangesDo:aBlock |
1920 |
"just a helper, check for a selected change and evaluate aBlock |
|
1921 |
with busy cursor" |
|
1922 |
||
1923 |
self withSelectedChangesInOrder:nil do:aBlock |
|
1924 |
! |
|
1925 |
||
1926 |
withSelectedChangesInOrder:order do:aBlock |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1927 |
"just a helper, check for a selected change and evaluate aBlock |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1928 |
with busy cursor" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1929 |
|
| 3211 | 1930 |
|changeNrSelection| |
1931 |
||
1932 |
changeNrSelection := changeListView selection. |
|
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1933 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1934 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1935 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1936 |
multipleApply := changeNrSelection size > 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1937 |
|
| 3211 | 1938 |
changeListView multipleSelectOk ifFalse:[ |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1939 |
changeNrSelection notNil ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1940 |
self withExecuteCursorDo:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1941 |
aBlock value:changeNrSelection |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1942 |
] |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1943 |
] |
| 3211 | 1944 |
] ifTrue:[ |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1945 |
changeNrSelection size > 0 ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1946 |
self withExecuteCursorDo:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1947 |
|changeNumbers| |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1948 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1949 |
changeNumbers := changeNrSelection copy sort. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1950 |
order == #reverse ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1951 |
changeNumbers reverse |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1952 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1953 |
changeNumbers do:aBlock |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1954 |
] |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1955 |
] |
| 3211 | 1956 |
]. |
1957 |
! |
|
1958 |
||
1959 |
withSelectedChangesReverseDo:aBlock |
|
1960 |
"just a helper, check for a selected change and evaluate aBlock |
|
1961 |
with busy cursor" |
|
1962 |
||
1963 |
self withSelectedChangesInOrder:#reverse do:aBlock |
|
| 3668 | 1964 |
! |
1965 |
||
1966 |
withSingleSelectedChangeDo:aBlock |
|
1967 |
"just a helper, check for a single selection, and evaluate aBlock |
|
1968 |
with busy cursor" |
|
1969 |
||
1970 |
self theSingleSelection isNil ifTrue:[ |
|
| 6288 | 1971 |
^ self information:'Only possible if a single change is selected.'. |
| 3668 | 1972 |
]. |
1973 |
||
1974 |
self withSelectedChangesInOrder:nil do:aBlock |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1975 |
! ! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1976 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1977 |
!ChangesBrowser methodsFor:'private-change access'! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1978 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1979 |
changeIsFollowupMethodChange:changeNr |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1980 |
"return true, if a change is a followup change (i.e. a followup change |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1981 |
in a bunch of methodsFor-changes)" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1982 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1983 |
^ changeIsFollowupMethodChange at:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1984 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1985 |
"Created: / 6.2.1998 / 13:03:39 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1986 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
1987 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1988 |
changeIsSnapShotInfo:changeNr |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1989 |
"return true, if a change is a snapShot info chunk" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1990 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1991 |
|words chunk| |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1992 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1993 |
(self classNameOfChange:changeNr) isNil ifTrue:[ |
| 6288 | 1994 |
" |
1995 |
get the chunk |
|
1996 |
" |
|
1997 |
chunk := changeChunks at:changeNr. |
|
1998 |
"mhmh - empty ??" |
|
1999 |
chunk notNil ifTrue:[ |
|
2000 |
(chunk startsWith:'''---') ifTrue:[ |
|
2001 |
words := chunk asCollectionOfWords. |
|
2002 |
words size > 2 ifTrue:[ |
|
2003 |
(words at:2) = 'snapshot' ifTrue:[ |
|
2004 |
^ true |
|
2005 |
]. |
|
2006 |
]. |
|
2007 |
]. |
|
2008 |
]. |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2009 |
]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2010 |
^ false |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2011 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2012 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2013 |
classNameOfChange:changeNr |
| 6288 | 2014 |
"return the classname of a change |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2015 |
(for classChanges (i.e. xxx class), the non-metaClassName (i.e. xxx) is returned)" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2016 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2017 |
|name| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2018 |
|
| 3364 | 2019 |
name := self realClassNameOfChange:changeNr. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2020 |
name isNil ifTrue:[^ nil]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2021 |
(name endsWith:' class') ifTrue:[ |
| 6288 | 2022 |
name := name copyWithoutLast:6 |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2023 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2024 |
^ name |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2025 |
|
| 3364 | 2026 |
"Modified: / 5.11.2001 / 18:10:25 / cg" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2027 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2028 |
|
| 3202 | 2029 |
extractSelectorOfMethodChange:changeNr |
2030 |
"return a method-changes selector, or nil if its not a methodChange" |
|
2031 |
||
2032 |
|source parser sel chunk aParseTree | |
|
2033 |
||
2034 |
source := self sourceOfMethodChange:changeNr. |
|
2035 |
source isNil ifTrue:[ |
|
| 8665 | 2036 |
(self classNameOfChange:changeNr) notNil ifTrue:[ |
2037 |
chunk := changeChunks at:changeNr. |
|
2038 |
chunk isNil ifTrue:[^ nil]. "mhmh - empty" |
|
2039 |
||
2040 |
aParseTree := self parseExpression:chunk. |
|
2041 |
(aParseTree isNil |
|
2042 |
or:[aParseTree == #Error |
|
2043 |
or:[aParseTree isMessage not]]) ifTrue:[ |
|
2044 |
^ nil "seems strange ... (could be a comment)" |
|
2045 |
]. |
|
2046 |
sel := aParseTree selector. |
|
2047 |
(#( |
|
2048 |
#'removeSelector:' |
|
2049 |
) includes:sel) ifTrue:[ |
|
2050 |
sel := aParseTree arguments at:1. |
|
2051 |
sel isConstant ifTrue:[ |
|
2052 |
sel := sel evaluate. |
|
2053 |
sel isSymbol ifTrue:[ |
|
2054 |
^ sel |
|
2055 |
] |
|
2056 |
] |
|
2057 |
] |
|
2058 |
]. |
|
2059 |
^ nil |
|
| 3202 | 2060 |
]. |
2061 |
||
2062 |
||
| 6288 | 2063 |
parser := Parser |
| 8665 | 2064 |
parseMethodArgAndVarSpecification:source |
2065 |
in:nil |
|
2066 |
ignoreErrors:true |
|
2067 |
ignoreWarnings:true |
|
2068 |
parseBody:false. |
|
| 3202 | 2069 |
|
2070 |
(parser notNil and:[parser ~~ #Error]) ifTrue:[ |
|
| 8665 | 2071 |
sel := parser selector. |
| 3202 | 2072 |
]. |
2073 |
^ sel |
|
2074 |
||
2075 |
"Created: 24.11.1995 / 14:30:46 / cg" |
|
2076 |
"Modified: 5.9.1996 / 17:12:50 / cg" |
|
2077 |
! |
|
2078 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2079 |
fullClassNameOfChange:changeNr |
| 6288 | 2080 |
"return the full classname of a change |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
2081 |
(for classChanges (i.e. xxx class), a string ending in ' class' is returned." |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2082 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2083 |
|chunk aParseTree recTree sel name arg1Tree isMeta prevMethodDefNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2084 |
words changeStream fullParseTree ownerTree ownerName oldDollarSetting| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2085 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2086 |
changeNr isNil ifTrue:[^ nil]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2087 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2088 |
first look, if not already known |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2089 |
" |
| 5145 | 2090 |
name := changeClassNames at:changeNr. |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
2091 |
name notNil ifTrue:[ |
| 7953 | 2092 |
name == #nil ifTrue:[^ nil]. |
2093 |
^ name |
|
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
2094 |
]. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2095 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2096 |
prevMethodDefNr := changeNr. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2097 |
[changeIsFollowupMethodChange at:prevMethodDefNr] whileTrue:[ |
| 7953 | 2098 |
prevMethodDefNr := prevMethodDefNr - 1. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2099 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2100 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2101 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2102 |
get the chunk |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2103 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2104 |
chunk := changeChunks at:prevMethodDefNr. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2105 |
chunk isNil ifTrue:[^ nil]. "mhmh - empty" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2106 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2107 |
(chunk startsWith:'''---') ifTrue:[ |
| 7953 | 2108 |
words := chunk asCollectionOfWords. |
2109 |
words size > 2 ifTrue:[ |
|
2110 |
(words at:2) = 'checkin' ifTrue:[ |
|
2111 |
name := words at:3. |
|
2112 |
^ name |
|
2113 |
] |
|
2114 |
]. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2115 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2116 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2117 |
"/ fix it - otherwise, it cannot be parsed |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2118 |
(chunk endsWith:'primitiveDefinitions:') ifTrue:[ |
| 7953 | 2119 |
chunk := chunk , '''''' |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2120 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2121 |
(chunk endsWith:'primitiveFunctions:') ifTrue:[ |
| 7953 | 2122 |
chunk := chunk , '''''' |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2123 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2124 |
(chunk endsWith:'primitiveVariables:') ifTrue:[ |
| 7953 | 2125 |
chunk := chunk , '''''' |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2126 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2127 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2128 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2129 |
use parser to construct a parseTree |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2130 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2131 |
oldDollarSetting := Parser allowDollarInIdentifier. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2132 |
[ |
| 7953 | 2133 |
Parser allowDollarInIdentifier:true. |
| 5014 | 2134 |
"/ Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
2135 |
"/ do:[ |
|
| 8665 | 2136 |
aParseTree := self parseExpression:chunk. |
| 5014 | 2137 |
"/ ]. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2138 |
|
| 7953 | 2139 |
aParseTree == #Error ifTrue:[ |
2140 |
(chunk includesString:'comment') ifTrue:[ |
|
2141 |
"/ could be a comment ... |
|
| 8665 | 2142 |
aParseTree := self parseExpression:chunk , ''''. |
| 7953 | 2143 |
] |
2144 |
]. |
|
|
3597
2e7fc0ae28c9
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3586
diff
changeset
|
2145 |
] ensure:[ |
| 7953 | 2146 |
Parser allowDollarInIdentifier:oldDollarSetting |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2147 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2148 |
(aParseTree isNil or:[aParseTree == #Error]) ifTrue:[ |
| 7953 | 2149 |
^ nil "seems strange ... (could be a comment)" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2150 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2151 |
aParseTree isMessage ifFalse:[ |
| 7953 | 2152 |
^ nil "very strange ... (whats that ?)" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2153 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2154 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2155 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2156 |
ask parser for selector |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2157 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2158 |
sel := aParseTree selector. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2159 |
recTree := aParseTree receiver. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2160 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2161 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2162 |
is it a method-change, methodRemove or comment-change ? |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2163 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2164 |
|
| 6288 | 2165 |
(#(#'methodsFor:' |
2166 |
#'privateMethodsFor:' |
|
2167 |
#'protectedMethodsFor:' |
|
2168 |
#'ignoredMethodsFor:' |
|
2169 |
#'publicMethodsFor:' |
|
2170 |
#'removeSelector:' |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2171 |
#'comment:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2172 |
#'primitiveDefinitions:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2173 |
#'primitiveFunctions:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2174 |
#'primitiveVariables:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2175 |
#'renameCategory:to:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2176 |
#'instanceVariableNames:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2177 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2178 |
#'methodsFor:stamp:' "/ Squeak support |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2179 |
#'commentStamp:prior:' "/ Squeak support |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2180 |
#'addClassVarName:' "/ Squeak support |
|
2527
afa639104477
some support for dolphin source files
Claus Gittinger <cg@exept.de>
parents:
2511
diff
changeset
|
2181 |
#methodsFor "/ Dolphin support |
| 3472 | 2182 |
#categoriesForClass "/ Dolphin support |
2183 |
#categoriesFor: "/ Dolphin support |
|
| 2606 | 2184 |
#methods "/ STV support |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2185 |
) includes:sel) ifTrue:[ |
| 7953 | 2186 |
" |
2187 |
yes, the className is the receiver |
|
2188 |
" |
|
2189 |
(recTree notNil and:[recTree ~~ #Error]) ifTrue:[ |
|
2190 |
isMeta := false. |
|
2191 |
recTree isUnaryMessage ifTrue:[ |
|
2192 |
(recTree selector ~~ #class) ifTrue:[^ nil]. |
|
2193 |
"id class methodsFor:..." |
|
2194 |
recTree := recTree receiver. |
|
2195 |
isMeta := true. |
|
2196 |
]. |
|
2197 |
recTree isPrimary ifTrue:[ |
|
2198 |
name := recTree name. |
|
2199 |
isMeta ifTrue:[ |
|
2200 |
name := name , ' class'. |
|
2201 |
]. |
|
2202 |
^ name |
|
2203 |
] |
|
2204 |
]. |
|
2205 |
"more strange things" |
|
2206 |
^ nil |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2207 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2208 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2209 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2210 |
is it a change in a class-description ? |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2211 |
" |
| 2322 | 2212 |
|
| 6288 | 2213 |
(('subclass:*' match:sel)
|
| 2322 | 2214 |
or:[('variable*ubclass:*' match:sel)]) ifTrue:[
|
| 7953 | 2215 |
"/ must parse the full changes text, to get |
2216 |
"/ privacy information. |
|
2217 |
||
2218 |
changeStream := self streamForChange:changeNr. |
|
2219 |
changeStream notNil ifTrue:[ |
|
2220 |
chunk := changeStream nextChunk. |
|
2221 |
changeStream close. |
|
| 8665 | 2222 |
fullParseTree := self parseExpression:chunk. |
| 7953 | 2223 |
(fullParseTree isNil or:[fullParseTree == #Error]) ifTrue:[ |
2224 |
fullParseTree := nil |
|
2225 |
] ifFalse:[ |
|
2226 |
fullParseTree isMessage ifFalse:[ |
|
2227 |
fullParseTree := nil |
|
2228 |
] |
|
2229 |
]. |
|
2230 |
"/ actually, the nil case cannot happen |
|
2231 |
fullParseTree notNil ifTrue:[ |
|
2232 |
aParseTree := fullParseTree. |
|
2233 |
sel := aParseTree selector. |
|
2234 |
]. |
|
2235 |
]. |
|
2236 |
||
2237 |
arg1Tree := aParseTree arg1. |
|
2238 |
(arg1Tree notNil and:[arg1Tree isConstant]) ifTrue:[ |
|
2239 |
name := arg1Tree value asString. |
|
2240 |
||
2241 |
"/ is it a private-class ? |
|
2242 |
('*privateIn:' match:sel) ifTrue:[
|
|
2243 |
ownerTree := aParseTree args last. |
|
2244 |
ownerName := ownerTree name asString. |
|
2245 |
name := ownerName , '::' , name |
|
2246 |
]. |
|
2247 |
^ name |
|
2248 |
]. |
|
2249 |
"very strange" |
|
2250 |
^ nil |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2251 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2252 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2253 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2254 |
is it a class remove ? |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2255 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2256 |
(sel == #removeClass:) ifTrue:[ |
| 7953 | 2257 |
(recTree notNil |
2258 |
and:[recTree ~~ #Error |
|
2259 |
and:[recTree isPrimary |
|
2260 |
and:[recTree name = 'Smalltalk']]]) ifTrue:[ |
|
2261 |
arg1Tree := aParseTree arg1. |
|
2262 |
(arg1Tree notNil and:[arg1Tree isPrimary]) ifTrue:[ |
|
2263 |
name := arg1Tree name. |
|
2264 |
^ name |
|
2265 |
]. |
|
2266 |
] |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2267 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2268 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2269 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2270 |
is it a method category change ? |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2271 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2272 |
((sel == #category:) |
| 7953 | 2273 |
or:[sel == #package: |
2274 |
or:[sel == #privacy:]]) ifTrue:[ |
|
2275 |
(recTree notNil |
|
2276 |
and:[recTree ~~ #Error |
|
2277 |
and:[recTree isMessage |
|
2278 |
and:[recTree selector == #compiledMethodAt:]]]) ifTrue:[ |
|
2279 |
isMeta := false. |
|
2280 |
recTree := recTree receiver. |
|
2281 |
recTree isUnaryMessage ifTrue:[ |
|
2282 |
(recTree selector ~~ #class) ifTrue:[^ nil]. |
|
2283 |
"id class " |
|
2284 |
recTree := recTree receiver |
|
2285 |
]. |
|
2286 |
recTree isPrimary ifTrue:[ |
|
2287 |
isMeta ifTrue:[ |
|
2288 |
name := name , ' class'. |
|
2289 |
]. |
|
2290 |
name := recTree name. |
|
2291 |
^ name |
|
2292 |
] |
|
2293 |
] |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2294 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2295 |
^ nil |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2296 |
|
| 2606 | 2297 |
"Modified: / 13.2.2000 / 15:05:28 / cg" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2298 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2299 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2300 |
numberOfChanges |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2301 |
^ changePositions size |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2302 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2303 |
"Created: 3.12.1995 / 18:15:39 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2304 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2305 |
|
| 2511 | 2306 |
ownerClassNameOfChange:changeNr |
| 6288 | 2307 |
"return the owner classname of a change |
| 2511 | 2308 |
For a normal class, this is the className; |
2309 |
for a private class, this is the name of the owning class" |
|
2310 |
||
| 4706 | 2311 |
|name "ns idx" cls| |
| 2511 | 2312 |
|
2313 |
name := self classNameOfChange:changeNr. |
|
2314 |
name isNil ifTrue:[^ nil]. |
|
2315 |
cls := Smalltalk at:name asSymbol. |
|
2316 |
(cls notNil and:[cls isBehavior]) ifTrue:[ |
|
| 6288 | 2317 |
cls owningClass notNil ifTrue:[ |
2318 |
^ cls owningClass name |
|
2319 |
]. |
|
2320 |
^ cls name |
|
| 2511 | 2321 |
]. |
2322 |
||
2323 |
"/ (name includes:$:) ifTrue:[ |
|
2324 |
"/ idx := name indexOf:$:. |
|
2325 |
"/ ns := name copyTo:idx-1. |
|
2326 |
"/ ns := Smalltalk at:ns asSymbol. |
|
2327 |
"/ ns notNil ifTrue:[ |
|
| 6288 | 2328 |
"/ |
| 2511 | 2329 |
"/ ]. |
2330 |
"/ |
|
2331 |
"/ name := name copyFrom:idx+2. |
|
2332 |
"/ (Smalltalk at:ns asSymbol) notNil ifTrue:[ |
|
2333 |
"/ cls |
|
2334 |
"/ ]. |
|
2335 |
"/ ^ name copyWithoutLast:6 |
|
2336 |
"/ ]. |
|
2337 |
^ name |
|
2338 |
||
2339 |
"Modified: 6.12.1995 / 17:06:31 / cg" |
|
2340 |
! |
|
2341 |
||
| 3364 | 2342 |
realClassNameOfChange:changeNr |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
2343 |
"return the classname of a change. |
| 6288 | 2344 |
- since parsing ascii methods is slow, keep result cached in |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
2345 |
changeClassNames for the next query" |
| 3364 | 2346 |
|
2347 |
|name| |
|
2348 |
||
2349 |
name := changeClassNames at:changeNr. |
|
2350 |
name isNil ifTrue:[ |
|
| 6288 | 2351 |
name := self fullClassNameOfChange:changeNr. |
2352 |
name isNil ifTrue:[ |
|
2353 |
changeClassNames at:changeNr put:#nil. |
|
2354 |
]. |
|
| 3364 | 2355 |
]. |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
2356 |
name == #nil ifTrue:[^ nil]. |
| 3364 | 2357 |
^ name |
2358 |
||
2359 |
"Modified: / 6.12.1995 / 17:06:31 / cg" |
|
2360 |
"Created: / 5.11.2001 / 18:09:46 / cg" |
|
2361 |
! |
|
2362 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2363 |
selectorOfMethodChange:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2364 |
"return a method-changes selector, or nil if its not a methodChange" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2365 |
|
| 3202 | 2366 |
|sel | |
2367 |
||
2368 |
changeSelectors size >= changeNr ifTrue:[ |
|
| 6288 | 2369 |
sel := changeSelectors at:changeNr. |
2370 |
sel notNil ifTrue:[ ^ sel ]. |
|
| 3202 | 2371 |
]. |
2372 |
||
2373 |
sel := self extractSelectorOfMethodChange:changeNr. |
|
2374 |
sel notNil ifTrue:[ |
|
| 6288 | 2375 |
changeSelectors isNil ifTrue:[ |
2376 |
changeSelectors := OrderedCollection new |
|
2377 |
]. |
|
2378 |
changeSelectors grow:changeNr. |
|
2379 |
changeSelectors at:changeNr put:sel. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2380 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2381 |
^ sel |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2382 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2383 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2384 |
sourceOfMethodChange:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2385 |
"return a method-changes source code, or nil if its not a methodChange." |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2386 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2387 |
|aStream chunk sawExcla parseTree sourceChunk sel| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2388 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2389 |
aStream := self streamForChange:changeNr. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2390 |
aStream isNil ifTrue:[^ nil]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2391 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2392 |
(self changeIsFollowupMethodChange:changeNr) ifFalse:[ |
| 8665 | 2393 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
2394 |
chunk := aStream nextChunk. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2395 |
] ifTrue:[ |
| 8665 | 2396 |
chunk := (changeChunks at:changeNr). |
2397 |
sawExcla := true. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2398 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2399 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2400 |
sawExcla ifTrue:[ |
| 8665 | 2401 |
parseTree := self parseExpression:chunk. |
2402 |
(parseTree notNil |
|
2403 |
and:[parseTree ~~ #Error |
|
2404 |
and:[parseTree isMessage]]) ifTrue:[ |
|
2405 |
sel := parseTree selector. |
|
2406 |
(#( |
|
2407 |
#methodsFor: |
|
2408 |
#privateMethodsFor: |
|
2409 |
#publicMethodsFor: |
|
2410 |
#ignoredMethodsFor: |
|
2411 |
#protectedMethodsFor: |
|
2412 |
||
2413 |
#methodsFor:stamp: "/ Squeak support |
|
2414 |
#commentStamp:prior: "/ Squeak support |
|
2415 |
#methodsFor "/ Dolphin support |
|
2416 |
#methods "/ STV support |
|
2417 |
) |
|
2418 |
includes:sel) ifTrue:[ |
|
2419 |
sourceChunk := aStream nextChunk. |
|
2420 |
] |
|
2421 |
]. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2422 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2423 |
aStream close. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2424 |
^ sourceChunk |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2425 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2426 |
"Created: / 5.9.1996 / 17:11:32 / cg" |
| 2606 | 2427 |
"Modified: / 13.2.2000 / 15:05:45 / cg" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2428 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2429 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2430 |
streamForChange:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2431 |
"answer a stream for change" |
| 6288 | 2432 |
|
| 5702 | 2433 |
|aStream encoding decoder| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2434 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2435 |
(changeNr between:1 and:changePositions size) ifFalse:[^ nil]. |
| 5702 | 2436 |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
2437 |
aStream := changeFileName asFilename readStreamOrNil. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2438 |
aStream isNil ifTrue:[^ nil]. |
| 5702 | 2439 |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2440 |
encodingIfKnown isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2441 |
encoding := CharacterEncoder guessEncodingOfStream:aStream. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2442 |
encodingIfKnown := encoding ? #none |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2443 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2444 |
(encodingIfKnown notNil and:[encodingIfKnown ~~ #none]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2445 |
decoder := CharacterEncoder encoderFor:encodingIfKnown. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2446 |
aStream := EncodedStream stream:aStream encoder:decoder. |
| 5702 | 2447 |
]. |
2448 |
||
|
4599
9a95e5ae08ad
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
4497
diff
changeset
|
2449 |
aStream position1Based:(changePositions at:changeNr). |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2450 |
^ aStream |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2451 |
! ! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2452 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2453 |
!ChangesBrowser methodsFor:'private-changeFile access'! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2454 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2455 |
changeFileName:aFileName |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2456 |
"set the name of the changeFile" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2457 |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2458 |
changeFileName := aFileName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
2459 |
encodingIfKnown := nil. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2460 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2461 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2462 |
checkIfFileHasChanged |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2463 |
"check if the changeFile has been modified since the last check; |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2464 |
install a timeout for rechecking after some time." |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
2465 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2466 |
|f info | |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2467 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2468 |
Processor removeTimedBlock:checkBlock. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2469 |
f := changeFileName asFilename. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2470 |
(info := f info) isNil ifTrue:[ |
| 6288 | 2471 |
self newLabel:'(unaccessable)' |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2472 |
] ifFalse:[ |
| 6288 | 2473 |
(info modificationTime) > changeFileTimestamp ifTrue:[ |
2474 |
self newLabel:'(outdated)'. |
|
2475 |
autoUpdate value ifTrue:[ |
|
2476 |
self doUpdate |
|
2477 |
] |
|
2478 |
] ifFalse:[ |
|
2479 |
self newLabel:'' |
|
2480 |
] |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2481 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2482 |
Processor addTimedBlock:checkBlock afterSeconds:5. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2483 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2484 |
"Created: 8.9.1995 / 19:30:19 / claus" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2485 |
"Modified: 8.9.1995 / 19:38:18 / claus" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2486 |
"Modified: 1.11.1996 / 20:22:56 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2487 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2488 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2489 |
readChangesFile |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2490 |
"read the changes file, create a list of header-lines (changeChunks) |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2491 |
and a list of chunk-positions (changePositions)" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2492 |
|
| 5178 | 2493 |
self readChangesFileInBackground:false. |
2494 |
self newLabel:''. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2495 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2496 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2497 |
readChangesFileInBackground:inBackground |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2498 |
"read the changes file, create a list of header-lines (changeChunks) |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2499 |
and a list of chunk-positions (changePositions). |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2500 |
Starting with 2.10.3, the entries are multi-col entries; |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2501 |
the cols are: |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2502 |
1 delta (only if comparing) |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2503 |
'+' -> new method (w.r.t. current state) |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2504 |
'-' -> removed method (w.r.t. current state) |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2505 |
'?' -> class does not exist currently |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2506 |
'=' -> change is the same as current methods source |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2507 |
'~' -> change is almost the same as current methods source |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2508 |
2 class/selector |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2509 |
3 type of change |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2510 |
doit |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2511 |
method |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2512 |
category change |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2513 |
4 timestamp |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2514 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2515 |
since comparing slows down startup time, it is now disabled by |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2516 |
default and can be enabled via a toggle." |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2517 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2518 |
|inStream i f askedForEditingClassSource myProcess myPriority myPrioRange encoding decoder| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2519 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2520 |
editingClassSource := false. |
| 2641 | 2521 |
askedForEditingClassSource := false. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2522 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2523 |
"/ maxLen := 60. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2524 |
|
| 3674 | 2525 |
self newLabel:'updating ...'. |
2526 |
||
2527 |
(self class isXMLFile:changeFileName) ifTrue:[ |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2528 |
^ self class readXMLChangesFromFile:changeFileName inBackground:inBackground |
| 3674 | 2529 |
]. |
2530 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2531 |
f := changeFileName asFilename. |
| 7346 | 2532 |
f exists ifFalse:[^ self]. |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2533 |
inStream := f readStream. |
| 5715 | 2534 |
|
|
6173
4ba4589e4952
guessEncoding now implemented in CharacterEncoder
Claus Gittinger <cg@exept.de>
parents:
6162
diff
changeset
|
2535 |
encoding := CharacterEncoder guessEncodingOfStream:inStream. |
| 5696 | 2536 |
encoding notNil ifTrue:[ |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2537 |
decoder := CharacterEncoder encoderFor:encoding. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2538 |
inStream := EncodedStream stream:inStream encoder:decoder. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2539 |
inStream skipEncodingChunk. |
| 5696 | 2540 |
]. |
2541 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2542 |
i := f info. |
|
3965
e499c0dae8fc
use #fileSize instead of #size
Claus Gittinger <cg@exept.de>
parents:
3962
diff
changeset
|
2543 |
changeFileSize := i fileSize. |
|
3962
3906b10c42fd
modified -> modificationTime
Claus Gittinger <cg@exept.de>
parents:
3930
diff
changeset
|
2544 |
changeFileTimestamp := i modificationTime. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2545 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2546 |
self withReadCursorDo:[ |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2547 |
" |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2548 |
this is a time consuming operation (especially, if reading an |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2549 |
NFS-mounted directory; therefore lower my priority ... |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2550 |
" |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2551 |
inBackground ifTrue:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2552 |
myProcess := Processor activeProcess. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2553 |
myPriority := myProcess priority. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2554 |
myPrioRange := myProcess priorityRange. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2555 |
myProcess priorityRange:(Processor userBackgroundPriority to:Processor activePriority). |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2556 |
]. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2557 |
|
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2558 |
[ |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2559 |
|reader| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2560 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2561 |
reader := ChangeFileReader new. |
|
6516
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
2562 |
reader changeFileName:changeFileName. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2563 |
reader browser:self. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2564 |
reader enforcedNameSpace:enforcedNameSpace. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2565 |
reader autoCompare:autoCompare. |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
2566 |
reader autoloadAsRequired:autoloadAsRequired. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2567 |
reader tabSpec:tabSpec. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2568 |
reader inStream:inStream. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2569 |
reader noColoring:(NoColoring == true). |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2570 |
reader readChangesFile. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2571 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2572 |
editingClassSource := reader thisIsAClassSource. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2573 |
changeChunks := reader changeChunks. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2574 |
changeClassNames := reader changeClassNames. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2575 |
changeHeaderLines := reader changeHeaderLines. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2576 |
changePositions := reader changePositions. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2577 |
changeTimeStamps := reader changeTimeStamps. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2578 |
changeIsFollowupMethodChange := reader changeIsFollowupMethodChange. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
2579 |
|
| 7360 | 2580 |
anyChanges := false. |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2581 |
] ensure:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2582 |
inStream close. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2583 |
inBackground ifTrue:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2584 |
myProcess priority:myPriority. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2585 |
myProcess priorityRange:myPrioRange. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2586 |
]. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2587 |
]. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2588 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2589 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2590 |
self checkIfFileHasChanged |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2591 |
|
| 7360 | 2592 |
"Modified: / 27-08-1995 / 23:06:55 / claus" |
2593 |
"Modified: / 06-10-2006 / 11:08:37 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2594 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2595 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2596 |
writeBackChanges |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2597 |
"write back the changes file. To avoid problems when the disk is full |
| 6288 | 2598 |
or a crash occurs while writing (well, or someone kills us), |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2599 |
first write the stuff to a new temporary file. If this works ok, |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2600 |
rename the old change-file to a .bak file and finally rename the |
| 6288 | 2601 |
tempfile back to the change-file. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2602 |
That way, if anything happens, either the original file is left unchanged, |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2603 |
or we have at least a backup of the previous change file." |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2604 |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2605 |
|inStream outStream tempfile stamp f encoding decoder| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2606 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2607 |
editingClassSource ifTrue:[ |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2608 |
(self confirm:'You are editing a classes sourceFile (not a changeFile) !!\\Are you certain, you want to overwrite it ?' withCRs) |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2609 |
ifFalse:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2610 |
^ false |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2611 |
] |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2612 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2613 |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2614 |
[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2615 |
inStream := changeFileName asFilename readStream. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2616 |
] on:FileStream openErrorSignal do:[:ex| |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2617 |
self warn:'Cannot open old changesFile.'. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2618 |
^ false |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2619 |
]. |
| 9020 | 2620 |
[ |
2621 |
tempfile := Filename newTemporaryIn:nil. |
|
2622 |
tempfile exists ifTrue:[tempfile remove]. |
|
2623 |
[ |
|
2624 |
outStream := tempfile writeStream. |
|
2625 |
] on:FileStream openErrorSignal do:[:ex| |
|
2626 |
self warn:'Cannot create temp file in current directory.'. |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2627 |
^ false |
| 9020 | 2628 |
]. |
2629 |
||
2630 |
outStream nextPutLine:'"{ Encoding: utf8 }" !!'.
|
|
2631 |
outStream := EncodedStream stream:outStream encoder:(CharacterEncoder encoderForUTF8). |
|
2632 |
||
2633 |
encoding := CharacterEncoder guessEncodingOfStream:inStream. |
|
2634 |
encoding notNil ifTrue:[ |
|
2635 |
decoder := CharacterEncoder encoderFor:encoding. |
|
2636 |
inStream := EncodedStream stream:inStream encoder:decoder. |
|
2637 |
]. |
|
2638 |
||
2639 |
self withCursor:(Cursor write) do:[ |
|
2640 |
|excla sawExcla done first chunk |
|
2641 |
nChanges "{Class:SmallInteger}" |
|
|
2642 |
||
2643 |
Stream writeErrorSignal handle:[:ex | |
|
2644 |
self warn:('Could not update the changes file.\\' , ex description) withCRs.
|
|
2645 |
tempfile exists ifTrue:[tempfile remove]. |
|
2646 |
^ false |
|
2647 |
] do:[ |
|
2648 |
excla := inStream class chunkSeparator. |
|
2649 |
nChanges := self numberOfChanges. |
|
2650 |
||
2651 |
1 to:nChanges do:[:index | |
|
2652 |
inStream position1Based:(changePositions at:index). |
|
2653 |
sawExcla := inStream peekFor:excla. |
|
2654 |
chunk := inStream nextChunk. |
|
2655 |
||
2656 |
(chunk notNil |
|
2657 |
and:[(chunk startsWith:'''---- snap') not]) ifTrue:[ |
|
2658 |
(stamp := changeTimeStamps at:index) notNil ifTrue:[ |
|
2659 |
outStream nextPutAll:'''---- timestamp ' , stamp , ' ----'''. |
|
2660 |
outStream nextPut:excla; cr. |
|
2661 |
]. |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2662 |
]. |
| 9020 | 2663 |
|
2664 |
sawExcla ifTrue:[ |
|
2665 |
outStream nextPut:excla. |
|
2666 |
outStream nextChunkPut:chunk. |
|
2667 |
outStream cr; cr. |
|
2668 |
" |
|
2669 |
a method-definition chunk - output followups |
|
2670 |
" |
|
2671 |
done := false. |
|
2672 |
first := true. |
|
2673 |
[done] whileFalse:[ |
|
2674 |
chunk := inStream nextChunk. |
|
2675 |
chunk isNil ifTrue:[ |
|
2676 |
outStream cr; cr. |
|
2677 |
done := true |
|
2678 |
] ifFalse:[ |
|
2679 |
chunk isEmpty ifTrue:[ |
|
2680 |
outStream space; nextChunkPut:chunk; cr; cr. |
|
2681 |
done := true. |
|
2682 |
] ifFalse:[ |
|
2683 |
first ifFalse:[ |
|
2684 |
outStream cr; cr. |
|
2685 |
]. |
|
2686 |
outStream nextChunkPut:chunk. |
|
2687 |
]. |
|
2688 |
]. |
|
2689 |
first := false. |
|
2690 |
]. |
|
2691 |
] ifFalse:[ |
|
2692 |
outStream nextChunkPut:chunk. |
|
2693 |
outStream cr |
|
2694 |
] |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2695 |
]. |
| 9020 | 2696 |
outStream syncData; close. |
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2697 |
]. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2698 |
inStream close. |
| 9020 | 2699 |
|
2700 |
f := changeFileName asFilename. |
|
2701 |
f renameTo:(f withSuffix:'bak'). |
|
2702 |
tempfile renameOrCopyTo:changeFileName. |
|
2703 |
anyChanges := false |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
2704 |
]. |
| 9020 | 2705 |
] ensure:[ |
2706 |
inStream close. |
|
2707 |
]. |
|
2708 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2709 |
^ true |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2710 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2711 |
"Modified: / 2.12.1996 / 22:29:15 / stefan" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2712 |
"Modified: / 21.4.1998 / 17:50:11 / cg" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2713 |
! ! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2714 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2715 |
!ChangesBrowser methodsFor:'private-user interaction ops'! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
2716 |
|
| 5735 | 2717 |
appendChange:changeNr toFile:aFileNameOrFileNameString |
| 202 | 2718 |
"append change to a file. return true if ok." |
2719 |
||
| 5735 | 2720 |
|fileName changeInStream outStream chunk chunk2 sawExcla separator encoding| |
2721 |
||
2722 |
changeInStream := self streamForChange:changeNr. |
|
2723 |
changeInStream isNil ifTrue:[ |
|
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2724 |
self warn:'Cannot read change'. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2725 |
^ false |
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
2726 |
]. |
| 5735 | 2727 |
changeInStream skipSeparators. |
2728 |
||
2729 |
separator := changeInStream class chunkSeparator. |
|
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
2730 |
|
|
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
2731 |
(self changeIsFollowupMethodChange:changeNr) ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2732 |
sawExcla := true. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2733 |
chunk := changeChunks at:changeNr. |
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
2734 |
] ifFalse:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2735 |
sawExcla := changeInStream peekFor:separator. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2736 |
chunk := changeInStream nextChunk. |
| 3991 | 2737 |
]. |
2738 |
chunk withoutSeparators isEmpty ifTrue:[ |
|
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2739 |
self error:'Empty chunk - should not happen' mayProceed:true. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2740 |
^ false. |
| 5735 | 2741 |
]. |
2742 |
||
2743 |
fileName := aFileNameOrFileNameString asFilename. |
|
2744 |
fileName exists ifTrue:[ |
|
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2745 |
encoding := CharacterEncoder guessEncodingOfFile:fileName. |
| 5735 | 2746 |
] ifFalse:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2747 |
encoding := #utf8. |
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
2748 |
]. |
| 202 | 2749 |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
2750 |
[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2751 |
outStream := fileName readWriteStream. |
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
2752 |
] on:FileStream openErrorSignal do:[:ex| |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2753 |
self warn:'Cannot update file: ''%1''' with:fileName. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2754 |
^ false |
| 73 | 2755 |
]. |
| 202 | 2756 |
|
| 5735 | 2757 |
encoding notNil ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2758 |
outStream := EncodedStream stream:outStream encoder:(CharacterEncoder encoderFor:encoding). |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2759 |
outStream nextPutLine:'"{ Encoding: utf8 }" !!'.
|
| 5735 | 2760 |
]. |
2761 |
||
| 202 | 2762 |
outStream setToEnd. |
2763 |
||
2764 |
sawExcla ifTrue:[ |
|
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2765 |
outStream nextPut:separator |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2766 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2767 |
outStream nextChunkPut:chunk; cr. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2768 |
sawExcla ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2769 |
chunk2 := changeInStream nextChunk. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2770 |
chunk2 withoutSeparators isEmpty ifTrue:[ |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2771 |
self error:'Empty chunk - should not happen'. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2772 |
]. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2773 |
outStream nextChunkPut:chunk2; space |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2774 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2775 |
sawExcla ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
2776 |
outStream nextPut:separator |
| 202 | 2777 |
]. |
2778 |
outStream cr. |
|
| 5735 | 2779 |
|
2780 |
changeInStream close. |
|
| 202 | 2781 |
outStream close. |
2782 |
^ true |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2783 |
|
| 1472 | 2784 |
"Modified: / 6.2.1998 / 13:03:54 / cg" |
| 73 | 2785 |
! |
2786 |
||
| 51 | 2787 |
applyChange:changeNr |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2788 |
"fileIn a change. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2789 |
Answer true, if everything went ok." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2790 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2791 |
|aStream applyAction nameSpace className changeClass ownerName ownerClass reader doItChunk methodsForChunk pkg |
| 4877 | 2792 |
alternativeClass shortName orgClassName nsClass aborted| |
| 45 | 2793 |
|
| 51 | 2794 |
aStream := self streamForChange:changeNr. |
2795 |
aStream isNil ifTrue:[^ self]. |
|
2796 |
||
| 2965 | 2797 |
className := self classNameOfChange:changeNr. |
2798 |
className notNil ifTrue:[ |
|
| 6378 | 2799 |
className := className asSymbol. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
2800 |
enforcedNameSpace notNil ifTrue:[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
2801 |
changeClass := enforcedNameSpace at:className ifAbsent:nil. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
2802 |
] ifFalse:[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
2803 |
changeClass := Smalltalk at:className ifAbsent:nil. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
2804 |
]. |
| 6378 | 2805 |
changeClass isNil ifTrue:[ |
2806 |
changeClass := self classOfChange:changeNr. |
|
2807 |
]. |
|
|
8351
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
2808 |
changeClass notNil ifTrue:[ |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
2809 |
"load unloaded class. Otherwise a class definition change |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
2810 |
will create a class without methods" |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
2811 |
changeClass autoload. |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
2812 |
]. |
| 51 | 2813 |
]. |
| 45 | 2814 |
|
| 51 | 2815 |
changeNrProcessed := changeNr. |
| 4877 | 2816 |
aborted := false. |
| 45 | 2817 |
|
| 6288 | 2818 |
applyAction := |
| 6378 | 2819 |
[ |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2820 |
AbortOperationRequest handle:[:ex | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2821 |
"catch the abort of a single apply here. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
2822 |
Send AbortAllOperationRequest to abort multiple operations" |
| 6378 | 2823 |
aborted := true. |
2824 |
ex return. |
|
2825 |
] do:[ |
|
2826 |
nameSpace := self nameSpaceForApply. |
|
2827 |
||
2828 |
pkg := enforcedPackage ? Class packageQuerySignal query. |
|
2829 |
Class packageQuerySignal answer:pkg |
|
2830 |
do:[ |
|
2831 |
Class nameSpaceQuerySignal answer:nameSpace |
|
2832 |
do:[ |
|
2833 |
"/ a followup methodsFor: chunk ... |
|
2834 |
(self changeIsFollowupMethodChange:changeNr) ifTrue:[ |
|
2835 |
methodsForChunk := (changeChunks at:changeNr). |
|
2836 |
] ifFalse:[ |
|
2837 |
doItChunk := aStream nextChunk. "/ an empty chunk sometimes ... |
|
2838 |
doItChunk notEmpty ifTrue:[ |
|
| 7528 | 2839 |
doItChunk first = (Character value:16rFEFF) ifTrue:[ |
2840 |
doItChunk := doItChunk copyFrom:2. |
|
2841 |
]. |
|
| 6378 | 2842 |
Compiler evaluate:doItChunk notifying:self. |
2843 |
] ifFalse:[ |
|
2844 |
methodsForChunk := aStream nextChunk. "/ the real one |
|
2845 |
] |
|
2846 |
]. |
|
2847 |
methodsForChunk notNil ifTrue:[ |
|
2848 |
changeClass isNil ifTrue:[ |
|
2849 |
orgClassName := className. |
|
2850 |
||
2851 |
(className includes:$:) ifTrue:[ |
|
2852 |
ownerName := className copyTo:(className lastIndexOf:$:) - 1. |
|
2853 |
(ownerName endsWith:$:) ifTrue:[ |
|
2854 |
ownerName := ownerName copyWithoutLast:1. |
|
2855 |
]. |
|
2856 |
||
2857 |
ownerClass := Smalltalk at:(ownerName asSymbol) ifAbsent:[]. |
|
2858 |
ownerClass notNil ifTrue:[ |
|
2859 |
ownerClass autoload |
|
2860 |
]. |
|
2861 |
]. |
|
2862 |
(nameSpace notNil and:[nameSpace ~~ Smalltalk]) ifTrue:[ |
|
2863 |
changeClass := nameSpace at:className ifAbsent:[]. |
|
2864 |
]. |
|
2865 |
changeClass isNil ifTrue:[ |
|
2866 |
changeClass := Smalltalk at:className ifAbsent:[]. |
|
2867 |
]. |
|
2868 |
[changeClass isNil] whileTrue:[ |
|
| 6682 | 2869 |
(NameSpace allNameSpaces |
| 9527 | 2870 |
contains:[:ns | (nsClass := (ns at:className)) notNil]) |
2871 |
ifTrue:[ |
|
| 6378 | 2872 |
shortName := nsClass name. |
2873 |
] ifFalse:[ |
|
2874 |
shortName := className copyFrom:(className lastIndexOf:$:) + 1. |
|
2875 |
shortName = className ifTrue:[ |
|
2876 |
shortName := '' |
|
2877 |
]. |
|
2878 |
]. |
|
2879 |
className := Dialog |
|
2880 |
request:'No class ''' , className , ''' for change. Add to which class ?' |
|
2881 |
initialAnswer:shortName. |
|
2882 |
||
2883 |
className size == 0 ifTrue:[ |
|
2884 |
^ self |
|
2885 |
]. |
|
2886 |
alternativeClass := Smalltalk classNamed:className. |
|
2887 |
alternativeClass notNil ifTrue:[ |
|
2888 |
changeClass := alternativeClass |
|
2889 |
] |
|
2890 |
]. |
|
2891 |
methodsForChunk := methodsForChunk copyFrom:(methodsForChunk indexOfSeparator). |
|
2892 |
methodsForChunk := changeClass name , methodsForChunk. |
|
2893 |
]. |
|
2894 |
reader := Compiler evaluate:methodsForChunk notifying:self. |
|
2895 |
reader fileInFrom:aStream notifying:self passChunk:false single:true. |
|
2896 |
] |
|
2897 |
] |
|
2898 |
] |
|
2899 |
]. |
|
2900 |
changeNrProcessed := nil. |
|
2901 |
]. |
|
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2902 |
|
|
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2903 |
"/ |
|
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2904 |
"/ if I am showing the changes file, dont update it |
|
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2905 |
"/ |
|
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2906 |
changeFileName = ObjectMemory nameForChanges ifTrue:[ |
| 6378 | 2907 |
Class withoutUpdatingChangesDo:[ |
2908 |
Class updateChangeListQuerySignal answer:updateChangeSet value do:applyAction |
|
2909 |
] |
|
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2910 |
] ifFalse:[ |
| 6378 | 2911 |
applyAction value |
| 45 | 2912 |
]. |
| 4877 | 2913 |
aStream close. |
2914 |
||
2915 |
^ aborted not |
|
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
2916 |
|
| 9527 | 2917 |
"Modified: / 21-07-2010 / 18:03:31 / cg" |
| 45 | 2918 |
! |
2919 |
||
| 7953 | 2920 |
compareCategoryChange:parseTree |
2921 |
|receiverExpression method| |
|
2922 |
||
2923 |
receiverExpression := parseTree receiver. |
|
2924 |
receiverExpression isMessage ifTrue:[ |
|
2925 |
receiverExpression selector == #compiledMethodAt: ifTrue:[ |
|
2926 |
(receiverExpression receiver evaluate isBehavior |
|
2927 |
and:[(method := receiverExpression evaluate) isMethod]) ifTrue:[ |
|
2928 |
method category = parseTree arg1 evaluate ifTrue:[ |
|
2929 |
^ true -> 'Change has no effect\\(same category)'. |
|
2930 |
] ifFalse:[ |
|
| 8173 | 2931 |
^ false -> ('Category is different (''' , method category , ''' vs. ''' , parseTree arg1 evaluate , ''')').
|
| 7953 | 2932 |
] |
2933 |
] ifFalse:[ |
|
2934 |
^ nil -> 'There is no such method'. |
|
2935 |
] |
|
2936 |
] |
|
2937 |
]. |
|
2938 |
^ nil -> 'Unhandled receiver' |
|
2939 |
! |
|
2940 |
||
| 255 | 2941 |
compareChange:changeNr |
| 2835 | 2942 |
"compare a change with the current (in-image) version; show the result of the compare (as dialog)" |
2943 |
||
2944 |
^ self compareChange:changeNr showResult:true |
|
2945 |
! |
|
2946 |
||
2947 |
compareChange:changeNr showResult:doShowResult |
|
2948 |
"compare a change with current version. |
|
2949 |
Return the result of the compare (same -> true, different -> false, uncomparable -> nil). |
|
2950 |
If doShowResult is true, the outcome is shown in a dialog/diffViewer." |
|
| 255 | 2951 |
|
2952 |
|aStream chunk sawExcla parseTree thisClass cat oldSource newSource |
|
| 7953 | 2953 |
parser sel oldMethod outcome showDiff d t1 t2 selector isLoaded beep superClass thisClassSym varsHere varsInChange addedVars removedVars |
2954 |
isSame ownerClass superClassHere superClassInChange sameAndOutcome | |
|
| 255 | 2955 |
|
2956 |
aStream := self streamForChange:changeNr. |
|
| 2835 | 2957 |
aStream isNil ifTrue:[^ nil]. |
| 255 | 2958 |
|
|
275
604a906c0eb7
better handling of changes for autoloaded classes
Claus Gittinger <cg@exept.de>
parents:
255
diff
changeset
|
2959 |
showDiff := false. |
|
604a906c0eb7
better handling of changes for autoloaded classes
Claus Gittinger <cg@exept.de>
parents:
255
diff
changeset
|
2960 |
|
| 1472 | 2961 |
(self changeIsFollowupMethodChange:changeNr) ifFalse:[ |
| 6357 | 2962 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
2963 |
chunk := aStream nextChunk. |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2964 |
] ifTrue:[ |
| 6357 | 2965 |
chunk := (changeChunks at:changeNr). |
2966 |
sawExcla := true. |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2967 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
2968 |
|
| 2835 | 2969 |
isSame := nil. |
2970 |
||
| 761 | 2971 |
beep := false. |
| 255 | 2972 |
sawExcla ifFalse:[ |
| 6357 | 2973 |
outcome := 'cannot compare this change\\(i.e. this is not a method change).'. |
2974 |
||
2975 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
2976 |
do:[ |
|
| 8665 | 2977 |
parseTree := self parseExpression:chunk. |
| 6357 | 2978 |
]. |
2979 |
(parseTree notNil and:[parseTree ~~ #Error and:[ parseTree isMessage ]]) ifTrue:[ |
|
2980 |
selector := parseTree selector. |
|
2981 |
||
2982 |
selector == #'removeSelector:' ifTrue:[ |
|
| 7953 | 2983 |
sameAndOutcome := self compareRemoveSelectorChange:parseTree. |
2984 |
isSame := sameAndOutcome key. |
|
2985 |
outcome := sameAndOutcome value. |
|
2986 |
]. |
|
2987 |
selector == #'package:' ifTrue:[ |
|
2988 |
sameAndOutcome := self comparePackageChange:parseTree. |
|
2989 |
isSame := sameAndOutcome key. |
|
2990 |
outcome := sameAndOutcome value. |
|
| 6357 | 2991 |
]. |
2992 |
selector == #'category:' ifTrue:[ |
|
| 7953 | 2993 |
sameAndOutcome := self compareCategoryChange:parseTree. |
2994 |
isSame := sameAndOutcome key. |
|
2995 |
outcome := sameAndOutcome value. |
|
| 6357 | 2996 |
]. |
2997 |
selector == #'comment:' ifTrue:[ |
|
| 7953 | 2998 |
sameAndOutcome := self compareCommentChange:parseTree. |
2999 |
isSame := sameAndOutcome key. |
|
3000 |
outcome := sameAndOutcome value. |
|
| 6357 | 3001 |
]. |
3002 |
||
3003 |
selector == #'instanceVariableNames:' ifTrue:[ |
|
| 7953 | 3004 |
sameAndOutcome := self compareInstanceVariableNamesChange:parseTree. |
3005 |
isSame := sameAndOutcome key. |
|
3006 |
outcome := sameAndOutcome value. |
|
| 6357 | 3007 |
]. |
3008 |
||
3009 |
(Class definitionSelectors includes:selector) |
|
3010 |
"/ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' |
|
3011 |
ifTrue:[ |
|
3012 |
superClass := (parseTree receiver evaluate). |
|
3013 |
superClass isBehavior ifFalse:[ |
|
3014 |
outcome := 'Cannot compare this change\\(superclass not loaded).'. |
|
3015 |
isSame := nil. |
|
3016 |
] ifTrue:[ |
|
3017 |
(self checkClassIsLoaded:superClass) ifTrue:[ |
|
3018 |
thisClassSym := (parseTree arguments at:1) evaluate. |
|
3019 |
||
3020 |
(selector endsWith:':privateIn:') ifTrue:[ |
|
3021 |
ownerClass := (parseTree arguments at:5) evaluate. |
|
3022 |
ownerClass isBehavior ifTrue:[ |
|
3023 |
thisClass := ownerClass privateClassesAt:thisClassSym. |
|
3024 |
]. |
|
3025 |
] ifFalse:[ |
|
3026 |
thisClass := (self nameSpaceForApply) at:thisClassSym ifAbsent:nil. |
|
3027 |
]. |
|
3028 |
thisClass isNil ifTrue:[ |
|
3029 |
outcome := 'Change defines the class: ' , thisClassSym allBold. |
|
3030 |
isSame := false. |
|
3031 |
] ifFalse:[ |
|
3032 |
(isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[ |
|
3033 |
outcome := 'Cannot compare this change\\(compare requires class to be loaded).'. |
|
3034 |
isSame := nil. |
|
3035 |
] ifTrue:[ |
|
3036 |
superClassHere := thisClass superclass name. |
|
3037 |
superClassInChange := parseTree receiver name. |
|
3038 |
superClassHere ~~ superClassInChange ifTrue:[ |
|
3039 |
outcome := 'Superclass is different.'. |
|
3040 |
isSame := false. |
|
3041 |
] ifFalse:[ |
|
3042 |
varsHere := thisClass instanceVariableString asCollectionOfWords. |
|
3043 |
varsInChange := (parseTree arguments at:2) evaluate asCollectionOfWords. |
|
3044 |
varsHere = varsInChange ifTrue:[ |
|
3045 |
thisClass classVariableString asCollectionOfWords = (parseTree arguments at:3) evaluate asCollectionOfWords ifTrue:[ |
|
|
9689
72819fbf329a
changed: #compareChange:showResult:
Claus Gittinger <cg@exept.de>
parents:
9621
diff
changeset
|
3046 |
((thisClass sharedPoolNames size == 0) and:[(parseTree arguments at:4) evaluate = '']) ifTrue:[ |
| 6357 | 3047 |
((selector endsWith:':category:') |
3048 |
and:[thisClass category ~= (parseTree arguments at:5) evaluate]) ifTrue:[ |
|
3049 |
outcome := 'Category is different'. |
|
3050 |
isSame := false. |
|
3051 |
] ifFalse:[ |
|
3052 |
outcome := 'Change has no effect\\(same definition)'. |
|
3053 |
isSame := true. |
|
3054 |
] |
|
|
4296
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3055 |
"/ thisClass category = (parseTree arguments at:5) evaluate ifTrue:[ |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3056 |
"/ outcome := 'Change has no effect\\(same definition)'. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3057 |
"/ isSame := true. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3058 |
"/ ] ifFalse:[ |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3059 |
"/ outcome := 'Category is different'. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3060 |
"/ isSame := false. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
3061 |
"/ ] |
| 6357 | 3062 |
] ifFalse:[ |
3063 |
outcome := 'SharedPool definition is different'. |
|
3064 |
isSame := false. |
|
3065 |
]. |
|
3066 |
] ifFalse:[ |
|
3067 |
outcome := 'ClassVariable definition is different'. |
|
3068 |
isSame := false. |
|
3069 |
] |
|
3070 |
] ifFalse:[ |
|
3071 |
outcome := 'InstanceVariable definition is different'. |
|
3072 |
isSame := false. |
|
3073 |
addedVars := varsInChange select:[:eachVar | (varsHere includes:eachVar) not]. |
|
3074 |
removedVars := varsHere select:[:eachVar | (varsInChange includes:eachVar) not]. |
|
3075 |
addedVars isEmpty ifTrue:[ |
|
3076 |
removedVars isEmpty ifTrue:[ |
|
3077 |
outcome := 'Change reorders instanceVariable(s)'. |
|
3078 |
] ifFalse:[ |
|
3079 |
removedVars := removedVars collect:[:eachVar | '''' , eachVar , '''']. |
|
3080 |
outcome := 'Change removes instanceVariable(s): ' , (removedVars asStringWith:Character space) allBold. |
|
3081 |
] |
|
3082 |
] ifFalse:[ |
|
3083 |
removedVars isEmpty ifTrue:[ |
|
3084 |
addedVars := addedVars collect:[:eachVar | '''' , eachVar , '''']. |
|
3085 |
outcome := 'Change adds instanceVariable(s): ' , (addedVars asStringWith:Character space) allBold. |
|
3086 |
]. |
|
3087 |
]. |
|
3088 |
] |
|
3089 |
] |
|
3090 |
] |
|
3091 |
] |
|
3092 |
] |
|
3093 |
] |
|
3094 |
] |
|
3095 |
] |
|
| 255 | 3096 |
] ifTrue:[ |
| 6357 | 3097 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
3098 |
do:[ |
|
| 8665 | 3099 |
parseTree := self parseExpression:chunk. |
| 6357 | 3100 |
]. |
3101 |
(parseTree notNil |
|
3102 |
and:[parseTree ~~ #Error |
|
3103 |
and:[parseTree isMessage]]) ifTrue:[ |
|
3104 |
"/ Squeak support (#methodsFor:***) |
|
3105 |
(#( |
|
3106 |
#methodsFor: |
|
3107 |
#privateMethodsFor: |
|
3108 |
#publicMethodsFor: |
|
3109 |
#ignoredMethodsFor: |
|
3110 |
#protectedMethodsFor: |
|
3111 |
||
3112 |
#methodsFor:stamp: "/ Squeak support |
|
3113 |
#methodsFor "/ Dolphin support |
|
3114 |
#methods "/ STV support |
|
3115 |
) |
|
3116 |
includes:parseTree selector) ifTrue:[ |
|
3117 |
thisClass := (parseTree receiver evaluate). |
|
3118 |
(thisClass notNil and:[thisClass isKindOf:UndefinedVariable]) ifTrue:[ |
|
3119 |
|thisName path| |
|
3120 |
||
3121 |
thisName := thisClass name. |
|
3122 |
path := thisName asCollectionOfSubstringsSeparatedByAll:'::'. |
|
3123 |
1 to:path size do:[:length | |
|
3124 |
|ownerName owner| |
|
3125 |
||
3126 |
ownerName := (path copyTo:length) asStringCollection asStringWith:'::'. |
|
|
6820
4e8815b9e661
Do not autoload class when comparing changes.
Stefan Vogel <sv@exept.de>
parents:
6682
diff
changeset
|
3127 |
owner := Smalltalk loadedClassNamed:ownerName. |
| 6357 | 3128 |
(owner notNil and:[owner isBehavior and:[owner isLoaded not]]) ifTrue:[ |
3129 |
self checkClassIsLoaded:owner. |
|
3130 |
]. |
|
3131 |
]. |
|
3132 |
thisClass := (parseTree receiver evaluate). |
|
3133 |
]. |
|
3134 |
||
3135 |
thisClass isBehavior ifTrue:[ |
|
3136 |
(isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[ |
|
3137 |
outcome := 'Cannot compare this change\\(compare requires class to be loaded).'. |
|
3138 |
isSame := nil. |
|
3139 |
]. |
|
3140 |
||
3141 |
parseTree selector == #methodsFor ifTrue:[ |
|
3142 |
cat := 'Dolphin methods'. |
|
3143 |
] ifFalse:[ |
|
3144 |
parseTree selector == #methods ifTrue:[ |
|
3145 |
cat := 'STV methods'. |
|
3146 |
] ifFalse:[ |
|
3147 |
cat := parseTree arg1 evaluate. |
|
3148 |
]. |
|
3149 |
]. |
|
3150 |
newSource := aStream nextChunk. |
|
3151 |
||
3152 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
3153 |
do:[ |
|
3154 |
parser := Parser parseMethod:newSource in:thisClass. |
|
3155 |
]. |
|
3156 |
(parser notNil and:[parser ~~ #Error]) ifTrue:[ |
|
3157 |
sel := parser selector. |
|
3158 |
oldMethod := thisClass compiledMethodAt:sel. |
|
3159 |
oldMethod notNil ifTrue:[ |
|
3160 |
(oldMethod category = cat) ifFalse:[ |
|
| 6447 | 3161 |
"/ Transcript showCR:'category changed.'. |
| 6357 | 3162 |
]. |
3163 |
oldSource := oldMethod source. |
|
3164 |
(oldSource = newSource) ifTrue:[ |
|
3165 |
outcome := 'Same source'. |
|
3166 |
isSame := true. |
|
3167 |
] ifFalse:[ |
|
3168 |
oldSource isNil ifTrue:[ |
|
3169 |
beep := true. |
|
3170 |
outcome := 'No source for compare.'. |
|
3171 |
isSame := true. |
|
3172 |
] ifFalse:[ |
|
3173 |
"/ |
|
3174 |
"/ compare for tabulator <-> space changes |
|
3175 |
"/ before showing diff ... |
|
3176 |
"/ |
|
3177 |
t1 := oldSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
3178 |
t2 := newSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
3179 |
t1 = t2 ifTrue:[ |
|
3180 |
outcome := 'Same source'. |
|
3181 |
isSame := true. |
|
3182 |
] ifFalse:[ |
|
3183 |
outcome := 'Source changed.'. |
|
3184 |
showDiff := true. |
|
3185 |
isSame := false. |
|
3186 |
||
3187 |
"/ |
|
3188 |
"/ check if only historyLine diffs |
|
3189 |
"/ |
|
3190 |
(HistoryManager notNil |
|
3191 |
and:[HistoryManager isActive]) ifTrue:[ |
|
3192 |
(HistoryManager withoutHistoryLines:newSource) |
|
3193 |
= |
|
3194 |
(HistoryManager withoutHistoryLines:oldSource) |
|
3195 |
ifTrue:[ |
|
3196 |
outcome := 'Same source (history only)'. |
|
3197 |
isSame := true. |
|
3198 |
showDiff := false. |
|
3199 |
] |
|
3200 |
]. |
|
3201 |
] |
|
3202 |
] |
|
3203 |
] |
|
3204 |
] ifFalse:[ |
|
3205 |
isLoaded ifTrue:[ |
|
3206 |
beep := true. |
|
3207 |
outcome := 'Method does not exist.'. |
|
3208 |
isSame := nil. |
|
3209 |
] |
|
3210 |
] |
|
3211 |
] ifFalse:[ |
|
3212 |
outcome := 'Change is unparsable (parse error).'. |
|
3213 |
isSame := nil. |
|
3214 |
]. |
|
3215 |
doShowResult ifTrue:[ |
|
3216 |
(showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[ |
|
| 8102 | 3217 |
d := DiffCodeView |
| 6639 | 3218 |
openOn:oldSource label:(resources string:'Current version (in image)') |
3219 |
and:newSource label:(resources string:'Change version'). |
|
| 6357 | 3220 |
d label:'method differences'. |
3221 |
] |
|
3222 |
] |
|
3223 |
] ifFalse:[ |
|
3224 |
beep := true. |
|
3225 |
outcome := 'Class does not exist.'. |
|
3226 |
isSame := nil. |
|
3227 |
] |
|
3228 |
] ifFalse:[ |
|
3229 |
beep := true. |
|
3230 |
outcome := 'Not comparable.'. |
|
3231 |
isSame := nil. |
|
3232 |
] |
|
3233 |
] ifFalse:[ |
|
3234 |
beep := true. |
|
3235 |
outcome := 'Not comparable.'. |
|
3236 |
isSame := nil. |
|
3237 |
] |
|
| 255 | 3238 |
]. |
3239 |
aStream close. |
|
| 2835 | 3240 |
|
3241 |
doShowResult ifTrue:[ |
|
| 6357 | 3242 |
showDiff ifFalse:[ |
3243 |
outcome := (resources stringWithCRs:outcome). |
|
3244 |
beep ifTrue:[ |
|
3245 |
self warn:outcome. |
|
3246 |
] ifFalse:[ |
|
3247 |
self information:outcome. |
|
3248 |
] |
|
3249 |
]. |
|
| 255 | 3250 |
]. |
| 2835 | 3251 |
^ isSame. |
| 255 | 3252 |
|
|
9689
72819fbf329a
changed: #compareChange:showResult:
Claus Gittinger <cg@exept.de>
parents:
9621
diff
changeset
|
3253 |
"Created: / 24-11-1995 / 14:30:46 / cg" |
|
72819fbf329a
changed: #compareChange:showResult:
Claus Gittinger <cg@exept.de>
parents:
9621
diff
changeset
|
3254 |
"Modified: / 18-01-2011 / 17:56:04 / cg" |
| 255 | 3255 |
! |
3256 |
||
| 7953 | 3257 |
compareCommentChange:parseTree |
3258 |
|thisClass| |
|
3259 |
||
3260 |
thisClass := (parseTree receiver evaluate). |
|
3261 |
thisClass isBehavior ifTrue:[ |
|
3262 |
(self checkClassIsLoaded:thisClass) ifTrue:[ |
|
3263 |
(thisClass comment = parseTree arg1 evaluate) ifTrue:[ |
|
3264 |
^ true -> 'Change has no effect\\(same comment)'. |
|
3265 |
] ifFalse:[ |
|
3266 |
^ false -> 'Comment is different'. |
|
3267 |
] |
|
3268 |
] ifFalse:[ |
|
3269 |
^ nil -> 'Cannot compare this change (compare requires class to be loaded).'. |
|
3270 |
] |
|
3271 |
]. |
|
3272 |
^ nil -> 'Cannot compare this change (class not present)'. |
|
3273 |
! |
|
3274 |
||
3275 |
compareInstanceVariableNamesChange:parseTree |
|
3276 |
|receiverExpression thisClass varsHere varsInChange | |
|
3277 |
||
3278 |
receiverExpression := parseTree receiver. |
|
3279 |
receiverExpression isMessage ifTrue:[ |
|
3280 |
receiverExpression selector == #class ifTrue:[ |
|
3281 |
thisClass := (receiverExpression evaluate). |
|
3282 |
varsHere := thisClass instanceVariableString asCollectionOfWords. |
|
3283 |
varsInChange := (parseTree arguments at:1) evaluate asCollectionOfWords. |
|
3284 |
varsHere = varsInChange ifTrue:[ |
|
3285 |
^ true -> 'Change has no effect\\(same definition)'. |
|
3286 |
] ifFalse:[ |
|
3287 |
^ false -> 'Class-instanceVariable definition is different'. |
|
3288 |
]. |
|
3289 |
]. |
|
3290 |
]. |
|
3291 |
^ nil -> 'Unhandled receiver' |
|
3292 |
! |
|
3293 |
||
3294 |
comparePackageChange:parseTree |
|
3295 |
|receiverExpression method| |
|
3296 |
||
3297 |
receiverExpression := parseTree receiver. |
|
3298 |
receiverExpression isMessage ifTrue:[ |
|
3299 |
receiverExpression selector == #compiledMethodAt: ifTrue:[ |
|
3300 |
(receiverExpression receiver evaluate isBehavior |
|
3301 |
and:[(method := receiverExpression evaluate) isMethod]) ifTrue:[ |
|
3302 |
method package = parseTree arg1 evaluate ifTrue:[ |
|
3303 |
^ true -> 'Change has no effect\\(same package)'. |
|
3304 |
] ifFalse:[ |
|
| 8000 | 3305 |
^ false -> ('Package is different (''<1p>'' vs. ''<2p>'')' expandMacrosWith:method package with:parseTree arg1 evaluate).
|
| 7953 | 3306 |
] |
3307 |
] ifFalse:[ |
|
3308 |
^ nil -> 'There is no such method'. |
|
3309 |
] |
|
3310 |
] |
|
3311 |
]. |
|
3312 |
^ nil -> 'Unhandled receiver' |
|
3313 |
! |
|
3314 |
||
3315 |
compareRemoveSelectorChange:parseTree |
|
3316 |
|thisClass selector| |
|
3317 |
||
3318 |
thisClass := (parseTree receiver evaluate). |
|
3319 |
thisClass isBehavior ifTrue:[ |
|
3320 |
(self checkClassIsLoaded:thisClass) ifTrue:[ |
|
3321 |
selector := (parseTree arg1 evaluate). |
|
3322 |
(thisClass includesSelector:selector) ifTrue:[ |
|
| 8000 | 3323 |
^ false -> ('Change removes the #' , selector , ' method from ' , thisClass name).
|
| 7953 | 3324 |
] ifFalse:[ |
| 8000 | 3325 |
^ true -> ('Change has no effect\\(there is no method for #' , selector , ' in ' , thisClass name , ')').
|
| 7953 | 3326 |
] |
3327 |
] ifFalse:[ |
|
3328 |
^ nil -> 'Cannot compare this change (compare requires class to be loaded).'. |
|
3329 |
] |
|
3330 |
]. |
|
3331 |
^ nil -> 'Cannot compare this change (class not present)'. |
|
3332 |
! |
|
3333 |
||
| 1359 | 3334 |
compressForClass:aClassNameOrNil |
| 6288 | 3335 |
"compress the change-set; |
| 1359 | 3336 |
this replaces multiple method-changes by the last (i.e. the most recent) change. |
3337 |
If the class argument is nil, compress for all classes. |
|
3338 |
otherwise, only changes for that class are compressed." |
|
3339 |
||
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3340 |
self |
| 6288 | 3341 |
compressForClass:aClassNameOrNil selector:nil |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3342 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3343 |
"Modified: / 19.11.2001 / 22:04:12 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3344 |
! |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3345 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3346 |
compressForClass:aClassNameOrNil selector:selectorToCompressOrNil |
| 6288 | 3347 |
"compress the change-set; |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3348 |
this replaces multiple method-changes by the last (i.e. the most recent) change. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3349 |
If the class argument is nil, compress for all classes. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3350 |
otherwise, only changes for that class are compressed." |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3351 |
|
| 6288 | 3352 |
|lbl aStream searchIndex anyMore deleteSet index |
| 7507 | 3353 |
str snapshotProto snapshotPrefix snapshotNameIndex| |
3354 |
||
3355 |
changeFileName notNil ifTrue:[ |
|
3356 |
aStream := changeFileName asFilename readStreamOrNil. |
|
3357 |
aStream isNil ifTrue:[^ self]. |
|
3358 |
]. |
|
| 1359 | 3359 |
|
| 4762 | 3360 |
lbl := 'compressing'. |
| 1359 | 3361 |
aClassNameOrNil isNil ifTrue:[ |
| 7507 | 3362 |
selectorToCompressOrNil notNil ifTrue:[ |
3363 |
lbl := lbl , ' for ' , selectorToCompressOrNil. |
|
3364 |
] |
|
| 1359 | 3365 |
] ifFalse:[ |
| 7507 | 3366 |
selectorToCompressOrNil isNil ifTrue:[ |
3367 |
lbl := lbl , ' for ' , aClassNameOrNil. |
|
3368 |
] ifFalse:[ |
|
3369 |
lbl := lbl , ' for ' , aClassNameOrNil , '>>' , selectorToCompressOrNil. |
|
3370 |
] |
|
| 1359 | 3371 |
]. |
| 6288 | 3372 |
lbl := lbl , '...'. |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3373 |
self newLabel:lbl. |
| 1359 | 3374 |
|
3375 |
CompressSnapshotInfo == true ifTrue:[ |
|
| 7507 | 3376 |
" |
3377 |
get a prototype snapshot record (to be independent of |
|
3378 |
the actual format .. |
|
3379 |
" |
|
3380 |
str := WriteStream on:String new. |
|
3381 |
Class addChangeRecordForSnapshot:'foo' to:str. |
|
3382 |
snapshotProto := str contents. |
|
3383 |
snapshotPrefix := snapshotProto copyTo:10. |
|
3384 |
snapshotNameIndex := snapshotProto findString:'foo'. |
|
| 1359 | 3385 |
]. |
3386 |
||
3387 |
self withExecuteCursorDo:[ |
|
| 7507 | 3388 |
|numChanges classes selectors types excla sawExcla |
3389 |
chunk aParseTree parseTreeChunk |
|
3390 |
thisClass thisSelector codeChunk codeParser |
|
3391 |
compressThis fileName| |
|
3392 |
||
3393 |
numChanges := self numberOfChanges. |
|
3394 |
classes := Array new:numChanges. |
|
3395 |
selectors := Array new:numChanges. |
|
3396 |
types := Array new:numChanges. |
|
3397 |
||
3398 |
"starting at the end, get the change class and change selector; |
|
3399 |
collect all in classes / selectors" |
|
3400 |
||
3401 |
aStream notNil ifTrue:[ |
|
3402 |
excla := aStream class chunkSeparator. |
|
3403 |
numChanges to:1 by:-1 do:[:changeNr | |
|
3404 |
aStream position1Based:(changePositions at:changeNr). |
|
3405 |
sawExcla := aStream peekFor:excla. |
|
3406 |
chunk := aStream nextChunk. |
|
3407 |
sawExcla ifTrue:[ |
|
3408 |
"optimize a bit if multiple methods for same category arrive" |
|
3409 |
(chunk = parseTreeChunk) ifFalse:[ |
|
| 8665 | 3410 |
aParseTree := self parseExpression:chunk. |
| 7507 | 3411 |
parseTreeChunk := chunk |
3412 |
]. |
|
3413 |
(aParseTree notNil |
|
3414 |
and:[(aParseTree ~~ #Error) |
|
3415 |
and:[aParseTree isMessage]]) ifTrue:[ |
|
3416 |
(#( |
|
3417 |
#methodsFor: |
|
3418 |
#privateMethodsFor: |
|
3419 |
#publicMethodsFor: |
|
3420 |
#ignoredMethodsFor: |
|
3421 |
#protectedMethodsFor: |
|
3422 |
#methodsFor:stamp: "/ Squeak support |
|
3423 |
#methodsFor "/ Dolphin support |
|
3424 |
#methods "/ STV support |
|
3425 |
) |
|
3426 |
includes:aParseTree selector) ifTrue:[ |
|
3427 |
codeChunk := aStream nextChunk. |
|
|
9543
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3428 |
[ |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3429 |
thisClass := aParseTree receiver evaluate. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3430 |
codeParser := Parser |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3431 |
parseMethodSpecification:codeChunk |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3432 |
in:thisClass |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3433 |
ignoreErrors:true |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3434 |
ignoreWarnings:true. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3435 |
(codeParser notNil and:[codeParser ~~ #Error]) ifTrue:[ |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3436 |
selectors at:changeNr put:(codeParser selector). |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3437 |
classes at:changeNr put:thisClass. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3438 |
types at:changeNr put:#methodsFor |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3439 |
] |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3440 |
] on:Parser parseErrorSignal do:[:ex| |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3441 |
"ignore chunk" |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3442 |
ex return. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3443 |
]. |
| 7507 | 3444 |
] |
3445 |
] |
|
3446 |
] ifFalse:[ |
|
| 8665 | 3447 |
aParseTree := self parseExpression:chunk. |
| 7507 | 3448 |
parseTreeChunk := chunk. |
3449 |
(aParseTree notNil |
|
3450 |
and:[(aParseTree ~~ #Error) |
|
3451 |
and:[aParseTree isMessage]]) ifTrue:[ |
|
3452 |
(aParseTree selector == #removeSelector:) ifTrue:[ |
|
|
9543
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3453 |
[ |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3454 |
thisClass := aParseTree receiver evaluate. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3455 |
selectors at:changeNr put:(aParseTree arg1 value). |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3456 |
classes at:changeNr put:thisClass. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3457 |
types at:changeNr put:#removeSelector |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3458 |
] on:Parser parseErrorSignal do:[:ex| |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3459 |
"ignore chunk" |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3460 |
ex return. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
3461 |
]. |
| 7507 | 3462 |
] |
3463 |
] ifFalse:[ |
|
3464 |
CompressSnapshotInfo == true ifTrue:[ |
|
3465 |
(chunk startsWith:snapshotPrefix) ifTrue:[ |
|
3466 |
str := chunk readStream position1Based:snapshotNameIndex. |
|
3467 |
fileName := str upTo:(Character space). |
|
3468 |
" |
|
3469 |
kludge to allow use of match-check below |
|
3470 |
" |
|
3471 |
selectors at:changeNr put:snapshotPrefix. |
|
3472 |
classes at:changeNr put:fileName. |
|
3473 |
] |
|
3474 |
] |
|
3475 |
] |
|
3476 |
]. |
|
3477 |
]. |
|
3478 |
aStream close. |
|
3479 |
] ifFalse:[ |
|
3480 |
numChanges to:1 by:-1 do:[:changeNr | |
|
3481 |
|change| |
|
3482 |
||
3483 |
classes at:changeNr put:(self classOfChange:changeNr ifAbsent:[:className| nil]). |
|
3484 |
selectors at:changeNr put:(self selectorOfMethodChange:changeNr). |
|
3485 |
]. |
|
3486 |
]. |
|
3487 |
||
3488 |
"for all changes, look for another class/selector occurrence later |
|
3489 |
in the list and, if there is one, add change number to the delete set" |
|
3490 |
||
3491 |
deleteSet := OrderedCollection new. |
|
3492 |
1 to:self numberOfChanges-1 do:[:changeNr | |
|
3493 |
thisClass := classes at:changeNr. |
|
3494 |
||
3495 |
compressThis := false. |
|
3496 |
aClassNameOrNil isNil ifTrue:[ |
|
3497 |
compressThis := true |
|
3498 |
] ifFalse:[ |
|
3499 |
"/ skipping unloaded/unknown classes |
|
3500 |
thisClass isBehavior ifTrue:[ |
|
3501 |
compressThis := aClassNameOrNil = thisClass theNonMetaclass name. |
|
3502 |
] |
|
3503 |
]. |
|
3504 |
compressThis ifTrue:[ |
|
3505 |
thisSelector := selectors at:changeNr. |
|
3506 |
compressThis := (selectorToCompressOrNil isNil or:[thisSelector == selectorToCompressOrNil]). |
|
3507 |
compressThis ifTrue:[ |
|
3508 |
searchIndex := changeNr. |
|
3509 |
anyMore := true. |
|
3510 |
[anyMore] whileTrue:[ |
|
3511 |
searchIndex := classes indexOf:thisClass startingAt:(searchIndex + 1). |
|
3512 |
(searchIndex ~~ 0) ifTrue:[ |
|
3513 |
((selectors at:searchIndex) == thisSelector) ifTrue:[ |
|
3514 |
thisClass notNil ifTrue:[ |
|
3515 |
deleteSet add:changeNr. |
|
3516 |
anyMore := false |
|
3517 |
] |
|
3518 |
] |
|
3519 |
] ifFalse:[ |
|
3520 |
anyMore := false |
|
3521 |
] |
|
3522 |
]. |
|
3523 |
]. |
|
3524 |
]. |
|
3525 |
]. |
|
3526 |
||
3527 |
"finally delete what has been found" |
|
3528 |
||
3529 |
(deleteSet size > 0) ifTrue:[ |
|
3530 |
changeListView setSelection:nil. |
|
3531 |
index := deleteSet size. |
|
3532 |
[index > 0] whileTrue:[ |
|
3533 |
self silentDeleteChange:(deleteSet at:index). |
|
3534 |
index := index - 1 |
|
3535 |
]. |
|
3536 |
self setChangeList. |
|
3537 |
" |
|
3538 |
scroll back a bit, if we are left way behind the list |
|
3539 |
" |
|
3540 |
changeListView firstLineShown > self numberOfChanges ifTrue:[ |
|
3541 |
changeListView makeLineVisible:self numberOfChanges |
|
3542 |
]. |
|
3543 |
self clearCodeView |
|
3544 |
] |
|
| 1359 | 3545 |
]. |
3546 |
self newLabel:''. |
|
3547 |
||
| 7507 | 3548 |
"Created: / 19-11-2001 / 22:03:42 / cg" |
3549 |
"Modified: / 13-11-2006 / 11:00:03 / cg" |
|
| 1359 | 3550 |
! |
3551 |
||
| 255 | 3552 |
deleteChange:changeNr |
3553 |
"delete a change" |
|
3554 |
||
3555 |
self deleteChangesFrom:changeNr to:changeNr |
|
3556 |
! |
|
3557 |
||
3558 |
deleteChangesFrom:start to:stop |
|
3559 |
"delete a range of changes" |
|
3560 |
||
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
3561 |
changeListView setSelection:nil. |
| 255 | 3562 |
stop to:start by:-1 do:[:changeNr | |
| 6288 | 3563 |
self silentDeleteInternalChange:changeNr. |
| 255 | 3564 |
]. |
| 6255 | 3565 |
changeListView removeFromIndex:start toIndex:stop. |
|
744
cb962cb21e8c
faster drawing when deleting items
Claus Gittinger <cg@exept.de>
parents:
742
diff
changeset
|
3566 |
|
|
1070
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3567 |
"/ changeListView contentsChanged. |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3568 |
"/ changeListView redrawFromLine:start. |
| 255 | 3569 |
|
|
744
cb962cb21e8c
faster drawing when deleting items
Claus Gittinger <cg@exept.de>
parents:
742
diff
changeset
|
3570 |
"/ self setChangeList |
|
cb962cb21e8c
faster drawing when deleting items
Claus Gittinger <cg@exept.de>
parents:
742
diff
changeset
|
3571 |
|
| 1648 | 3572 |
"Modified: / 18.5.1998 / 14:22:27 / cg" |
| 255 | 3573 |
! |
3574 |
||
| 202 | 3575 |
makeChangeAPatch:changeNr |
3576 |
"append change to patchfile" |
|
3577 |
||
3578 |
self appendChange:changeNr toFile:'patches' |
|
3579 |
! |
|
3580 |
||
3581 |
makeChangePermanent:changeNr |
|
3582 |
"rewrite the source file where change changeNr lies" |
|
3583 |
||
3584 |
self notify:'this is not yet implemented' |
|
3585 |
! |
|
3586 |
||
| 73 | 3587 |
silentDeleteChange:changeNr |
3588 |
"delete a change do not update changeListView" |
|
| 57 | 3589 |
|
| 73 | 3590 |
anyChanges := true. |
3591 |
changeChunks removeIndex:changeNr. |
|
| 3203 | 3592 |
changePositions size >= changeNr ifTrue:[ changePositions removeIndex:changeNr ]. |
3593 |
changeClassNames size >= changeNr ifTrue:[ changeClassNames removeIndex:changeNr ]. |
|
3594 |
changeSelectors size >= changeNr ifTrue:[ changeSelectors removeIndex:changeNr ]. |
|
3595 |
changeHeaderLines size >= changeNr ifTrue:[ changeHeaderLines removeIndex:changeNr ]. |
|
3596 |
changeTimeStamps size >= changeNr ifTrue:[ changeTimeStamps removeIndex:changeNr ]. |
|
3597 |
changeIsFollowupMethodChange size >= changeNr ifTrue:[ changeIsFollowupMethodChange removeIndex:changeNr ]. |
|
|
182
0c2f9214d531
handle & display timestamp records
Claus Gittinger <cg@exept.de>
parents:
176
diff
changeset
|
3598 |
|
|
0c2f9214d531
handle & display timestamp records
Claus Gittinger <cg@exept.de>
parents:
176
diff
changeset
|
3599 |
"Modified: 18.11.1995 / 17:08:44 / cg" |
| 45 | 3600 |
! |
3601 |
||
| 202 | 3602 |
silentDeleteChangesFor:aClassName from:start to:stop |
|
1428
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3603 |
"delete changes for a given class in a range. |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3604 |
Return the number of deleted changes." |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3605 |
|
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3606 |
|thisClassName index numDeleted| |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3607 |
|
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3608 |
numDeleted := 0. |
| 202 | 3609 |
index := stop. |
3610 |
[index >= start] whileTrue:[ |
|
| 6288 | 3611 |
thisClassName := self classNameOfChange:index. |
3612 |
thisClassName = aClassName ifTrue:[ |
|
3613 |
self silentDeleteChange:index. |
|
3614 |
numDeleted := numDeleted + 1. |
|
3615 |
]. |
|
3616 |
index := index - 1 |
|
|
1428
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3617 |
]. |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
3618 |
^ numDeleted |
| 51 | 3619 |
|
| 45 | 3620 |
! |
3621 |
||
| 3607 | 3622 |
silentDeleteChangesFor:aClassName selector:selector from:start to:stop |
3623 |
"delete changes for given class/selector in a range. |
|
3624 |
Return the number of deleted changes." |
|
3625 |
||
3626 |
|thisClassName index numDeleted| |
|
3627 |
||
3628 |
numDeleted := 0. |
|
3629 |
index := stop. |
|
3630 |
[index >= start] whileTrue:[ |
|
| 6288 | 3631 |
thisClassName := self classNameOfChange:index. |
3632 |
thisClassName = aClassName ifTrue:[ |
|
3633 |
(self selectorOfMethodChange:index) == selector ifTrue:[ |
|
3634 |
self silentDeleteChange:index. |
|
3635 |
numDeleted := numDeleted + 1. |
|
3636 |
] |
|
3637 |
]. |
|
3638 |
index := index - 1 |
|
| 3607 | 3639 |
]. |
3640 |
^ numDeleted |
|
3641 |
! |
|
3642 |
||
| 2511 | 3643 |
silentDeleteChangesForClassAndPrivateClasses:aClassName from:start to:stop |
3644 |
"delete changes for a given class and its private classes in a range. |
|
3645 |
Return the number of deleted changes." |
|
3646 |
||
3647 |
|thisClassName index numDeleted| |
|
3648 |
||
3649 |
numDeleted := 0. |
|
3650 |
index := stop. |
|
3651 |
[index >= start] whileTrue:[ |
|
| 6288 | 3652 |
thisClassName := self ownerClassNameOfChange:index. |
3653 |
thisClassName = aClassName ifTrue:[ |
|
3654 |
self silentDeleteChange:index. |
|
3655 |
numDeleted := numDeleted + 1. |
|
3656 |
]. |
|
3657 |
index := index - 1 |
|
| 2511 | 3658 |
]. |
3659 |
^ numDeleted |
|
3660 |
||
3661 |
! |
|
3662 |
||
|
1070
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3663 |
silentDeleteInternalChange:changeNr |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3664 |
"delete a change do not update changeListView" |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3665 |
|
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3666 |
anyChanges := true. |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
3667 |
changeChunks removeIndex:changeNr. |
| 1473 | 3668 |
changePositions size >= changeNr ifTrue:[changePositions removeIndex:changeNr]. |
3669 |
changeClassNames size >= changeNr ifTrue:[changeClassNames removeIndex:changeNr]. |
|
| 3203 | 3670 |
changeSelectors size >= changeNr ifTrue:[ changeSelectors removeIndex:changeNr ]. |
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
3671 |
changeTimeStamps size >= changeNr ifTrue:[changeTimeStamps removeIndex:changeNr]. |
|
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
3672 |
changeIsFollowupMethodChange size >= changeNr ifTrue:[changeIsFollowupMethodChange removeIndex:changeNr]. |
| 1473 | 3673 |
|
3674 |
"Created: / 7.3.1997 / 16:28:32 / cg" |
|
3675 |
"Modified: / 7.2.1998 / 19:59:11 / cg" |
|
|
1496
978b3c3565c9
#silentDeleteInternalChange: copy-paste error
Stefan Vogel <sv@exept.de>
parents:
1473
diff
changeset
|
3676 |
"Modified: / 26.2.1998 / 18:20:48 / stefan" |
| 4487 | 3677 |
! |
3678 |
||
3679 |
updateDiffView |
|
3680 |
self withSelectedChangesDo:[:changeNr | |
|
| 6288 | 3681 |
self updateDiffViewFor:changeNr. |
3682 |
^ self. |
|
| 4487 | 3683 |
]. |
3684 |
||
3685 |
diffView text1:'' text2:'' |
|
3686 |
! |
|
3687 |
||
3688 |
updateDiffViewFor:changeNr |
|
3689 |
|aStream chunk sawExcla parseTree thisClass cat oldSource newSource |
|
|
8675
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3690 |
parser sel showDiff selector oldMethod i| |
| 4487 | 3691 |
|
3692 |
aStream := self streamForChange:changeNr. |
|
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3693 |
aStream isNil ifTrue:[ |
| 6317 | 3694 |
^ self |
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3695 |
]. |
| 4487 | 3696 |
|
3697 |
showDiff := false. |
|
3698 |
||
3699 |
(self changeIsFollowupMethodChange:changeNr) ifFalse:[ |
|
| 6317 | 3700 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
3701 |
chunk := aStream nextChunk. |
|
| 4487 | 3702 |
] ifTrue:[ |
| 6317 | 3703 |
chunk := (changeChunks at:changeNr). |
3704 |
sawExcla := true. |
|
| 4487 | 3705 |
]. |
3706 |
||
| 4857 | 3707 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
3708 |
do:[ |
|
| 8665 | 3709 |
parseTree := self parseExpression:chunk. |
| 6317 | 3710 |
(parseTree notNil and:[parseTree ~~ #Error and:[ parseTree isMessage ]]) ifTrue:[ |
3711 |
selector := parseTree selector. |
|
3712 |
] |
|
| 4857 | 3713 |
]. |
3714 |
||
3715 |
selector isNil ifTrue:[ |
|
| 6317 | 3716 |
newSource := chunk. |
3717 |
oldSource := 'Not comparable.'. |
|
| 4857 | 3718 |
] ifFalse:[ |
| 6317 | 3719 |
sawExcla ifFalse:[ |
3720 |
"/ not a method-change |
|
3721 |
newSource := chunk. |
|
3722 |
oldSource := self oldSourceForParseTree:parseTree. |
|
3723 |
] ifTrue:[ |
|
3724 |
"/ a method-change |
|
3725 |
||
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3726 |
(self class methodDefinitionSelectors includes:selector) ifTrue:[ |
| 6317 | 3727 |
newSource := aStream nextChunk. |
| 8515 | 3728 |
Error |
3729 |
handle:[ ] |
|
3730 |
do:[ |
|
3731 |
thisClass := parseTree receiver evaluate. |
|
3732 |
]. |
|
| 6378 | 3733 |
thisClass isBehavior ifFalse:[ |
3734 |
thisClass := self classOfChange:changeNr. |
|
3735 |
]. |
|
| 6317 | 3736 |
thisClass isBehavior ifTrue:[ |
3737 |
(thisClass isLoaded |
|
3738 |
or:[ autoloadAsRequired value |
|
3739 |
and:[self checkClassIsLoaded:thisClass]]) ifFalse:[ |
|
3740 |
oldSource := 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
3741 |
] ifTrue:[ |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3742 |
selector numArgs == 0 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3743 |
cat := '* as yet uncategorized *'. |
| 6532 | 3744 |
cat := selector. |
| 6317 | 3745 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3746 |
cat := parseTree arg1 evaluate. |
| 6317 | 3747 |
]. |
3748 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
3749 |
do:[ |
|
| 7709 | 3750 |
parser := Parser new. |
| 6639 | 3751 |
Error catch:[ |
| 7709 | 3752 |
parser |
3753 |
parseMethod:newSource in:thisClass |
|
3754 |
ignoreErrors:true ignoreWarnings:true. |
|
| 6317 | 3755 |
] |
3756 |
]. |
|
| 7709 | 3757 |
sel := parser selector. |
3758 |
(sel notNil) ifTrue:[ |
|
| 6317 | 3759 |
oldMethod := thisClass compiledMethodAt:sel. |
3760 |
oldMethod notNil ifTrue:[ |
|
3761 |
(oldMethod category = cat) ifFalse:[ |
|
| 6447 | 3762 |
"/ Transcript showCR:'category changed.'. |
| 6317 | 3763 |
]. |
3764 |
oldSource := oldMethod source. |
|
3765 |
(oldSource = newSource) ifFalse:[ |
|
3766 |
oldSource isNil ifTrue:[ |
|
3767 |
oldSource := 'No source for compare.'. |
|
3768 |
] ifFalse:[ |
|
3769 |
"/ |
|
3770 |
"/ compare for tabulator <-> space changes |
|
3771 |
"/ before showing diff ... |
|
3772 |
"/ |
|
3773 |
oldSource := oldSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
3774 |
newSource := newSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
3775 |
oldSource = newSource ifFalse:[ |
|
3776 |
"/ |
|
3777 |
"/ check if only historyLine diffs |
|
3778 |
"/ |
|
3779 |
(HistoryManager notNil |
|
3780 |
and:[HistoryManager isActive]) ifTrue:[ |
|
3781 |
oldSource := oldSource asStringCollection asString. |
|
3782 |
newSource := newSource asStringCollection asString. |
|
3783 |
(HistoryManager withoutHistoryLines:oldSource) |
|
3784 |
= |
|
3785 |
(HistoryManager withoutHistoryLines:newSource) |
|
3786 |
ifTrue:[ |
|
3787 |
oldSource := (HistoryManager withoutHistoryLines:oldSource). |
|
3788 |
newSource := (HistoryManager withoutHistoryLines:newSource). |
|
3789 |
] |
|
3790 |
]. |
|
3791 |
] |
|
3792 |
] |
|
3793 |
] |
|
3794 |
] ifFalse:[ |
|
3795 |
oldSource := 'Method does not exist.'. |
|
3796 |
] |
|
3797 |
] ifFalse:[ |
|
3798 |
oldSource := 'Change is unparsable (parse error).'. |
|
3799 |
]. |
|
3800 |
]. |
|
3801 |
] ifFalse:[ |
|
3802 |
oldSource := 'Class does not exist.'. |
|
3803 |
] |
|
3804 |
] ifFalse:[ |
|
3805 |
newSource := chunk. "/ aStream contents. |
|
3806 |
oldSource := 'Not comparable.'. |
|
3807 |
] |
|
3808 |
] |
|
| 4487 | 3809 |
]. |
3810 |
aStream close. |
|
3811 |
||
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3812 |
oldSource := oldSource ? ''. |
|
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3813 |
newSource := newSource ? ''. |
|
8675
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3814 |
|
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3815 |
oldSource := oldSource asStringCollection asString. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3816 |
newSource := newSource asStringCollection asString. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3817 |
|
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3818 |
"/ unify cr, crlf and lf into lf |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3819 |
(oldSource includes:Character return) ifTrue: [ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3820 |
i := oldSource indexOf:Character return. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3821 |
(oldSource at:i+1) == Character nl ifTrue:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3822 |
"/ crnl endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3823 |
oldSource := oldSource copyReplaceString:(String crlf) withString:(String lf). |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3824 |
] ifFalse:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3825 |
"/ cr endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3826 |
oldSource := oldSource copyReplaceAll:Character return with:Character nl. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3827 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3828 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3829 |
|
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3830 |
"/ unify cr, crlf and lf into lf |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3831 |
(newSource includes:Character return) ifTrue: [ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3832 |
i := newSource indexOf:Character return. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3833 |
(newSource at:i+1) == Character nl ifTrue:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3834 |
"/ crnl endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3835 |
newSource := newSource copyReplaceString:(String crlf) withString:(String lf). |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3836 |
] ifFalse:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3837 |
"/ cr endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3838 |
newSource := newSource copyReplaceAll:Character return with:Character nl. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3839 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3840 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
3841 |
|
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3842 |
(oldSource = newSource |
|
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3843 |
or:[ oldSource asStringCollection withTabsExpanded = newSource asStringCollection withTabsExpanded]) ifTrue:[ |
| 6317 | 3844 |
self makeDiffViewInvisible |
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3845 |
] ifFalse:[ |
| 6317 | 3846 |
self makeDiffViewVisible. |
3847 |
diffView text1:oldSource text2:newSource. |
|
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
3848 |
]. |
| 4487 | 3849 |
|
| 7709 | 3850 |
"Created: / 24-11-1995 / 14:30:46 / cg" |
| 7710 | 3851 |
"Modified: / 06-03-2007 / 14:21:35 / cg" |
| 202 | 3852 |
! ! |
| 0 | 3853 |
|
| 202 | 3854 |
!ChangesBrowser methodsFor:'termination'! |
| 51 | 3855 |
|
|
3392
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3856 |
askIfChangesAreToBeWrittenBack |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3857 |
|action again| |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3858 |
|
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3859 |
anyChanges ifFalse:[^ self]. |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3860 |
|
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3861 |
again := true. |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3862 |
[again] whileTrue:[ |
| 6357 | 3863 |
action := OptionBox |
3864 |
request:(resources stringWithCRs:'The modified changelist has not been written back to the change file.\\Write change file before closing ?') |
|
3865 |
label:'ChangesBrowser' |
|
3866 |
image:(WarningBox iconBitmap) |
|
3867 |
buttonLabels:(resources array:#('Cancel' 'Don''t Write' 'Write'))
|
|
3868 |
values:#(#abort #ignore #save) |
|
3869 |
default:#save |
|
3870 |
onCancel:#abort. |
|
3871 |
||
3872 |
again := false. |
|
3873 |
action == #abort ifTrue:[AbortSignal raise. ^ self]. |
|
3874 |
action == #save ifTrue:[ |
|
3875 |
again := self writeBackChanges not |
|
3876 |
]. |
|
|
3392
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3877 |
]. |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3878 |
! |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3879 |
|
| 1787 | 3880 |
closeRequest |
3881 |
"window manager wants us to go away" |
|
3882 |
||
|
3392
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
3883 |
self askIfChangesAreToBeWrittenBack. |
| 1787 | 3884 |
super closeRequest |
3885 |
! |
|
3886 |
||
| 202 | 3887 |
saveAndTerminate |
3888 |
"update the changes file and quit. |
|
3889 |
Dont depend on this being sent, not all window managers |
|
3890 |
send it; instead, they simply destroy the view." |
|
| 28 | 3891 |
|
| 202 | 3892 |
anyChanges ifTrue:[ |
| 6288 | 3893 |
self writeBackChanges. |
| 0 | 3894 |
]. |
| 1787 | 3895 |
super saveAndTerminate |
3896 |
||
3897 |
"Modified: / 3.8.1998 / 19:54:00 / cg" |
|
| 0 | 3898 |
! ! |
3899 |
||
| 73 | 3900 |
!ChangesBrowser methodsFor:'user interaction'! |
| 51 | 3901 |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3902 |
askForSearch:msg initialAnswer:initial thenSearchUsing:searchBlock2 onCancel:cancelBlock |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3903 |
|searchString directionHolder searchBlock| |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3904 |
|
| 6288 | 3905 |
searchString := self |
3906 |
askForSearchString:msg |
|
3907 |
initialAnswer:initial |
|
3908 |
directionInto:(directionHolder := ValueHolder new). |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3909 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3910 |
searchString isNil ifTrue:[ |
| 6288 | 3911 |
^ cancelBlock value |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3912 |
]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3913 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3914 |
searchBlock := [:changeNr | searchBlock2 value:searchString value:changeNr]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3915 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3916 |
directionHolder value == #backward ifTrue:[ |
| 6288 | 3917 |
changeNrShown isNil ifTrue:[ |
3918 |
changeNrShown := self numberOfChanges. |
|
3919 |
]. |
|
3920 |
self findPreviousForWhich:searchBlock |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3921 |
] ifFalse:[ |
| 6288 | 3922 |
changeNrShown isNil ifTrue:[ |
3923 |
changeNrShown := 0. |
|
3924 |
]. |
|
3925 |
self findNextForWhich:searchBlock |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3926 |
]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3927 |
! |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3928 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3929 |
askForSearchString:msg initialAnswer:initial directionInto:aValueHolder |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3930 |
"common code to open a search box" |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3931 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3932 |
|searchString direction| |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3933 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3934 |
direction := #forward. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3935 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3936 |
Dialog aboutToOpenBoxNotificationSignal handle:[:ex | |
| 6288 | 3937 |
|box nextButton prevButton| |
3938 |
||
3939 |
box := ex parameter. |
|
3940 |
nextButton := box okButton. |
|
3941 |
prevButton := Button label:(resources string:'Previous'). |
|
3942 |
prevButton action:[direction := #backward. box okPressed.]. |
|
3943 |
box addButton:prevButton after:nextButton. |
|
3944 |
nextButton label:(resources string:'Next'). |
|
3945 |
ex proceed. |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3946 |
] do:[ |
| 6288 | 3947 |
searchString := Dialog |
3948 |
request:msg |
|
3949 |
initialAnswer:initial |
|
3950 |
onCancel:nil. |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3951 |
]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3952 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3953 |
searchString isNil ifTrue:[ |
| 6288 | 3954 |
^ nil |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3955 |
]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3956 |
aValueHolder value:direction. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3957 |
^ searchString |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3958 |
! |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
3959 |
|
| 221 | 3960 |
autoUpdate:aBoolean |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3961 |
"enabled/disable automatic update from the change-file (for monitoring)" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3962 |
|
| 6216 | 3963 |
autoUpdate value:aBoolean |
| 221 | 3964 |
|
3965 |
"Created: 3.12.1995 / 14:14:24 / cg" |
|
3966 |
"Modified: 3.12.1995 / 14:20:45 / cg" |
|
3967 |
! |
|
3968 |
||
| 6216 | 3969 |
autoloadAsRequired:aBoolean |
3970 |
"enabled/disable automatic load of unloaded classes" |
|
3971 |
||
3972 |
autoloadAsRequired value:aBoolean |
|
3973 |
! |
|
3974 |
||
| 3211 | 3975 |
changeSelection:lineNrCollection |
| 0 | 3976 |
"show a change in the codeView" |
3977 |
||
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3978 |
|chunk lineNr| |
| 3211 | 3979 |
|
3980 |
lineNrCollection isInteger ifTrue:[ |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3981 |
lineNr := lineNrCollection |
| 3211 | 3982 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3983 |
changeListView multipleSelectOk ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3984 |
lineNrCollection size == 1 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3985 |
lineNr := lineNrCollection first. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3986 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3987 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3988 |
lineNr := lineNrCollection |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3989 |
]. |
| 3211 | 3990 |
]. |
| 0 | 3991 |
|
| 2293 | 3992 |
lineNr isNil ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3993 |
codeView contents:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3994 |
codeView initializeDoITAction. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3995 |
changeNrShown := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
3996 |
^ self |
| 2293 | 3997 |
]. |
3998 |
||
| 3211 | 3999 |
"/ display the changes code |
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
4000 |
chunk := self sourceOfChange:lineNr. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
4001 |
chunk isNil ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4002 |
codeView initializeDoITAction. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4003 |
^ self |
| 2044 | 4004 |
]. |
| 8391 | 4005 |
|
| 0 | 4006 |
codeView contents:chunk. |
| 13 | 4007 |
codeView acceptAction:[:theCode | self doApply "noChangesAllowed"]. |
|
2043
66b5276b2760
set self in changesBrowsers doIt.
Claus Gittinger <cg@exept.de>
parents:
1996
diff
changeset
|
4008 |
codeView doItAction:[:theCode | |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4009 |
|clsName cls| |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4010 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4011 |
clsName := self classNameOfChange:lineNr. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4012 |
clsName notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4013 |
clsName := clsName asSymbolIfInterned. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4014 |
clsName notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4015 |
cls := Smalltalk at:clsName ifAbsent:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4016 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4017 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4018 |
Compiler |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4019 |
evaluate:theCode |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4020 |
in:nil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4021 |
receiver:cls |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4022 |
notifying:self |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4023 |
logged:true |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4024 |
ifFail:nil |
|
2043
66b5276b2760
set self in changesBrowsers doIt.
Claus Gittinger <cg@exept.de>
parents:
1996
diff
changeset
|
4025 |
]. |
| 15 | 4026 |
changeNrShown := lineNr. |
| 0 | 4027 |
|
| 4487 | 4028 |
self showingDiffs value ifTrue:[ |
| 8391 | 4029 |
self withWaitCursorDo:[ |
4030 |
AbortOperationRequest catch:[ |
|
4031 |
self updateDiffViewFor:changeNrShown. |
|
4032 |
] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4033 |
] |
| 4487 | 4034 |
]. |
4035 |
||
| 2044 | 4036 |
"Modified: / 28.2.1999 / 15:26:46 / cg" |
| 51 | 4037 |
! |
4038 |
||
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4039 |
classOfChange:changeNr |
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4040 |
^ self |
| 6386 | 4041 |
classOfChange:changeNr |
4042 |
ifAbsent:[:className | |
|
4043 |
|msg| |
|
4044 |
||
4045 |
className isNil ifTrue:[ |
|
4046 |
msg := 'Could not extract classname from change'. |
|
4047 |
] ifFalse:[ |
|
4048 |
msg := 'Class not found: ''' , className , ''''. |
|
4049 |
]. |
|
|
8320
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4050 |
Transcript showCR:msg. |
| 6386 | 4051 |
"/ self warn:msg. |
4052 |
nil |
|
4053 |
] |
|
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4054 |
! |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4055 |
|
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4056 |
classOfChange:changeNr ifAbsent:exceptionBlock |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4057 |
"answer the class that is subject to the chamge at changeNr. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4058 |
The classes owning class may be autoloaded, if autoloadAsRequired is true." |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4059 |
|
|
8272
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
4060 |
|className cls isMeta nameSpaceForApply path ownerName owner| |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4061 |
|
| 5014 | 4062 |
className := self realClassNameOfChange:changeNr. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4063 |
className isNil ifTrue:[ |
| 6378 | 4064 |
^ exceptionBlock value:nil |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4065 |
]. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4066 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4067 |
isMeta := false. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4068 |
(className endsWith:' class') ifTrue:[ |
| 6378 | 4069 |
className := className copyWithoutLast:6. |
4070 |
isMeta := true. |
|
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4071 |
]. |
| 3472 | 4072 |
|
|
8272
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
4073 |
autoloadAsRequired value ifTrue:[ |
|
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
4074 |
path := className asCollectionOfSubstringsSeparatedByAll:'::'. |
|
8320
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4075 |
path size >= 2 ifTrue:[ |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4076 |
1 to:path size-1 do:[:l | |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4077 |
"/ ensure that the owningClass is loaded - this will load the private classes as well |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4078 |
"/ Transcript showCR:'loading owner'. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4079 |
ownerName := (path copyTo:l) asStringCollection asStringWith:'::'. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4080 |
owner := Smalltalk classNamed:ownerName. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4081 |
owner notNil ifTrue:[ |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4082 |
owner autoload. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4083 |
]. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
4084 |
]. |
|
8272
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
4085 |
]. |
|
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
4086 |
]. |
|
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
4087 |
|
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4088 |
nameSpaceForApply := self nameSpaceForApply. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4089 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4090 |
cls := nameSpaceForApply classNamed:className. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4091 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4092 |
cls := nameSpaceForApply loadedClassNamed:className |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4093 |
]. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4094 |
(cls isNil and:[nameSpaceForApply ~~ Smalltalk]) ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4095 |
"if not found in special name space, fall back to the Smalltalk name space" |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4096 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4097 |
cls := Smalltalk classNamed:className. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4098 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4099 |
cls := Smalltalk loadedClassNamed:className |
| 6378 | 4100 |
]. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4101 |
]. |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
4102 |
|
| 6378 | 4103 |
cls isNil ifTrue:[ |
4104 |
^ exceptionBlock value:className |
|
4105 |
]. |
|
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4106 |
isMeta ifTrue:[ |
| 6378 | 4107 |
cls := cls class |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4108 |
]. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4109 |
^ cls |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4110 |
! |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4111 |
|
| 202 | 4112 |
doApply |
4113 |
"user wants a change to be applied" |
|
| 45 | 4114 |
|
| 3211 | 4115 |
self withSelectedChangesDo:[:changeNr | |
| 6682 | 4116 |
(self applyChange:changeNr) ifFalse:[ |
4117 |
^ self "/ cancel |
|
4118 |
]. |
|
4119 |
self autoSelect:(changeNr + 1) |
|
| 202 | 4120 |
] |
| 45 | 4121 |
! |
4122 |
||
| 202 | 4123 |
doApplyAll |
4124 |
"user wants all changes to be applied" |
|
| 37 | 4125 |
|
| 294 | 4126 |
self withExecuteCursorDo:[ |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4127 |
|lastNr "{ Class: SmallInteger }" |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4128 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4129 |
self clearCodeView. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4130 |
lastNr := self numberOfChanges. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4131 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4132 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4133 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4134 |
multipleApply := lastNr > 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4135 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4136 |
1 to:lastNr do:[:changeNr | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4137 |
changeListView setSelection:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4138 |
self applyChange:changeNr |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4139 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4140 |
self autoSelectLast |
| 202 | 4141 |
] |
| 294 | 4142 |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
4143 |
"Modified: 21.1.1997 / 22:26:30 / cg" |
| 37 | 4144 |
! |
4145 |
||
| 3668 | 4146 |
doApplyClassFromBeginning |
4147 |
"user wants all changes for this class from 1 to changeNr to be applied" |
|
4148 |
||
4149 |
self withSingleSelectedChangeDo:[:changeNr | |
|
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4150 |
|thisClassName classNameToApply lastChange |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4151 |
lastNr "{ Class: SmallInteger }" |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4152 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4153 |
classNameToApply := self classNameOfChange:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4154 |
classNameToApply notNil ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4155 |
self clearCodeView. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4156 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4157 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4158 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4159 |
multipleApply := changeNr ~= 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4160 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4161 |
1 to:changeNr do:[:changeNr | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4162 |
thisClassName := self classNameOfChange:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4163 |
thisClassName = classNameToApply ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4164 |
changeListView setSelection:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4165 |
self applyChange:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4166 |
lastChange := changeNr |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4167 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4168 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4169 |
self autoSelect:changeNr+1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4170 |
] |
| 3668 | 4171 |
] |
4172 |
||
4173 |
"Modified: 21.1.1997 / 22:26:04 / cg" |
|
4174 |
! |
|
4175 |
||
| 202 | 4176 |
doApplyClassRest |
4177 |
"user wants all changes for this class from changeNr to be applied" |
|
4178 |
||
| 3668 | 4179 |
self withSingleSelectedChangeDo:[:changeNr | |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4180 |
|thisClassName classNameToApply lastChange |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4181 |
lastNr "{ Class: SmallInteger }" |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4182 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4183 |
classNameToApply := self classNameOfChange:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4184 |
classNameToApply notNil ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4185 |
self clearCodeView. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4186 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4187 |
lastNr := self numberOfChanges. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4188 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4189 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4190 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4191 |
multipleApply := (lastNr - changeNr) > 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4192 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4193 |
changeNr to:lastNr do:[:changeNr | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4194 |
thisClassName := self classNameOfChange:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4195 |
thisClassName = classNameToApply ifTrue:[ |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4196 |
changeListView setSelection:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4197 |
self applyChange:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4198 |
lastChange := changeNr |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4199 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4200 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4201 |
self autoSelect:lastChange. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4202 |
] |
| 202 | 4203 |
] |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
4204 |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
4205 |
"Modified: 21.1.1997 / 22:26:04 / cg" |
| 37 | 4206 |
! |
4207 |
||
| 3668 | 4208 |
doApplyFromBeginning |
4209 |
"user wants all changes from 1 to changeNr to be applied" |
|
4210 |
||
4211 |
self withSingleSelectedChangeDo:[:changeNr | |
|
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4212 |
|lastNr "{ Class: SmallInteger }" |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4213 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4214 |
self clearCodeView. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4215 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4216 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4217 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4218 |
multipleApply := changeNr ~= 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4219 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4220 |
1 to:changeNr do:[:changeNr | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4221 |
changeListView setSelection:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4222 |
self applyChange:changeNr |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4223 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4224 |
self autoSelect:changeNr+1. |
| 3668 | 4225 |
] |
4226 |
! |
|
4227 |
||
| 202 | 4228 |
doApplyRest |
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4229 |
"apply all changes from changeNr to the end" |
| 28 | 4230 |
|
| 3668 | 4231 |
self withSingleSelectedChangeDo:[:changeNr | |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4232 |
|lastNr "{ Class: SmallInteger }" |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4233 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4234 |
self clearCodeView. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4235 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4236 |
lastNr := self numberOfChanges. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4237 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4238 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4239 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4240 |
multipleApply := (lastNr - changeNr) > 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4241 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4242 |
changeNr to:lastNr do:[:changeNr | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4243 |
changeListView setSelection:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4244 |
self applyChange:changeNr |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4245 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4246 |
self autoSelect:self numberOfChanges. |
| 37 | 4247 |
] |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
4248 |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
4249 |
"Modified: 21.1.1997 / 22:25:29 / cg" |
| 37 | 4250 |
! |
4251 |
||
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4252 |
doApplyToConflictOrEnd |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4253 |
"apply all changes from changeNr to either a conflict (i.e. method exists) |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4254 |
or the end." |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4255 |
|
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4256 |
self withSingleSelectedChangeDo:[:changeNr | |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4257 |
|lastNr "{ Class: SmallInteger }"|
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4258 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4259 |
self clearCodeView. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4260 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4261 |
lastNr := self numberOfChanges. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4262 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4263 |
"if we apply multiple changes, and an error occurs, |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4264 |
ask the user if all operations should be aborted..." |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4265 |
multipleApply := (lastNr - changeNr) > 1. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4266 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4267 |
changeNr to:lastNr do:[:changeNr | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4268 |
| cls sel | |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4269 |
changeListView setSelection:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4270 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4271 |
((cls := self classOfChange:changeNr ifAbsent:[:className| nil]) notNil |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4272 |
and:[(sel := self selectorOfMethodChange:changeNr) notNil]) |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4273 |
ifTrue:[ |
|
9006
4c53a23241d2
changed: #doApplyToConflictOrEnd
Claus Gittinger <cg@exept.de>
parents:
8985
diff
changeset
|
4274 |
(cls includesSelector:sel) ifTrue:[ |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4275 |
self autoSelect:changeNr. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4276 |
^ self |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4277 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4278 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4279 |
self applyChange:changeNr |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4280 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4281 |
self autoSelect:self numberOfChanges. |
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4282 |
] |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4283 |
! |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
4284 |
|
| 45 | 4285 |
doBrowse |
4286 |
"user wants a browser on the class of a change" |
|
4287 |
||
| 3668 | 4288 |
self withSingleSelectedChangeDo:[:changeNr | |
| 6288 | 4289 |
|cls| |
4290 |
||
4291 |
cls := self classOfChange:changeNr. |
|
4292 |
cls notNil ifTrue:[ |
|
4293 |
UserPreferences systemBrowserClass |
|
4294 |
openInClass:cls |
|
4295 |
selector:(self selectorOfMethodChange:changeNr) |
|
4296 |
] |
|
| 37 | 4297 |
] |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4298 |
! |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4299 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4300 |
doBrowseImplementors |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4301 |
"open an implementors-browser" |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4302 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4303 |
|changeNr initial selector| |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4304 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4305 |
(changeNr := self theSingleSelection) notNil ifTrue:[ |
| 6288 | 4306 |
initial := self selectorOfMethodChange:changeNr. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4307 |
]. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4308 |
|
| 6288 | 4309 |
selector := Dialog |
4310 |
request:'Selector to browse implementors of:' |
|
4311 |
initialAnswer:(initial ? ''). |
|
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4312 |
selector size ~~ 0 ifTrue:[ |
| 6288 | 4313 |
UserPreferences systemBrowserClass |
4314 |
browseImplementorsMatching:selector. |
|
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4315 |
] |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4316 |
! |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4317 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4318 |
doBrowseSenders |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4319 |
"user wants a browser on the class of a change" |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4320 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4321 |
|changeNr initial selector| |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4322 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4323 |
(changeNr := self theSingleSelection) notNil ifTrue:[ |
| 6288 | 4324 |
initial := self selectorOfMethodChange:changeNr. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4325 |
]. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4326 |
|
| 6288 | 4327 |
selector := Dialog |
4328 |
request:'Selector to browse senders of:' |
|
4329 |
initialAnswer:(initial ? ''). |
|
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4330 |
selector size ~~ 0 ifTrue:[ |
| 6288 | 4331 |
UserPreferences systemBrowserClass |
4332 |
browseAllCallsOn:selector asSymbol. |
|
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
4333 |
] |
| 37 | 4334 |
! |
4335 |
||
|
2541
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4336 |
doCheckinAndDeleteClassAll |
|
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4337 |
"first checkin the selected changes class then delete all changes |
|
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4338 |
for it." |
|
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4339 |
|
|
6605
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4340 |
|classes answer logTitle checkinInfo| |
| 3442 | 4341 |
|
4342 |
"/ self theSingleSelection isNil ifTrue:[ |
|
4343 |
"/ ^ self information:'Only possible if a single change is selected.'. |
|
4344 |
"/ ]. |
|
4345 |
||
4346 |
self withExecuteCursorDo:[ |
|
|
6605
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4347 |
classes := IdentitySet new. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4348 |
|
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4349 |
self withSelectedChangesDo:[:changeNr | |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4350 |
| className class | |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4351 |
|
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4352 |
className := self classNameOfChange:changeNr. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4353 |
className notNil ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4354 |
class := Smalltalk classNamed:className. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4355 |
class isNil ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4356 |
self error:'oops - no class: ', className mayProceed:true. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4357 |
]. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4358 |
class notNil ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4359 |
class := class theNonMetaclass. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4360 |
(classes includes:class) ifFalse:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4361 |
class isPrivate ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4362 |
(classes includes:class owningClass) ifFalse:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4363 |
answer := self confirmWithCancel:('This is a private class.\\CheckIn the owner ''%1'' and all of its private classes ?'
|
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4364 |
bindWith:class owningClass name allBold) withCRs. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4365 |
answer isNil ifTrue:[^ self]. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4366 |
answer ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4367 |
classes add:class owningClass |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4368 |
] |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4369 |
] |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4370 |
] ifFalse:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4371 |
classes add:class |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4372 |
]. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4373 |
] |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4374 |
] |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4375 |
] |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4376 |
]. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4377 |
|
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4378 |
classes size == 1 ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4379 |
logTitle := classes first name. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4380 |
] ifFalse:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4381 |
logTitle := '%1 classes' bindWith:classes size. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4382 |
]. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4383 |
checkinInfo := SourceCodeManagerUtilities |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4384 |
getCheckinInfoFor:logTitle |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4385 |
initialAnswer:nil. |
| 6977 | 4386 |
checkinInfo isNil ifTrue:[^ self ]. |
|
6605
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4387 |
|
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4388 |
changeListView setSelection:nil. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4389 |
classes do:[:eachClass | |
| 6977 | 4390 |
(SourceCodeManagerUtilities checkinClass:eachClass withInfo:checkinInfo) |
|
6605
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4391 |
ifTrue:[ |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4392 |
self silentDeleteChangesForClassAndPrivateClasses:eachClass name |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4393 |
from:1 to:(self numberOfChanges). |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4394 |
] |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4395 |
]. |
|
255a3095ad5d
Setting/deleting symbolic names
Stefan Vogel <sv@exept.de>
parents:
6532
diff
changeset
|
4396 |
self setChangeList. |
|
2541
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4397 |
] |
|
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4398 |
|
| 3442 | 4399 |
"Modified: / 6.9.1995 / 17:11:16 / claus" |
4400 |
"Modified: / 17.11.2001 / 14:21:13 / cg" |
|
|
2541
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4401 |
! |
|
f8b6ae881564
experimental: checkIn & deleteForClass added.
Claus Gittinger <cg@exept.de>
parents:
2527
diff
changeset
|
4402 |
|
| 73 | 4403 |
doCompare |
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4404 |
"compare change with current system version" |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4405 |
|
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4406 |
classesNotToBeAutoloaded removeAll. |
| 73 | 4407 |
|
| 3668 | 4408 |
self withSingleSelectedChangeDo:[:changeNr | |
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4409 |
self withExecuteCursorDo:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4410 |
self compareChange:changeNr |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4411 |
]. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4412 |
self newLabel:'' |
| 3211 | 4413 |
]. |
4414 |
||
| 394 | 4415 |
"Modified: 24.2.1996 / 19:37:19 / cg" |
| 73 | 4416 |
! |
4417 |
||
| 2835 | 4418 |
doCompareAndCompress |
4419 |
"remove all changes, which are equivalent to the current image version" |
|
4420 |
||
4421 |
|toDelete| |
|
4422 |
||
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4423 |
classesNotToBeAutoloaded removeAll. |
| 2835 | 4424 |
toDelete := OrderedCollection new. |
4425 |
self withExecuteCursorDo:[ |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4426 |
1 to:self numberOfChanges do:[:changeNr | |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4427 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4428 |
toDelete add:changeNr |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4429 |
] |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4430 |
]. |
| 2835 | 4431 |
]. |
4432 |
||
4433 |
toDelete reverseDo:[:changeNr | |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4434 |
self silentDeleteChange:changeNr. |
| 2835 | 4435 |
]. |
4436 |
self setChangeList. |
|
4437 |
" |
|
4438 |
scroll back a bit, if we are left way behind the list |
|
4439 |
" |
|
4440 |
changeListView firstLineShown > self numberOfChanges ifTrue:[ |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4441 |
changeListView makeLineVisible:self numberOfChanges |
| 2835 | 4442 |
]. |
4443 |
self clearCodeView. |
|
4444 |
||
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4445 |
self newLabel:''. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
4446 |
classesNotToBeAutoloaded removeAll. |
| 2835 | 4447 |
! |
4448 |
||
| 45 | 4449 |
doCompress |
| 6288 | 4450 |
"compress the change-set; this replaces multiple method-changes by the last |
| 45 | 4451 |
(i.e. the most recent) change" |
4452 |
||
| 1359 | 4453 |
self compressForClass:nil |
4454 |
||
4455 |
"Modified: / 29.10.1997 / 01:03:26 / cg" |
|
4456 |
! |
|
4457 |
||
4458 |
doCompressClass |
|
4459 |
"compress changes for the selected class. |
|
4460 |
this replaces multiple method-changes by the last (i.e. the most recent) change." |
|
4461 |
||
| 3211 | 4462 |
self theSingleSelection isNil ifTrue:[ |
| 6288 | 4463 |
^ self information:'Only possible if a single change is selected.'. |
| 3211 | 4464 |
]. |
4465 |
||
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4466 |
self selectedClassNames do:[:classNameToCompress | |
| 6288 | 4467 |
self compressForClass:classNameToCompress. |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4468 |
] |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4469 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4470 |
"Created: / 29.10.1997 / 01:05:16 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4471 |
"Modified: / 19.11.2001 / 21:55:17 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4472 |
! |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4473 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4474 |
doCompressSelector |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4475 |
"compress changes for the selected class & selector. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4476 |
this replaces multiple method-changes by the last (i.e. the most recent) change." |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4477 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4478 |
|classSelectorPairs| |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4479 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4480 |
self theSingleSelection isNil ifTrue:[ |
| 6288 | 4481 |
^ self information:'Only possible if a single change is selected.'. |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4482 |
]. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4483 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4484 |
classSelectorPairs := Set new. |
| 3211 | 4485 |
self withSelectedChangesDo:[:changeNr | |
| 6288 | 4486 |
| classNameToCompress selector | |
4487 |
||
4488 |
classNameToCompress := self classNameOfChange:changeNr. |
|
4489 |
classNameToCompress notNil ifTrue:[ |
|
4490 |
selector := self selectorOfMethodChange:changeNr. |
|
4491 |
selector notNil ifTrue:[ |
|
4492 |
classSelectorPairs add:(classNameToCompress -> selector). |
|
4493 |
] |
|
4494 |
] |
|
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4495 |
]. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4496 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4497 |
classSelectorPairs do:[:pair | |
| 6288 | 4498 |
self compressForClass:pair key selector:pair value. |
| 1359 | 4499 |
] |
4500 |
||
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4501 |
"Created: / 19.11.2001 / 21:50:59 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
4502 |
"Modified: / 19.11.2001 / 22:10:08 / cg" |
| 45 | 4503 |
! |
4504 |
||
| 202 | 4505 |
doDelete |
| 3211 | 4506 |
"delete currently selected change(s)" |
4507 |
||
| 6255 | 4508 |
|rangeEnd rangeStart firstDeleted| |
4509 |
||
4510 |
changeListView selection size <= 5 ifTrue:[ |
|
| 6288 | 4511 |
self withSelectedChangesReverseDo:[:changeNr | |
4512 |
self deleteChange:changeNr. |
|
4513 |
self autoSelectOrEnd:changeNr |
|
4514 |
]. |
|
4515 |
^ self |
|
| 6255 | 4516 |
]. |
4517 |
||
| 3211 | 4518 |
self withSelectedChangesReverseDo:[:changeNr | |
| 6288 | 4519 |
rangeEnd isNil ifTrue:[ |
4520 |
rangeEnd := rangeStart := changeNr |
|
4521 |
] ifFalse:[ |
|
4522 |
(changeNr = (rangeEnd + 1)) ifTrue:[ |
|
4523 |
rangeEnd := changeNr |
|
4524 |
] ifFalse:[ |
|
4525 |
(changeNr = (rangeStart - 1)) ifTrue:[ |
|
4526 |
rangeStart := changeNr |
|
4527 |
] ifFalse:[ |
|
4528 |
self deleteChangesFrom:rangeStart to:rangeEnd. |
|
4529 |
firstDeleted := (firstDeleted ? rangeStart) min:rangeStart. |
|
4530 |
rangeStart := rangeEnd := nil. |
|
4531 |
]. |
|
4532 |
]. |
|
4533 |
]. |
|
| 6255 | 4534 |
]. |
4535 |
rangeStart notNil ifTrue:[ |
|
| 6288 | 4536 |
self deleteChangesFrom:rangeStart to:rangeEnd. |
4537 |
firstDeleted := (firstDeleted ? rangeStart) min:rangeStart. |
|
| 6255 | 4538 |
]. |
4539 |
self autoSelectOrEnd:firstDeleted |
|
| 73 | 4540 |
! |
4541 |
||
| 3249 | 4542 |
doDeleteAndSelectPrevious |
4543 |
"delete currently selected change(s)" |
|
4544 |
||
4545 |
self withSelectedChangesReverseDo:[:changeNr | |
|
| 6288 | 4546 |
self deleteChange:changeNr. |
4547 |
self autoSelectOrEnd:changeNr-1 |
|
| 3249 | 4548 |
] |
4549 |
! |
|
4550 |
||
| 202 | 4551 |
doDeleteClassAll |
4552 |
"delete all changes with same class as currently selected change" |
|
4553 |
||
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4554 |
|classNamesToDelete lastChangeNr overAllNumDeletedBefore| |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4555 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4556 |
lastChangeNr := -1. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4557 |
classNamesToDelete := Set new. |
| 3211 | 4558 |
self withSelectedChangesDo:[:changeNr | |
| 6288 | 4559 |
|classNameToDelete| |
4560 |
||
4561 |
classNameToDelete := self classNameOfChange:changeNr. |
|
4562 |
classNameToDelete notNil ifTrue:[ |
|
4563 |
classNamesToDelete add:classNameToDelete. |
|
4564 |
]. |
|
4565 |
lastChangeNr := lastChangeNr max:changeNr. |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4566 |
]. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4567 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4568 |
overAllNumDeletedBefore := 0. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4569 |
changeListView setSelection:nil. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4570 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4571 |
self withExecuteCursorDo:[ |
| 6288 | 4572 |
classNamesToDelete do:[:classNameToDelete | |
4573 |
|numDeletedBefore| |
|
4574 |
||
4575 |
self silentDeleteChangesFor:classNameToDelete |
|
4576 |
from:lastChangeNr |
|
4577 |
to:(self numberOfChanges). |
|
4578 |
numDeletedBefore := self |
|
4579 |
silentDeleteChangesFor:classNameToDelete |
|
4580 |
from:1 |
|
4581 |
to:(lastChangeNr-1). |
|
4582 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
4583 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
4584 |
]. |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4585 |
]. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4586 |
|
| 6288 | 4587 |
self setChangeList. |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
4588 |
self autoSelectOrEnd:lastChangeNr |
|
286
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4589 |
|
| 1431 | 4590 |
"Created: / 13.12.1995 / 16:07:14 / cg" |
4591 |
"Modified: / 28.1.1998 / 20:42:14 / cg" |
|
|
286
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4592 |
! |
|
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4593 |
|
| 2511 | 4594 |
doDeleteClassAndPrivateClassesAll |
4595 |
"delete all changes with same class and private classes |
|
4596 |
as currently selected change" |
|
4597 |
||
| 6200 | 4598 |
|lastChangeNr classNamesToDelete overAllNumDeletedBefore| |
4599 |
||
4600 |
lastChangeNr := -1. |
|
4601 |
classNamesToDelete := Set new. |
|
| 3211 | 4602 |
self withSelectedChangesDo:[:changeNr | |
| 6288 | 4603 |
|classNameToDelete| |
4604 |
||
4605 |
classNameToDelete := self ownerClassNameOfChange:changeNr. |
|
4606 |
classNameToDelete notNil ifTrue:[ |
|
4607 |
classNamesToDelete add:classNameToDelete. |
|
4608 |
]. |
|
4609 |
lastChangeNr := lastChangeNr max:changeNr. |
|
| 6200 | 4610 |
]. |
4611 |
||
4612 |
overAllNumDeletedBefore := 0. |
|
4613 |
changeListView setSelection:nil. |
|
4614 |
||
4615 |
self withExecuteCursorDo:[ |
|
| 6288 | 4616 |
classNamesToDelete do:[:classNameToDelete | |
4617 |
| changeNr numDeletedBefore| |
|
4618 |
||
4619 |
classNameToDelete notNil ifTrue:[ |
|
4620 |
changeListView setSelection:nil. |
|
4621 |
self silentDeleteChangesForClassAndPrivateClasses:classNameToDelete |
|
4622 |
from:lastChangeNr |
|
4623 |
to:(self numberOfChanges). |
|
4624 |
numDeletedBefore := self |
|
4625 |
silentDeleteChangesForClassAndPrivateClasses:classNameToDelete |
|
4626 |
from:1 |
|
4627 |
to:(lastChangeNr-1). |
|
4628 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
4629 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
4630 |
] |
|
4631 |
] |
|
| 6200 | 4632 |
]. |
| 6288 | 4633 |
self setChangeList. |
| 6200 | 4634 |
self autoSelectOrEnd:lastChangeNr |
| 2511 | 4635 |
|
4636 |
"Created: / 13.12.1995 / 16:07:14 / cg" |
|
4637 |
"Modified: / 28.1.1998 / 20:42:14 / cg" |
|
4638 |
! |
|
4639 |
||
|
286
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4640 |
doDeleteClassFromBeginning |
|
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4641 |
"delete changes with same class as currently selected change from the beginning |
|
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4642 |
up to the selected change. |
|
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4643 |
Useful to get rid of obsolete changes before a fileout or checkin entry." |
|
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4644 |
|
| 3668 | 4645 |
self withSingleSelectedChangeDo:[:changeNr | |
| 6288 | 4646 |
|classNameToDelete prevSelection numDeleted| |
4647 |
||
4648 |
classNameToDelete := self classNameOfChange:changeNr. |
|
4649 |
classNameToDelete notNil ifTrue:[ |
|
4650 |
prevSelection := changeNr. |
|
4651 |
changeListView setSelection:nil. |
|
4652 |
numDeleted := self |
|
4653 |
silentDeleteChangesFor:classNameToDelete |
|
4654 |
from:1 |
|
4655 |
to:changeNr. |
|
4656 |
self setChangeList. |
|
4657 |
self autoSelectOrEnd:(changeNr + 1 - numDeleted) |
|
4658 |
] |
|
|
1428
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
4659 |
]. |
|
286
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4660 |
|
|
96d31200b0c1
added delete-for-class-from-beginning; ignore timestamps for fileOut/checkin/snapshot entries
Claus Gittinger <cg@exept.de>
parents:
276
diff
changeset
|
4661 |
"Created: 13.12.1995 / 15:41:58 / cg" |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
4662 |
"Modified: 25.5.1996 / 12:26:34 / cg" |
| 51 | 4663 |
! |
4664 |
||
| 73 | 4665 |
doDeleteClassRest |
4666 |
"delete rest of changes with same class as currently selected change" |
|
4667 |
||
| 3668 | 4668 |
self withSingleSelectedChangeDo:[:changeNr | |
| 6288 | 4669 |
| classNameToDelete | |
4670 |
||
4671 |
classNameToDelete := self classNameOfChange:changeNr. |
|
4672 |
classNameToDelete notNil ifTrue:[ |
|
4673 |
changeListView setSelection:nil. |
|
4674 |
self silentDeleteChangesFor:classNameToDelete |
|
4675 |
from:changeNr |
|
4676 |
to:(self numberOfChanges). |
|
4677 |
self setChangeList. |
|
4678 |
self autoSelectOrEnd:changeNr |
|
4679 |
] |
|
| 73 | 4680 |
] |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
4681 |
|
| 1648 | 4682 |
"Modified: / 18.5.1998 / 14:25:07 / cg" |
| 73 | 4683 |
! |
4684 |
||
| 3607 | 4685 |
doDeleteClassSelectorAll |
4686 |
"delete all changes with same class and selector as currently selected change" |
|
4687 |
||
4688 |
|classNameSelectorPairsToDelete lastChangeNr overAllNumDeletedBefore| |
|
4689 |
||
4690 |
lastChangeNr := -1. |
|
4691 |
classNameSelectorPairsToDelete := Set new. |
|
4692 |
self withSelectedChangesDo:[:changeNr | |
|
| 6288 | 4693 |
|className selector| |
4694 |
||
4695 |
className := self classNameOfChange:changeNr. |
|
4696 |
selector := self selectorOfMethodChange:changeNr. |
|
4697 |
selector notNil ifTrue:[ |
|
4698 |
(className notNil and:[selector notNil]) ifTrue:[ |
|
4699 |
classNameSelectorPairsToDelete add:(className -> selector). |
|
4700 |
] |
|
4701 |
]. |
|
4702 |
lastChangeNr := lastChangeNr max:changeNr. |
|
| 3607 | 4703 |
]. |
4704 |
||
4705 |
overAllNumDeletedBefore := 0. |
|
4706 |
changeListView setSelection:nil. |
|
4707 |
||
4708 |
self withExecuteCursorDo:[ |
|
| 6288 | 4709 |
classNameSelectorPairsToDelete do:[:pair | |
4710 |
|numDeletedBefore className selector| |
|
4711 |
||
4712 |
className := pair key. |
|
4713 |
selector := pair value. |
|
4714 |
self silentDeleteChangesFor:className selector:selector |
|
4715 |
from:lastChangeNr |
|
4716 |
to:(self numberOfChanges). |
|
4717 |
numDeletedBefore := self |
|
4718 |
silentDeleteChangesFor:className selector:selector |
|
4719 |
from:1 |
|
4720 |
to:(lastChangeNr-1). |
|
4721 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
4722 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
4723 |
]. |
|
| 3607 | 4724 |
]. |
4725 |
||
| 6288 | 4726 |
self setChangeList. |
| 3607 | 4727 |
self autoSelectOrEnd:lastChangeNr |
4728 |
||
4729 |
"Created: / 13.12.1995 / 16:07:14 / cg" |
|
4730 |
"Modified: / 28.1.1998 / 20:42:14 / cg" |
|
4731 |
! |
|
4732 |
||
| 4896 | 4733 |
doDeleteFromBeginning |
4734 |
"delete all changes from 1 to the current" |
|
4735 |
||
4736 |
self withSingleSelectedChangeDo:[:changeNr | |
|
| 6288 | 4737 |
self deleteChangesFrom:1 to:changeNr. |
4738 |
self clearCodeView. |
|
4739 |
self autoSelectOrEnd:changeNr |
|
| 4896 | 4740 |
] |
4741 |
! |
|
4742 |
||
| 202 | 4743 |
doDeleteRest |
4744 |
"delete all changes from current to the end" |
|
| 51 | 4745 |
|
| 3668 | 4746 |
self withSingleSelectedChangeDo:[:changeNr | |
| 6288 | 4747 |
self deleteChangesFrom:changeNr to:(self numberOfChanges). |
4748 |
self clearCodeView. |
|
4749 |
self autoSelectOrEnd:changeNr-1 |
|
| 3668 | 4750 |
] |
| 132 | 4751 |
! |
4752 |
||
4753 |
doFileoutAndDeleteClassAll |
|
4754 |
"first fileOut the selected changes class then delete all changes |
|
4755 |
for it." |
|
4756 |
||
| 3668 | 4757 |
self withSingleSelectedChangeDo:[:changeNr | |
| 6288 | 4758 |
| className class | |
4759 |
||
4760 |
className := self classNameOfChange:changeNr. |
|
4761 |
className notNil ifTrue:[ |
|
4762 |
class := Smalltalk classNamed:className. |
|
4763 |
class notNil ifTrue:[ |
|
4764 |
Class fileOutErrorSignal handle:[:ex | |
|
4765 |
self warn:('fileout failed: ' , ex description).
|
|
4766 |
] do:[ |
|
4767 |
class fileOut. |
|
4768 |
self doDeleteClassAll |
|
4769 |
]. |
|
4770 |
]. |
|
4771 |
||
4772 |
]. |
|
| 132 | 4773 |
] |
4774 |
||
4775 |
"Modified: 6.9.1995 / 17:11:16 / claus" |
|
| 202 | 4776 |
! |
| 73 | 4777 |
|
| 202 | 4778 |
doMakePatch |
4779 |
"user wants a change to be made a patch |
|
4780 |
- copy it over to the patches file" |
|
| 89 | 4781 |
|
| 3211 | 4782 |
self withSelectedChangesDo:[:changeNr | |
| 6288 | 4783 |
self makeChangeAPatch:changeNr. |
4784 |
self autoSelect:(changeNr + 1) |
|
| 202 | 4785 |
] |
| 73 | 4786 |
! |
4787 |
||
| 202 | 4788 |
doMakePermanent |
4789 |
"user wants a change to be made permanent |
|
4790 |
- rewrite the source file where this change has to go" |
|
4791 |
||
4792 |
|yesNoBox| |
|
| 73 | 4793 |
|
| 3211 | 4794 |
(self theSingleSelection) isNil ifTrue:[ |
| 6639 | 4795 |
^ self information:'Only possible if a single change is selected.'. |
| 3211 | 4796 |
]. |
4797 |
||
| 202 | 4798 |
yesNoBox := YesNoBox new. |
| 6639 | 4799 |
yesNoBox title:(resources string:'Warning: this operation cannot be undone'). |
4800 |
yesNoBox okText:(resources string:'continue') noText:(resources string:'abort'). |
|
| 202 | 4801 |
yesNoBox okAction:[ |changeNr| |
4802 |
||
| 6639 | 4803 |
changeNr := self theSingleSelection. |
4804 |
changeNr notNil ifTrue:[ |
|
4805 |
self makeChangePermanent:changeNr. |
|
4806 |
self autoSelect:(changeNr + 1) |
|
4807 |
] |
|
4808 |
]. |
|
| 917 | 4809 |
yesNoBox showAtPointer. |
4810 |
yesNoBox destroy |
|
4811 |
||
4812 |
"Modified: 7.1.1997 / 23:03:33 / cg" |
|
| 73 | 4813 |
! |
4814 |
||
| 202 | 4815 |
doSave |
4816 |
"user wants a change to be appended to a file" |
|
| 73 | 4817 |
|
| 3211 | 4818 |
|fileName| |
4819 |
||
4820 |
self withSelectedChangesDo:[:changeNr | |
|
| 9604 | 4821 |
fileName := Dialog |
4822 |
requestFileNameForSave:(resources string:'Append change to:') |
|
4823 |
default:(lastSaveFileName ? '') |
|
4824 |
ok:(resources string:'Append') |
|
4825 |
abort:(resources string:'Abort') |
|
4826 |
pattern:'*.chg'. |
|
4827 |
||
4828 |
fileName notNil ifTrue:[ |
|
4829 |
lastSaveFileName := fileName. |
|
4830 |
self withCursor:(Cursor write) do:[ |
|
4831 |
self appendChange:changeNr toFile:fileName. |
|
4832 |
]. |
|
4833 |
self autoSelect:(changeNr + 1) |
|
4834 |
]. |
|
| 202 | 4835 |
] |
| 9604 | 4836 |
|
4837 |
"Modified: / 27-10-2010 / 11:30:07 / cg" |
|
| 73 | 4838 |
! |
4839 |
||
| 202 | 4840 |
doSaveClass |
4841 |
"user wants changes for some class from current to end to be appended to a file" |
|
| 89 | 4842 |
|
| 3211 | 4843 |
(self theSingleSelection) isNil ifTrue:[ |
| 6288 | 4844 |
^ self information:'Only possible if a single change is selected.'. |
| 3211 | 4845 |
]. |
| 202 | 4846 |
self doSaveClassFrom:1 |
| 89 | 4847 |
! |
4848 |
||
| 202 | 4849 |
doSaveClassAll |
4850 |
"user wants changes for some class from current to end to be appended to a file" |
|
| 73 | 4851 |
|
| 3211 | 4852 |
(self theSingleSelection) isNil ifTrue:[ |
| 6288 | 4853 |
^ self information:'Only possible if a single change is selected.'. |
| 3211 | 4854 |
]. |
| 202 | 4855 |
self doSaveClassFrom:1 |
4856 |
! |
|
4857 |
||
4858 |
doSaveClassFrom:startNr |
|
4859 |
"user wants changes from current to end to be appended to a file" |
|
4860 |
||
4861 |
|changeNr classNameToSave| |
|
| 73 | 4862 |
|
| 3211 | 4863 |
(changeNr := self theSingleSelection) isNil ifTrue:[ |
| 6288 | 4864 |
^ self information:'Only possible if a single change is selected.'. |
| 3211 | 4865 |
]. |
4866 |
classNameToSave := self classNameOfChange:changeNr. |
|
4867 |
classNameToSave notNil ifTrue:[ |
|
| 6288 | 4868 |
self saveClass:classNameToSave from:startNr |
| 202 | 4869 |
] |
4870 |
! |
|
| 73 | 4871 |
|
| 202 | 4872 |
doSaveClassRest |
4873 |
"user wants changes for some class from current to end to be appended to a file" |
|
| 73 | 4874 |
|
| 202 | 4875 |
|changeNr| |
| 132 | 4876 |
|
| 3211 | 4877 |
(changeNr := self theSingleSelection) isNil ifTrue:[ |
| 6317 | 4878 |
^ self information:'Only possible if a single change is selected.'. |
| 3211 | 4879 |
]. |
| 6317 | 4880 |
self doSaveClassFrom:changeNr. |
4881 |
||
4882 |
changeListView setSelection:changeNr. |
|
4883 |
"/ self changeSelection:changeNr. |
|
| 81 | 4884 |
! |
4885 |
||
| 202 | 4886 |
doSaveRest |
4887 |
"user wants changes from current to end to be appended to a file" |
|
| 73 | 4888 |
|
| 202 | 4889 |
|changeNr fileName| |
| 51 | 4890 |
|
| 3211 | 4891 |
(changeNr := self theSingleSelection) isNil ifTrue:[ |
| 9604 | 4892 |
^ self information:(resources string:'Only possible if a single change is selected.'). |
| 3211 | 4893 |
]. |
4894 |
||
4895 |
fileName := Dialog |
|
| 9604 | 4896 |
requestFileNameForSave:(resources string:'Append changes to:') |
4897 |
default:(lastSaveFileName ? '') |
|
4898 |
ok:(resources string:'Append') |
|
4899 |
abort:(resources string:'Abort') |
|
4900 |
pattern:'*.chg'. |
|
| 3211 | 4901 |
|
4902 |
fileName notNil ifTrue:[ |
|
| 9604 | 4903 |
lastSaveFileName := fileName. |
4904 |
self withCursor:(Cursor write) do:[ |
|
4905 |
changeNr to:(self numberOfChanges) do:[:changeNr | |
|
4906 |
changeListView setSelection:changeNr. |
|
4907 |
(self appendChange:changeNr toFile:fileName) ifFalse:[ |
|
4908 |
^ self |
|
4909 |
] |
|
4910 |
] |
|
4911 |
] |
|
| 202 | 4912 |
] |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
4913 |
|
| 9604 | 4914 |
"Modified: / 27-10-2010 / 11:30:37 / cg" |
| 51 | 4915 |
! |
4916 |
||
| 202 | 4917 |
doUpdate |
4918 |
"reread the changes-file" |
|
| 51 | 4919 |
|
| 202 | 4920 |
self readChangesFileInBackground:true. |
| 5178 | 4921 |
self newLabel:''. |
| 202 | 4922 |
realized ifTrue:[ |
| 6288 | 4923 |
self setChangeList. |
| 202 | 4924 |
] |
| 51 | 4925 |
! |
4926 |
||
| 202 | 4927 |
doWriteBack |
4928 |
"write back the list onto the changes file" |
|
| 51 | 4929 |
|
4930 |
anyChanges ifTrue:[ |
|
|
6415
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4931 |
(self writeBackChanges) ifTrue:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4932 |
realized ifTrue:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4933 |
self readChangesFile. |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4934 |
realized ifTrue:[ |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4935 |
self setChangeList |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4936 |
] |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4937 |
] |
|
3b2616b53ab3
utf-8 characters have been destroyed if changes were written back to the change file
Stefan Vogel <sv@exept.de>
parents:
6386
diff
changeset
|
4938 |
] |
| 202 | 4939 |
] |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4940 |
|
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4941 |
"Modified: 5.9.1996 / 17:19:46 / cg" |
| 202 | 4942 |
! |
| 126 | 4943 |
|
| 1471 | 4944 |
doubleClickOnChange:lineNr |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4945 |
"action performed when a change-list entry is doubleClicked" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4946 |
|
| 1471 | 4947 |
self doBrowse |
4948 |
||
4949 |
"Created: / 6.2.1998 / 13:08:49 / cg" |
|
4950 |
! |
|
4951 |
||
| 1127 | 4952 |
findClass |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4953 |
"findClass menu action: let user enter a classes name, and select the next change for that class" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4954 |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
4955 |
|current| |
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
4956 |
|
| 1127 | 4957 |
changeNrShown notNil ifTrue:[ |
| 8985 | 4958 |
current := self classNameOfChange:changeNrShown. |
| 1127 | 4959 |
]. |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
4960 |
|
| 6288 | 4961 |
self |
| 8985 | 4962 |
askForSearch:'Class to search for:' |
4963 |
initialAnswer:current |
|
4964 |
thenSearchUsing:[:searchString :changeNr | |
|
4965 |
|thisClassName| |
|
4966 |
||
4967 |
thisClassName := self classNameOfChange:changeNr. |
|
4968 |
thisClassName notNil |
|
4969 |
and:[ |
|
4970 |
(thisClassName sameAs: searchString) |
|
4971 |
or:[searchString includesMatchCharacters and:[searchString match:thisClassName ignoreCase:true]]] |
|
4972 |
] |
|
4973 |
onCancel:[^ self]. |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
4974 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
4975 |
lastSearchType := #class. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4976 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
4977 |
! |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
4978 |
|
| 7527 | 4979 |
findFirstForClass |
4980 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
4981 |
||
4982 |
self findNextForClassStartingAt:1 |
|
4983 |
||
4984 |
"Created: / 20-11-2006 / 16:37:56 / cg" |
|
4985 |
! |
|
4986 |
||
4987 |
findLastForClass |
|
4988 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
4989 |
||
4990 |
self findPreviousForClassStartingAt:(self numberOfChanges) |
|
4991 |
||
4992 |
"Created: / 20-11-2006 / 16:39:15 / cg" |
|
4993 |
! |
|
4994 |
||
| 7360 | 4995 |
findLastSnapshot |
4996 |
"findLastSnapshot menu action: select the last change which is for a snapShot-image save action" |
|
4997 |
||
| 7363 | 4998 |
"/ lastSearchType := #snapshot. |
| 7360 | 4999 |
|
5000 |
self |
|
5001 |
findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ] |
|
5002 |
startingAt:(self numberOfChanges) |
|
5003 |
||
5004 |
"Created: / 06-10-2006 / 11:03:39 / cg" |
|
5005 |
! |
|
5006 |
||
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5007 |
findNext |
| 6288 | 5008 |
"findNext menu action: select the next change. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5009 |
Searches for what the last search was for; i.e. either same class or same selector" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5010 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5011 |
lastSearchType == #selector ifTrue:[ |
| 6288 | 5012 |
^ self findNextForSelector |
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5013 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5014 |
lastSearchType == #snapshot ifTrue:[ |
| 6288 | 5015 |
^ self findNextSnapshot |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5016 |
]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5017 |
lastSearchType == #string ifTrue:[ |
| 6288 | 5018 |
^ self findNextForString |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5019 |
]. |
| 3534 | 5020 |
lastSearchType == #difference ifTrue:[ |
| 6288 | 5021 |
^ self findNextDifference |
| 3534 | 5022 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5023 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5024 |
^ self findNextForClass |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5025 |
|
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5026 |
"Created: / 18.6.1998 / 22:15:00 / cg" |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5027 |
"Modified: / 18.6.1998 / 22:15:25 / cg" |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5028 |
! |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5029 |
|
| 3534 | 5030 |
findNextDifference |
5031 |
lastSearchType := #difference. |
|
5032 |
changeNrShown isNil ifTrue:[^ self]. |
|
5033 |
||
| 6288 | 5034 |
self findNextForWhich:[:changeNr | |
5035 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
5036 |
"/ same |
|
5037 |
false |
|
5038 |
] ifFalse:[ |
|
5039 |
"/ different |
|
5040 |
true |
|
5041 |
] |
|
5042 |
] |
|
| 3534 | 5043 |
! |
5044 |
||
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5045 |
findNextForClass |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5046 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5047 |
|
| 7527 | 5048 |
self findNextForClassStartingAt: changeNrShown + 1 |
5049 |
||
5050 |
"Modified: / 20-11-2006 / 16:37:49 / cg" |
|
5051 |
! |
|
5052 |
||
5053 |
findNextForClassStartingAt:startNr |
|
5054 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
5055 |
||
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5056 |
|cls| |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5057 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5058 |
lastSearchType := #class. |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5059 |
changeNrShown isNil ifTrue:[^ self]. |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5060 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5061 |
cls := self classNameOfChange:changeNrShown. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5062 |
cls isNil ifTrue:[^ self]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5063 |
|
| 7527 | 5064 |
self |
5065 |
findNextForWhich:[:changeNr | |
|
5066 |
|thisClass| |
|
5067 |
||
5068 |
thisClass := self classNameOfChange:changeNr. |
|
5069 |
(thisClass = cls |
|
5070 |
or:[cls includesMatchCharacters and:[cls match:thisClass]])] |
|
5071 |
startingAt:startNr |
|
5072 |
||
5073 |
"Created: / 20-11-2006 / 16:37:37 / cg" |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5074 |
! |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5075 |
|
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5076 |
findNextForSelector |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5077 |
"findNextForSelector menu action: select the next change for the selected changes selector" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5078 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5079 |
|sel| |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5080 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5081 |
lastSearchType := #selector. |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5082 |
changeNrShown isNil ifTrue:[^ self]. |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5083 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5084 |
sel := self selectorOfMethodChange:changeNrShown. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5085 |
sel isNil ifTrue:[^ self]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5086 |
|
| 6288 | 5087 |
self findNextForWhich: [:changeNr | |
5088 |
|thisSelector| |
|
5089 |
||
5090 |
thisSelector := self selectorOfMethodChange:changeNr. |
|
5091 |
(thisSelector = sel or:[sel includesMatchCharacters and:[sel match:thisSelector]]) |
|
5092 |
] |
|
|
3341
8f156ac559d5
fixed matching in find actions
Claus Gittinger <cg@exept.de>
parents:
3339
diff
changeset
|
5093 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5094 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5095 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5096 |
findNextForString |
| 4458 | 5097 |
lastSearchString isNil ifTrue:[ |
| 6288 | 5098 |
^ self findString |
| 4458 | 5099 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5100 |
self findNextWithString:lastSearchString |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5101 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5102 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5103 |
findNextForWhich:aBlock |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5104 |
"helper: select the next change for which aBlock evaluates to true" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5105 |
|
| 7527 | 5106 |
^ self findNextForWhich:aBlock startingAt:changeNrShown + 1 |
5107 |
||
5108 |
"Modified: / 20-11-2006 / 16:34:23 / cg" |
|
5109 |
! |
|
5110 |
||
5111 |
findNextForWhich:aBlock startingAt:changeNrToStartSearch |
|
5112 |
"helper: select the next change for which aBlock evaluates to true" |
|
5113 |
||
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5114 |
self withCursor:Cursor questionMark do:[ |
| 7527 | 5115 |
Object userInterruptSignal handle:[:ex | |
5116 |
self beep. |
|
5117 |
^ 0 |
|
5118 |
] do:[ |
|
5119 |
|lastNr nr| |
|
5120 |
||
5121 |
lastNr := self numberOfChanges. |
|
5122 |
nr := changeNrToStartSearch. |
|
5123 |
[nr <= lastNr] whileTrue:[ |
|
5124 |
(aBlock value:nr) ifTrue:[ |
|
5125 |
changeListView setSelection:nr . |
|
5126 |
self changeSelection:nr. |
|
5127 |
^ nr |
|
5128 |
]. |
|
5129 |
nr := nr + 1. |
|
5130 |
]. |
|
5131 |
]. |
|
| 1127 | 5132 |
]. |
| 2132 | 5133 |
self showNotFound. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5134 |
self windowGroup sensor flushKeyboard. "/ avoid multiple beeps, in case of type ahead |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5135 |
^ 0 |
| 7527 | 5136 |
|
5137 |
"Created: / 20-11-2006 / 16:34:06 / cg" |
|
| 1127 | 5138 |
! |
5139 |
||
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5140 |
findNextSnapshot |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5141 |
"findNextSnapshot menu action: select the next change which is for a snapShot-image save action" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5142 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5143 |
lastSearchType := #snapshot. |
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5144 |
changeNrShown isNil ifTrue:[^ self]. |
|
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5145 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5146 |
self findNextForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ] |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5147 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5148 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5149 |
findNextWithString:searchString |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5150 |
lastSearchType := #string. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5151 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5152 |
lastSearchString := searchString. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5153 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5154 |
changeNrShown isNil ifTrue:[ |
| 6288 | 5155 |
changeNrShown := 0. |
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5156 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5157 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5158 |
self findNextForWhich: |
| 6288 | 5159 |
[:changeNr | |
5160 |
|s| |
|
5161 |
||
5162 |
s := self sourceOfMethodChange:changeNr. |
|
5163 |
s notNil and:[ |
|
5164 |
(searchString includesMatchCharacters not |
|
5165 |
and:[(s findString:searchString) ~~ 0]) |
|
5166 |
or:[ searchString includesMatchCharacters |
|
5167 |
and:[('*' , searchString , '*') match:s ]]]
|
|
5168 |
]. |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5169 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5170 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5171 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5172 |
codeView setSearchPattern:searchString. |
| 6288 | 5173 |
codeView |
5174 |
searchFwd:searchString |
|
5175 |
ignoreCase:false |
|
5176 |
startingAtLine:1 col:0 |
|
5177 |
ifAbsent:nil. |
|
|
3341
8f156ac559d5
fixed matching in find actions
Claus Gittinger <cg@exept.de>
parents:
3339
diff
changeset
|
5178 |
|
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5179 |
! |
|
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5180 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5181 |
findPrevious |
| 6288 | 5182 |
"findPrevious menu action: select the previous change. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5183 |
Searches for what the last search was for; i.e. either same class or same selector" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5184 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5185 |
lastSearchType == #selector ifTrue:[ |
| 6288 | 5186 |
^ self findPreviousForSelector |
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5187 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5188 |
lastSearchType == #snapshot ifTrue:[ |
| 6288 | 5189 |
^ self findPreviousSnapshot |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5190 |
]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5191 |
lastSearchType == #string ifTrue:[ |
| 6288 | 5192 |
^ self findPreviousForString |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5193 |
]. |
| 3534 | 5194 |
lastSearchType == #difference ifTrue:[ |
| 6288 | 5195 |
^ self findPreviousDifference |
| 3534 | 5196 |
]. |
5197 |
||
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5198 |
^ self findPreviousForClass |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5199 |
|
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5200 |
"Created: / 18.6.1998 / 22:15:15 / cg" |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5201 |
! |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5202 |
|
| 3534 | 5203 |
findPreviousDifference |
5204 |
lastSearchType := #difference. |
|
5205 |
changeNrShown isNil ifTrue:[^ self]. |
|
5206 |
||
| 6288 | 5207 |
self findPreviousForWhich:[:changeNr | |
5208 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
5209 |
"/ same |
|
5210 |
false |
|
5211 |
] ifFalse:[ |
|
5212 |
"/ different |
|
5213 |
true |
|
5214 |
] |
|
5215 |
] |
|
| 3534 | 5216 |
! |
5217 |
||
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5218 |
findPreviousForClass |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5219 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5220 |
|
| 7527 | 5221 |
self findPreviousForClassStartingAt:(changeNrShown - 1) |
5222 |
||
5223 |
"Modified: / 20-11-2006 / 16:39:04 / cg" |
|
5224 |
! |
|
5225 |
||
5226 |
findPreviousForClassStartingAt:startNr |
|
5227 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
5228 |
||
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5229 |
|cls| |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5230 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5231 |
lastSearchType := #class. |
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
5232 |
changeNrShown isNil ifTrue:[^ self]. |
|
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
5233 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5234 |
cls := self classNameOfChange:changeNrShown. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5235 |
cls isNil ifTrue:[^ self]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5236 |
|
| 7527 | 5237 |
self |
5238 |
findPreviousForWhich: |
|
5239 |
[:changeNr | |
|
5240 |
|thisClass| |
|
5241 |
||
5242 |
thisClass := self classNameOfChange:changeNr. |
|
5243 |
(thisClass = cls |
|
5244 |
or:[cls includesMatchCharacters and:[cls match:thisClass]])] |
|
5245 |
startingAt:startNr |
|
5246 |
||
5247 |
"Created: / 20-11-2006 / 16:38:37 / cg" |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5248 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5249 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5250 |
findPreviousForSelector |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5251 |
"findPreviousForSelector menu action: select the previous change for the selected changes selector" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5252 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5253 |
|sel| |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5254 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5255 |
lastSearchType := #selector. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5256 |
changeNrShown isNil ifTrue:[^ self]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5257 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5258 |
sel := self selectorOfMethodChange:changeNrShown. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5259 |
sel isNil ifTrue:[^ self]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5260 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5261 |
self findPreviousForWhich: |
| 6288 | 5262 |
[:changeNr | |
5263 |
|thisSelector| |
|
5264 |
||
5265 |
thisSelector := self selectorOfMethodChange:changeNr. |
|
5266 |
(thisSelector = sel |
|
5267 |
or:[sel includesMatchCharacters and:[sel match:thisSelector]]) |
|
5268 |
] |
|
|
3341
8f156ac559d5
fixed matching in find actions
Claus Gittinger <cg@exept.de>
parents:
3339
diff
changeset
|
5269 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5270 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5271 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5272 |
findPreviousForString |
| 4458 | 5273 |
lastSearchString isNil ifTrue:[ |
| 6288 | 5274 |
^ self findString |
| 4458 | 5275 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5276 |
self findPreviousWithString:lastSearchString |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5277 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5278 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5279 |
findPreviousForWhich:aBlock |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5280 |
"helper: select the previous change for which aBlock evaluates to true" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5281 |
|
| 7360 | 5282 |
^ self findPreviousForWhich:aBlock startingAt:(changeNrShown - 1) |
5283 |
||
5284 |
"Modified: / 06-10-2006 / 11:01:38 / cg" |
|
5285 |
! |
|
5286 |
||
5287 |
findPreviousForWhich:aBlock startingAt:changeNrToStartSearch |
|
5288 |
"helper: select the previous change for which aBlock evaluates to true" |
|
5289 |
||
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
5290 |
self withCursor:Cursor questionMark do:[ |
| 7360 | 5291 |
Object userInterruptSignal handle:[:ex | |
5292 |
self beep. |
|
5293 |
^ 0 |
|
5294 |
] do:[ |
|
5295 |
|nr| |
|
5296 |
||
5297 |
nr := changeNrToStartSearch. |
|
5298 |
[nr >= 1] whileTrue:[ |
|
5299 |
(aBlock value:nr) ifTrue:[ |
|
5300 |
changeListView setSelection:nr. |
|
5301 |
self changeSelection:nr. |
|
5302 |
^ nr |
|
5303 |
]. |
|
5304 |
nr := nr - 1. |
|
5305 |
]. |
|
5306 |
] |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
5307 |
]. |
| 2132 | 5308 |
self showNotFound. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5309 |
self windowGroup sensor flushKeyboard. "/ avoid multiple beeps, in case of type ahead |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5310 |
^ 0 |
| 7360 | 5311 |
|
5312 |
"Created: / 06-10-2006 / 11:01:09 / cg" |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5313 |
! |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5314 |
|
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5315 |
findPreviousSnapshot |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5316 |
"findPreviousSnapshot menu action: select the previous change which is for a snapShot-image save action" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5317 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5318 |
lastSearchType := #snapshot. |
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5319 |
changeNrShown isNil ifTrue:[^ self]. |
|
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5320 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5321 |
self findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ] |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5322 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5323 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5324 |
findPreviousWithString:searchString |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5325 |
lastSearchType := #string. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5326 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5327 |
lastSearchString := searchString. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5328 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5329 |
changeNrShown isNil ifTrue:[ |
| 6288 | 5330 |
changeNrShown := 0. |
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5331 |
]. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5332 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5333 |
self findPreviousForWhich: |
| 6288 | 5334 |
[:changeNr | |
5335 |
|s includesMatchCharacters| |
|
5336 |
||
5337 |
includesMatchCharacters := searchString includesMatchCharacters. |
|
5338 |
s := self sourceOfMethodChange:changeNr. |
|
5339 |
s notNil and:[ |
|
5340 |
(includesMatchCharacters not and:[(s findString:searchString) ~~ 0]) |
|
5341 |
or:[includesMatchCharacters and:[('*' , searchString , '*') match:s ]]]
|
|
5342 |
]. |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5343 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5344 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5345 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5346 |
codeView setSearchPattern:searchString. |
| 6288 | 5347 |
codeView |
5348 |
searchFwd:searchString |
|
5349 |
ignoreCase:false |
|
5350 |
startingAtLine:1 col:0 |
|
5351 |
ifAbsent:nil. |
|
|
3341
8f156ac559d5
fixed matching in find actions
Claus Gittinger <cg@exept.de>
parents:
3339
diff
changeset
|
5352 |
|
|
1848
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5353 |
! |
|
61054ff3d470
added find prev/next snapshot to search menu
Claus Gittinger <cg@exept.de>
parents:
1833
diff
changeset
|
5354 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5355 |
findSelector |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5356 |
"findSelector menu action: let user enter a selector, and select the next change for that selector" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5357 |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5358 |
|current| |
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5359 |
|
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5360 |
changeNrShown notNil ifTrue:[ |
| 6288 | 5361 |
current := self selectorOfMethodChange:changeNrShown. |
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
5362 |
]. |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5363 |
|
| 6288 | 5364 |
self |
5365 |
askForSearch:'Selector to search for:' |
|
5366 |
initialAnswer:current |
|
5367 |
thenSearchUsing:[:searchString :changeNr | |
|
5368 |
|thisSelector| |
|
5369 |
||
5370 |
thisSelector := self selectorOfMethodChange:changeNr. |
|
5371 |
(thisSelector = searchString |
|
5372 |
or:[searchString includesMatchCharacters and:[searchString match:thisSelector]]) |
|
5373 |
] |
|
5374 |
onCancel:[^ self]. |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5375 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5376 |
lastSearchType := #selector. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5377 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
5378 |
! |
|
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
5379 |
|
|
2576
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5380 |
findString |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5381 |
|searchString directionHolder| |
|
2576
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5382 |
|
|
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5383 |
lastSearchType := #string. |
|
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5384 |
|
|
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5385 |
searchString := codeView selection. |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
5386 |
searchString size == 0 ifTrue:[searchString := lastSearchString]. |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5387 |
|
| 6288 | 5388 |
searchString := self |
5389 |
askForSearchString:'String to search for:' |
|
5390 |
initialAnswer:(searchString ? '') |
|
5391 |
directionInto:(directionHolder := ValueHolder new). |
|
| 3554 | 5392 |
|
5393 |
searchString size == 0 ifTrue:[ |
|
| 6288 | 5394 |
^ self |
|
2576
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5395 |
]. |
|
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5396 |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5397 |
directionHolder value == #backward ifTrue:[ |
| 6288 | 5398 |
self findPreviousWithString:searchString. |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5399 |
] ifFalse:[ |
| 6288 | 5400 |
self findNextWithString:searchString. |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
5401 |
] |
|
2576
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5402 |
! |
|
b5f0d32b09d3
added string search (in methods code)
Claus Gittinger <cg@exept.de>
parents:
2573
diff
changeset
|
5403 |
|
| 202 | 5404 |
noChangesAllowed |
5405 |
"show a warning that changes cannot be changed" |
|
| 93 | 5406 |
|
| 3211 | 5407 |
self warn:'Changes are not allowed to be changed.' |
| 0 | 5408 |
! |
5409 |
||
| 202 | 5410 |
saveClass:aClassName from:startNr |
5411 |
"user wants changes from current to end to be appended to a file" |
|
| 51 | 5412 |
|
| 202 | 5413 |
|changeNr fileName| |
| 51 | 5414 |
|
| 202 | 5415 |
changeNr := changeListView selection. |
5416 |
changeNr notNil ifTrue:[ |
|
| 9604 | 5417 |
fileName := Dialog |
5418 |
requestFileNameForSave:(resources string:'Append changes for class to:') |
|
5419 |
default:(lastSaveFileName ? '') |
|
5420 |
ok:(resources string:'Append') |
|
5421 |
abort:(resources string:'Abort') |
|
5422 |
pattern:'*.chg'. |
|
5423 |
||
5424 |
fileName notNil ifTrue:[ |
|
5425 |
lastSaveFileName := fileName. |
|
5426 |
self withCursor:(Cursor write) do:[ |
|
5427 |
startNr to:(self numberOfChanges) do:[:changeNr | |
|
5428 |
|thisClassName| |
|
5429 |
||
5430 |
thisClassName := self classNameOfChange:changeNr. |
|
5431 |
thisClassName = aClassName ifTrue:[ |
|
5432 |
self setSingleSelection:changeNr. |
|
5433 |
(self appendChange:changeNr toFile:fileName) ifFalse:[ |
|
5434 |
^ self |
|
5435 |
] |
|
5436 |
] |
|
5437 |
] |
|
5438 |
] |
|
5439 |
]. |
|
| 202 | 5440 |
] |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
5441 |
|
| 9604 | 5442 |
"Modified: / 27-10-2010 / 11:31:06 / cg" |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5443 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5444 |
|
| 3472 | 5445 |
setEnforcedNameSpace |
| 9168 | 5446 |
|nsName listOfKnownNameSpaces keepAsDefaultHolder| |
| 3472 | 5447 |
|
5448 |
listOfKnownNameSpaces := Set new. |
|
| 6288 | 5449 |
NameSpace |
| 6682 | 5450 |
allNameSpaces |
5451 |
do:[:eachNameSpace | |
|
5452 |
listOfKnownNameSpaces add:eachNameSpace name |
|
5453 |
]. |
|
| 3472 | 5454 |
listOfKnownNameSpaces := listOfKnownNameSpaces asOrderedCollection sort. |
5455 |
||
| 9168 | 5456 |
Dialog aboutToOpenBoxNotificationSignal handle:[:ex | |
5457 |
|box| |
|
5458 |
||
5459 |
keepAsDefaultHolder := true asValue. |
|
5460 |
box := ex parameter. |
|
5461 |
box verticalPanel |
|
5462 |
add:((CheckBox |
|
5463 |
label:(resources string:'Use this as default in the future')) |
|
5464 |
model:keepAsDefaultHolder). |
|
5465 |
ex proceed. |
|
5466 |
] do:[ |
|
5467 |
nsName := Dialog |
|
| 6682 | 5468 |
request:'When applying, new classes are created in nameSpace:' |
|
8494
0bd45c6b5486
remember the last enforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
8393
diff
changeset
|
5469 |
initialAnswer:(enforcedNameSpace ? LastEnforcedNameSpace ? Class nameSpaceQuerySignal query name) |
| 6682 | 5470 |
list:listOfKnownNameSpaces. |
| 9168 | 5471 |
]. |
| 7096 | 5472 |
nsName isNil ifTrue:[^ self]. |
5473 |
||
5474 |
(nsName isEmpty or:[nsName = 'Smalltalk']) ifTrue:[ |
|
5475 |
applyInOriginalNameSpace value:true. |
|
|
8494
0bd45c6b5486
remember the last enforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
8393
diff
changeset
|
5476 |
LastEnforcedNameSpace := enforcedNameSpace := nil. |
| 7096 | 5477 |
] ifFalse:[ |
5478 |
applyInOriginalNameSpace value:false. |
|
|
8494
0bd45c6b5486
remember the last enforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
8393
diff
changeset
|
5479 |
LastEnforcedNameSpace := enforcedNameSpace := NameSpace name:nsName. |
| 6682 | 5480 |
autoCompare value ifTrue:[ |
5481 |
self doUpdate |
|
5482 |
]. |
|
|
8494
0bd45c6b5486
remember the last enforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
8393
diff
changeset
|
5483 |
]. |
| 9168 | 5484 |
KeepEnforcedNameSpace := keepAsDefaultHolder value |
| 7096 | 5485 |
|
5486 |
"Modified: / 07-09-2006 / 15:10:25 / cg" |
|
| 3472 | 5487 |
! |
5488 |
||
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5489 |
setEnforcedPackage |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5490 |
|pkg listOfKnownPackages| |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5491 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5492 |
listOfKnownPackages := Set new. |
| 6288 | 5493 |
Smalltalk allClassesDo:[:eachClass | |
5494 |
|package| |
|
5495 |
||
5496 |
package := eachClass package. |
|
5497 |
package size > 0 ifTrue:[ |
|
5498 |
listOfKnownPackages add:package |
|
5499 |
] |
|
5500 |
]. |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5501 |
listOfKnownPackages := listOfKnownPackages asOrderedCollection sort. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5502 |
|
| 6288 | 5503 |
pkg := Dialog |
5504 |
request:'When applying, changes go into package:' |
|
5505 |
initialAnswer:(enforcedPackage ? Class packageQuerySignal query) |
|
5506 |
list:listOfKnownPackages. |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5507 |
pkg size ~~ 0 ifTrue:[ |
| 6288 | 5508 |
enforcedPackage := pkg |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
5509 |
] |
| 202 | 5510 |
! ! |
| 0 | 5511 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5512 |
!ChangesBrowser::ChangeFileReader methodsFor:'accessing'! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5513 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5514 |
autoCompare:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5515 |
autoCompare := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5516 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5517 |
|
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5518 |
autoloadAsRequired |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5519 |
^ autoloadAsRequired |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5520 |
! |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5521 |
|
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5522 |
autoloadAsRequired:something |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5523 |
autoloadAsRequired := something. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5524 |
! |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5525 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5526 |
browser:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5527 |
browser := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5528 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5529 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5530 |
changeChunks |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5531 |
^ changeChunks |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5532 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5533 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5534 |
changeClassNames |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5535 |
^ changeClassNames |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5536 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5537 |
|
|
6516
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5538 |
changeFileName |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5539 |
^ changeFileName |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5540 |
! |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5541 |
|
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5542 |
changeFileName:something |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5543 |
changeFileName := something. |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5544 |
! |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
5545 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5546 |
changeHeaderLines |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5547 |
^ changeHeaderLines |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5548 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5549 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5550 |
changeIsFollowupMethodChange |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5551 |
^ changeIsFollowupMethodChange |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5552 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5553 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5554 |
changePositions |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5555 |
^ changePositions |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5556 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5557 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5558 |
changeTimeStamps |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5559 |
^ changeTimeStamps |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5560 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5561 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5562 |
enforcedNameSpace:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5563 |
enforcedNameSpace := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5564 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5565 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5566 |
inStream:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5567 |
inStream := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5568 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5569 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5570 |
noColoring:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5571 |
noColoring := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5572 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5573 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5574 |
tabSpec:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5575 |
tabSpec := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5576 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5577 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5578 |
thisIsAClassSource |
| 7360 | 5579 |
^ thisIsAClassSource ? false |
5580 |
||
5581 |
"Modified: / 06-10-2006 / 11:18:49 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5582 |
! ! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5583 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5584 |
!ChangesBrowser::ChangeFileReader methodsFor:'private'! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5585 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5586 |
contractClass:className selector:selector to:maxLen |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5587 |
"contract a class>>selector string (for display in the changeList)." |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5588 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5589 |
|s l| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5590 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5591 |
s := className , ' ', selector. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5592 |
s size > maxLen ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5593 |
l := maxLen - 1 - selector size max:20. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5594 |
s := (className contractTo:l) , ' ' , selector. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5595 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5596 |
s size > maxLen ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5597 |
l := maxLen - 1 - className size max:20. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5598 |
s := className , ' ', (selector contractTo:l). |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5599 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5600 |
s size > maxLen ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5601 |
s := (className contractTo:(maxLen // 2 - 1)) , ' ' , (selector contractTo:maxLen // 2) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5602 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5603 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5604 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5605 |
^ s |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5606 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5607 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5608 |
extractClassAndClassNameFromParseTree:rec |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5609 |
|isUnaryMessage className changeClass| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5610 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5611 |
isUnaryMessage := rec isUnaryMessage. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5612 |
|
| 9019 | 5613 |
Error |
5614 |
handle:[:ex | ^ '?' -> nil] |
|
| 6843 | 5615 |
do:[ |
| 9019 | 5616 |
isUnaryMessage ifTrue:[ |
5617 |
className := rec receiver name. |
|
5618 |
] ifFalse:[ |
|
5619 |
className := rec name. |
|
5620 |
]. |
|
| 6843 | 5621 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5622 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5623 |
enforcedNameSpace notNil ifTrue:[ |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5624 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5625 |
changeClass := enforcedNameSpace classNamed:className. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5626 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5627 |
changeClass := enforcedNameSpace loadedClassNamed:className. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5628 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5629 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5630 |
changeClass isNil ifTrue:[ |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5631 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5632 |
changeClass := Smalltalk classNamed:className. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5633 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5634 |
changeClass := Smalltalk loadedClassNamed:className. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
5635 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5636 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5637 |
isUnaryMessage ifTrue:[ |
| 6843 | 5638 |
changeClass notNil ifTrue:[ |
5639 |
changeClass := changeClass class. |
|
5640 |
]. |
|
5641 |
className := className , ' class'. |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5642 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5643 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5644 |
^ className -> changeClass |
| 6843 | 5645 |
|
5646 |
"Modified: / 03-08-2006 / 14:02:31 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5647 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5648 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5649 |
nameSpaceForApply |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5650 |
^ browser nameSpaceForApply |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5651 |
! ! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5652 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5653 |
!ChangesBrowser::ChangeFileReader methodsFor:'reading'! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5654 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5655 |
addHeaderLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5656 |
|entry| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5657 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5658 |
entry := MultiColListEntry new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5659 |
entry tabulatorSpecification:tabSpec. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5660 |
entry colAt:1 put:changeDelta. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5661 |
entry colAt:2 put:changeString. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5662 |
entry colAt:3 put:changeType. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5663 |
timeStampInfo notNil ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5664 |
entry colAt:4 put:timeStampInfo. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5665 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5666 |
changeHeaderLines add:entry |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5667 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5668 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5669 |
processChunk |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5670 |
(chunkText startsWith:'''---- timestamp ') ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5671 |
timeStampInfo := (chunkText copyFrom:16 to:(chunkText size - 6)) withoutSpaces. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5672 |
^ self. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5673 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5674 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5675 |
changeChunks add:chunkText. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5676 |
changeClassNames add:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5677 |
changePositions add:chunkPosition. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5678 |
changeTimeStamps add:timeStampInfo. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5679 |
changeIsFollowupMethodChange add:false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5680 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5681 |
headerLine := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5682 |
changeDelta := ' '. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5683 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5684 |
sawExcla ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5685 |
self processNonMethodChunk |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5686 |
] ifTrue:[ |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5687 |
self processMethodChunkIfNone: |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5688 |
[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5689 |
changeChunks removeLast. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5690 |
changeClassNames removeLast. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5691 |
changePositions removeLast. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5692 |
changeTimeStamps removeLast. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5693 |
changeIsFollowupMethodChange removeLast. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5694 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5695 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5696 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5697 |
changeString notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5698 |
self addHeaderLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5699 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5700 |
headerLine notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5701 |
changeHeaderLines add:headerLine |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5702 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5703 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5704 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5705 |
|
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5706 |
processMethodChunkIfNone:emptyBlock |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5707 |
"sawExcla" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5708 |
|
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5709 |
|askedForEditingClassSource changeClass category anyMethod |
| 8665 | 5710 |
sel cls p rec clsName done first text methodPos |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5711 |
singleJunkOnly methodChunks classCategoryChunks methodCategoryChunks singleInfo m currentText t1 t2 methodSelector nameAndClass| |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5712 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5713 |
singleJunkOnly := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5714 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5715 |
classCategoryChunks := methodCategoryChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5716 |
singleInfo := false. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5717 |
anyMethod := false. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5718 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5719 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5720 |
method definitions actually consist of |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5721 |
two (or more) chunks; skip next chunk(s) |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5722 |
up to an empty one. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5723 |
The system only writes one chunk, |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5724 |
and we cannot handle more in this ChangesBrowser .... |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5725 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5726 |
clsName := nil. |
| 8665 | 5727 |
|
5728 |
p := browser parseExpression:chunkText inNameSpace:(self nameSpaceForApply). |
|
|
6835
87e0844b7e12
Avoid debugger on timestamp information whenn doing autocompare
Stefan Vogel <sv@exept.de>
parents:
6820
diff
changeset
|
5729 |
(p notNil and:[p ~~ #Error and:[p isMessage]]) ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5730 |
rec := p receiver. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5731 |
sel := p selector. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5732 |
(ChangesBrowser methodDefinitionSelectors includes:sel) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5733 |
methodChunks := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5734 |
nameAndClass := self extractClassAndClassNameFromParseTree:rec. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5735 |
clsName := nameAndClass key. changeClass := nameAndClass value. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5736 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5737 |
sel == #categoriesForClass ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5738 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5739 |
classCategoryChunks := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5740 |
changeType := '(class category change)'. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5741 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5742 |
sel == #categoriesFor: ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5743 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5744 |
methodCategoryChunks := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5745 |
changeType := '(category change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5746 |
methodSelector := (p args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5747 |
] ifFalse:[ |
| 6532 | 5748 |
(sel numArgs == 0) ifTrue:[ |
5749 |
category := '* As yet uncategorized *'. |
|
5750 |
category := sel. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5751 |
] ifFalse:[ |
| 6532 | 5752 |
category := (p args at:1) evaluate. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5753 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5754 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5755 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5756 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5757 |
sel == #'methodsFor:stamp:' ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5758 |
"/ Squeak timeStamp |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5759 |
timeStampInfo := (p args at:2) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5760 |
singleInfo := true |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5761 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5762 |
sel == #'commentStamp:prior:' ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5763 |
singleJunkOnly := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5764 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5765 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5766 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5767 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5768 |
sel == #reorganize ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5769 |
singleJunkOnly := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5770 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5771 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5772 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5773 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5774 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5775 |
done := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5776 |
first := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5777 |
[done] whileFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5778 |
changeDelta := ' '. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5779 |
methodPos := inStream position1Based. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5780 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5781 |
text := inStream nextChunk. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5782 |
done := text isEmptyOrNil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5783 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5784 |
done ifFalse:[ |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5785 |
anyMethod := true. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5786 |
first ifFalse:[ |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5787 |
changeChunks add:chunkText. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5788 |
changeClassNames add:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5789 |
changePositions add:methodPos. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5790 |
changeTimeStamps add:timeStampInfo. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5791 |
changeIsFollowupMethodChange add:true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5792 |
askedForEditingClassSource ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5793 |
thisIsAClassSource := (changeFileName asFilename hasSuffix:'st'). |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5794 |
askedForEditingClassSource := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5795 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5796 |
] ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5797 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5798 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5799 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5800 |
first := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5801 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5802 |
(classCategoryChunks or:[methodCategoryChunks]) ifTrue:[ |
| 6639 | 5803 |
text := text firstLine. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5804 |
classCategoryChunks ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5805 |
changeClass isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5806 |
changeDelta := '?'. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5807 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5808 |
changeClass category = text ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5809 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5810 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5811 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5812 |
changeString := clsName , ' category: ' , text storeString. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5813 |
]ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5814 |
changeString := '(' , clsName , ' compiledMethodAt:' , methodSelector storeString , ') category: ' , text storeString.
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5815 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5816 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5817 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5818 |
try to find the selector |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5819 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5820 |
methodSelector := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5821 |
clsName notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5822 |
methodChunks ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5823 |
p := Parser |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5824 |
parseMethodSpecification:text |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5825 |
in:nil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5826 |
ignoreErrors:true |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5827 |
ignoreWarnings:true. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5828 |
(p notNil and:[p ~~ #Error]) ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5829 |
methodSelector := p selector. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5830 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5831 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5832 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5833 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5834 |
methodSelector isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5835 |
changeString := (chunkText contractTo:maxLen). |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5836 |
changeType := '(change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5837 |
headerLine := chunkText , ' (change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5838 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5839 |
changeString := self contractClass:clsName selector:methodSelector to:maxLen. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5840 |
changeType := '{ ' , category , ' }'.
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5841 |
headerLine := clsName , ' ' , methodSelector , ' ' , '(change category: ''' , category , ''')'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5842 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5843 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5844 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5845 |
changeClass isNil ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5846 |
cls := changeClass theNonMetaclass |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5847 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5848 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5849 |
(changeClass isNil or:[methodSelector isNil or:[cls isLoaded not]]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5850 |
changeClass isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5851 |
changeDelta := '+' |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5852 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5853 |
changeDelta := '?' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5854 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5855 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5856 |
(changeClass includesSelector:methodSelector asSymbol) ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5857 |
changeDelta := '+'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5858 |
] ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5859 |
m := changeClass compiledMethodAt:methodSelector asSymbol. |
| 8978 | 5860 |
Error handle:[:ex | |
5861 |
Transcript showCR:'Error while accessing methods current source: ',ex description. |
|
5862 |
] do:[ |
|
5863 |
currentText := m source. |
|
5864 |
]. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5865 |
currentText notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5866 |
text asString string withoutTrailingSeparators = currentText asString string withoutTrailingSeparators ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5867 |
changeDelta := '=' |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5868 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5869 |
t1 := currentText asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5870 |
t2 := text asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5871 |
t1 = t2 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5872 |
changeDelta := '=' |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5873 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5874 |
|tree1 tree2| |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5875 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5876 |
RBParser notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5877 |
tree1 := RBParser parseMethod:currentText onError:[:aString :pos | ^ nil]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5878 |
tree2 := RBParser parseMethod:text onError:[:aString :pos | ^ nil]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5879 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5880 |
tree1 = tree2 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5881 |
changeDelta := '~' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5882 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5883 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5884 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
5885 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5886 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5887 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5888 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5889 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5890 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5891 |
self addHeaderLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5892 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5893 |
changeString := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5894 |
headerLine := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5895 |
singleJunkOnly ifTrue:[done := true] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5896 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5897 |
singleInfo ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5898 |
timeStampInfo := nil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5899 |
]. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5900 |
anyMethod ifFalse:[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5901 |
emptyBlock value |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
5902 |
]. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5903 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5904 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5905 |
processNonMethodChunk |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5906 |
|s changeClass sel cls p rec clsName ownerTree ownerName |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5907 |
m nameAndClass| |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5908 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5909 |
(chunkText startsWith:'''---- snap') ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5910 |
self processSnapshotChunk. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5911 |
^ self |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5912 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5913 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5914 |
headerLine := chunkText , ' (doIt)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5915 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5916 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5917 |
first, assume doIt - then lets have a more detailed look ... |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5918 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5919 |
((chunkText startsWith:'''---- file') |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5920 |
or:[(chunkText startsWith:'''---- check')]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5921 |
changeType := ''. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5922 |
timeStampInfo := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5923 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5924 |
changeType := '(doIt)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5925 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5926 |
changeString := (chunkText contractTo:maxLen) withoutSeparators. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5927 |
|
| 8665 | 5928 |
p := browser parseExpression:fullChunkText inNameSpace:Smalltalk. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5929 |
(p notNil and:[p ~~ #Error]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5930 |
p isMessage ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5931 |
sel := p selector. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5932 |
rec := p receiver. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5933 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5934 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5935 |
sel := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5936 |
(Scanner new scanTokens:fullChunkText) size == 0 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5937 |
"/ a comment only |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5938 |
changeType := '(comment)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5939 |
NoColoring ~~ true ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5940 |
changeType := changeType allItalic. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5941 |
"/ changeString := changeString allItalic. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5942 |
changeType emphasisAllAdd:(#color -> UserPreferences current commentColor). |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5943 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5944 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5945 |
changeType := '(???)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5946 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5947 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5948 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5949 |
(sel == #comment:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5950 |
changeType := '(comment)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5951 |
clsName := rec name. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5952 |
changeClass := (self nameSpaceForApply) classNamed:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5953 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5954 |
NoColoring ~~ true ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5955 |
changeType := changeType allItalic. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5956 |
changeType emphasisAllAdd:(#color -> UserPreferences current commentColor). |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5957 |
"/ changeString := clsName allItalic. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5958 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5959 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5960 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5961 |
changeDelta := '?' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5962 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5963 |
(changeClass comment = (p args at:1) evaluate) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5964 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5965 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5966 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5967 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5968 |
sel := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5969 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5970 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5971 |
(sel == #removeSelector:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5972 |
nameAndClass := self extractClassAndClassNameFromParseTree:rec. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5973 |
clsName := nameAndClass key. changeClass := nameAndClass value. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5974 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5975 |
sel := (p args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5976 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5977 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5978 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5979 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5980 |
changeDelta := '?' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5981 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5982 |
(changeClass includesSelector:sel asSymbol) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5983 |
changeDelta := '-'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5984 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5985 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5986 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5987 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5988 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5989 |
changeType := '(remove)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5990 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5991 |
sel := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5992 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5993 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5994 |
(p notNil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5995 |
and:[p ~~ #Error |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5996 |
and:[p isMessage |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5997 |
and:[rec isMessage |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5998 |
and:[rec selector == #compiledMethodAt:]]]]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5999 |
nameAndClass := self extractClassAndClassNameFromParseTree:rec receiver. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6000 |
clsName := nameAndClass key. changeClass := nameAndClass value. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6001 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6002 |
(sel == #category:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6003 |
sel := (rec args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6004 |
changeType := '(category change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6005 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6006 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6007 |
changeClass notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6008 |
m := changeClass compiledMethodAt:sel asSymbol. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6009 |
m notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6010 |
m category = (p args at:1) evaluate ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6011 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6012 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6013 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6014 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6015 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6016 |
(sel == #privacy:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6017 |
sel := (rec args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6018 |
changeType := '(privacy change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6019 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6020 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6021 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6022 |
sel := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6023 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6024 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6025 |
(Class definitionSelectors includes:sel) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6026 |
changeType := '(class definition)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6027 |
clsName := (p args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6028 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6029 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6030 |
"/ is it a private-class ? |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6031 |
('*privateIn:' match:sel) ifTrue:[
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6032 |
ownerTree := p args last. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6033 |
ownerName := ownerTree name asString. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6034 |
clsName := ownerName , '::' , clsName |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6035 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6036 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6037 |
changeString := clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6038 |
NoColoring ~~ true ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6039 |
changeType := changeType allBold. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6040 |
changeString := changeString allBold. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6041 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6042 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6043 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6044 |
cls := (self nameSpaceForApply) at:clsName asSymbol ifAbsent:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6045 |
cls isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6046 |
changeDelta := '+'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6047 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6048 |
(cls definitionSelector = sel |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6049 |
or:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6050 |
"/ could be an ST/V, VAge or Dolphin definition |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6051 |
cls definitionSelector = (sel , 'category:') |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6052 |
]) |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6053 |
ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6054 |
((cls superclass isNil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6055 |
and:[p receiver isConstant |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6056 |
and:[p receiver evaluate isNil]]) |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6057 |
or:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6058 |
cls superclass notNil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6059 |
and:[p receiver isConstant not |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6060 |
and:[cls superclass name = p receiver name]] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6061 |
]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6062 |
cls instanceVariableString asCollectionOfWords = (p args at:2) evaluate asCollectionOfWords ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6063 |
cls classVariableString asCollectionOfWords = (p args at:3) evaluate asCollectionOfWords ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6064 |
(p args at:4) evaluate isEmpty ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6065 |
cls definitionSelector = (sel , 'category:') |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6066 |
ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6067 |
"/ ST/V, VAge or Dolphin definition |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6068 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6069 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6070 |
cls category = (p args at:5) evaluate ifTrue:[ |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6071 |
changeDelta := '='. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6072 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6073 |
changeType := '(class category change)'. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6074 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6075 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6076 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6077 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6078 |
] |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6079 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6080 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6081 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6082 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6083 |
sel := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6084 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6085 |
(#( |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6086 |
#'primitiveDefinitions:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6087 |
#'primitiveFunctions:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6088 |
#'primitiveVariables:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6089 |
) includes:sel) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6090 |
changeType := '(class definition)'. |
| 9548 | 6091 |
clsName := rec name. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6092 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6093 |
((sel == #instanceVariableNames:) |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6094 |
and:[rec isMessage |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6095 |
and:[rec selector == #class]]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6096 |
clsName := rec receiver name. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6097 |
changeClass := (self nameSpaceForApply) classNamed:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6098 |
changeType := '(class definition)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6099 |
changeClassNames at:changeClassNames size put:clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6100 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6101 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6102 |
changeClass isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6103 |
changeDelta := '?'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6104 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6105 |
s := (p args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6106 |
s = changeClass class instanceVariableString ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6107 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6108 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6109 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6110 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6111 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6112 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6113 |
]. |
| 9548 | 6114 |
|
6115 |
"Modified: / 14-08-2010 / 12:54:24 / cg" |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6116 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6117 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6118 |
processSnapshotChunk |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6119 |
changeType := ''. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6120 |
headerLine := chunkText. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6121 |
changeString := (chunkText contractTo:maxLen) withoutSeparators. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6122 |
timeStampInfo := nil. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6123 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6124 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6125 |
readChangesFile |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6126 |
"read the changes file, create a list of header-lines (changeChunks) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6127 |
and a list of chunk-positions (changePositions). |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6128 |
Starting with 2.10.3, the entries are multi-col entries; |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6129 |
the cols are: |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6130 |
1 delta (only if comparing) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6131 |
'+' -> new method (w.r.t. current state) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6132 |
'-' -> removed method (w.r.t. current state) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6133 |
'?' -> class does not exist currently |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6134 |
'=' -> change is the same as current methods source |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6135 |
'~' -> change is almost the same as current methods source |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6136 |
2 class/selector |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6137 |
3 type of change |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6138 |
doit |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6139 |
method |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6140 |
category change |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6141 |
4 timestamp |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6142 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6143 |
since comparing slows down startup time, it is now disabled by |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6144 |
default and can be enabled via a toggle." |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6145 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6146 |
|excla| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6147 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6148 |
changeChunks := OrderedCollection new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6149 |
changeClassNames := OrderedCollection new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6150 |
changeHeaderLines := OrderedCollection new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6151 |
changePositions := OrderedCollection new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6152 |
changeTimeStamps := OrderedCollection new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6153 |
changeIsFollowupMethodChange := OrderedCollection new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6154 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6155 |
excla := inStream class chunkSeparator. |
| 9515 | 6156 |
maxLen := 100. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6157 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6158 |
[inStream atEnd] whileFalse:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6159 |
" |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6160 |
get a chunk (separated by excla) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6161 |
" |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6162 |
inStream skipSeparators. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6163 |
chunkPosition := inStream position1Based. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6164 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6165 |
sawExcla := inStream peekFor:excla. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6166 |
chunkText := fullChunkText := inStream nextChunk. |
|
7619
95943c1bc289
Ignore empty chunks when reading from changes file
Stefan Vogel <sv@exept.de>
parents:
7618
diff
changeset
|
6167 |
chunkText notEmptyOrNil ifTrue:[ |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6168 |
self processChunk. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6169 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6170 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6171 |
|
| 9515 | 6172 |
"Modified: / 27-08-1995 / 23:06:55 / claus" |
6173 |
"Modified: / 10-07-2010 / 10:58:08 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6174 |
! ! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6175 |
|
| 761 | 6176 |
!ChangesBrowser class methodsFor:'documentation'! |
| 202 | 6177 |
|
6178 |
version |
|
|
9715
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
6179 |
^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.410 2011-01-29 10:24:38 cg Exp $' |
| 8978 | 6180 |
! |
6181 |
||
6182 |
version_CVS |
|
|
9715
3be7736915bb
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9689
diff
changeset
|
6183 |
^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.410 2011-01-29 10:24:38 cg Exp $' |
|
276
017219e571e4
more stuff for autoloaded classes
Claus Gittinger <cg@exept.de>
parents:
275
diff
changeset
|
6184 |
! ! |