| author | Claus Gittinger <cg@exept.de> |
| Wed, 24 Oct 2018 18:09:48 +0200 | |
| changeset 18490 | f38df56cb637 |
| parent 18429 | 9b4f1bf498ce |
| child 18596 | 48275ca92cf1 |
| 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 |
|
| 15082 | 14 |
"{ NameSpace: Smalltalk }"
|
15 |
||
| 0 | 16 |
StandardSystemView subclass:#ChangesBrowser |
| 16372 | 17 |
instanceVariableNames:'changesReader changeInfoList changeListView codeView diffView |
18 |
changeFileName anyChanges changeNrShown changeNrProcessed |
|
19 |
multipleApply autoCompare changeFileSize changeFileTimestamp |
|
20 |
checkBlock tabSpec autoUpdate editingClassSource lastSearchType |
|
| 4489 | 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 |
| 10719 | 24 |
classesNotToBeAutoloaded encodingIfKnown |
| 11244 | 25 |
ignorePublicPrivateCategories changeListSelectionHolder |
| 17848 | 26 |
defaultApplicationForVAGEClasses infoHolder leftCodeLabelHolder |
| 18429 | 27 |
rightCodeLabelHolder menuPanel toolbarMenu' |
| 17848 | 28 |
classVariableNames:'CompressSnapshotInfo DefaultAutoCompare DefaultShowingDiffs |
29 |
KeepEnforcedNameSpace LastEnforcedNameSpace NoColoring |
|
30 |
ShowWarningDialogs' |
|
| 4489 | 31 |
poolDictionaries:'' |
32 |
category:'Interface-Browsers' |
|
| 0 | 33 |
! |
34 |
||
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
35 |
Object subclass:#ChangeFileReader |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
36 |
instanceVariableNames:'browser enforcedNameSpace changeFileName changeFileSize |
| 16372 | 37 |
changeFileTimestamp changeInfo changeChunks changeClassNames |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
38 |
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
|
39 |
changeIsFollowupMethodChange autoCompare autoloadAsRequired |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
40 |
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
|
41 |
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
|
42 |
changeString changeType changeDelta headerLine maxLen' |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
43 |
classVariableNames:'NoColoring' |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
44 |
poolDictionaries:'' |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
45 |
privateIn:ChangesBrowser |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
46 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
47 |
|
| 16372 | 48 |
Object subclass:#ChangeInfo |
49 |
instanceVariableNames:'position chunk className selector headerLine timestamp |
|
| 18059 | 50 |
isFollowupChange categoryIfCategoryChange' |
| 16372 | 51 |
classVariableNames:'' |
52 |
poolDictionaries:'' |
|
53 |
privateIn:ChangesBrowser |
|
54 |
! |
|
55 |
||
| 761 | 56 |
!ChangesBrowser class methodsFor:'documentation'! |
| 29 | 57 |
|
58 |
copyright |
|
59 |
" |
|
60 |
COPYRIGHT (c) 1990 by Claus Gittinger |
|
| 6288 | 61 |
All Rights Reserved |
| 0 | 62 |
|
| 29 | 63 |
This software is furnished under a license and may be used |
64 |
only in accordance with the terms of that license and with the |
|
65 |
inclusion of the above copyright notice. This software may not |
|
66 |
be provided or otherwise made available to, or used by, any |
|
67 |
other person. No title to or ownership of the software is |
|
68 |
hereby transferred. |
|
69 |
" |
|
70 |
! |
|
71 |
||
72 |
documentation |
|
73 |
" |
|
| 11397 | 74 |
this implements a browser for the changes-file |
75 |
(actually, it can display any sourceFile's contents). |
|
| 29 | 76 |
See the extra document 'doc/misc/cbrowser.doc' for how to use this browser. |
77 |
||
78 |
written jan 90 by claus |
|
| 51 | 79 |
|
| 11397 | 80 |
This is a very old leftover class (it was one of the very first apps in ST/X |
81 |
and the Merovingian has not yet detected this one ;-) |
|
| 18059 | 82 |
|
83 |
At the time this was originally written, I had a 2Mb machine, and every memory byte was a very valuable. |
|
84 |
Therefore, the original did not keep any infos in memory, but instead kept a list of change-chunk file offsets, |
|
85 |
and parsed the chunks over and over (eg. when searching for classname/selector etc.) |
|
86 |
Later, when bigger memories became available, more and more infos where cached in additional arrays (classname, |
|
87 |
selector, etc.) and those where finally condensed into a single changeInfo object. |
|
88 |
However, now that really enough memory is avail, this is really no longer useful, and we should keep |
|
89 |
changeSet entries instead (which hold the same info plus more). |
|
90 |
The ChangeSetBrowser does exactly this, but does not support all of the fancy compress/delete etc. |
|
91 |
operations of the ChangesBrowser, to which we got used so much. |
|
92 |
Thus, this one kept on living its zombie life and gets occasional features added (sigh)... |
|
93 |
(Well, like many workhorses, they become ugly when aged, but still do their duty) |
|
94 |
||
95 |
It MUST eventually be completely replaced by the ChangeSetBrowser class in the near future. |
|
| 5703 | 96 |
|
97 |
||
| 508 | 98 |
[Class variables:] |
| 11397 | 99 |
CompressSnapshotInfo if true (the default), snapshot entries |
100 |
are also compressed in the compress function. |
|
101 |
Some users prefer them to be not compressed. |
|
102 |
Set it to false for this. |
|
| 58 | 103 |
|
| 51 | 104 |
Notice: |
| 11397 | 105 |
this needs a total rewrite, to build up a changeSet from the file |
106 |
(which did not exist when the ChangesBrowser was originally written) |
|
107 |
and manipulate that changeSet. |
|
108 |
||
109 |
This way, we get a browser for any upcoming incore changeSets for |
|
110 |
free. Also, this will put the chunk analysation code into Change and |
|
111 |
subclasses (where it belongs) and give a better encapsulation and |
|
112 |
overall structure. Do not take this as an example for good style ;-) |
|
113 |
||
114 |
The Change hierarchy is currently been completed, and the changes browser |
|
| 17047 | 115 |
should be adapted soon. |
| 508 | 116 |
|
117 |
[author:] |
|
| 11397 | 118 |
Claus Gittinger |
| 508 | 119 |
|
120 |
[start with:] |
|
| 11397 | 121 |
ChangesBrowser open |
| 1359 | 122 |
|
123 |
[see also:] |
|
| 11397 | 124 |
( Using the ChangesBrowser :html: tools/cbrowser/TOP.html ) |
| 6288 | 125 |
|
| 29 | 126 |
" |
127 |
! ! |
|
| 0 | 128 |
|
| 761 | 129 |
!ChangesBrowser class methodsFor:'instance creation'! |
| 45 | 130 |
|
| 8379 | 131 |
openOn:aFilename |
| 9525 | 132 |
"create & open a changes browser on a change file" |
| 5696 | 133 |
|
| 8379 | 134 |
|fileName browser| |
135 |
||
136 |
fileName := aFilename asFilename pathName. |
|
137 |
||
138 |
(self isXMLFile:fileName) ifTrue:[ |
|
139 |
browser := ChangeSetBrowser new |
|
| 5696 | 140 |
] ifFalse:[ |
| 8379 | 141 |
browser := self new |
142 |
]. |
|
143 |
||
144 |
browser label:(self defaultLabel , ': ', fileName). |
|
145 |
browser changeFileName:fileName. |
|
| 5696 | 146 |
browser open. |
147 |
^ browser |
|
| 9525 | 148 |
|
149 |
"Modified: / 18-07-2010 / 10:32:18 / cg" |
|
| 45 | 150 |
! ! |
151 |
||
| 761 | 152 |
!ChangesBrowser class methodsFor:'behavior'! |
| 0 | 153 |
|
154 |
autoSelectNext |
|
155 |
"returning true here, makes a Delete operation automatically |
|
156 |
select the next change" |
|
157 |
||
158 |
^ true |
|
159 |
! ! |
|
160 |
||
| 761 | 161 |
!ChangesBrowser class methodsFor:'defaults'! |
| 0 | 162 |
|
| 489 | 163 |
defaultIcon |
| 1153 | 164 |
"return the browsers default window icon" |
165 |
||
|
7631
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
166 |
<resource: #programImage> |
|
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
167 |
|
|
258e8ad34edf
defaultIcon no longer uses a class variable
Stefan Vogel <sv@exept.de>
parents:
7625
diff
changeset
|
168 |
^ ToolbarIconLibrary startChangesBrowserIcon |
| 489 | 169 |
! |
170 |
||
| 73 | 171 |
defaultLabel |
| 5527 | 172 |
^ self classResources string:'Changes Browser' |
| 2417 | 173 |
! |
174 |
||
175 |
isVisualStartable |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
176 |
"return true, if this application can be started via #open. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
177 |
(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
|
178 |
|
| 2417 | 179 |
^ true |
180 |
||
181 |
"Created: / 27.9.1999 / 12:28:27 / cg" |
|
| 28 | 182 |
! ! |
183 |
||
| 16022 | 184 |
!ChangesBrowser class methodsFor:'help specs'! |
| 3202 | 185 |
|
| 17899 | 186 |
helpSpec |
| 16022 | 187 |
<resource: #help> |
188 |
||
189 |
^ Dictionary new |
|
190 |
addPairsFrom:#( |
|
191 |
||
192 |
#applyChange |
|
193 |
'Apply (install) the selected change' |
|
194 |
||
195 |
deleteAllForClass |
|
196 |
'Delete all changes for the selected change''s class' |
|
197 |
||
198 |
deleteForClassFromBegin |
|
| 17597 | 199 |
'Delete this and all previous changes for the selected change''s class' |
| 16022 | 200 |
|
201 |
deleteForClassToEnd |
|
202 |
'Delete this and all following changes for the selected change''s class' |
|
| 17565 | 203 |
|
204 |
deleteClassSelectorAll |
|
205 |
'Delete all changes for the selected method' |
|
206 |
||
207 |
deleteClassSelectorOlder |
|
| 17597 | 208 |
'Delete this and all previous changes for the selected method' |
| 16022 | 209 |
) |
| 17565 | 210 |
|
| 17597 | 211 |
"Modified: / 25-07-2017 / 10:55:55 / cg" |
| 16022 | 212 |
! ! |
213 |
||
214 |
!ChangesBrowser class methodsFor:'menu specs'! |
|
| 10681 | 215 |
|
| 3202 | 216 |
menuSpec |
217 |
"This resource specification was automatically generated |
|
218 |
by the MenuEditor of ST/X." |
|
219 |
||
220 |
"Do not manually edit this!! If it is corrupted, |
|
221 |
the MenuEditor may not be able to read the specification." |
|
222 |
||
| 10719 | 223 |
|
| 3202 | 224 |
" |
225 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpec |
|
226 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpec)) startUp |
|
227 |
" |
|
228 |
||
229 |
<resource: #menu> |
|
230 |
||
| 7360 | 231 |
^ |
| 6216 | 232 |
#(Menu |
| 7096 | 233 |
( |
234 |
(MenuItem |
|
235 |
label: 'File' |
|
| 17093 | 236 |
submenuChannel: menuSpecFile |
| 7096 | 237 |
) |
238 |
(MenuItem |
|
| 18252 | 239 |
label: 'Change_subst' |
| 17093 | 240 |
submenuChannel: menuSpecChange |
| 7096 | 241 |
) |
242 |
(MenuItem |
|
243 |
label: 'Search' |
|
| 17093 | 244 |
submenuChannel: menuSpecSearch |
| 7096 | 245 |
) |
246 |
(MenuItem |
|
247 |
label: 'Browse' |
|
| 17093 | 248 |
submenuChannel: menuSpecBrowse |
| 7096 | 249 |
) |
250 |
(MenuItem |
|
251 |
label: 'Settings' |
|
| 17093 | 252 |
submenuChannel: menuSpecSettings |
| 7096 | 253 |
) |
254 |
(MenuItem |
|
|
7463
e8e74bdbfbda
support '?' as help (for now: controlled by resources)
Claus Gittinger <cg@exept.de>
parents:
7415
diff
changeset
|
255 |
label: 'MENU_Help' |
| 17093 | 256 |
submenuChannel: menuSpecHelp |
257 |
) |
|
258 |
) |
|
259 |
nil |
|
260 |
nil |
|
261 |
) |
|
| 17096 | 262 |
|
263 |
"Modified: / 21-11-2016 / 23:46:22 / cg" |
|
| 18252 | 264 |
"Modified: / 01-07-2018 / 09:24:30 / Claus Gittinger" |
| 17093 | 265 |
! |
266 |
||
267 |
menuSpecBrowse |
|
268 |
"This resource specification was automatically generated |
|
269 |
by the MenuEditor of ST/X." |
|
270 |
||
271 |
"Do not manually edit this!! If it is corrupted, |
|
272 |
the MenuEditor may not be able to read the specification." |
|
273 |
||
274 |
||
275 |
" |
|
276 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpecBrowse |
|
277 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpecBrowse)) startUp |
|
278 |
" |
|
279 |
||
280 |
<resource: #menu> |
|
281 |
||
282 |
^ |
|
283 |
#(Menu |
|
284 |
( |
|
285 |
(MenuItem |
|
286 |
enabled: hasSingleSelection |
|
287 |
label: 'Class' |
|
288 |
itemValue: doBrowse |
|
289 |
) |
|
290 |
(MenuItem |
|
291 |
label: '-' |
|
292 |
) |
|
293 |
(MenuItem |
|
294 |
label: 'Senders...' |
|
295 |
itemValue: doBrowseSenders |
|
296 |
) |
|
297 |
(MenuItem |
|
298 |
label: 'Implementors...' |
|
299 |
itemValue: doBrowseImplementors |
|
300 |
) |
|
301 |
) |
|
302 |
nil |
|
303 |
nil |
|
304 |
) |
|
305 |
! |
|
306 |
||
307 |
menuSpecChange |
|
308 |
"This resource specification was automatically generated |
|
309 |
by the MenuEditor of ST/X." |
|
310 |
||
311 |
"Do not manually edit this!! If it is corrupted, |
|
312 |
the MenuEditor may not be able to read the specification." |
|
313 |
||
314 |
||
315 |
" |
|
316 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpecChange |
|
317 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpecChange)) startUp |
|
318 |
" |
|
319 |
||
320 |
<resource: #menu> |
|
321 |
||
322 |
^ |
|
323 |
#(Menu |
|
324 |
( |
|
325 |
(MenuItem |
|
326 |
enabled: hasSelection |
|
327 |
label: 'Apply' |
|
328 |
itemValue: doApply |
|
329 |
) |
|
330 |
(MenuItem |
|
331 |
enabled: hasSingleSelection |
|
332 |
label: 'Apply to End' |
|
333 |
itemValue: doApplyRest |
|
334 |
) |
|
335 |
(MenuItem |
|
336 |
enabled: hasSingleSelection |
|
337 |
label: 'Apply from Begin' |
|
338 |
itemValue: doApplyFromBeginning |
|
339 |
) |
|
340 |
(MenuItem |
|
341 |
enabled: hasSingleSelection |
|
342 |
label: 'Apply for Class to End' |
|
343 |
itemValue: doApplyClassRest |
|
344 |
) |
|
345 |
(MenuItem |
|
346 |
enabled: hasSingleSelection |
|
347 |
label: 'Apply for Class from Begin' |
|
348 |
itemValue: doApplyClassFromBeginning |
|
349 |
) |
|
350 |
(MenuItem |
|
351 |
enabled: hasNoSelection |
|
352 |
label: 'Apply All' |
|
353 |
itemValue: doApplyAll |
|
354 |
) |
|
355 |
(MenuItem |
|
356 |
enabled: hasSingleSelection |
|
357 |
label: 'Apply to Conflict or End' |
|
358 |
itemValue: doApplyToConflictOrEnd |
|
359 |
) |
|
360 |
(MenuItem |
|
361 |
label: '-' |
|
362 |
) |
|
363 |
(MenuItem |
|
364 |
enabled: hasSelection |
|
365 |
label: 'Delete' |
|
366 |
itemValue: doDelete |
|
367 |
) |
|
368 |
(MenuItem |
|
369 |
enabled: hasSingleSelection |
|
370 |
label: 'Delete to End' |
|
371 |
itemValue: doDeleteRest |
|
372 |
) |
|
373 |
(MenuItem |
|
374 |
enabled: hasSingleSelection |
|
375 |
label: 'Delete from Begin' |
|
376 |
itemValue: doDeleteFromBeginning |
|
377 |
) |
|
378 |
(MenuItem |
|
379 |
enabled: hasSingleSelection |
|
380 |
label: 'Delete for Class to End' |
|
381 |
itemValue: doDeleteClassRest |
|
382 |
) |
|
383 |
(MenuItem |
|
384 |
enabled: hasSingleSelection |
|
385 |
label: 'Delete for Class from Begin' |
|
386 |
itemValue: doDeleteClassFromBeginning |
|
387 |
) |
|
388 |
(MenuItem |
|
389 |
enabled: hasSelection |
|
390 |
label: 'Delete all for Class' |
|
391 |
itemValue: doDeleteClassAll |
|
392 |
isVisible: hasNoMultiSelection |
|
393 |
) |
|
394 |
(MenuItem |
|
395 |
enabled: hasSelection |
|
396 |
label: 'Delete all for Class && its Private Classes' |
|
397 |
itemValue: doDeleteClassAndPrivateClassesAll |
|
398 |
isVisible: hasNoMultiSelection |
|
399 |
) |
|
400 |
(MenuItem |
|
401 |
enabled: hasSelection |
|
402 |
label: 'Delete all for Namespace' |
|
403 |
itemValue: doDeleteAllForNamespace |
|
404 |
) |
|
405 |
(MenuItem |
|
406 |
enabled: hasSelection |
|
407 |
label: 'Delete all for Classes' |
|
408 |
itemValue: doDeleteClassAll |
|
409 |
isVisible: hasMultiSelection |
|
410 |
) |
|
411 |
(MenuItem |
|
412 |
enabled: hasSelection |
|
413 |
label: 'Delete all for Classes && their Private Classes' |
|
414 |
itemValue: doDeleteClassAndPrivateClassesAll |
|
415 |
isVisible: hasMultiSelection |
|
416 |
) |
|
417 |
(MenuItem |
|
418 |
label: '-' |
|
419 |
) |
|
420 |
(MenuItem |
|
421 |
enabled: hasSelection |
|
| 18233 | 422 |
label: 'Delete older Versions of Selected Change' |
| 17093 | 423 |
itemValue: doDeleteClassSelectorOlder |
424 |
isVisible: hasNoMultiSelectionHolder |
|
425 |
) |
|
426 |
(MenuItem |
|
427 |
enabled: hasSelection |
|
| 18233 | 428 |
label: 'Delete older Versions of all Selected Changes' |
| 17093 | 429 |
itemValue: doDeleteClassSelectorOlder |
430 |
isVisible: hasMultiSelectionHolder |
|
431 |
) |
|
432 |
(MenuItem |
|
433 |
enabled: hasSelection |
|
| 18233 | 434 |
label: 'Delete all Versions of Selected Change' |
| 17093 | 435 |
itemValue: doDeleteClassSelectorAll |
436 |
isVisible: hasNoMultiSelectionHolder |
|
437 |
) |
|
438 |
(MenuItem |
|
439 |
enabled: hasSelection |
|
| 18233 | 440 |
label: 'Delete all Versions of all Selected Changes' |
| 17093 | 441 |
itemValue: doDeleteClassSelectorAll |
442 |
isVisible: hasMultiSelectionHolder |
|
443 |
) |
|
444 |
(MenuItem |
|
445 |
label: '-' |
|
446 |
) |
|
447 |
(MenuItem |
|
448 |
enabled: hasSingleSelection |
|
449 |
label: 'Compare with Current' |
|
450 |
itemValue: doCompare |
|
451 |
) |
|
452 |
(MenuItem |
|
| 17096 | 453 |
enabled: hasSingleSelection |
454 |
label: 'Copy to Clipboard' |
|
455 |
itemValue: doCopyToClipboard |
|
456 |
) |
|
457 |
(MenuItem |
|
| 17093 | 458 |
label: '-' |
459 |
) |
|
460 |
(MenuItem |
|
461 |
enabled: hasSelection |
|
462 |
label: 'Make Change a Patch' |
|
463 |
itemValue: doMakePatch |
|
464 |
) |
|
465 |
) |
|
466 |
nil |
|
467 |
nil |
|
468 |
) |
|
| 17096 | 469 |
|
470 |
"Modified: / 21-11-2016 / 23:46:42 / cg" |
|
| 18233 | 471 |
"Modified: / 21-06-2018 / 09:11:40 / Claus Gittinger" |
| 17093 | 472 |
! |
473 |
||
474 |
menuSpecFile |
|
475 |
"This resource specification was automatically generated |
|
476 |
by the MenuEditor of ST/X." |
|
477 |
||
478 |
"Do not manually edit this!! If it is corrupted, |
|
479 |
the MenuEditor may not be able to read the specification." |
|
480 |
||
481 |
||
482 |
" |
|
483 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpecFile |
|
484 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpecFile)) startUp |
|
485 |
" |
|
486 |
||
487 |
<resource: #menu> |
|
488 |
||
489 |
^ |
|
490 |
#(Menu |
|
491 |
( |
|
492 |
(MenuItem |
|
493 |
label: 'Compress' |
|
494 |
itemValue: doCompress |
|
495 |
isVisible: notEditingClassSource |
|
496 |
) |
|
497 |
(MenuItem |
|
498 |
enabled: hasSingleSelection |
|
499 |
label: 'Compress for Class' |
|
500 |
itemValue: doCompressClass |
|
501 |
isVisible: notEditingClassSource |
|
502 |
) |
|
503 |
(MenuItem |
|
504 |
enabled: hasSingleSelection |
|
505 |
label: 'Compress for Class && Selector' |
|
506 |
itemValue: doCompressSelector |
|
507 |
isVisible: notEditingClassSource |
|
508 |
) |
|
509 |
(MenuItem |
|
510 |
label: 'Compare and Compress' |
|
511 |
itemValue: doCompareAndCompress |
|
512 |
isVisible: notEditingClassSource |
|
513 |
) |
|
514 |
(MenuItem |
|
515 |
label: '-' |
|
516 |
isVisible: notEditingClassSource |
|
517 |
) |
|
518 |
(MenuItem |
|
| 18059 | 519 |
label: 'Cleanup' |
520 |
itemValue: doCleanup |
|
521 |
isVisible: notEditingClassSource |
|
522 |
) |
|
523 |
(MenuItem |
|
524 |
label: '-' |
|
525 |
isVisible: notEditingClassSource |
|
526 |
) |
|
527 |
(MenuItem |
|
| 17093 | 528 |
enabled: hasSingleSelection |
529 |
label: 'Fileout && Delete all Changes for Class' |
|
530 |
itemValue: doFileoutAndDeleteClassAll |
|
531 |
isVisible: notEditingClassSource |
|
532 |
) |
|
533 |
(MenuItem |
|
534 |
enabled: hasSelection |
|
535 |
label: 'CheckIn && Delete all Changes for Class' |
|
536 |
itemValue: doCheckinAndDeleteClassAll |
|
537 |
isVisible: notEditingClassSource |
|
538 |
) |
|
539 |
(MenuItem |
|
540 |
label: '-' |
|
541 |
isVisible: notEditingClassSource |
|
542 |
) |
|
543 |
(MenuItem |
|
544 |
enabled: hasSelection |
|
545 |
label: 'Save In...' |
|
546 |
itemValue: doSave |
|
547 |
) |
|
548 |
(MenuItem |
|
549 |
enabled: hasSingleSelection |
|
550 |
label: 'Save to End In...' |
|
551 |
itemValue: doSaveRest |
|
552 |
) |
|
553 |
(MenuItem |
|
554 |
enabled: hasSingleSelection |
|
555 |
label: 'Save for Class to End In...' |
|
556 |
itemValue: doSaveClassRest |
|
557 |
) |
|
558 |
(MenuItem |
|
559 |
enabled: hasSingleSelection |
|
560 |
label: 'Save all for Class In...' |
|
561 |
itemValue: doSaveClassAll |
|
562 |
) |
|
563 |
(MenuItem |
|
564 |
label: '-' |
|
565 |
) |
|
566 |
(MenuItem |
|
567 |
label: 'Writeback ClassFile' |
|
568 |
itemValue: doWriteBack |
|
569 |
isVisible: editingClassSource |
|
570 |
) |
|
571 |
(MenuItem |
|
572 |
label: 'Writeback ChangeFile' |
|
573 |
itemValue: doWriteBack |
|
574 |
isVisible: notEditingClassSource |
|
575 |
) |
|
576 |
(MenuItem |
|
577 |
label: '-' |
|
578 |
) |
|
579 |
(MenuItem |
|
580 |
label: 'Update' |
|
581 |
itemValue: doUpdate |
|
582 |
) |
|
583 |
(MenuItem |
|
584 |
label: '-' |
|
585 |
) |
|
586 |
(MenuItem |
|
587 |
label: 'Exit' |
|
588 |
itemValue: menuExit |
|
589 |
) |
|
590 |
) |
|
591 |
nil |
|
592 |
nil |
|
593 |
) |
|
594 |
! |
|
595 |
||
596 |
menuSpecHelp |
|
597 |
"This resource specification was automatically generated |
|
598 |
by the MenuEditor of ST/X." |
|
599 |
||
600 |
"Do not manually edit this!! If it is corrupted, |
|
601 |
the MenuEditor may not be able to read the specification." |
|
602 |
||
603 |
||
604 |
" |
|
605 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpecHelp |
|
606 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpecHelp)) startUp |
|
607 |
" |
|
608 |
||
609 |
<resource: #menu> |
|
610 |
||
611 |
^ |
|
612 |
#(Menu |
|
613 |
( |
|
614 |
(MenuItem |
|
615 |
label: 'ChangesBrowser Documentation' |
|
616 |
itemValue: openHTMLDocument: |
|
617 |
argument: 'tools/cbrowser/TOP.html' |
|
618 |
) |
|
619 |
(MenuItem |
|
620 |
label: '-' |
|
621 |
) |
|
622 |
(MenuItem |
|
623 |
label: 'About ChangesBrowser...' |
|
624 |
itemValue: openAboutThisApplication |
|
625 |
) |
|
626 |
) |
|
627 |
nil |
|
628 |
nil |
|
629 |
) |
|
630 |
! |
|
631 |
||
632 |
menuSpecSearch |
|
633 |
"This resource specification was automatically generated |
|
634 |
by the MenuEditor of ST/X." |
|
635 |
||
636 |
"Do not manually edit this!! If it is corrupted, |
|
637 |
the MenuEditor may not be able to read the specification." |
|
638 |
||
639 |
||
640 |
" |
|
641 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpecSearch |
|
642 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpecSearch)) startUp |
|
643 |
" |
|
644 |
||
645 |
<resource: #menu> |
|
646 |
||
647 |
^ |
|
648 |
#(Menu |
|
649 |
( |
|
650 |
(MenuItem |
|
651 |
label: 'Class...' |
|
652 |
itemValue: findClass |
|
653 |
) |
|
654 |
(MenuItem |
|
655 |
enabled: hasSelection |
|
656 |
label: 'First for Class' |
|
657 |
itemValue: findFirstForClass |
|
658 |
) |
|
659 |
(MenuItem |
|
660 |
enabled: hasSelection |
|
661 |
label: 'Previous for Class' |
|
662 |
itemValue: findPreviousForClass |
|
663 |
) |
|
664 |
(MenuItem |
|
665 |
enabled: hasSelection |
|
666 |
label: 'Next for Class' |
|
667 |
itemValue: findNextForClass |
|
668 |
) |
|
669 |
(MenuItem |
|
670 |
enabled: hasSelection |
|
671 |
label: 'Last for Class' |
|
672 |
itemValue: findLastForClass |
|
673 |
) |
|
674 |
(MenuItem |
|
675 |
label: '-' |
|
676 |
) |
|
677 |
(MenuItem |
|
678 |
label: 'Selector...' |
|
679 |
itemValue: findSelector |
|
680 |
) |
|
681 |
(MenuItem |
|
682 |
enabled: hasSelection |
|
683 |
label: 'Previous for Selector' |
|
684 |
itemValue: findPreviousForSelector |
|
685 |
) |
|
686 |
(MenuItem |
|
687 |
enabled: hasSelection |
|
688 |
label: 'Next for Selector' |
|
689 |
itemValue: findNextForSelector |
|
690 |
) |
|
691 |
(MenuItem |
|
692 |
label: '-' |
|
693 |
) |
|
694 |
(MenuItem |
|
695 |
label: 'String...' |
|
696 |
itemValue: findString |
|
697 |
) |
|
698 |
(MenuItem |
|
699 |
enabled: hasSelection |
|
700 |
label: 'Previous with String' |
|
701 |
itemValue: findPreviousForString |
|
702 |
) |
|
703 |
(MenuItem |
|
704 |
enabled: hasSelection |
|
705 |
label: 'Next with String' |
|
706 |
itemValue: findNextForString |
|
707 |
) |
|
708 |
(MenuItem |
|
709 |
label: '-' |
|
710 |
) |
|
711 |
(MenuItem |
|
712 |
enabled: hasSelection |
|
713 |
label: 'Previous Difference' |
|
714 |
itemValue: findPreviousDifference |
|
715 |
) |
|
716 |
(MenuItem |
|
717 |
enabled: hasSelection |
|
718 |
label: 'Next Difference' |
|
719 |
itemValue: findNextDifference |
|
720 |
) |
|
721 |
(MenuItem |
|
722 |
label: '-' |
|
723 |
) |
|
724 |
(MenuItem |
|
725 |
enabled: hasSelection |
|
726 |
label: 'Previous Snapshot' |
|
727 |
itemValue: findPreviousSnapshot |
|
728 |
) |
|
729 |
(MenuItem |
|
730 |
enabled: hasSelection |
|
731 |
label: 'Next Snapshot' |
|
732 |
itemValue: findNextSnapshot |
|
733 |
) |
|
734 |
(MenuItem |
|
735 |
label: 'Last Snapshot' |
|
736 |
itemValue: findLastSnapshot |
|
737 |
) |
|
738 |
) |
|
739 |
nil |
|
740 |
nil |
|
741 |
) |
|
742 |
! |
|
743 |
||
744 |
menuSpecSettings |
|
745 |
"This resource specification was automatically generated |
|
746 |
by the MenuEditor of ST/X." |
|
747 |
||
748 |
"Do not manually edit this!! If it is corrupted, |
|
749 |
the MenuEditor may not be able to read the specification." |
|
750 |
||
751 |
||
752 |
" |
|
753 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#menuSpecSettings |
|
754 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser menuSpecSettings)) startUp |
|
755 |
" |
|
756 |
||
757 |
<resource: #menu> |
|
758 |
||
759 |
^ |
|
760 |
#(Menu |
|
761 |
( |
|
762 |
(MenuItem |
|
763 |
label: 'Auto Compare' |
|
764 |
indication: autoCompare |
|
765 |
) |
|
766 |
(MenuItem |
|
767 |
label: 'Autoload As Required' |
|
768 |
indication: autoloadAsRequired |
|
769 |
) |
|
770 |
(MenuItem |
|
771 |
label: 'Show Diffs' |
|
772 |
indication: showingDiffs |
|
773 |
) |
|
774 |
(MenuItem |
|
775 |
label: 'Auto Update' |
|
776 |
indication: autoUpdate |
|
777 |
) |
|
778 |
(MenuItem |
|
779 |
label: '-' |
|
780 |
) |
|
781 |
(MenuItem |
|
782 |
label: 'Add to ChangeSet when Applying' |
|
783 |
indication: updateChangeSet |
|
784 |
) |
|
785 |
(MenuItem |
|
786 |
label: 'Ignore Public/Private in Categories (Dolphin code)' |
|
787 |
itemValue: ignorePublicPrivateCategories: |
|
788 |
isVisible: false |
|
789 |
indication: ignorePublicPrivateCategories |
|
790 |
) |
|
791 |
(MenuItem |
|
792 |
label: '-' |
|
793 |
) |
|
794 |
(MenuItem |
|
795 |
label: 'Apply into Package...' |
|
796 |
itemValue: setEnforcedPackage |
|
797 |
) |
|
798 |
(MenuItem |
|
799 |
label: 'Apply into NameSpace...' |
|
800 |
itemValue: setEnforcedNameSpace |
|
801 |
) |
|
802 |
(MenuItem |
|
803 |
label: '-' |
|
804 |
) |
|
805 |
(MenuItem |
|
806 |
label: 'Settings...' |
|
807 |
itemValue: openSettingsDialog |
|
| 7096 | 808 |
) |
809 |
) |
|
810 |
nil |
|
811 |
nil |
|
| 3202 | 812 |
) |
| 10681 | 813 |
! |
814 |
||
815 |
toolbarMenuSpec |
|
816 |
"This resource specification was automatically generated |
|
817 |
by the MenuEditor of ST/X." |
|
818 |
||
819 |
"Do not manually edit this!! If it is corrupted, |
|
820 |
the MenuEditor may not be able to read the specification." |
|
821 |
||
822 |
||
823 |
" |
|
824 |
MenuEditor new openOnClass:ChangesBrowser andSelector:#toolbarMenuSpec |
|
825 |
(Menu new fromLiteralArrayEncoding:(ChangesBrowser toolbarMenuSpec)) startUp |
|
826 |
" |
|
827 |
||
828 |
<resource: #menu> |
|
829 |
||
830 |
^ |
|
831 |
#(Menu |
|
832 |
( |
|
833 |
(MenuItem |
|
834 |
activeHelpKey: applyChange |
|
835 |
enabled: hasSelectionHolder |
|
836 |
label: 'Apply' |
|
837 |
itemValue: doApply |
|
838 |
translateLabel: true |
|
839 |
isButton: true |
|
840 |
labelImage: (ResourceRetriever ToolbarIconLibrary executeMethod20x20Icon) |
|
841 |
) |
|
842 |
(MenuItem |
|
843 |
label: '-' |
|
844 |
) |
|
845 |
(MenuItem |
|
846 |
activeHelpKey: deleteAllForClass |
|
847 |
enabled: hasSelectionHolder |
|
| 15016 | 848 |
isVisible: canDeleteChanges |
| 10681 | 849 |
label: 'Delete all for Class' |
850 |
itemValue: doDeleteClassAll |
|
851 |
translateLabel: true |
|
852 |
isButton: true |
|
853 |
labelImage: (ResourceRetriever ToolbarIconLibrary deleteClass24x24Icon) |
|
854 |
) |
|
| 13991 | 855 |
(MenuItem |
| 16022 | 856 |
activeHelpKey: deleteForClassFromBegin |
857 |
enabled: hasSelectionHolder |
|
858 |
isVisible: canDeleteChanges |
|
859 |
label: 'Delete for Class from Beginning' |
|
860 |
itemValue: doDeleteClassFromBeginning |
|
861 |
translateLabel: true |
|
862 |
isButton: true |
|
863 |
labelImage: (ResourceRetriever ToolbarIconLibrary deleteClassFromStart24x24Icon) |
|
864 |
) |
|
865 |
(MenuItem |
|
| 13991 | 866 |
activeHelpKey: deleteForClassToEnd |
867 |
enabled: hasSelectionHolder |
|
| 15016 | 868 |
isVisible: canDeleteChanges |
| 13991 | 869 |
label: 'Delete for Class to End' |
870 |
itemValue: doDeleteClassRest |
|
871 |
translateLabel: true |
|
872 |
isButton: true |
|
873 |
labelImage: (ResourceRetriever ToolbarIconLibrary deleteClassToEnd24x24Icon) |
|
874 |
) |
|
| 17565 | 875 |
(MenuItem |
876 |
label: '-' |
|
877 |
) |
|
878 |
(MenuItem |
|
879 |
activeHelpKey: deleteClassSelectorAll |
|
880 |
enabled: hasSelectionHolder |
|
881 |
isVisible: canDeleteChanges |
|
| 18233 | 882 |
label: 'Delete all versions of this change' |
| 17565 | 883 |
itemValue: doDeleteClassSelectorAll |
884 |
translateLabel: true |
|
885 |
isButton: true |
|
886 |
labelImage: (ResourceRetriever ToolbarIconLibrary deleteMethod24x24Icon) |
|
887 |
) |
|
888 |
(MenuItem |
|
889 |
activeHelpKey: deleteClassSelectorOlder |
|
890 |
enabled: hasSelectionHolder |
|
891 |
isVisible: canDeleteChanges |
|
| 18233 | 892 |
label: 'Delete older versions of this change' |
| 17565 | 893 |
itemValue: doDeleteClassSelectorOlder |
894 |
translateLabel: true |
|
895 |
isButton: true |
|
896 |
labelImage: (ResourceRetriever ToolbarIconLibrary deleteMethodFromStart24x24Icon) |
|
897 |
) |
|
| 10681 | 898 |
) |
899 |
nil |
|
900 |
nil |
|
901 |
) |
|
| 17565 | 902 |
|
903 |
"Modified: / 07-07-2017 / 12:52:28 / cg" |
|
| 18233 | 904 |
"Modified: / 21-06-2018 / 09:11:51 / Claus Gittinger" |
| 3202 | 905 |
! ! |
906 |
||
| 3674 | 907 |
!ChangesBrowser class methodsFor:'private-changeFile access'! |
908 |
||
909 |
readXMLChangesFrom:aStream inBackground:inBackground |
|
910 |
"read an XML source file (format as in campSmalltalk DTD)" |
|
911 |
||
912 |
|changeSet| |
|
913 |
||
914 |
(XML isNil or:[XML::SourceNodeBuilder isNil or:[XML::XMLParser isNil]]) ifTrue:[ |
|
| 6288 | 915 |
Smalltalk loadPackage:'stx:goodies/xml/vw'. |
916 |
(XML isNil or:[XML::SourceNodeBuilder isNil or:[XML::XMLParser isNil]]) ifTrue:[ |
|
917 |
self error:'Could not load XML package(s) from ''stx:goodies/xml/vw'''. |
|
918 |
] |
|
| 3674 | 919 |
]. |
920 |
||
921 |
changeSet := ChangeSet new. |
|
| 6288 | 922 |
XML::SourceScannerNodeBuilder new |
923 |
scanFile:aStream |
|
924 |
do:[:eachChange | |
|
925 |
changeSet addChange:eachChange. |
|
926 |
]. |
|
| 3674 | 927 |
^ changeSet |
928 |
||
929 |
"/ builder := XML::SourceScannerNodeBuilder new. |
|
930 |
"/ parser := XML::XMLParser on:aStream. |
|
931 |
"/ parser builder:builder. |
|
932 |
"/ parser validate:false. |
|
933 |
"/ parser scanDocument. |
|
934 |
! |
|
935 |
||
936 |
readXMLChangesFromFile:changeFileName inBackground:inBackground |
|
| 14011 | 937 |
|set| |
938 |
||
939 |
changeFileName asFilename readingFileDo:[:s| |
|
940 |
set := self readXMLChangesFrom:s inBackground:false. |
|
941 |
]. |
|
| 3674 | 942 |
^ set. |
943 |
! ! |
|
944 |
||
945 |
!ChangesBrowser class methodsFor:'utilities'! |
|
946 |
||
947 |
isXMLFile:aFilename |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
948 |
|stream first| |
|
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
949 |
|
|
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
950 |
stream := aFilename asFilename readStreamOrNil. |
| 3674 | 951 |
stream isNil ifTrue:[^ false]. |
952 |
||
953 |
stream skipSeparators. |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
954 |
first := stream peek. |
| 3674 | 955 |
stream close. |
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
956 |
^ first == $< |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
957 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
958 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
959 |
methodDefinitionSelectors |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
960 |
^ #( |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
961 |
#'methodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
962 |
#'privateMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
963 |
#'publicMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
964 |
#'ignoredMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
965 |
#'protectedMethodsFor:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
966 |
#'methodsFor:stamp:' "/ Squeak support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
967 |
#'commentStamp:prior:' "/ Squeak support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
968 |
#methodsFor "/ Dolphin support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
969 |
#categoriesForClass "/ Dolphin support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
970 |
#'categoriesFor:' "/ Dolphin support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
971 |
#methods "/ STV support |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
972 |
#publicMethods "/ STV / V'Age support |
| 6532 | 973 |
#privateMethods "/ STV / V'Age support |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
974 |
#'methodsForUndefined:' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
975 |
) |
| 3674 | 976 |
! ! |
977 |
||
| 3202 | 978 |
!ChangesBrowser methodsFor:'aspects'! |
979 |
||
980 |
applyInOriginalNameSpace |
|
981 |
^ applyInOriginalNameSpace |
|
982 |
! |
|
983 |
||
| 3472 | 984 |
applyNotInOriginalNameSpace |
| 6288 | 985 |
^ BlockValue forLogicalNot:self applyInOriginalNameSpace |
| 3472 | 986 |
! |
987 |
||
| 3202 | 988 |
autoCompare |
989 |
^ autoCompare |
|
990 |
! |
|
991 |
||
992 |
autoUpdate |
|
993 |
"enabled/disable automatic update from the change-file (for monitoring)" |
|
994 |
||
995 |
^ autoUpdate |
|
996 |
||
997 |
"Created: 3.12.1995 / 14:14:24 / cg" |
|
998 |
"Modified: 3.12.1995 / 14:20:45 / cg" |
|
999 |
! |
|
1000 |
||
| 6216 | 1001 |
autoloadAsRequired |
1002 |
^ autoloadAsRequired |
|
1003 |
! |
|
1004 |
||
| 15016 | 1005 |
canDeleteChanges |
1006 |
"makes the delete buttons in the toolbar visible" |
|
1007 |
||
1008 |
^ true. |
|
1009 |
! |
|
1010 |
||
| 11048 | 1011 |
changeListSelectionHolder |
1012 |
changeListSelectionHolder isNil ifTrue:[ |
|
1013 |
changeListSelectionHolder := nil asValue. |
|
1014 |
]. |
|
1015 |
^ changeListSelectionHolder |
|
1016 |
||
1017 |
"Created: / 03-01-2012 / 15:19:25 / cg" |
|
1018 |
! |
|
1019 |
||
| 3202 | 1020 |
editingClassSource |
| 3203 | 1021 |
^ editingClassSource ? false |
| 3202 | 1022 |
! |
1023 |
||
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1024 |
hasMultiSelection |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1025 |
^ self hasSelection and:[self hasSingleSelection not] |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1026 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1027 |
|
| 11028 | 1028 |
hasMultiSelectionHolder |
1029 |
^ [ self hasMultiSelection ] |
|
1030 |
||
1031 |
"Created: / 25-12-2011 / 11:21:52 / cg" |
|
1032 |
! |
|
1033 |
||
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1034 |
hasNoMultiSelection |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1035 |
^ self hasMultiSelection not |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1036 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1037 |
|
| 11028 | 1038 |
hasNoMultiSelectionHolder |
1039 |
^ [ self hasNoMultiSelection ] |
|
1040 |
||
1041 |
"Created: / 25-12-2011 / 11:21:20 / cg" |
|
1042 |
! |
|
1043 |
||
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1044 |
hasNoSelection |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1045 |
^ self hasSelection not |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1046 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1047 |
|
| 3202 | 1048 |
hasSelection |
| 17924 | 1049 |
"true if a change is selected" |
1050 |
||
| 6288 | 1051 |
^ changeListView hasSelection |
| 3202 | 1052 |
! |
1053 |
||
| 11048 | 1054 |
hasSelectionHolder |
1055 |
^ BlockValue |
|
1056 |
with:[:v | v notEmptyOrNil ] |
|
1057 |
argument:(self changeListSelectionHolder) |
|
1058 |
||
1059 |
"Created: / 03-01-2012 / 15:15:47 / cg" |
|
1060 |
! |
|
1061 |
||
| 3211 | 1062 |
hasSingleSelection |
1063 |
changeListView multipleSelectOk ifTrue:[ |
|
| 6288 | 1064 |
^ changeListView selection size == 1 |
| 3211 | 1065 |
]. |
1066 |
^ changeListView hasSelection |
|
1067 |
! |
|
1068 |
||
| 10719 | 1069 |
ignorePublicPrivateCategories |
1070 |
^ ignorePublicPrivateCategories |
|
1071 |
||
1072 |
"Created: / 23-09-2011 / 19:42:46 / cg" |
|
1073 |
! |
|
1074 |
||
| 18136 | 1075 |
leftCodeLabel:aString |
1076 |
"change the string shown above the left codeView (defaults to: 'Current')" |
|
1077 |
||
1078 |
self leftCodeLabelHolder value:aString |
|
1079 |
||
1080 |
"Created: / 07-12-2017 / 12:28:37 / cg" |
|
1081 |
! |
|
1082 |
||
| 17848 | 1083 |
leftCodeLabelHolder |
1084 |
"holds the string shown above the left codeView (defaults to: 'Current')" |
|
1085 |
||
1086 |
^ leftCodeLabelHolder |
|
1087 |
||
1088 |
"Created: / 07-12-2017 / 12:28:31 / cg" |
|
1089 |
! |
|
1090 |
||
| 3202 | 1091 |
notEditingClassSource |
1092 |
^ self editingClassSource not |
|
| 3211 | 1093 |
! |
1094 |
||
|
3224
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1095 |
notEditingClassSourceAndNotReadOnly |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1096 |
^ (self editingClassSource or:[readOnly == true]) not |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1097 |
! |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1098 |
|
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1099 |
notReadOnly |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1100 |
^ (readOnly ~~ true) |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1101 |
! |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1102 |
|
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1103 |
readOnly:aBoolean |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1104 |
readOnly := aBoolean |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1105 |
! |
|
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1106 |
|
| 18136 | 1107 |
rightCodeLabel:aString |
1108 |
"change the string shown above the right codeView (defaults to: 'Change')" |
|
1109 |
||
1110 |
self rightCodeLabelHolder value:aString |
|
1111 |
||
1112 |
"Created: / 07-12-2017 / 12:28:37 / cg" |
|
1113 |
! |
|
1114 |
||
| 17848 | 1115 |
rightCodeLabelHolder |
1116 |
"holds the string shown above the right codeView (defaults to: 'Change')" |
|
1117 |
||
1118 |
^ rightCodeLabelHolder |
|
1119 |
||
1120 |
"Created: / 07-12-2017 / 12:28:37 / cg" |
|
1121 |
! |
|
1122 |
||
| 4487 | 1123 |
showingDiffs |
1124 |
showingDiffs isNil ifTrue:[ |
|
| 6288 | 1125 |
showingDiffs := self showingDiffsDefault asValue. |
1126 |
showingDiffs |
|
1127 |
onChangeEvaluate:[ |
|
1128 |
showingDiffs value ifTrue:[ |
|
1129 |
self updateDiffView. |
|
1130 |
self makeDiffViewVisible |
|
1131 |
] ifFalse:[ |
|
1132 |
self makeDiffViewInvisible |
|
1133 |
]. |
|
1134 |
DefaultShowingDiffs := showingDiffs value. |
|
1135 |
] |
|
| 4487 | 1136 |
]. |
1137 |
^ showingDiffs |
|
1138 |
! |
|
1139 |
||
| 4943 | 1140 |
showingDiffsDefault |
1141 |
^ (DefaultShowingDiffs ? true) |
|
1142 |
! |
|
1143 |
||
| 3211 | 1144 |
theSingleSelection |
1145 |
|sel| |
|
1146 |
||
1147 |
sel := changeListView selection. |
|
1148 |
changeListView multipleSelectOk ifTrue:[ |
|
| 6288 | 1149 |
sel size == 1 ifTrue:[ |
1150 |
^ sel first |
|
1151 |
]. |
|
1152 |
^ nil |
|
| 3211 | 1153 |
]. |
1154 |
^ sel. |
|
| 3319 | 1155 |
! |
1156 |
||
1157 |
updateChangeSet |
|
1158 |
^ updateChangeSet |
|
| 3202 | 1159 |
! ! |
1160 |
||
| 202 | 1161 |
!ChangesBrowser methodsFor:'compiler interface'! |
1162 |
||
1163 |
wantChangeLog |
|
1164 |
"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
|
1165 |
be written when compiling. Return false here." |
| 202 | 1166 |
|
1167 |
^ false |
|
1168 |
! ! |
|
1169 |
||
| 4869 | 1170 |
!ChangesBrowser methodsFor:'compiler interface-error handling'! |
| 202 | 1171 |
|
1172 |
correctableError:aString position:relPos to:relEndPos from:aCompiler |
|
| 12656 | 1173 |
"compiler notifies us of an error - this should really not happen since |
| 202 | 1174 |
changes ought to be correct (did someone edit the changes file ??). |
1175 |
Show the bad change in the codeView and let codeView hilight the error; |
|
1176 |
no corrections allowed here therefore return false" |
|
1177 |
||
| 2293 | 1178 |
ShowWarningDialogs == true ifTrue:[ |
| 12656 | 1179 |
self error:aString position:relPos to:relEndPos from:aCompiler. |
| 2293 | 1180 |
] ifFalse:[ |
| 12656 | 1181 |
Transcript showCR:aString. |
| 2293 | 1182 |
]. |
| 202 | 1183 |
^ false |
1184 |
! |
|
1185 |
||
| 2555 | 1186 |
correctableSelectorWarning:aString position:relPos to:relEndPos from:aCompiler |
| 12656 | 1187 |
"compiler notifies us of a warning" |
| 2555 | 1188 |
|
1189 |
^ false |
|
1190 |
||
1191 |
"Modified: / 19.1.2000 / 16:25:31 / cg" |
|
1192 |
"Created: / 19.1.2000 / 16:27:23 / cg" |
|
1193 |
! |
|
1194 |
||
|
9621
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1195 |
correctableWarning:aString position:relPos to:relEndPos from:aCompiler |
| 12656 | 1196 |
"compiler notifies us of an error - this should really not happen since |
|
9621
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1197 |
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
|
1198 |
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
|
1199 |
no corrections allowed here therefore return false" |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1200 |
|
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1201 |
^ self correctableError:aString position:relPos to:relEndPos from:aCompiler |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1202 |
|
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1203 |
"Created: / 02-11-2010 / 13:29:52 / cg" |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1204 |
! |
|
2353a178d5c7
added: #correctableError:position:to:from:
Claus Gittinger <cg@exept.de>
parents:
9604
diff
changeset
|
1205 |
|
| 202 | 1206 |
error:aString position:relPos to:relEndPos from:aCompiler |
| 12656 | 1207 |
"compiler notifies us of an error - this should really not happen since |
| 202 | 1208 |
changes ought to be correct (did someone edit the changes file ??). |
1209 |
Show the bad change in the codeView and let codeView hilight the error" |
|
1210 |
||
1211 |
|action| |
|
1212 |
||
1213 |
(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
|
1214 |
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
|
1215 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1216 |
|
| 12973 | 1217 |
"if more than a single change is applied, |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1218 |
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
|
1219 |
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
|
1220 |
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
|
1221 |
|box| |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1222 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1223 |
" |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1224 |
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
|
1225 |
" |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1226 |
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
|
1227 |
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
|
1228 |
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
|
1229 |
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
|
1230 |
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
|
1231 |
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
|
1232 |
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
|
1233 |
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
|
1234 |
]. |
| 2293 | 1235 |
|
1236 |
"/ action == #shutUp ifTrue:[ |
|
1237 |
"/ aCompiler ignoreWarnings. |
|
| 6288 | 1238 |
"/ ^ false |
| 2293 | 1239 |
"/ ]. |
1240 |
||
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1241 |
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
|
1242 |
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
|
1243 |
^ false |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1244 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1245 |
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
|
1246 |
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
|
1247 |
^ false |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1248 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
1249 |
^ false |
| 202 | 1250 |
]. |
1251 |
^ codeView error:aString position:relPos to:relEndPos from:aCompiler |
|
| 373 | 1252 |
|
|
3436
c4fe19deba58
class based exceptions - abortSignal;
Claus Gittinger <cg@exept.de>
parents:
3406
diff
changeset
|
1253 |
"Modified: / 16.11.2001 / 17:38:10 / cg" |
| 202 | 1254 |
! |
1255 |
||
| 3064 | 1256 |
unusedVariableWarning:aString position:relPos to:relEndPos from:aCompiler |
1257 |
"compiler notifies us of a (or some) unused variables; |
|
1258 |
hilight the error (relPos to relEndPos) and show a Box asking for continue/correct/abort; |
|
1259 |
this method should return true to the compiler if user wants the error |
|
1260 |
to be corrected; false otherwise" |
|
1261 |
||
1262 |
^ false |
|
1263 |
! |
|
1264 |
||
| 202 | 1265 |
warning:aString position:relPos to:relEndPos from:aCompiler |
| 12656 | 1266 |
"compiler notifies us of a warning - ignore it" |
| 202 | 1267 |
|
1268 |
^ self |
|
1269 |
! ! |
|
1270 |
||
| 2604 | 1271 |
!ChangesBrowser methodsFor:'event handling'! |
| 202 | 1272 |
|
1273 |
handlesKeyPress:key inView:view |
|
1274 |
"this method is reached via delegation: are we prepared to handle |
|
1275 |
a keyPress in some other view ?" |
|
1276 |
||
| 1127 | 1277 |
<resource: #keyboard (#Delete #BackSpace #Accept #Find #FindPrev #FindNext)> |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1278 |
|
| 202 | 1279 |
view == changeListView ifTrue:[ |
| 6288 | 1280 |
(key == #Delete |
1281 |
or:[key == #BackSpace |
|
1282 |
or:[key == #Accept |
|
1283 |
or:[key == #Find |
|
1284 |
or:[key == #FindPrev |
|
1285 |
or:[key == #FindNext]]]]]) ifTrue:[^ true]. |
|
| 202 | 1286 |
]. |
1287 |
^ false |
|
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1288 |
|
| 1127 | 1289 |
"Modified: 8.4.1997 / 11:01:42 / cg" |
| 0 | 1290 |
! |
1291 |
||
| 202 | 1292 |
keyPress:key x:x y:y view:view |
1293 |
"this method is reached via delegation from the changeListView" |
|
1294 |
||
| 1127 | 1295 |
<resource: #keyboard (#Delete #BackSpace #Accept #Find #FindPrev #FindNext)> |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1296 |
|
| 3249 | 1297 |
(key == #Delete) ifTrue:[ |
| 13078 | 1298 |
self sensor shiftDown ifTrue:[ |
1299 |
self doDeleteAndSelectPrevious. |
|
1300 |
] ifFalse:[ |
|
1301 |
self doDelete. |
|
1302 |
]. |
|
1303 |
^ self |
|
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1304 |
]. |
| 3249 | 1305 |
(key == #BackSpace) ifTrue:[ |
| 13078 | 1306 |
self doDelete. "/ doDeleteAndSelectPrevious. |
1307 |
^ self |
|
| 3249 | 1308 |
]. |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1309 |
(key == #Accept) ifTrue:[ |
| 13078 | 1310 |
self doApply. |
1311 |
^ self |
|
| 202 | 1312 |
]. |
| 1127 | 1313 |
(key == #Find) ifTrue:[ |
| 13078 | 1314 |
self findClass. |
1315 |
^ self |
|
| 1127 | 1316 |
]. |
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1317 |
(key == #FindPrev) ifTrue:[ |
| 13078 | 1318 |
self findPrevious. |
1319 |
^ self |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1320 |
]. |
|
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1321 |
(key == #FindNext) ifTrue:[ |
| 13078 | 1322 |
self findNext. |
1323 |
^ self |
|
|
975
41a41f54874d
added findPrev (Alt-B) and findNext (Alt-F)
Claus Gittinger <cg@exept.de>
parents:
958
diff
changeset
|
1324 |
]. |
| 202 | 1325 |
changeListView keyPress:key x:x y:y |
|
417
c80a8acf429c
show shortkeys in changeList view
Claus Gittinger <cg@exept.de>
parents:
394
diff
changeset
|
1326 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1327 |
"Modified: / 18.6.1998 / 22:15:36 / cg" |
| 202 | 1328 |
! ! |
1329 |
||
| 3327 | 1330 |
!ChangesBrowser methodsFor:'help'! |
| 202 | 1331 |
|
| 394 | 1332 |
showActivity:someMessage |
| 502 | 1333 |
"some activityNotification to be forwarded to the user; |
1334 |
show it in the windows title area here." |
|
1335 |
||
| 11346 | 1336 |
someMessage isNil ifTrue:[ |
1337 |
self newLabel:'' |
|
| 11347 | 1338 |
] ifFalse:[ |
1339 |
self label:someMessage |
|
1340 |
]. |
|
| 394 | 1341 |
|
1342 |
"Created: 24.2.1996 / 19:35:42 / cg" |
|
| 502 | 1343 |
"Modified: 23.4.1996 / 21:39:36 / cg" |
| 202 | 1344 |
! ! |
1345 |
||
| 4868 | 1346 |
!ChangesBrowser methodsFor:'initialization & release'! |
| 202 | 1347 |
|
| 3202 | 1348 |
autoCompareChanged |
1349 |
"sent from the compare-toggle" |
|
1350 |
||
| 3534 | 1351 |
|doCompare| |
1352 |
||
| 13373 | 1353 |
self askIfChangesAreToBeWrittenBack. |
1354 |
||
| 3534 | 1355 |
doCompare := autoCompare value. |
1356 |
DefaultAutoCompare := doCompare. |
|
1357 |
self setupTabSpec. |
|
1358 |
doCompare ifTrue:[ |
|
| 13373 | 1359 |
self doUpdate |
| 3202 | 1360 |
] ifFalse:[ |
| 13373 | 1361 |
changeListView invalidate. "/ clear; redraw. |
| 3202 | 1362 |
] |
1363 |
! |
|
1364 |
||
| 202 | 1365 |
changeListMenu |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1366 |
"return the menu for the change (upper) list" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
1367 |
|
| 586 | 1368 |
<resource: #keyboard ( #Accept #Delete ) > |
| 1359 | 1369 |
<resource: #programMenu > |
| 586 | 1370 |
|
| 3211 | 1371 |
|items m replNext replPrev sel| |
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1372 |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1373 |
self sensor ctrlDown ifTrue:[ |
| 7360 | 1374 |
"/ notice - findNext/prev shortKeys will search for the same thing again. |
1375 |
items := #( |
|
1376 |
('Search Class...' findClass #Find )
|
|
1377 |
('Previous for this Class' findPreviousForClass #FindPrevClass )
|
|
1378 |
('Next for this Class' findNextForClass #FindNextClass )
|
|
1379 |
('-' )
|
|
1380 |
('Search Selector...' findSelector )
|
|
1381 |
('Previous with this Selector' findPreviousForSelector #FindPrevSelector )
|
|
1382 |
('Next with this Selector' findNextForSelector #FindNextSelector )
|
|
1383 |
('-' )
|
|
1384 |
('Search String...' findString )
|
|
1385 |
('Previous with this String' findPreviousForString #FindPrevString )
|
|
1386 |
('Next with this String' findNextForString #FindNextString )
|
|
1387 |
('-' )
|
|
1388 |
('Previous Snapshot' findPreviousSnapshot #FindPrevSnapshot )
|
|
1389 |
('Next Snapshot' findNextSnapshot #FindNextSnapshot )
|
|
1390 |
). |
|
1391 |
||
1392 |
lastSearchType == #selector ifTrue:[ |
|
1393 |
replNext := #FindNextSelector. |
|
1394 |
replPrev := #FindPrevSelector. |
|
1395 |
] ifFalse:[ |
|
1396 |
lastSearchType == #snapshot ifTrue:[ |
|
1397 |
replNext := #FindNextSnapshot. |
|
1398 |
replPrev := #FindPrevSnapshot. |
|
1399 |
] ifFalse:[ |
|
1400 |
lastSearchType == #string ifTrue:[ |
|
1401 |
replNext := #FindNextString. |
|
1402 |
replPrev := #FindPrevString. |
|
1403 |
] ifFalse:[ |
|
1404 |
replNext := #FindNextClass. |
|
1405 |
replPrev := #FindPrevClass. |
|
1406 |
] |
|
1407 |
] |
|
1408 |
]. |
|
1409 |
items := items deepCopy. |
|
1410 |
items do:[:each | |
|
1411 |
each replaceAll:replNext with:#FindNext. |
|
1412 |
each replaceAll:replPrev with:#FindPrev. |
|
1413 |
each replaceAny:#(FindNextClass FindPrevClass |
|
1414 |
FindNextSelector FindPrevSelector |
|
1415 |
FindNextSnapshot FindPrevSnapshot |
|
1416 |
FindNextString FindPrevString) |
|
1417 |
with:nil. |
|
1418 |
]. |
|
1419 |
||
1420 |
^ PopUpMenu itemList:items resources:resources. |
|
|
1706
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1421 |
]. |
|
dd888c645873
added more search functions and a control-menu.
Claus Gittinger <cg@exept.de>
parents:
1670
diff
changeset
|
1422 |
|
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1423 |
items := #( |
| 7360 | 1424 |
('Apply' doApply Accept)
|
1425 |
('Apply to End' doApplyRest )
|
|
1426 |
('Apply from Begin' doApplyFromBeginning )
|
|
1427 |
('Apply for Class to End' doApplyClassRest )
|
|
1428 |
('Apply for Class from Begin' doApplyClassFromBeginning )
|
|
1429 |
('Apply All' doApplyAll )
|
|
1430 |
('-' )
|
|
1431 |
('Delete' doDelete Delete)
|
|
1432 |
('Delete to End' doDeleteRest )
|
|
1433 |
('Delete for Class to End' doDeleteClassRest )
|
|
1434 |
('Delete for Class from Begin' doDeleteClassFromBeginning )
|
|
1435 |
). |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1436 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1437 |
(self hasSelection and:[self hasSingleSelection not]) ifTrue:[ |
| 7360 | 1438 |
items := items , |
1439 |
#( |
|
| 15187 | 1440 |
('Delete all for Classes' doDeleteClassAll )
|
1441 |
('Delete all for Classes & their Private Classes' doDeleteClassAndPrivateClassesAll )
|
|
| 7360 | 1442 |
). |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1443 |
] ifFalse:[ |
| 7360 | 1444 |
items := items , |
1445 |
#( |
|
| 15187 | 1446 |
('Delete all for Class' doDeleteClassAll )
|
1447 |
('Delete all for Class & its Private Classes' doDeleteClassAndPrivateClassesAll )
|
|
| 7360 | 1448 |
). |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1449 |
]. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1450 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1451 |
items := items , |
| 7360 | 1452 |
#( |
1453 |
('-' )
|
|
1454 |
('Compress' doCompress )
|
|
1455 |
('Compress for Class' doCompressClass )
|
|
1456 |
('Compare and Compress' doCompareAndCompress )
|
|
1457 |
('-' )
|
|
1458 |
('Compare with current Version' doCompare )
|
|
1459 |
('Browse Class' doBrowse )
|
|
1460 |
('-' )
|
|
1461 |
('Make Change a Patch' doMakePatch )
|
|
1462 |
). |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1463 |
|
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1464 |
editingClassSource ifFalse:[ |
| 7360 | 1465 |
items := items , #( |
| 15187 | 1466 |
('Fileout & Delete all for Class' doFileoutAndDeleteClassAll )
|
1467 |
('CheckIn & Delete all for Class' doCheckinAndDeleteClassAll )
|
|
| 7360 | 1468 |
) |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1469 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1470 |
|
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1471 |
items := items , #( |
| 7360 | 1472 |
('-' )
|
1473 |
('Save in...' doSave )
|
|
1474 |
('Save to End In...' doSaveRest )
|
|
1475 |
('Save for Class to End In...' doSaveClassRest )
|
|
1476 |
('Save all for Class In...' doSaveClassAll )
|
|
1477 |
('-' )
|
|
1478 |
). |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1479 |
|
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1480 |
editingClassSource ifTrue:[ |
| 7360 | 1481 |
items := items , #( |
1482 |
('Writeback ClassFile' doWriteBack )
|
|
1483 |
) |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1484 |
] ifFalse:[ |
| 7360 | 1485 |
items := items , #( |
1486 |
('Writeback ChangeFile' doWriteBack )
|
|
1487 |
) |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1488 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
1489 |
|
|
1833
c9b1a30b326d
moved update item to the end
Claus Gittinger <cg@exept.de>
parents:
1788
diff
changeset
|
1490 |
items := items , #( |
| 7360 | 1491 |
('-' )
|
1492 |
('Update' doUpdate )
|
|
1493 |
). |
|
|
1670
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1494 |
|
|
c3915af3f7f6
use new menu creation message
Claus Gittinger <cg@exept.de>
parents:
1649
diff
changeset
|
1495 |
m := PopUpMenu itemList:items resources:resources. |
| 202 | 1496 |
|
| 255 | 1497 |
"/ |
1498 |
"/ disable those that require a selected entry |
|
1499 |
"/ |
|
| 3202 | 1500 |
self hasSelection ifFalse:[ |
| 7360 | 1501 |
m disableAll:#(doApply doApplyClassRest doApplyRest doDelete doDeleteRest doDeleteClassRest |
1502 |
doDeleteClassFromBeginning doDeleteClassAll doDeleteClassAndPrivateClassesAll |
|
1503 |
doCompare doCompressClass doMakePatch doSaveChangeInFile doMakePermanent |
|
1504 |
doSave doSaveRest doSaveClassAll doSaveClassRest doBrowse |
|
1505 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll) |
|
| 1368 | 1506 |
] ifTrue:[ |
| 7360 | 1507 |
sel := self theSingleSelection. |
1508 |
sel isNil ifTrue:[ |
|
1509 |
"/ multiple selections |
|
1510 |
m disableAll:#(doApplyClassRest doApplyRest doDeleteClassRest doDeleteRest |
|
1511 |
doDeleteClassFromBeginning |
|
1512 |
doCompressClass doCompare |
|
1513 |
doSaveClassAll doSaveClassRest doSaveRest doBrowse |
|
1514 |
doFileoutAndDeleteClassAll) |
|
1515 |
] ifFalse:[ |
|
1516 |
(self classNameOfChange:sel) isNil ifTrue:[ |
|
1517 |
m disableAll:#(doApplyClassRest doDeleteClassRest |
|
1518 |
doDeleteClassFromBeginning doDeleteClassAll doDeleteClassAndPrivateClassesAll |
|
1519 |
doCompressClass doCompare doMakePatch |
|
1520 |
doSaveClassAll doSaveClassRest doBrowse |
|
1521 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll) |
|
1522 |
] |
|
1523 |
] |
|
| 255 | 1524 |
]. |
1525 |
||
1526 |
"/ |
|
1527 |
"/ disable those that do not make sense with autoUpdate |
|
1528 |
"/ ('cause this would be overwritten by next update operation)
|
|
1529 |
"/ |
|
| 3202 | 1530 |
autoUpdate value ifTrue:[ |
| 7360 | 1531 |
m disableAll:#(doDelete doDeleteRest doDeleteClassRest doDeleteClassAll |
1532 |
doDeleteClassAndPrivateClassesAll doCompress |
|
1533 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll |
|
1534 |
doWriteBack) |
|
| 202 | 1535 |
]. |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1536 |
readOnly == true ifTrue:[ |
| 7360 | 1537 |
m disableAll:#(doDelete doDeleteRest doDeleteClassRest doDeleteClassAll |
1538 |
doDeleteClassAndPrivateClassesAll doCompress |
|
1539 |
doFileoutAndDeleteClassAll doCheckinAndDeleteClassAll |
|
1540 |
doWriteBack doSaveBack doUpdate |
|
1541 |
doApplyAll doApplyRest) |
|
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1542 |
]. |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1543 |
|
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1544 |
self hasSelection ifTrue:[ |
| 7360 | 1545 |
m disable:#doApplyAll |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
1546 |
]. |
|
3224
b2f3a2a0bc80
readOnly flag added (for method-versions browsing)
Claus Gittinger <cg@exept.de>
parents:
3211
diff
changeset
|
1547 |
|
| 202 | 1548 |
^ m |
1549 |
||
| 7360 | 1550 |
"Modified: / 06-09-1995 / 17:14:22 / claus" |
1551 |
"Modified: / 06-10-2006 / 11:17:06 / cg" |
|
| 202 | 1552 |
! |
1553 |
||
| 2114 | 1554 |
destroy |
1555 |
"destroy the receiver; make certain, that boxes are destroyed too" |
|
1556 |
||
1557 |
Processor removeTimedBlock:checkBlock. |
|
1558 |
ObjectMemory removeDependent:self. |
|
1559 |
super destroy |
|
1560 |
! |
|
1561 |
||
| 202 | 1562 |
initialize |
| 18429 | 1563 |
|panel infoLabel v upperFrame buttonPanel mH tmH |
| 9168 | 1564 |
checkBox oldStyle codeViewBox lbl applyInOriginal| |
| 3202 | 1565 |
|
| 18252 | 1566 |
leftCodeLabelHolder := (self class resources string:'Current') asValue. |
1567 |
rightCodeLabelHolder := (self class resources string:'Change_subst') asValue. |
|
| 17848 | 1568 |
|
| 3211 | 1569 |
"/ oldStyle := true. |
| 3202 | 1570 |
oldStyle := false. |
| 202 | 1571 |
|
1572 |
super initialize. |
|
1573 |
||
| 5702 | 1574 |
changeFileName := ObjectMemory nameForChanges. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
1575 |
encodingIfKnown := nil. |
| 17968 | 1576 |
autoCompare := (DefaultAutoCompare ? true) asValue. |
| 3202 | 1577 |
autoCompare onChangeSend:#autoCompareChanged to:self. |
1578 |
autoUpdate := false asValue. |
|
| 6216 | 1579 |
autoloadAsRequired := false asValue. |
| 10719 | 1580 |
ignorePublicPrivateCategories := false asValue. |
| 9168 | 1581 |
|
1582 |
applyInOriginal := true. |
|
1583 |
KeepEnforcedNameSpace == true ifTrue:[ |
|
1584 |
enforcedNameSpace := LastEnforcedNameSpace. |
|
1585 |
applyInOriginal := false. |
|
1586 |
]. |
|
1587 |
||
1588 |
applyInOriginalNameSpace := applyInOriginal asValue. |
|
| 6288 | 1589 |
applyInOriginalNameSpace |
| 6357 | 1590 |
onChangeEvaluate:[ |
1591 |
autoCompare value ifTrue:[ |
|
1592 |
self doUpdate |
|
1593 |
]. |
|
1594 |
]. |
|
| 9168 | 1595 |
|
| 4897 | 1596 |
updateChangeSet := true "false" asValue. |
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
1597 |
classesNotToBeAutoloaded := Set new. |
| 221 | 1598 |
|
|
1099
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1599 |
" |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1600 |
checkBlock is executed by the Processor. |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1601 |
We use #pushEvent: to perform the update |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1602 |
in our windowgroups process. |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1603 |
" |
|
b0a4e8ccc5cc
Use #pushEvent: for timer handling.
Stefan Vogel <sv@exept.de>
parents:
1090
diff
changeset
|
1604 |
checkBlock := [self pushEvent:#checkIfFileHasChanged]. |
| 202 | 1605 |
|
| 3202 | 1606 |
oldStyle ifFalse:[ |
| 6357 | 1607 |
menuPanel := MenuPanel in:self. |
1608 |
"/ menuPanel level:1. |
|
1609 |
menuPanel verticalLayout:false. |
|
1610 |
menuPanel receiver:self. |
|
1611 |
menuPanel menu:(self pullDownMenu). |
|
1612 |
||
|
8164
ee17624160a6
added preferredWidth & preferredHeight
Claus Gittinger <cg@exept.de>
parents:
8102
diff
changeset
|
1613 |
mH := menuPanel preferredHeight. |
| 6357 | 1614 |
menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)). |
1615 |
mH := mH + 1. |
|
| 10681 | 1616 |
|
1617 |
toolbarMenu := MenuPanel in:self. |
|
1618 |
toolbarMenu verticalLayout:false. |
|
1619 |
toolbarMenu receiver:self. |
|
1620 |
toolbarMenu menu:(self toolbarMenu). |
|
| 17899 | 1621 |
toolbarMenu helpSpecProvider:self. "/ for helpTexts |
| 10681 | 1622 |
|
1623 |
tmH := toolbarMenu preferredHeight. |
|
1624 |
toolbarMenu origin:(0.0 @ mH) corner:(1.0 @ (mH+tmH)). |
|
1625 |
mH := mH + tmH + 1. |
|
| 18429 | 1626 |
|
1627 |
toolbarMenu delegate:self. |
|
| 3202 | 1628 |
] ifTrue:[ |
| 6357 | 1629 |
mH := 0.0 |
| 3202 | 1630 |
]. |
1631 |
||
| 16467 | 1632 |
panel := VariableVerticalPanel in:self. |
1633 |
"/ panel origin:(0.0 @ mH) corner:(1.0 @ 1.0) |
|
1634 |
panel layout:(LayoutFrame |
|
1635 |
leftFraction:0.0 offset:0 |
|
1636 |
rightFraction:1.0 offset:0 |
|
1637 |
topFraction:0.0 offset:mH |
|
1638 |
bottomFraction:1.0 offset:-30). |
|
1639 |
panel borderWidth:0. |
|
1640 |
||
1641 |
infoLabel := Label in:self. |
|
1642 |
infoLabel layout:(LayoutFrame |
|
1643 |
leftFraction:0.0 offset:0 |
|
1644 |
rightFraction:1.0 offset:0 |
|
1645 |
topFraction:1.0 offset:-28 |
|
1646 |
bottomFraction:1.0 offset:-2). |
|
1647 |
infoLabel borderWidth:0. |
|
1648 |
infoLabel sizeFixed:true. |
|
1649 |
infoLabel level:-1. |
|
1650 |
infoLabel adjust:#left. |
|
1651 |
infoLabel labelChannel:(infoHolder := '' asValue). |
|
1652 |
||
| 3202 | 1653 |
upperFrame := panel. |
1654 |
oldStyle ifTrue:[ |
|
| 6357 | 1655 |
upperFrame := VariableHorizontalPanel origin:(0.0 @ 0.0) corner:(1.0 @ 0.3) in:panel. |
| 3202 | 1656 |
]. |
| 202 | 1657 |
|
1658 |
v := HVScrollableView for:SelectionInListView miniScrollerH:true in:upperFrame. |
|
| 3202 | 1659 |
oldStyle ifTrue:[ |
| 6357 | 1660 |
v origin:(0.0 @ 0.0) corner:(0.75 @ 1.0). |
| 3202 | 1661 |
] ifFalse:[ |
| 6357 | 1662 |
v origin:(0.0 @ 0.0) corner:(1.0 @ 0.3). |
| 3202 | 1663 |
]. |
| 3090 | 1664 |
|
| 202 | 1665 |
changeListView := v scrolledView. |
1666 |
changeListView delegate:self. |
|
1667 |
changeListView menuHolder:self; menuPerformer:self; menuMessage:#changeListMenu. |
|
| 1471 | 1668 |
changeListView doubleClickAction:[:line | self doubleClickOnChange:line]. |
| 3211 | 1669 |
oldStyle ifFalse:[ |
| 6357 | 1670 |
changeListView multipleSelectOk:true. |
| 3211 | 1671 |
]. |
| 202 | 1672 |
|
| 3202 | 1673 |
oldStyle ifTrue:[ |
| 6357 | 1674 |
buttonPanel := VerticalPanelView in:upperFrame. |
1675 |
buttonPanel origin:(0.75 @ 0.0) corner:(1.0 @ 1.0). |
|
1676 |
buttonPanel verticalLayout:#topSpace; horizontalLayout:#leftSpace. |
|
1677 |
||
1678 |
checkBox := CheckBox new model:autoCompare. |
|
1679 |
checkBox label:(resources string:'Auto Compare'). |
|
1680 |
checkBox action:[:val | autoCompare value:val]. |
|
1681 |
buttonPanel addSubView:checkBox. |
|
1682 |
||
1683 |
checkBox := CheckBox new model:autoUpdate. |
|
1684 |
checkBox label:(resources string:'Auto Update'). |
|
1685 |
checkBox action:[:val | autoUpdate value:val]. |
|
1686 |
buttonPanel addSubView:checkBox. |
|
1687 |
||
1688 |
checkBox := CheckBox new. |
|
1689 |
checkBox label:(resources stringWithCRs:'Apply in original NameSpace'). |
|
1690 |
checkBox model:applyInOriginalNameSpace. |
|
1691 |
buttonPanel addSubView:checkBox. |
|
| 3202 | 1692 |
]. |
| 2301 | 1693 |
|
| 3090 | 1694 |
"/ protectExistingMethods := CheckBox new. |
1695 |
"/ protectExistingMethods label:(resources string:'Protect existing code' withCRs). |
|
1696 |
"/ protectExistingMethods model:protectExistingMethods. |
|
1697 |
"/ buttonPanel addSubView:protectExistingMethods. |
|
1698 |
||
| 4487 | 1699 |
codeViewBox := View in:panel. |
1700 |
codeViewBox origin:(0.0 @ 0.3) corner:(1.0 @ 1.0). |
|
1701 |
||
1702 |
v := HVScrollableView for:CodeView miniScrollerH:true miniScrollerV:false in:codeViewBox. |
|
1703 |
v origin:(0.0 @ 0.0) corner:(1.0 @ 1.0). |
|
| 202 | 1704 |
codeView := v scrolledView. |
| 1996 | 1705 |
codeView readOnly:true. |
| 202 | 1706 |
|
| 4487 | 1707 |
diffViewBox := View in:codeViewBox. |
1708 |
diffViewBox origin:(0.0 @ 0.0) corner:(1.0 @ 1.0). |
|
1709 |
||
| 17848 | 1710 |
lbl := Label label:leftCodeLabelHolder value in:diffViewBox. |
1711 |
lbl labelChannel:leftCodeLabelHolder. |
|
| 4487 | 1712 |
lbl layout:(LayoutFrame |
| 6357 | 1713 |
leftFraction:0.0 offset:0 |
1714 |
rightFraction:0.5 offset:0 |
|
1715 |
topFraction:0.0 offset:0 |
|
1716 |
bottomFraction:0.0 offset:20). |
|
| 17848 | 1717 |
lbl := Label label:rightCodeLabelHolder value in:diffViewBox. |
1718 |
lbl labelChannel:rightCodeLabelHolder. |
|
| 4487 | 1719 |
lbl layout:(LayoutFrame |
| 6357 | 1720 |
leftFraction:0.5 offset:0 |
1721 |
rightFraction:1.0 offset:0 |
|
1722 |
topFraction:0.0 offset:0 |
|
1723 |
bottomFraction:0.0 offset:20). |
|
| 4487 | 1724 |
|
1725 |
"/ diffView := DiffTextView in:diffViewBox. |
|
1726 |
"/ diffView layout:(LayoutFrame |
|
1727 |
"/ leftFraction:0.0 offset:0 |
|
1728 |
"/ rightFraction:1.0 offset:0 |
|
1729 |
"/ topFraction:0.0 offset:20 |
|
1730 |
"/ bottomFraction:1.0 offset:0). |
|
1731 |
||
| 8102 | 1732 |
v := HVScrollableView for:DiffCodeView miniScrollerH:true miniScrollerV:false in:diffViewBox. |
| 4487 | 1733 |
v layout:(LayoutFrame |
| 6357 | 1734 |
leftFraction:0.0 offset:0 |
1735 |
rightFraction:1.0 offset:0 |
|
1736 |
topFraction:0.0 offset:20 |
|
1737 |
bottomFraction:1.0 offset:0). |
|
| 4487 | 1738 |
diffView := v scrolledView. |
1739 |
||
1740 |
self showingDiffs value ifFalse:[ |
|
| 6357 | 1741 |
self makeDiffViewInvisible |
| 4487 | 1742 |
]. |
1743 |
||
| 202 | 1744 |
anyChanges := false. |
1745 |
ObjectMemory addDependent:self. "to get shutdown-update" |
|
1746 |
||
1747 |
tabSpec := TabulatorSpecification new. |
|
1748 |
tabSpec unit:#inch. |
|
1749 |
tabSpec positions:#(-1 0 5 8.5 ). |
|
1750 |
" +/- cls>>sel type info" |
|
1751 |
tabSpec align: #(#left #left #left #left). |
|
1752 |
||
| 10681 | 1753 |
"Modified: / 27-03-1997 / 11:07:07 / stefan" |
| 17848 | 1754 |
"Modified: / 07-12-2017 / 12:28:09 / cg" |
| 18429 | 1755 |
"Modified: / 24-09-2018 / 22:50:40 / Claus Gittinger" |
| 202 | 1756 |
! |
1757 |
||
|
1246
9ed3722bd2f2
setup in #postRealize instead of #realize
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1758 |
postRealize |
| 3534 | 1759 |
self setupTabSpec. |
| 202 | 1760 |
self readChangesFileInBackground:true. |
| 18059 | 1761 |
self updateChangeList. |
| 16467 | 1762 |
changeListView action:[:lineNrOrCollection | self changeSelection:lineNrOrCollection]. |
| 202 | 1763 |
Processor addTimedBlock:checkBlock afterSeconds:5. |
|
1246
9ed3722bd2f2
setup in #postRealize instead of #realize
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1764 |
|
|
9ed3722bd2f2
setup in #postRealize instead of #realize
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1765 |
"Created: 24.7.1997 / 18:06:12 / cg" |
| 202 | 1766 |
! |
1767 |
||
| 3202 | 1768 |
pullDownMenu |
1769 |
"return the top (pullDown) menu" |
|
1770 |
||
1771 |
<resource: #programMenu> |
|
1772 |
||
| 3330 | 1773 |
^ self menuFromSpec:self class menuSpec. |
1774 |
||
1775 |
"/ |m| |
|
1776 |
"/ |
|
1777 |
"/ m := self class menuSpec. |
|
1778 |
"/ m := m decodeAsLiteralArray. |
|
1779 |
"/ m receiver:self. |
|
1780 |
"/ m findGuiResourcesIn:self. |
|
1781 |
"/ ^ m. |
|
| 3202 | 1782 |
! |
1783 |
||
| 3534 | 1784 |
setupTabSpec |
1785 |
autoCompare value ifTrue:[ |
|
| 9515 | 1786 |
tabSpec positions:#(0 0.15 7 9.5 ). |
| 3534 | 1787 |
] ifFalse:[ |
| 9515 | 1788 |
"/ |
1789 |
"/ set tabs to hide compare-column |
|
1790 |
"/ |
|
1791 |
tabSpec positions:#(-1 0 7 9.5 ). |
|
| 3534 | 1792 |
] |
| 9515 | 1793 |
|
1794 |
"Modified: / 10-07-2010 / 10:59:49 / cg" |
|
| 3534 | 1795 |
! |
1796 |
||
| 10681 | 1797 |
toolbarMenu |
1798 |
"return the top (pullDown) menu" |
|
1799 |
||
1800 |
<resource: #programMenu> |
|
1801 |
||
1802 |
^ self menuFromSpec:self class toolbarMenuSpec. |
|
1803 |
||
1804 |
"Created: / 07-09-2011 / 16:03:41 / cg" |
|
1805 |
! |
|
1806 |
||
| 627 | 1807 |
update:what with:aParameter from:changedObject |
| 202 | 1808 |
|box| |
1809 |
||
|
8558
a85166102cb7
Wait for #aboutToQuit change message instead of obsolete #aboutToExit
Stefan Vogel <sv@exept.de>
parents:
8515
diff
changeset
|
1810 |
(what == #aboutToQuit) ifTrue:[ |
| 6639 | 1811 |
" |
1812 |
smalltalk is about to shut down - |
|
1813 |
- if change list was modified, ask user and save if requested. |
|
1814 |
" |
|
1815 |
anyChanges ifTrue:[ |
|
1816 |
self raiseDeiconified. |
|
1817 |
||
1818 |
box := YesNoBox new. |
|
1819 |
box title:('The modified changelist has not been written back to the change file.\\Write change file before exiting ?') withCRs.
|
|
1820 |
box okText:(resources string:'Write') noText:(resources string:'Don''t write'). |
|
1821 |
box yesAction:[self writeBackChanges] |
|
1822 |
noAction:[]. |
|
1823 |
box showAtPointer. |
|
1824 |
box destroy |
|
1825 |
]. |
|
1826 |
^ self |
|
| 202 | 1827 |
]. |
| 11048 | 1828 |
|
|
8558
a85166102cb7
Wait for #aboutToQuit change message instead of obsolete #aboutToExit
Stefan Vogel <sv@exept.de>
parents:
8515
diff
changeset
|
1829 |
super update:what with:aParameter from:changedObject |
| 627 | 1830 |
|
| 11048 | 1831 |
"Created: / 15-06-1996 / 15:26:30 / cg" |
1832 |
"Modified: / 24-08-1999 / 09:45:06 / stefan" |
|
1833 |
"Modified: / 03-01-2012 / 15:23:13 / cg" |
|
| 202 | 1834 |
! ! |
1835 |
||
| 3202 | 1836 |
!ChangesBrowser methodsFor:'menu actions'! |
1837 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1838 |
doApply |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1839 |
"user wants a change to be applied" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1840 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1841 |
self withSelectedChangesDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1842 |
(self applyChange:changeNr) ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1843 |
^ self "/ cancel |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1844 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1845 |
self autoSelect:(changeNr + 1) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1846 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1847 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1848 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1849 |
doApplyAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1850 |
"user wants all changes to be applied" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1851 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1852 |
self withExecuteCursorDo:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1853 |
|lastNr "{ Class: SmallInteger }" |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1854 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1855 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1856 |
lastNr := self numberOfChanges. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1857 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1858 |
"if we apply multiple changes, and an error occurs, |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1859 |
ask the user if all operations should be aborted..." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1860 |
multipleApply := lastNr > 1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1861 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1862 |
1 to:lastNr do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1863 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1864 |
self applyChange:changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1865 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1866 |
self autoSelectLast |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1867 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1868 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1869 |
"Modified: 21.1.1997 / 22:26:30 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1870 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1871 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1872 |
doApplyClassFromBeginning |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1873 |
"user wants all changes for this class from 1 to changeNr to be applied" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1874 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1875 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1876 |
|thisClassName classNameToApply lastChange |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1877 |
lastNr "{ Class: SmallInteger }" |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1878 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1879 |
classNameToApply := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1880 |
classNameToApply notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1881 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1882 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1883 |
"if we apply multiple changes, and an error occurs, |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1884 |
ask the user if all operations should be aborted..." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1885 |
multipleApply := changeNr ~= 1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1886 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1887 |
1 to:changeNr do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1888 |
thisClassName := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1889 |
thisClassName = classNameToApply ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1890 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1891 |
self applyChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1892 |
lastChange := changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1893 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1894 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1895 |
self autoSelect:changeNr+1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1896 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1897 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1898 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1899 |
"Modified: 21.1.1997 / 22:26:04 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1900 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1901 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1902 |
doApplyClassRest |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1903 |
"user wants all changes for this class from changeNr to be applied" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1904 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1905 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1906 |
|thisClassName classNameToApply lastChange |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1907 |
lastNr "{ Class: SmallInteger }" |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1908 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1909 |
classNameToApply := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1910 |
classNameToApply notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1911 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1912 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1913 |
lastNr := self numberOfChanges. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1914 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1915 |
"if we apply multiple changes, and an error occurs, |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1916 |
ask the user if all operations should be aborted..." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1917 |
multipleApply := (lastNr - changeNr) > 1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1918 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1919 |
changeNr to:lastNr do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1920 |
thisClassName := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1921 |
thisClassName = classNameToApply ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1922 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1923 |
self applyChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1924 |
lastChange := changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1925 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1926 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1927 |
self autoSelect:lastChange. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1928 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1929 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1930 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1931 |
"Modified: 21.1.1997 / 22:26:04 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1932 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1933 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1934 |
doApplyFromBeginning |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1935 |
"user wants all changes from 1 to changeNr to be applied" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1936 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1937 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1938 |
|lastNr "{ Class: SmallInteger }" |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1939 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1940 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1941 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1942 |
"if we apply multiple changes, and an error occurs, |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1943 |
ask the user if all operations should be aborted..." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1944 |
multipleApply := changeNr ~= 1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1945 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1946 |
1 to:changeNr do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1947 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1948 |
self applyChange:changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1949 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1950 |
self autoSelect:changeNr+1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1951 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1952 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1953 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1954 |
doApplyRest |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1955 |
"apply all changes from changeNr to the end" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1956 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1957 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1958 |
|lastNr "{ Class: SmallInteger }" |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1959 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1960 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1961 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1962 |
lastNr := self numberOfChanges. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1963 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1964 |
"if we apply multiple changes, and an error occurs, |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1965 |
ask the user if all operations should be aborted..." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1966 |
multipleApply := (lastNr - changeNr) > 1. |
| 15087 | 1967 |
AbortAllOperationRequest handle:[:ex | |
1968 |
ex return |
|
1969 |
] do:[ |
|
1970 |
changeNr to:lastNr do:[:changeNr | |
|
1971 |
changeListView setSelection:changeNr. |
|
1972 |
self applyChange:changeNr |
|
1973 |
]. |
|
1974 |
self autoSelect:self numberOfChanges. |
|
1975 |
] |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1976 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1977 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1978 |
"Modified: 21.1.1997 / 22:25:29 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1979 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1980 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1981 |
doApplyToConflictOrEnd |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1982 |
"apply all changes from changeNr to either a conflict (i.e. method exists) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1983 |
or the end." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1984 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1985 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1986 |
|lastNr "{ Class: SmallInteger }"|
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1987 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1988 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1989 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1990 |
lastNr := self numberOfChanges. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1991 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1992 |
"if we apply multiple changes, and an error occurs, |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1993 |
ask the user if all operations should be aborted..." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1994 |
multipleApply := (lastNr - changeNr) > 1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1995 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1996 |
changeNr to:lastNr do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1997 |
| cls sel | |
| 18059 | 1998 |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
1999 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2000 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2001 |
((cls := self classOfChange:changeNr ifAbsent:[:className| nil]) notNil |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2002 |
and:[(sel := self selectorOfMethodChange:changeNr) notNil]) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2003 |
ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2004 |
(cls includesSelector:sel) ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2005 |
self autoSelect:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2006 |
^ self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2007 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2008 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2009 |
self applyChange:changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2010 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2011 |
self autoSelect:self numberOfChanges. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2012 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2013 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2014 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2015 |
doBrowse |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2016 |
"user wants a browser on the class of a change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2017 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2018 |
self withSingleSelectedChangeDo:[:changeNr | |
| 17666 | 2019 |
|cls| |
2020 |
||
2021 |
cls := self classOfChange:changeNr. |
|
2022 |
cls notNil ifTrue:[ |
|
2023 |
SystemBrowser default |
|
2024 |
openInClass:cls |
|
2025 |
selector:(self selectorOfMethodChange:changeNr) |
|
2026 |
] |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2027 |
] |
| 17666 | 2028 |
|
2029 |
"Modified: / 01-09-2017 / 14:20:00 / cg" |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2030 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2031 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2032 |
doBrowseImplementors |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2033 |
"open an implementors-browser" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2034 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2035 |
|changeNr initial selector| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2036 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2037 |
(changeNr := self theSingleSelection) notNil ifTrue:[ |
| 17666 | 2038 |
initial := self selectorOfMethodChange:changeNr. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2039 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2040 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2041 |
selector := Dialog |
| 17666 | 2042 |
request:'Selector to browse implementors of:' |
2043 |
initialAnswer:(initial ? ''). |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2044 |
selector size ~~ 0 ifTrue:[ |
| 17666 | 2045 |
SystemBrowser default browseImplementorsMatching:selector. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2046 |
] |
| 17666 | 2047 |
|
2048 |
"Modified (format): / 01-09-2017 / 14:20:06 / cg" |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2049 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2050 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2051 |
doBrowseSenders |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2052 |
"user wants a browser on the class of a change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2053 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2054 |
|changeNr initial selector| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2055 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2056 |
(changeNr := self theSingleSelection) notNil ifTrue:[ |
| 17666 | 2057 |
initial := self selectorOfMethodChange:changeNr. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2058 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2059 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2060 |
selector := Dialog |
| 17666 | 2061 |
request:'Selector to browse senders of:' |
2062 |
initialAnswer:(initial ? ''). |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2063 |
selector size ~~ 0 ifTrue:[ |
| 17666 | 2064 |
SystemBrowser default browseAllCallsOn:selector asSymbol. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2065 |
] |
| 17666 | 2066 |
|
2067 |
"Modified: / 01-09-2017 / 14:20:13 / cg" |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2068 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2069 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2070 |
doCheckinAndDeleteClassAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2071 |
"first checkin the selected changes class then delete all changes |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2072 |
for it." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2073 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2074 |
|classes answer logTitle checkinInfo| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2075 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2076 |
"/ self theSingleSelection isNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2077 |
"/ ^ self information:'Only possible if a single change is selected.'. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2078 |
"/ ]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2079 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2080 |
self withExecuteCursorDo:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2081 |
classes := IdentitySet new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2082 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2083 |
self withSelectedChangesDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2084 |
| className class | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2085 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2086 |
className := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2087 |
className notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2088 |
class := Smalltalk classNamed:className. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2089 |
class isNil ifTrue:[ |
| 18152 | 2090 |
self proceedableError:'oops - no class: ', className. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2091 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2092 |
class notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2093 |
class := class theNonMetaclass. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2094 |
(classes includes:class) ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2095 |
class isPrivate ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2096 |
(classes includes:class owningClass) ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2097 |
answer := self confirmWithCancel:('This is a private class.\\CheckIn the owner ''%1'' and all of its private classes ?'
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2098 |
bindWith:class owningClass name allBold) withCRs. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2099 |
answer isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2100 |
answer ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2101 |
classes add:class owningClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2102 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2103 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2104 |
] ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2105 |
classes add:class |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2106 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2107 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2108 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2109 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2110 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2111 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2112 |
classes size == 1 ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2113 |
logTitle := classes first name. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2114 |
] ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2115 |
logTitle := '%1 classes' bindWith:classes size. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2116 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2117 |
checkinInfo := SourceCodeManagerUtilities default |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2118 |
getCheckinInfoFor:logTitle |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2119 |
initialAnswer:nil. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2120 |
checkinInfo isNil ifTrue:[^ self ]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2121 |
|
| 18059 | 2122 |
self unselect. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2123 |
classes do:[:eachClass | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2124 |
(SourceCodeManagerUtilities default checkinClass:eachClass withInfo:checkinInfo) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2125 |
ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2126 |
self silentDeleteChangesForClassAndPrivateClasses:eachClass name |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2127 |
from:1 to:(self numberOfChanges). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2128 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2129 |
]. |
| 18059 | 2130 |
self updateChangeList. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2131 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2132 |
|
| 18152 | 2133 |
"Modified: / 06-09-1995 / 17:11:16 / claus" |
2134 |
"Modified: / 17-11-2001 / 14:21:13 / cg" |
|
2135 |
"Modified: / 24-05-2018 / 14:55:14 / Claus Gittinger" |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2136 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2137 |
|
| 18059 | 2138 |
doCleanup |
2139 |
"cleanup the changefile/changeset. |
|
2140 |
actions done: |
|
2141 |
- from the end, find changes which are equal to the current version |
|
| 18061 | 2142 |
and not in the current changeset (i.e. represents the current version as built from CVS). |
| 18059 | 2143 |
Then delete it incl. previous versions of it." |
2144 |
||
2145 |
|numChanges nextChangeNr changeNr changeSelector changeClass numDeleted| |
|
2146 |
||
2147 |
numChanges := self numberOfChanges. |
|
2148 |
self unselect. |
|
2149 |
||
2150 |
self withWaitCursorDo:[ |
|
2151 |
"/ find the last method change which is equal |
|
2152 |
changeNr := numChanges. |
|
2153 |
[changeNr > 0] whileTrue:[ |
|
2154 |
nextChangeNr := changeNr - 1. |
|
2155 |
||
2156 |
(changeClass := self classOfChange:changeNr ifAbsent:nil) notNil ifTrue:[ |
|
2157 |
||
2158 |
(changeInfoList at:changeNr) isMethodCategoryChange ifTrue:[ |
|
2159 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
2160 |
(changeSelector := self selectorOfMethodCategoryChange:changeNr) notNil ifTrue:[ |
|
2161 |
(ChangeSet current includesChangeForClass:changeClass selector:changeSelector) ifFalse:[ |
|
2162 |
infoHolder value:('Deleting category changes for %1 >> %2' bindWith:changeClass name with:changeSelector).
|
|
2163 |
self windowGroup repairDamage. |
|
2164 |
numDeleted := self |
|
2165 |
silentDeleteMethodCategoryChangesFor:changeClass name selector:changeSelector |
|
2166 |
from:1 to:changeNr. |
|
2167 |
"/ self selectChange:changeNr. |
|
2168 |
"/ self doDeleteClassSelectorOlder. |
|
2169 |
nextChangeNr := (changeNr - numDeleted + 1) min:self numberOfChanges. |
|
2170 |
]. |
|
2171 |
]. |
|
2172 |
]. |
|
2173 |
] ifFalse:[ |
|
2174 |
(changeSelector := self selectorOfMethodChange:changeNr) notNil ifTrue:[ |
|
2175 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
2176 |
"/ found a method change, which is the same as the current version |
|
2177 |
"/ if in the current changeSet, then do not delete (needs checkin first) |
|
2178 |
(ChangeSet current includesChangeForClass:changeClass selector:changeSelector) ifFalse:[ |
|
2179 |
infoHolder value:('Deleting changes for %1 >> %2' bindWith:changeClass name with:changeSelector).
|
|
2180 |
self windowGroup repairDamage. |
|
2181 |
numDeleted := self |
|
2182 |
silentDeleteChangesFor:changeClass name selector:changeSelector |
|
2183 |
from:1 to:changeNr. |
|
2184 |
"/ self selectChange:changeNr. |
|
2185 |
"/ self doDeleteClassSelectorOlder. |
|
2186 |
nextChangeNr := (changeNr - numDeleted + 1) min:self numberOfChanges. |
|
2187 |
]. |
|
2188 |
]. |
|
2189 |
]. |
|
2190 |
]. |
|
2191 |
]. |
|
2192 |
changeNr := nextChangeNr. |
|
2193 |
]. |
|
2194 |
]. |
|
2195 |
self updateChangeList. |
|
2196 |
! |
|
2197 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2198 |
doCompare |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2199 |
"compare change with current system version" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2200 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2201 |
classesNotToBeAutoloaded removeAll. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2202 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2203 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2204 |
self withExecuteCursorDo:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2205 |
self compareChange:changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2206 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2207 |
self newLabel:'' |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2208 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2209 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2210 |
"Modified: 24.2.1996 / 19:37:19 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2211 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2212 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2213 |
doCompareAndCompress |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2214 |
"remove all changes, which are equivalent to the current image version" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2215 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2216 |
|toDelete| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2217 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2218 |
classesNotToBeAutoloaded removeAll. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2219 |
toDelete := OrderedCollection new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2220 |
self withExecuteCursorDo:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2221 |
1 to:self numberOfChanges do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2222 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2223 |
toDelete add:changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2224 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2225 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2226 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2227 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2228 |
toDelete reverseDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2229 |
self silentDeleteChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2230 |
]. |
| 18059 | 2231 |
self updateChangeList. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2232 |
" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2233 |
scroll back a bit, if we are left way behind the list |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2234 |
" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2235 |
changeListView firstLineShown > self numberOfChanges ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2236 |
changeListView makeLineVisible:self numberOfChanges |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2237 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2238 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2239 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2240 |
self newLabel:''. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2241 |
classesNotToBeAutoloaded removeAll. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2242 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2243 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2244 |
doCompress |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2245 |
"compress the change-set; this replaces multiple method-changes by the last |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2246 |
(i.e. the most recent) change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2247 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2248 |
self compressForClass:nil |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2249 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2250 |
"Modified: / 29.10.1997 / 01:03:26 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2251 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2252 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2253 |
doCompressClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2254 |
"compress changes for the selected class. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2255 |
this replaces multiple method-changes by the last (i.e. the most recent) change." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2256 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2257 |
self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2258 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2259 |
self selectedClassNames do:[:classNameToCompress | |
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2260 |
self compressForClass:classNameToCompress. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2261 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2262 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2263 |
"Created: / 29.10.1997 / 01:05:16 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2264 |
"Modified: / 19.11.2001 / 21:55:17 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2265 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2266 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2267 |
doCompressSelector |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2268 |
"compress changes for the selected class & selector. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2269 |
this replaces multiple method-changes by the last (i.e. the most recent) change." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2270 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2271 |
|classSelectorPairs| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2272 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2273 |
self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2274 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2275 |
classSelectorPairs := Set new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2276 |
self withSelectedChangesDo:[:changeNr | |
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2277 |
| classNameToCompress selector | |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2278 |
|
| 17600 | 2279 |
classNameToCompress := self realClassNameOfChange:changeNr. |
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2280 |
classNameToCompress notNil ifTrue:[ |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2281 |
selector := self selectorOfMethodChange:changeNr. |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2282 |
selector notNil ifTrue:[ |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2283 |
classSelectorPairs add:(classNameToCompress -> selector). |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2284 |
] |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2285 |
] |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2286 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2287 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2288 |
classSelectorPairs do:[:pair | |
| 17600 | 2289 |
self compressForClass:(pair key) selector:(pair value). |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2290 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2291 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2292 |
"Created: / 19.11.2001 / 21:50:59 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2293 |
"Modified: / 19.11.2001 / 22:10:08 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2294 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2295 |
|
| 17096 | 2296 |
doCopyToClipboard |
2297 |
"user wants a change text to be copied to the clipboard" |
|
2298 |
||
2299 |
|text| |
|
2300 |
||
2301 |
self withSingleSelectedChangeDo:[:changeNr | |
|
2302 |
text := self sourceOfMethodChange:changeNr. |
|
2303 |
]. |
|
2304 |
text notEmptyOrNil ifTrue:[ |
|
2305 |
self window setClipboardText:text |
|
2306 |
] |
|
2307 |
||
2308 |
"Created: / 21-11-2016 / 23:38:11 / cg" |
|
2309 |
! |
|
2310 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2311 |
doDelete |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2312 |
"delete currently selected change(s)" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2313 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2314 |
|rangeEnd rangeStart firstDeleted| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2315 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2316 |
changeListView selection size <= 5 ifTrue:[ |
| 16467 | 2317 |
self withSelectedChangesReverseDo:[:changeNr | |
2318 |
self deleteChange:changeNr. |
|
2319 |
self autoSelectOrEnd:changeNr |
|
2320 |
]. |
|
2321 |
self showNumberOfChanges. |
|
2322 |
^ self |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2323 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2324 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2325 |
self withSelectedChangesReverseDo:[:changeNr | |
| 16467 | 2326 |
rangeEnd isNil ifTrue:[ |
2327 |
rangeEnd := rangeStart := changeNr |
|
2328 |
] ifFalse:[ |
|
2329 |
(changeNr = (rangeEnd + 1)) ifTrue:[ |
|
2330 |
rangeEnd := changeNr |
|
2331 |
] ifFalse:[ |
|
2332 |
(changeNr = (rangeStart - 1)) ifTrue:[ |
|
2333 |
rangeStart := changeNr |
|
2334 |
] ifFalse:[ |
|
2335 |
self deleteChangesFrom:rangeStart to:rangeEnd. |
|
2336 |
firstDeleted := (firstDeleted ? rangeStart) min:rangeStart. |
|
2337 |
rangeStart := rangeEnd := nil. |
|
2338 |
]. |
|
2339 |
]. |
|
2340 |
]. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2341 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2342 |
rangeStart notNil ifTrue:[ |
| 16467 | 2343 |
self deleteChangesFrom:rangeStart to:rangeEnd. |
2344 |
firstDeleted := (firstDeleted ? rangeStart) min:rangeStart. |
|
2345 |
]. |
|
2346 |
self autoSelectOrEnd:firstDeleted. |
|
2347 |
self showNumberOfChanges |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2348 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2349 |
|
| 12428 | 2350 |
doDeleteAllForNamespace |
2351 |
"delete all changes for classes with same namespace as currently selected change" |
|
2352 |
||
2353 |
|namespacesToDelete lastChangeNr overAllNumDeletedBefore| |
|
2354 |
||
2355 |
lastChangeNr := -1. |
|
2356 |
namespacesToDelete := Set new. |
|
2357 |
self withSelectedChangesDo:[:changeNr | |
|
2358 |
|namespaceToDelete| |
|
2359 |
||
2360 |
namespaceToDelete := self namespaceOfChange:changeNr. |
|
2361 |
namespaceToDelete notNil ifTrue:[ |
|
2362 |
namespacesToDelete add:namespaceToDelete |
|
2363 |
]. |
|
2364 |
lastChangeNr := lastChangeNr max:changeNr. |
|
2365 |
]. |
|
2366 |
namespacesToDelete isEmpty ifTrue:[^ self]. |
|
2367 |
||
2368 |
overAllNumDeletedBefore := 0. |
|
| 18059 | 2369 |
self unselect. |
| 12428 | 2370 |
|
2371 |
self withExecuteCursorDo:[ |
|
2372 |
namespacesToDelete do:[:namespaceToDelete | |
|
2373 |
|numDeletedBefore| |
|
2374 |
||
2375 |
self |
|
2376 |
silentDeleteChangesForNamespace:namespaceToDelete |
|
2377 |
from:lastChangeNr |
|
2378 |
to:(self numberOfChanges). |
|
2379 |
numDeletedBefore := self |
|
2380 |
silentDeleteChangesForNamespace:namespaceToDelete |
|
2381 |
from:1 |
|
2382 |
to:(lastChangeNr-1). |
|
2383 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
2384 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
2385 |
]. |
|
2386 |
]. |
|
2387 |
||
| 18059 | 2388 |
self updateChangeList. |
| 16467 | 2389 |
self autoSelectOrEnd:lastChangeNr. |
| 12428 | 2390 |
! |
2391 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2392 |
doDeleteAndSelectPrevious |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2393 |
"delete currently selected change(s)" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2394 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2395 |
self withSelectedChangesReverseDo:[:changeNr | |
| 16467 | 2396 |
self deleteChange:changeNr. |
2397 |
self autoSelectOrEnd:changeNr-1 |
|
2398 |
]. |
|
2399 |
||
2400 |
"/mh - don't we need a |
|
2401 |
"/ self setChangeList |
|
2402 |
"/ here? |
|
2403 |
self showNumberOfChanges |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2404 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2405 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2406 |
doDeleteClassAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2407 |
"delete all changes with same class as currently selected change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2408 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2409 |
|classNamesToDelete lastChangeNr overAllNumDeletedBefore| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2410 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2411 |
lastChangeNr := -1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2412 |
classNamesToDelete := Set new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2413 |
self withSelectedChangesDo:[:changeNr | |
| 16467 | 2414 |
|classNameToDelete| |
2415 |
||
2416 |
classNameToDelete := self classNameOfChange:changeNr. |
|
2417 |
classNameToDelete notNil ifTrue:[ |
|
2418 |
classNamesToDelete add:classNameToDelete. |
|
2419 |
]. |
|
2420 |
lastChangeNr := lastChangeNr max:changeNr. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2421 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2422 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2423 |
overAllNumDeletedBefore := 0. |
| 18059 | 2424 |
self unselect. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2425 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2426 |
self withExecuteCursorDo:[ |
| 16467 | 2427 |
classNamesToDelete do:[:classNameToDelete | |
2428 |
|numDeletedBefore| |
|
2429 |
||
2430 |
self silentDeleteChangesFor:classNameToDelete |
|
2431 |
from:lastChangeNr |
|
2432 |
to:(self numberOfChanges). |
|
2433 |
numDeletedBefore := self |
|
2434 |
silentDeleteChangesFor:classNameToDelete |
|
2435 |
from:1 |
|
2436 |
to:(lastChangeNr-1). |
|
2437 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
2438 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
2439 |
]. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2440 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2441 |
|
| 18059 | 2442 |
self updateChangeList. |
| 16467 | 2443 |
self autoSelectOrEnd:lastChangeNr. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2444 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2445 |
"Created: / 13.12.1995 / 16:07:14 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2446 |
"Modified: / 28.1.1998 / 20:42:14 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2447 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2448 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2449 |
doDeleteClassAndPrivateClassesAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2450 |
"delete all changes with same class and private classes |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2451 |
as currently selected change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2452 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2453 |
|lastChangeNr classNamesToDelete overAllNumDeletedBefore| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2454 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2455 |
lastChangeNr := -1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2456 |
classNamesToDelete := Set new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2457 |
self withSelectedChangesDo:[:changeNr | |
| 16467 | 2458 |
|classNameToDelete| |
2459 |
||
2460 |
classNameToDelete := self ownerClassNameOfChange:changeNr. |
|
2461 |
classNameToDelete notNil ifTrue:[ |
|
2462 |
classNamesToDelete add:classNameToDelete. |
|
2463 |
]. |
|
2464 |
lastChangeNr := lastChangeNr max:changeNr. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2465 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2466 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2467 |
overAllNumDeletedBefore := 0. |
| 18059 | 2468 |
self unselect. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2469 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2470 |
self withExecuteCursorDo:[ |
| 16467 | 2471 |
classNamesToDelete do:[:classNameToDelete | |
2472 |
| changeNr numDeletedBefore| |
|
2473 |
||
2474 |
classNameToDelete notNil ifTrue:[ |
|
2475 |
changeListView setSelection:nil. |
|
2476 |
self silentDeleteChangesForClassAndPrivateClasses:classNameToDelete |
|
2477 |
from:lastChangeNr |
|
2478 |
to:(self numberOfChanges). |
|
2479 |
numDeletedBefore := self |
|
2480 |
silentDeleteChangesForClassAndPrivateClasses:classNameToDelete |
|
2481 |
from:1 |
|
2482 |
to:(lastChangeNr-1). |
|
2483 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
2484 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
2485 |
] |
|
2486 |
] |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2487 |
]. |
| 18059 | 2488 |
self updateChangeList. |
| 16467 | 2489 |
self autoSelectOrEnd:lastChangeNr. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2490 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2491 |
"Created: / 13.12.1995 / 16:07:14 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2492 |
"Modified: / 28.1.1998 / 20:42:14 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2493 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2494 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2495 |
doDeleteClassFromBeginning |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2496 |
"delete changes with same class as currently selected change from the beginning |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2497 |
up to the selected change. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2498 |
Useful to get rid of obsolete changes before a fileout or checkin entry." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2499 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2500 |
self withSingleSelectedChangeDo:[:changeNr | |
| 18059 | 2501 |
|classNameToDelete prevSelection numDeleted| |
2502 |
||
2503 |
classNameToDelete := self classNameOfChange:changeNr. |
|
2504 |
classNameToDelete notNil ifTrue:[ |
|
2505 |
prevSelection := changeNr. |
|
2506 |
self unselect. |
|
2507 |
numDeleted := self |
|
2508 |
silentDeleteChangesFor:classNameToDelete |
|
2509 |
from:1 |
|
2510 |
to:changeNr. |
|
2511 |
self updateChangeList. |
|
2512 |
self autoSelectOrEnd:(changeNr + 1 - numDeleted) |
|
2513 |
] |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2514 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2515 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2516 |
"Created: 13.12.1995 / 15:41:58 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2517 |
"Modified: 25.5.1996 / 12:26:34 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2518 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2519 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2520 |
doDeleteClassRest |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2521 |
"delete rest of changes with same class as currently selected change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2522 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2523 |
self withSingleSelectedChangeDo:[:changeNr | |
| 18059 | 2524 |
| classNameToDelete | |
2525 |
||
2526 |
classNameToDelete := self classNameOfChange:changeNr. |
|
2527 |
classNameToDelete notNil ifTrue:[ |
|
2528 |
self unselect. |
|
2529 |
self silentDeleteChangesFor:classNameToDelete |
|
2530 |
from:changeNr |
|
2531 |
to:(self numberOfChanges). |
|
2532 |
self updateChangeList. |
|
2533 |
self autoSelectOrEnd:changeNr |
|
2534 |
] |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2535 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2536 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2537 |
"Modified: / 18.5.1998 / 14:25:07 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2538 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2539 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2540 |
doDeleteClassSelectorAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2541 |
"delete all changes with same class and selector as currently selected change" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2542 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2543 |
|classNameSelectorPairsToDelete lastChangeNr overAllNumDeletedBefore| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2544 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2545 |
lastChangeNr := -1. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2546 |
classNameSelectorPairsToDelete := Set new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2547 |
self withSelectedChangesDo:[:changeNr | |
| 17600 | 2548 |
|className selector| |
2549 |
||
2550 |
className := self realClassNameOfChange:changeNr. |
|
2551 |
selector := self selectorOfMethodChange:changeNr. |
|
2552 |
selector notNil ifTrue:[ |
|
2553 |
(className notNil and:[selector notNil]) ifTrue:[ |
|
2554 |
classNameSelectorPairsToDelete add:(className -> selector). |
|
2555 |
] |
|
2556 |
]. |
|
2557 |
lastChangeNr := lastChangeNr max:changeNr. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2558 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2559 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2560 |
overAllNumDeletedBefore := 0. |
| 18059 | 2561 |
self unselect. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2562 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2563 |
self withExecuteCursorDo:[ |
| 17600 | 2564 |
classNameSelectorPairsToDelete do:[:pair | |
2565 |
|numDeletedBefore className selector| |
|
2566 |
||
2567 |
className := pair key. |
|
2568 |
selector := pair value. |
|
2569 |
self silentDeleteChangesFor:className selector:selector |
|
2570 |
from:lastChangeNr |
|
2571 |
to:(self numberOfChanges). |
|
2572 |
numDeletedBefore := self |
|
2573 |
silentDeleteChangesFor:className selector:selector |
|
2574 |
from:1 |
|
2575 |
to:(lastChangeNr-1). |
|
2576 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
|
2577 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
2578 |
]. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2579 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2580 |
|
| 18059 | 2581 |
self updateChangeList. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2582 |
self autoSelectOrEnd:lastChangeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2583 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2584 |
"Created: / 13.12.1995 / 16:07:14 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2585 |
"Modified: / 28.1.1998 / 20:42:14 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2586 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2587 |
|
| 16475 | 2588 |
doDeleteClassSelectorOlder |
| 18059 | 2589 |
"delete this and older changes with same class and selector as currently selected change(s)" |
| 16475 | 2590 |
|
| 18232 | 2591 |
|classNameSelectorTypeTuplesToDelete |
2592 |
lastChangeNr overAllNumDeletedBefore| |
|
| 16475 | 2593 |
|
2594 |
lastChangeNr := -1. |
|
| 18232 | 2595 |
classNameSelectorTypeTuplesToDelete := OrderedCollection new. |
| 16475 | 2596 |
|
| 17597 | 2597 |
"/ collect info on what is to be deleted |
| 18232 | 2598 |
self withSelectedChangesInOrder:#reverse do:[:changeNr | |
2599 |
|className selector changeType| |
|
2600 |
||
2601 |
changeType := #methodChange. |
|
| 17600 | 2602 |
className := self realClassNameOfChange:changeNr. |
| 16475 | 2603 |
selector := self selectorOfMethodChange:changeNr. |
| 18232 | 2604 |
selector isNil ifTrue:[ |
2605 |
(changeInfoList at:changeNr) isMethodCategoryChange ifTrue:[ |
|
2606 |
selector := self selectorOfMethodCategoryChange:changeNr. |
|
2607 |
selector notNil ifTrue:[ |
|
2608 |
changeType := #methodCategoryChange. |
|
2609 |
] |
|
| 16475 | 2610 |
] |
2611 |
]. |
|
| 18232 | 2612 |
(className notNil and:[selector notNil]) ifTrue:[ |
2613 |
classNameSelectorTypeTuplesToDelete add:{ className . selector . changeType . changeNr}.
|
|
2614 |
]. |
|
| 16475 | 2615 |
lastChangeNr := lastChangeNr max:changeNr. |
2616 |
]. |
|
2617 |
||
2618 |
overAllNumDeletedBefore := 0. |
|
| 18059 | 2619 |
self unselect. |
| 16475 | 2620 |
|
2621 |
self withExecuteCursorDo:[ |
|
| 18232 | 2622 |
classNameSelectorTypeTuplesToDelete do:[:tuple | |
2623 |
|numDeletedBefore className selector changeType lastToDelete| |
|
2624 |
||
2625 |
className := tuple at:1. |
|
2626 |
selector := tuple at:2. |
|
2627 |
changeType := tuple at:3. |
|
2628 |
lastToDelete := (tuple at:4) - overAllNumDeletedBefore. |
|
2629 |
||
2630 |
changeType == #methodCategoryChange ifTrue:[ |
|
2631 |
numDeletedBefore := self |
|
2632 |
silentDeleteMethodCategoryChangesFor:className selector:selector |
|
2633 |
from:1 to:lastToDelete. |
|
2634 |
] ifFalse:[ |
|
2635 |
numDeletedBefore := self |
|
2636 |
silentDeleteChangesFor:className selector:selector |
|
2637 |
from:1 to:lastToDelete. |
|
2638 |
]. |
|
| 16475 | 2639 |
lastChangeNr := lastChangeNr - numDeletedBefore. |
2640 |
overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore. |
|
2641 |
]. |
|
2642 |
]. |
|
2643 |
||
| 18059 | 2644 |
self updateChangeList. |
| 16475 | 2645 |
self autoSelectOrEnd:lastChangeNr |
| 17597 | 2646 |
|
2647 |
"Modified: / 25-07-2017 / 10:57:31 / cg" |
|
| 18232 | 2648 |
"Modified: / 20-06-2018 / 15:33:40 / Claus Gittinger" |
| 16475 | 2649 |
! |
2650 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2651 |
doDeleteFromBeginning |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2652 |
"delete all changes from 1 to the current" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2653 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2654 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2655 |
self deleteChangesFrom:1 to:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2656 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2657 |
self autoSelectOrEnd:changeNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2658 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2659 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2660 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2661 |
doDeleteRest |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2662 |
"delete all changes from current to the end" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2663 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2664 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2665 |
self deleteChangesFrom:changeNr to:(self numberOfChanges). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2666 |
self clearCodeView. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2667 |
self autoSelectOrEnd:changeNr-1 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2668 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2669 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2670 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2671 |
doFileoutAndDeleteClassAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2672 |
"first fileOut the selected changes class then delete all changes |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2673 |
for it." |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2674 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2675 |
self withSingleSelectedChangeDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2676 |
| className class | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2677 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2678 |
className := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2679 |
className notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2680 |
class := Smalltalk classNamed:className. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2681 |
class notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2682 |
Class fileOutErrorSignal handle:[:ex | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2683 |
self warn:('fileout failed: ' , ex description).
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2684 |
] do:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2685 |
class fileOut. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2686 |
self doDeleteClassAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2687 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2688 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2689 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2690 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2691 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2692 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2693 |
"Modified: 6.9.1995 / 17:11:16 / claus" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2694 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2695 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2696 |
doMakePatch |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2697 |
"user wants a change to be made a patch |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2698 |
- copy it over to the patches file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2699 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2700 |
self withSelectedChangesDo:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2701 |
self makeChangeAPatch:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2702 |
self autoSelect:(changeNr + 1) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2703 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2704 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2705 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2706 |
doMakePermanent |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2707 |
"user wants a change to be made permanent |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2708 |
- rewrite the source file where this change has to go" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2709 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2710 |
|yesNoBox| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2711 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2712 |
self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2713 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2714 |
yesNoBox := YesNoBox new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2715 |
yesNoBox title:(resources string:'Warning: this operation cannot be undone'). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2716 |
yesNoBox okText:(resources string:'continue') noText:(resources string:'abort'). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2717 |
yesNoBox okAction:[ |changeNr| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2718 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2719 |
changeNr := self theSingleSelection. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2720 |
changeNr notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2721 |
self makeChangePermanent:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2722 |
self autoSelect:(changeNr + 1) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2723 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2724 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2725 |
yesNoBox showAtPointer. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2726 |
yesNoBox destroy |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2727 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2728 |
"Modified: 7.1.1997 / 23:03:33 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2729 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2730 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2731 |
doSave |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2732 |
"user wants a change to be appended to a file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2733 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2734 |
|fileName| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2735 |
|
| 13651 | 2736 |
fileName := Dialog |
2737 |
requestFileNameForSave:(resources string:'Append change to:') |
|
2738 |
default:(lastSaveFileName ? '') |
|
2739 |
ok:(resources string:'Append') |
|
2740 |
abort:(resources string:'Abort') |
|
2741 |
pattern:'*.chg'. |
|
2742 |
fileName isEmptyOrNil ifTrue:[ |
|
2743 |
^ self |
|
2744 |
]. |
|
2745 |
lastSaveFileName := fileName. |
|
2746 |
||
2747 |
self withWriteCursorDo:[ |
|
2748 |
self withSelectedChangesDo:[:changeNr | |
|
2749 |
self appendChange:changeNr toFile:fileName. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2750 |
self autoSelect:(changeNr + 1) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2751 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2752 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2753 |
|
| 11685 | 2754 |
"Modified: / 27-07-2012 / 09:46:14 / cg" |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2755 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2756 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2757 |
doSaveClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2758 |
"user wants changes for some class from current to end to be appended to a file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2759 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2760 |
self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2761 |
self doSaveClassFrom:1 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2762 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2763 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2764 |
doSaveClassAll |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2765 |
"user wants changes for some class from current to end to be appended to a file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2766 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2767 |
self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2768 |
self doSaveClassFrom:1 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2769 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2770 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2771 |
doSaveClassFrom:startNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2772 |
"user wants changes from current to end to be appended to a file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2773 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2774 |
|changeNr classNameToSave| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2775 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2776 |
changeNr := self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2777 |
classNameToSave := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2778 |
classNameToSave notNil ifTrue:[ |
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2779 |
self saveClass:classNameToSave from:startNr |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2780 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2781 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2782 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2783 |
doSaveClassRest |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2784 |
"user wants changes for some class from current to end to be appended to a file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2785 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2786 |
|changeNr| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2787 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
2788 |
changeNr := self checkSingleSelectedChange. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2789 |
self doSaveClassFrom:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2790 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2791 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2792 |
"/ self changeSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2793 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2794 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2795 |
doSaveRest |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2796 |
"user wants changes from current to end to be appended to a file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2797 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2798 |
|changeNr fileName| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2799 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2800 |
(changeNr := self theSingleSelection) isNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2801 |
^ self information:(resources string:'Only possible if a single change is selected.'). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2802 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2803 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2804 |
fileName := Dialog |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2805 |
requestFileNameForSave:(resources string:'Append changes to:') |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2806 |
default:(lastSaveFileName ? '') |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2807 |
ok:(resources string:'Append') |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2808 |
abort:(resources string:'Abort') |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2809 |
pattern:'*.chg'. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2810 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2811 |
fileName notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2812 |
lastSaveFileName := fileName. |
| 11685 | 2813 |
self withWriteCursorDo:[ |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2814 |
changeNr to:(self numberOfChanges) do:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2815 |
changeListView setSelection:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2816 |
(self appendChange:changeNr toFile:fileName) ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2817 |
^ self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2818 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2819 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2820 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2821 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2822 |
|
| 11685 | 2823 |
"Modified: / 27-07-2012 / 09:46:09 / cg" |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2824 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2825 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2826 |
doUpdate |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2827 |
"reread the changes-file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2828 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2829 |
self readChangesFileInBackground:true. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2830 |
self newLabel:''. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2831 |
realized ifTrue:[ |
| 18059 | 2832 |
self updateChangeList. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2833 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2834 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2835 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2836 |
doWriteBack |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2837 |
"write back the list onto the changes file" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2838 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2839 |
anyChanges ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2840 |
(self writeBackChanges) ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2841 |
realized ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2842 |
self readChangesFile. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2843 |
realized ifTrue:[ |
| 18059 | 2844 |
self updateChangeList |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2845 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2846 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2847 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2848 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2849 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2850 |
"Modified: 5.9.1996 / 17:19:46 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2851 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2852 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2853 |
findClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2854 |
"findClass menu action: let user enter a classes name, and select the next change for that class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2855 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2856 |
|current| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2857 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2858 |
changeNrShown notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2859 |
current := self classNameOfChange:changeNrShown. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2860 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2861 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2862 |
self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2863 |
askForSearch:'Class to search for:' |
| 17394 | 2864 |
initialAnswer:(current ? lastSearchString) |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2865 |
thenSearchUsing:[:searchString :changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2866 |
|thisClassName| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2867 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2868 |
thisClassName := self classNameOfChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2869 |
thisClassName notNil |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2870 |
and:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2871 |
(thisClassName sameAs: searchString) |
| 13440 | 2872 |
or:[searchString includesMatchCharacters and:[searchString match:thisClassName caseSensitive:false]]] |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2873 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2874 |
onCancel:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2875 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2876 |
lastSearchType := #class. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2877 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
| 17382 | 2878 |
|
| 17394 | 2879 |
"Modified: / 12-02-2017 / 11:31:47 / cg" |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2880 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2881 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2882 |
findFirstForClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2883 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2884 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2885 |
self findNextForClassStartingAt:1 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2886 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2887 |
"Created: / 20-11-2006 / 16:37:56 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2888 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2889 |
|
| 15674 | 2890 |
findFirstForClass:className |
2891 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
2892 |
||
2893 |
self findNextForClass:className startingAt:1 |
|
2894 |
! |
|
2895 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2896 |
findLastForClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2897 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2898 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2899 |
self findPreviousForClassStartingAt:(self numberOfChanges) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2900 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2901 |
"Created: / 20-11-2006 / 16:39:15 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2902 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2903 |
|
| 15674 | 2904 |
findLastForClass:className |
2905 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
2906 |
||
2907 |
self findPreviousForClass:className startingAt:(self numberOfChanges) |
|
2908 |
||
2909 |
"Created: / 20-11-2006 / 16:39:15 / cg" |
|
2910 |
! |
|
2911 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2912 |
findLastSnapshot |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2913 |
"findLastSnapshot menu action: select the last change which is for a snapShot-image save action" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2914 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2915 |
"/ lastSearchType := #snapshot. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2916 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2917 |
self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2918 |
findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2919 |
startingAt:(self numberOfChanges) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2920 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2921 |
"Created: / 06-10-2006 / 11:03:39 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2922 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2923 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2924 |
findNext |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2925 |
"findNext menu action: select the next change. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2926 |
Searches for what the last search was for; i.e. either same class or same selector" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2927 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2928 |
lastSearchType == #selector ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2929 |
^ self findNextForSelector |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2930 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2931 |
lastSearchType == #snapshot ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2932 |
^ self findNextSnapshot |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2933 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2934 |
lastSearchType == #string ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2935 |
^ self findNextForString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2936 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2937 |
lastSearchType == #difference ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2938 |
^ self findNextDifference |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2939 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2940 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2941 |
^ self findNextForClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2942 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2943 |
"Created: / 18.6.1998 / 22:15:00 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2944 |
"Modified: / 18.6.1998 / 22:15:25 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2945 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2946 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2947 |
findNextDifference |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2948 |
lastSearchType := #difference. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2949 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2950 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2951 |
self findNextForWhich:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2952 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2953 |
"/ same |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2954 |
false |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2955 |
] ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2956 |
"/ different |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2957 |
true |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2958 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2959 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2960 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2961 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2962 |
findNextForClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2963 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2964 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2965 |
self findNextForClassStartingAt: changeNrShown + 1 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2966 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2967 |
"Modified: / 20-11-2006 / 16:37:49 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2968 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2969 |
|
| 15674 | 2970 |
findNextForClass:className startingAt:startNr |
2971 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
2972 |
||
2973 |
lastSearchType := #class. |
|
2974 |
||
2975 |
self |
|
2976 |
findNextForWhich:[:changeNr | |
|
2977 |
|thisClass| |
|
2978 |
||
2979 |
thisClass := self classNameOfChange:changeNr. |
|
2980 |
(thisClass = className |
|
2981 |
or:[className includesMatchCharacters |
|
2982 |
and:[className match:thisClass]])] |
|
2983 |
startingAt:startNr |
|
2984 |
! |
|
2985 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2986 |
findNextForClassStartingAt:startNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2987 |
"findNextForClass menu action: select the next change for the selected changes class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2988 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2989 |
|cls| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2990 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2991 |
lastSearchType := #class. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2992 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2993 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2994 |
cls := self classNameOfChange:changeNrShown. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2995 |
cls isNil ifTrue:[^ self]. |
| 15674 | 2996 |
self findNextForClass:cls startingAt:startNr. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2997 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2998 |
"Created: / 20-11-2006 / 16:37:37 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
2999 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3000 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3001 |
findNextForSelector |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3002 |
"findNextForSelector menu action: select the next change for the selected changes selector" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3003 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3004 |
|sel| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3005 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3006 |
lastSearchType := #selector. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3007 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3008 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3009 |
sel := self selectorOfMethodChange:changeNrShown. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3010 |
sel isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3011 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3012 |
self findNextForWhich: [:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3013 |
|thisSelector| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3014 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3015 |
thisSelector := self selectorOfMethodChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3016 |
(thisSelector = sel or:[sel includesMatchCharacters and:[sel match:thisSelector]]) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3017 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3018 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3019 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3020 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3021 |
findNextForString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3022 |
lastSearchString isNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3023 |
^ self findString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3024 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3025 |
self findNextWithString:lastSearchString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3026 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3027 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3028 |
findNextForWhich:aBlock |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3029 |
"helper: select the next change for which aBlock evaluates to true" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3030 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3031 |
^ self findNextForWhich:aBlock startingAt:changeNrShown + 1 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3032 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3033 |
"Modified: / 20-11-2006 / 16:34:23 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3034 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3035 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3036 |
findNextForWhich:aBlock startingAt:changeNrToStartSearch |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3037 |
"helper: select the next change for which aBlock evaluates to true" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3038 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3039 |
^ self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3040 |
findNextOrPrevious:#next |
| 18059 | 3041 |
forWhich:aBlock |
3042 |
startingAt:changeNrToStartSearch |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3043 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3044 |
"Created: / 20-11-2006 / 16:34:06 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3045 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3046 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3047 |
findNextOrPrevious:direction forWhich:aBlock startingAt:changeNrToStartSearch |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3048 |
"helper: find and select the next or previous change for which aBlock evaluates to true" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3049 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3050 |
self withCursor:Cursor questionMark do:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3051 |
Object userInterruptSignal handle:[:ex | |
| 17941 | 3052 |
self beepInEditor. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3053 |
^ 0 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3054 |
] do:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3055 |
|increment nr lastNr| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3056 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3057 |
increment := (direction == #previous) ifTrue:[-1] ifFalse:[1]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3058 |
lastNr := self numberOfChanges. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3059 |
nr := changeNrToStartSearch. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3060 |
[ (direction == #previous and:[nr >= 1]) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3061 |
or:[ direction == #next and:[ nr <= lastNr]] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3062 |
] whileTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3063 |
(aBlock value:nr) ifTrue:[ |
| 18059 | 3064 |
self selectChange:nr. |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3065 |
^ nr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3066 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3067 |
nr := nr + increment. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3068 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3069 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3070 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3071 |
self showNotFound. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3072 |
self windowGroup sensor flushKeyboard. "/ avoid multiple beeps, in case of type ahead |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3073 |
^ 0 |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3074 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3075 |
"Created: / 08-03-2012 / 11:57:26 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3076 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3077 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3078 |
findNextSnapshot |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3079 |
"findNextSnapshot menu action: select the next change which is for a snapShot-image save action" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3080 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3081 |
lastSearchType := #snapshot. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3082 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3083 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3084 |
self findNextForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3085 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3086 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3087 |
findNextWithString:searchString |
| 14939 | 3088 |
|includesMatchCharacters| |
3089 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3090 |
lastSearchType := #string. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3091 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3092 |
lastSearchString := searchString. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3093 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3094 |
changeNrShown isNil ifTrue:[ |
| 14939 | 3095 |
changeNrShown := 0. |
3096 |
]. |
|
3097 |
||
3098 |
includesMatchCharacters := searchString includesMatchCharacters. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3099 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3100 |
self findNextForWhich: |
| 14939 | 3101 |
[:changeNr | |
3102 |
|s| |
|
3103 |
||
3104 |
s := self sourceOfMethodChange:changeNr. |
|
3105 |
s notNil and:[ |
|
3106 |
(includesMatchCharacters not and:[(s findString:searchString) ~~ 0]) |
|
3107 |
or:[ includesMatchCharacters and:[('*' , searchString , '*') match:s ]]]
|
|
3108 |
]. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3109 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3110 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3111 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3112 |
codeView setSearchPattern:searchString. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3113 |
codeView |
| 14939 | 3114 |
searchFwd:searchString |
3115 |
ignoreCase:false |
|
3116 |
startingAtLine:1 col:0 |
|
3117 |
ifAbsent:nil. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3118 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3119 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3120 |
findPrevious |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3121 |
"findPrevious menu action: select the previous change. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3122 |
Searches for what the last search was for; i.e. either same class or same selector" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3123 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3124 |
lastSearchType == #selector ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3125 |
^ self findPreviousForSelector |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3126 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3127 |
lastSearchType == #snapshot ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3128 |
^ self findPreviousSnapshot |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3129 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3130 |
lastSearchType == #string ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3131 |
^ self findPreviousForString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3132 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3133 |
lastSearchType == #difference ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3134 |
^ self findPreviousDifference |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3135 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3136 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3137 |
^ self findPreviousForClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3138 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3139 |
"Created: / 18.6.1998 / 22:15:15 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3140 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3141 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3142 |
findPreviousDifference |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3143 |
lastSearchType := #difference. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3144 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3145 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3146 |
self findPreviousForWhich:[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3147 |
(self compareChange:changeNr showResult:false) == true ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3148 |
"/ same |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3149 |
false |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3150 |
] ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3151 |
"/ different |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3152 |
true |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3153 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3154 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3155 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3156 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3157 |
findPreviousForClass |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3158 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3159 |
|
| 12738 | 3160 |
self findPreviousForClassStartingAt:((changeNrShown ? 1) - 1) |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3161 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3162 |
"Modified: / 20-11-2006 / 16:39:04 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3163 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3164 |
|
| 15674 | 3165 |
findPreviousForClass:className startingAt:startNr |
3166 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
3167 |
||
3168 |
lastSearchType := #class. |
|
3169 |
||
3170 |
self |
|
3171 |
findPreviousForWhich: |
|
3172 |
[:changeNr | |
|
3173 |
|thisClass| |
|
3174 |
||
3175 |
thisClass := self classNameOfChange:changeNr. |
|
3176 |
(thisClass = className |
|
3177 |
or:[className includesMatchCharacters |
|
3178 |
and:[className match:thisClass]])] |
|
3179 |
startingAt:startNr |
|
3180 |
! |
|
3181 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3182 |
findPreviousForClassStartingAt:startNr |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3183 |
"findPreviousForClass menu action: select the previous change for the selected changes class" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3184 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3185 |
|cls| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3186 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3187 |
lastSearchType := #class. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3188 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3189 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3190 |
cls := self classNameOfChange:changeNrShown. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3191 |
cls isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3192 |
|
| 15674 | 3193 |
self findPreviousForClass:cls startingAt:startNr |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3194 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3195 |
"Created: / 20-11-2006 / 16:38:37 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3196 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3197 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3198 |
findPreviousForSelector |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3199 |
"findPreviousForSelector menu action: select the previous change for the selected changes selector" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3200 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3201 |
|sel| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3202 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3203 |
lastSearchType := #selector. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3204 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3205 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3206 |
sel := self selectorOfMethodChange:changeNrShown. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3207 |
sel isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3208 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3209 |
self findPreviousForWhich: |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3210 |
[:changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3211 |
|thisSelector| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3212 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3213 |
thisSelector := self selectorOfMethodChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3214 |
(thisSelector = sel |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3215 |
or:[sel includesMatchCharacters and:[sel match:thisSelector]]) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3216 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3217 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3218 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3219 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3220 |
findPreviousForString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3221 |
lastSearchString isNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3222 |
^ self findString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3223 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3224 |
self findPreviousWithString:lastSearchString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3225 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3226 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3227 |
findPreviousForWhich:aBlock |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3228 |
"helper: select the previous change for which aBlock evaluates to true" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3229 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3230 |
^ self findPreviousForWhich:aBlock startingAt:(changeNrShown - 1) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3231 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3232 |
"Modified: / 06-10-2006 / 11:01:38 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3233 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3234 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3235 |
findPreviousForWhich:aBlock startingAt:changeNrToStartSearch |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3236 |
"helper: select the previous change for which aBlock evaluates to true" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3237 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3238 |
^ self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3239 |
findNextOrPrevious:#previous |
| 18059 | 3240 |
forWhich:aBlock |
3241 |
startingAt:changeNrToStartSearch |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3242 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3243 |
"Created: / 06-10-2006 / 11:01:09 / cg" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3244 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3245 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3246 |
findPreviousSnapshot |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3247 |
"findPreviousSnapshot menu action: select the previous change which is for a snapShot-image save action" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3248 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3249 |
lastSearchType := #snapshot. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3250 |
changeNrShown isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3251 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3252 |
self findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3253 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3254 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3255 |
findPreviousWithString:searchString |
| 14939 | 3256 |
|includesMatchCharacters| |
3257 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3258 |
lastSearchType := #string. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3259 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3260 |
lastSearchString := searchString. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3261 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3262 |
changeNrShown isNil ifTrue:[ |
| 14939 | 3263 |
changeNrShown := 0. |
3264 |
]. |
|
3265 |
||
3266 |
includesMatchCharacters := searchString includesMatchCharacters. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3267 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3268 |
self findPreviousForWhich: |
| 14939 | 3269 |
[:changeNr | |
3270 |
|s | |
|
3271 |
||
3272 |
s := self sourceOfMethodChange:changeNr. |
|
3273 |
s notNil and:[ |
|
3274 |
(includesMatchCharacters not and:[(s findString:searchString) ~~ 0]) |
|
3275 |
or:[includesMatchCharacters and:[('*' , searchString , '*') match:s ]]]
|
|
3276 |
]. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3277 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3278 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3279 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3280 |
codeView setSearchPattern:searchString. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3281 |
codeView |
| 14939 | 3282 |
searchFwd:searchString |
3283 |
ignoreCase:false |
|
3284 |
startingAtLine:1 col:0 |
|
3285 |
ifAbsent:nil. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3286 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3287 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3288 |
findSelector |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3289 |
"findSelector menu action: let user enter a selector, and select the next change for that selector" |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3290 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3291 |
|current| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3292 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3293 |
changeNrShown notNil ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3294 |
current := self selectorOfMethodChange:changeNrShown. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3295 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3296 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3297 |
self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3298 |
askForSearch:'Selector to search for:' |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3299 |
initialAnswer:current |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3300 |
thenSearchUsing:[:searchString :changeNr | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3301 |
|thisSelector| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3302 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3303 |
thisSelector := self selectorOfMethodChange:changeNr. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3304 |
(thisSelector = searchString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3305 |
or:[searchString includesMatchCharacters and:[searchString match:thisSelector]]) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3306 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3307 |
onCancel:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3308 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3309 |
lastSearchType := #selector. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3310 |
changeNrShown == 0 ifTrue:[changeNrShown := nil]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3311 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3312 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3313 |
findString |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3314 |
|searchString directionHolder| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3315 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3316 |
lastSearchType := #string. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3317 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3318 |
searchString := codeView selection. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3319 |
searchString size == 0 ifTrue:[searchString := lastSearchString]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3320 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3321 |
searchString := self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3322 |
askForSearchString:'String to search for:' |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3323 |
initialAnswer:(searchString ? '') |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3324 |
directionInto:(directionHolder := ValueHolder new). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3325 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3326 |
searchString size == 0 ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3327 |
^ self |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3328 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3329 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3330 |
directionHolder value == #backward ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3331 |
self findPreviousWithString:searchString. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3332 |
] ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3333 |
self findNextWithString:searchString. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3334 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3335 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3336 |
|
| 10719 | 3337 |
ignorePublicPrivateCategories:aBoolean |
3338 |
UserPreferences current ignorePublicPrivateCategories:aBoolean |
|
3339 |
||
3340 |
"Created: / 23-09-2011 / 19:52:21 / cg" |
|
3341 |
! |
|
3342 |
||
| 3202 | 3343 |
menuExit |
| 3204 | 3344 |
self closeRequest |
| 3202 | 3345 |
! |
3346 |
||
3347 |
openAboutThisApplication |
|
3348 |
"opens an about box for this application." |
|
3349 |
||
| 7115 | 3350 |
Dialog aboutClass:self class. |
3351 |
||
3352 |
"Modified: / 12-09-2006 / 17:20:22 / cg" |
|
| 3202 | 3353 |
! |
3354 |
||
3355 |
openHTMLDocument:relativeDocPath |
|
3356 |
HTMLDocumentView openFullOnDocumentationFile:relativeDocPath |
|
3357 |
! |
|
3358 |
||
| 9055 | 3359 |
openSettingsDialog |
| 14558 | 3360 |
|settingsList| |
| 9055 | 3361 |
|
3362 |
settingsList := |
|
3363 |
#( |
|
3364 |
#('Editor' #'AbstractSettingsApplication::EditSettingsAppl' )
|
|
3365 |
"/ #('Syntax Color' #'AbstractSettingsApplication::SyntaxColorSettingsAppl' )
|
|
3366 |
"/ #('Code Format' #'AbstractSettingsApplication::SourceCodeFormatSettingsAppl' )
|
|
3367 |
"/ #('System Browser' #'AbstractSettingsApplication::SystemBrowserSettingsAppl' )
|
|
3368 |
#('Compiler' #'AbstractSettingsApplication::GeneralCompilerSettingsAppl' )
|
|
3369 |
#('Compiler/ByteCode' #'AbstractSettingsApplication::ByteCodeCompilerSettingsAppl' )
|
|
3370 |
"/ #('Source Code Management' #'AbstractSettingsApplication::SourceCodeManagementSettingsAppl')
|
|
3371 |
). |
|
3372 |
||
| 14558 | 3373 |
SettingsDialog |
3374 |
openWithList:settingsList |
|
3375 |
label:(resources string:'Change Browser Settings'). |
|
| 9055 | 3376 |
! |
3377 |
||
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3378 |
setEnforcedNameSpace |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3379 |
|nsName listOfKnownNameSpaces keepAsDefaultHolder| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3380 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3381 |
listOfKnownNameSpaces := Set new. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3382 |
NameSpace |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3383 |
allNameSpaces |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3384 |
do:[:eachNameSpace | |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3385 |
listOfKnownNameSpaces add:eachNameSpace name |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3386 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3387 |
listOfKnownNameSpaces := listOfKnownNameSpaces asOrderedCollection sort. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3388 |
|
| 15450 | 3389 |
Dialog modifyingBoxWith:[:box | |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3390 |
keepAsDefaultHolder := true asValue. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3391 |
box verticalPanel |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3392 |
add:((CheckBox |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3393 |
label:(resources string:'Use this as default in the future')) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3394 |
model:keepAsDefaultHolder). |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3395 |
] do:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3396 |
nsName := Dialog |
| 15450 | 3397 |
request:(resources string:'When applying, new classes are created in nameSpace:') |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3398 |
initialAnswer:(enforcedNameSpace ? LastEnforcedNameSpace ? Class nameSpaceQuerySignal query name) |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3399 |
list:listOfKnownNameSpaces. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3400 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3401 |
nsName isNil ifTrue:[^ self]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3402 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3403 |
(nsName isEmpty or:[nsName = 'Smalltalk']) ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3404 |
applyInOriginalNameSpace value:true. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3405 |
LastEnforcedNameSpace := enforcedNameSpace := nil. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3406 |
] ifFalse:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3407 |
applyInOriginalNameSpace value:false. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3408 |
LastEnforcedNameSpace := enforcedNameSpace := NameSpace name:nsName. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3409 |
autoCompare value ifTrue:[ |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3410 |
self doUpdate |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3411 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3412 |
]. |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3413 |
KeepEnforcedNameSpace := keepAsDefaultHolder value. |
|
11680
5b1a15736f97
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11499
diff
changeset
|
3414 |
codeView nameSpaceForDoits:enforcedNameSpace. |
|
5b1a15736f97
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11499
diff
changeset
|
3415 |
diffView textViews do:[:each | each nameSpaceForDoits:enforcedNameSpace]. |
|
5b1a15736f97
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11499
diff
changeset
|
3416 |
|
|
5b1a15736f97
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11499
diff
changeset
|
3417 |
"Modified: / 26-07-2012 / 23:06:23 / cg" |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3418 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3419 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3420 |
setEnforcedPackage |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3421 |
|pkg listOfKnownPackages| |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3422 |
|
| 16207 | 3423 |
listOfKnownPackages := Smalltalk allPackageIDs. |
| 12645 | 3424 |
"/ Smalltalk allClassesDo:[:eachClass | |
3425 |
"/ |package| |
|
3426 |
"/ |
|
3427 |
"/ package := eachClass package. |
|
3428 |
"/ package size > 0 ifTrue:[ |
|
3429 |
"/ listOfKnownPackages add:package |
|
3430 |
"/ ] |
|
3431 |
"/ ]. |
|
3432 |
listOfKnownPackages := listOfKnownPackages asNewOrderedCollection sort. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3433 |
|
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3434 |
pkg := Dialog |
| 12645 | 3435 |
request:'When applying, changes go into package:' |
3436 |
initialAnswer:(enforcedPackage ? Class packageQuerySignal query) |
|
3437 |
list:listOfKnownPackages. |
|
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3438 |
pkg size ~~ 0 ifTrue:[ |
| 12645 | 3439 |
enforcedPackage := pkg |
|
11499
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3440 |
] |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3441 |
! |
|
dcd14a0cdbc5
changed: #setEnforcedNameSpace
Claus Gittinger <cg@exept.de>
parents:
11477
diff
changeset
|
3442 |
|
| 3202 | 3443 |
showAboutSTX |
3444 |
ToolApplicationModel openAboutSTX |
|
3445 |
! ! |
|
3446 |
||
| 202 | 3447 |
!ChangesBrowser methodsFor:'private'! |
3448 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3449 |
autoSelect:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3450 |
"select a change" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3451 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3452 |
self class autoSelectNext ifTrue:[ |
| 18059 | 3453 |
(changeNr <= self numberOfChanges) ifTrue:[ |
3454 |
self selectChange:changeNr. |
|
3455 |
^ self |
|
3456 |
] |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3457 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3458 |
self clearCodeView. |
| 18059 | 3459 |
self unselect. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3460 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3461 |
"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
|
3462 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3463 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3464 |
autoSelectLast |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3465 |
"select the last change" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3466 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3467 |
self autoSelect:(self numberOfChanges) |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3468 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3469 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3470 |
autoSelectOrEnd:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3471 |
"select the next change or the last" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3472 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3473 |
|last| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3474 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3475 |
last := self numberOfChanges. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3476 |
changeNr < last ifTrue:[ |
| 18059 | 3477 |
self autoSelect:changeNr |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3478 |
] ifFalse:[ |
| 18059 | 3479 |
last == 0 ifTrue:[ |
3480 |
last := nil |
|
3481 |
]. |
|
3482 |
self selectChange:last. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3483 |
] |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3484 |
|
|
3406
8fe22b36fbc2
fixed autoselectNext if list is empty
Claus Gittinger <cg@exept.de>
parents:
3392
diff
changeset
|
3485 |
"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
|
3486 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3487 |
|
| 16372 | 3488 |
changeChunkAt:index |
3489 |
^ (changeInfoList at:index) chunk |
|
3490 |
"/ ^ changeChunks at:index |
|
3491 |
||
3492 |
"Created: / 01-05-2016 / 18:24:28 / cg" |
|
3493 |
! |
|
3494 |
||
3495 |
changeClassNameAt:index |
|
3496 |
^ (changeInfoList at:index) className |
|
3497 |
||
3498 |
"Created: / 01-05-2016 / 18:28:13 / cg" |
|
3499 |
"Modified: / 01-05-2016 / 19:32:42 / cg" |
|
3500 |
! |
|
3501 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3502 |
checkClassIsLoaded:aClass |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3503 |
"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
|
3504 |
|
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
3505 |
|cls answer| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3506 |
|
|
3359
2cc7eff866e4
isMeta/soleInstance -> theNonMetaclass
Claus Gittinger <cg@exept.de>
parents:
3341
diff
changeset
|
3507 |
cls := aClass theNonMetaclass. |
| 5825 | 3508 |
cls isLoaded ifTrue:[ |
| 6357 | 3509 |
^ true. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3510 |
]. |
| 11805 | 3511 |
(classesNotToBeAutoloaded includes:#all) ifTrue:[ |
3512 |
^ false. |
|
3513 |
]. |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3514 |
(classesNotToBeAutoloaded includes:cls) ifTrue:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3515 |
^ false. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3516 |
]. |
| 5825 | 3517 |
|
| 6216 | 3518 |
autoloadAsRequired value == true ifTrue:[ |
| 6357 | 3519 |
answer := true |
| 6216 | 3520 |
] ifFalse:[ |
| 11805 | 3521 |
answer := Dialog |
3522 |
confirmWithCancel:(resources |
|
| 17400 | 3523 |
stringWithCRs:'%1 is an autoloaded class.\I can only compare the method''s source if it''s loaded first.\\Shall the class be loaded now ?' |
| 11805 | 3524 |
with:cls name allBold) |
3525 |
labels:(resources array:#('Cancel' 'No for All' 'No' 'Yes'))
|
|
3526 |
values:#(nil #never false true) |
|
3527 |
default:4. |
|
3528 |
answer isNil ifTrue:[ |
|
3529 |
"cancel the operation" |
|
3530 |
AbortAllOperationRequest raise. |
|
3531 |
"not reached" |
|
3532 |
]. |
|
3533 |
answer == #never ifTrue:[ |
|
3534 |
classesNotToBeAutoloaded add:#all. |
|
3535 |
^ false. |
|
3536 |
]. |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3537 |
]. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3538 |
|
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3539 |
answer ifTrue:[ |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3540 |
Autoload autoloadFailedSignal catch:[ |
| 6357 | 3541 |
^ cls autoload isLoaded |
3542 |
] |
|
| 5825 | 3543 |
]. |
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
3544 |
|
|
8026
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3545 |
classesNotToBeAutoloaded add:cls. |
|
48f053eed5b8
on #compareAndCompress - ask only once for each unloaded class
Stefan Vogel <sv@exept.de>
parents:
8000
diff
changeset
|
3546 |
|
|
6162
5ab2371c63a1
Compare and Compress: continue comparing even if the user doesn't
Stefan Vogel <sv@exept.de>
parents:
6048
diff
changeset
|
3547 |
^ false. |
| 17400 | 3548 |
|
3549 |
"Modified: / 13-02-2017 / 19:57:15 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3550 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3551 |
|
|
11896
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3552 |
checkSingleSelectedChange |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3553 |
"just a helper, check for a single selection" |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3554 |
|
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3555 |
|changeNr| |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3556 |
|
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3557 |
(changeNr := self theSingleSelection) isNil ifTrue:[ |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3558 |
self information:'Only possible if a single change is selected.'. |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3559 |
AbortSignal raise. |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3560 |
^ nil. |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3561 |
]. |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3562 |
^ changeNr |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3563 |
! |
|
627b63f51074
added: #checkSingleSelectedChange
Claus Gittinger <cg@exept.de>
parents:
11805
diff
changeset
|
3564 |
|
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3565 |
classFromEvaluatingTree:aParseTree |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3566 |
|thisClass| |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3567 |
|
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3568 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3569 |
do:[ |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3570 |
thisClass := Parser undefinedVariableError handle:[:ex | ] do:[ aParseTree evaluate ]. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3571 |
]. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3572 |
^ thisClass |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3573 |
|
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3574 |
"Created: / 05-03-2012 / 14:28:01 / cg" |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3575 |
! |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3576 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3577 |
clearCodeView |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3578 |
"clear the (lower) code view." |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3579 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3580 |
self unselect "changeListView deselect". |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3581 |
codeView contents:nil. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3582 |
changeNrShown := nil |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3583 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3584 |
|
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3585 |
currentSourceForParseTree:parseTree |
| 12845 | 3586 |
|selector thisClass method mClass thisClassSym ownerClass receiver classGlobalNode| |
| 4857 | 3587 |
|
| 6288 | 3588 |
(parseTree isNil |
3589 |
or:[parseTree == #Error |
|
| 4857 | 3590 |
or:[ parseTree isMessage not ]]) ifTrue:[ |
| 6614 | 3591 |
^ nil |
| 4857 | 3592 |
]. |
3593 |
||
3594 |
selector := parseTree selector. |
|
3595 |
receiver := parseTree receiver. |
|
3596 |
||
3597 |
selector == #'removeSelector:' ifTrue:[ |
|
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3598 |
thisClass := self classFromEvaluatingTree:receiver. |
| 6614 | 3599 |
thisClass isBehavior ifTrue:[ |
3600 |
thisClass isLoaded ifTrue:[ |
|
3601 |
selector := (parseTree arg1 evaluate). |
|
3602 |
(thisClass includesSelector:selector) ifTrue:[ |
|
3603 |
^ (thisClass compiledMethodAt:selector) source. |
|
3604 |
] |
|
3605 |
] ifFalse:[ |
|
3606 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
3607 |
] |
|
3608 |
] ifFalse:[ |
|
3609 |
^ 'Cannot compare this change (class not present)'. |
|
3610 |
]. |
|
| 4857 | 3611 |
]. |
3612 |
selector == #'comment:' ifTrue:[ |
|
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3613 |
thisClass := self classFromEvaluatingTree:receiver. |
| 6614 | 3614 |
thisClass isBehavior ifTrue:[ |
3615 |
thisClass isLoaded ifTrue:[ |
|
3616 |
^ thisClass name , ' comment: ' , thisClass comment storeString. |
|
3617 |
] ifFalse:[ |
|
3618 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
3619 |
] |
|
3620 |
] ifFalse:[ |
|
3621 |
^ 'Cannot compare this change (class not present)'. |
|
3622 |
]. |
|
| 4857 | 3623 |
]. |
3624 |
||
| 7953 | 3625 |
(#(#'category:' #'package:') includes:selector) ifTrue:[ |
| 6614 | 3626 |
receiver isMessage ifTrue:[ |
3627 |
receiver selector == #compiledMethodAt: ifTrue:[ |
|
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3628 |
"/ thisClass := self classFromEvaluatingTree:receiver receiver. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3629 |
"/ thisClass isNil ifTrue:[ |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3630 |
"/ ^ 'Class does not exist.'. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3631 |
"/ ]. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3632 |
|
| 6614 | 3633 |
classGlobalNode := receiver receiver. |
3634 |
(classGlobalNode isMessage and:[classGlobalNode selector == #class]) ifTrue:[ |
|
3635 |
classGlobalNode := classGlobalNode receiver |
|
3636 |
]. |
|
3637 |
classGlobalNode isUndeclared ifTrue:[ |
|
3638 |
^ 'Class does not exist.'. |
|
3639 |
]. |
|
3640 |
Error handle:[method := nil] do:[method := receiver evaluate]. |
|
| 7953 | 3641 |
method isMethod ifFalse:[ |
3642 |
^ 'There is no such method'. |
|
3643 |
]. |
|
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3644 |
mClass := method mclass. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3645 |
|
| 7953 | 3646 |
selector == #category: ifTrue:[ |
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3647 |
"/ method category = parseTree arg1 evaluate ifFalse:[ |
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3648 |
^ '(' , mClass name , ' compiledMethodAt: ' , method selector storeString , ') category: ' , method category storeString.
|
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3649 |
"/ ]. |
| 6614 | 3650 |
] ifFalse:[ |
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3651 |
"/ method package = parseTree arg1 evaluate ifFalse:[ |
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3652 |
^ '(' , mClass name , ' compiledMethodAt: ' , method selector storeString , ') package: ' , method package storeString.
|
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3653 |
"/ ]. |
| 7953 | 3654 |
]. |
3655 |
^ nil |
|
| 6614 | 3656 |
] |
3657 |
] |
|
| 4857 | 3658 |
]. |
3659 |
||
3660 |
selector == #'instanceVariableNames:' ifTrue:[ |
|
| 6614 | 3661 |
receiver isMessage ifTrue:[ |
3662 |
receiver selector == #class ifTrue:[ |
|
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
3663 |
thisClass := self classFromEvaluatingTree:receiver. |
| 6614 | 3664 |
thisClass isBehavior ifTrue:[ |
3665 |
thisClass isLoaded ifTrue:[ |
|
| 4857 | 3666 |
"/ varsHere := thisClass instanceVariableString asCollectionOfWords. |
3667 |
"/ varsInChange := (parseTree arguments at:1) evaluate asCollectionOfWords. |
|
| 6614 | 3668 |
^ thisClass definition. |
3669 |
] ifFalse:[ |
|
3670 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
3671 |
]. |
|
3672 |
] ifFalse:[ |
|
3673 |
^ 'Cannot compare this change (class not present)'. |
|
3674 |
] |
|
3675 |
]. |
|
3676 |
] |
|
| 4857 | 3677 |
]. |
3678 |
||
3679 |
(Class definitionSelectors includes:selector) |
|
| 6288 | 3680 |
"/ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' |
| 4857 | 3681 |
ifTrue:[ |
| 6614 | 3682 |
"/ Class nameSpaceQuerySignal |
3683 |
"/ answer:(self nameSpaceForApply) |
|
3684 |
"/ do:[ |
|
3685 |
"/ superClass := receiver evaluate. |
|
3686 |
"/ ]. |
|
3687 |
"/ superClass isBehavior ifFalse:[ |
|
3688 |
"/ self nameSpaceForApply classNamed:receiver name |
|
3689 |
"/ ]. |
|
3690 |
"/ superClass isBehavior ifFalse:[ |
|
3691 |
"/ |rest matchingKeys superClassName| |
|
3692 |
"/ |
|
3693 |
"/ rest := '::' , receiver name. |
|
3694 |
"/ matchingKeys := Smalltalk keys select:[:nm | nm endsWith:rest]. |
|
3695 |
"/ superClassName := Dialog choose:'Which Class ?' fromList:matchingKeys lines:10. |
|
3696 |
"/ superClassName notEmptyOrNil ifTrue:[ |
|
3697 |
"/ superClass := Smalltalk at:superClassName asSymbol. |
|
3698 |
"/ ]. |
|
3699 |
"/ ]. |
|
3700 |
"/ superClass isBehavior ifFalse:[ |
|
3701 |
"/ ^ 'Cannot compare this change\\(no such superclass).' withCRs. |
|
3702 |
"/ ]. |
|
3703 |
"/ superClass isLoaded ifFalse:[ |
|
3704 |
"/ ^ 'Cannot compare this change\\(superclass not loaded).' withCRs. |
|
3705 |
"/ ]. |
|
3706 |
||
3707 |
thisClassSym := (parseTree arguments at:1) evaluate. |
|
3708 |
||
3709 |
(selector endsWith:':privateIn:') ifTrue:[ |
|
3710 |
ownerClass := (parseTree arguments at:5). |
|
3711 |
ownerClass isUndeclared ifFalse:[ |
|
3712 |
ownerClass := ownerClass evaluate. |
|
3713 |
] ifTrue:[ |
|
3714 |
ownerClass := nil. |
|
3715 |
]. |
|
3716 |
ownerClass isNil ifTrue:[ |
|
3717 |
^ 'Cannot compare this change\\(owning class is not loaded).' withCRs. |
|
3718 |
]. |
|
3719 |
thisClass := ownerClass privateClassesAt:thisClassSym. |
|
3720 |
] ifFalse:[ |
|
3721 |
thisClass := (self nameSpaceForApply) at:thisClassSym ifAbsent:nil. |
|
3722 |
]. |
|
3723 |
thisClass notNil ifTrue:[ |
|
3724 |
thisClass isLoaded ifFalse:[ |
|
3725 |
^ 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
3726 |
] ifTrue:[ |
|
3727 |
^ thisClass definition. |
|
3728 |
] |
|
3729 |
] |
|
| 4857 | 3730 |
]. |
3731 |
||
3732 |
^ nil. |
|
|
9570
f81993219003
changed: #oldSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
9548
diff
changeset
|
3733 |
|
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3734 |
"Created: / 15-02-2012 / 15:11:15 / cg" |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3735 |
! |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3736 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3737 |
isChangeSetBrowser |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3738 |
^ false |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3739 |
! |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3740 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3741 |
makeDiffViewInvisible |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3742 |
diffViewBox lower |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3743 |
! |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3744 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3745 |
makeDiffViewVisible |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3746 |
diffViewBox raise |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3747 |
! |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3748 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3749 |
nameSpaceForApply |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3750 |
applyInOriginalNameSpace value ifFalse:[ |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3751 |
^ enforcedNameSpace ? Class nameSpaceQuerySignal query. |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3752 |
]. |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3753 |
^ Smalltalk. |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3754 |
! |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3755 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3756 |
newLabel:how |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3757 |
|l| |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3758 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3759 |
l := self class defaultLabel. |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3760 |
(changeFileName notNil and:[changeFileName ~= 'changes']) ifTrue:[ |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3761 |
l := l , ': ', changeFileName |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3762 |
]. |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3763 |
l := l , ' ' , how. |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3764 |
self label:l |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3765 |
|
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3766 |
"Created: / 08-09-1995 / 19:32:04 / claus" |
|
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
3767 |
"Modified: / 12-11-2006 / 16:23:53 / cg" |
| 4857 | 3768 |
! |
3769 |
||
| 8665 | 3770 |
parseExpression:chunk |
| 18059 | 3771 |
"parse an expression; return a parseTree" |
3772 |
||
| 8665 | 3773 |
^ self parseExpression:chunk inNameSpace:(self nameSpaceForApply). |
3774 |
! |
|
3775 |
||
3776 |
parseExpression:text inNameSpace:nameSpace |
|
| 18059 | 3777 |
"parse an expression; return a parseTree" |
3778 |
||
3779 |
|parser parseTree| |
|
| 8665 | 3780 |
|
3781 |
"/ old: |
|
3782 |
"/ does not care for VW qualified names |
|
3783 |
"/ ^ Parser parseExpression:text inNameSpace:nameSpace. |
|
3784 |
||
| 18429 | 3785 |
(text includesString:'§') ifTrue:[ |
| 18054 | 3786 |
self halt:'should no longer happen' |
3787 |
]. |
|
| 17094 | 3788 |
|
| 8665 | 3789 |
"/ new: |
3790 |
parser := Parser for:(ReadStream on:text). |
|
| 18059 | 3791 |
parser parserFlags |
3792 |
allowQualifiedNames:true; |
|
3793 |
allowDollarInIdentifier:true; |
|
3794 |
allowParagraphInIdentifier:true. |
|
3795 |
||
|
9228
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3796 |
Error handle:[:ex | |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3797 |
^ nil |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3798 |
] do:[ |
| 18059 | 3799 |
parseTree := parser |
|
9228
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3800 |
parseExpressionWithSelf:nil |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3801 |
notifying:nil |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3802 |
ignoreErrors:true |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3803 |
ignoreWarnings:true |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3804 |
inNameSpace:nameSpace. |
|
c99c25eb54db
changed: #parseExpression:inNameSpace:
Claus Gittinger <cg@exept.de>
parents:
9168
diff
changeset
|
3805 |
]. |
| 18059 | 3806 |
^ parseTree |
| 17094 | 3807 |
|
3808 |
"Modified: / 21-11-2016 / 23:25:48 / cg" |
|
| 8665 | 3809 |
! |
3810 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3811 |
queryCloseText |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3812 |
"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
|
3813 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3814 |
^ 'Quit without updating changeFile ?' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3815 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3816 |
|
| 18059 | 3817 |
selectChange:changeNr |
3818 |
changeListView setSelection:changeNr. |
|
3819 |
self changeSelection:changeNr. |
|
3820 |
! |
|
3821 |
||
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3822 |
selectedClassNames |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3823 |
|classes| |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3824 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3825 |
classes := Set new. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3826 |
self withSelectedChangesDo:[:changeNr | |
| 6288 | 3827 |
| classNameToCompress | |
3828 |
||
3829 |
classNameToCompress := self classNameOfChange:changeNr. |
|
3830 |
classNameToCompress notNil ifTrue:[ |
|
3831 |
classes add:classNameToCompress. |
|
3832 |
] |
|
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3833 |
]. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3834 |
^ classes |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3835 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3836 |
"Created: / 19.11.2001 / 21:54:59 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3837 |
! |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
3838 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3839 |
setChangeList |
| 18059 | 3840 |
<resource: #obsolete> |
| 16467 | 3841 |
"update the selection-list; |
3842 |
called after the changeList has been modified" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3843 |
|
| 18059 | 3844 |
self updateChangeList |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3845 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3846 |
|
| 3211 | 3847 |
setSingleSelection:changeNr |
3848 |
changeListView multipleSelectOk ifFalse:[ |
|
| 6288 | 3849 |
changeListView setSelection:changeNr. |
| 3211 | 3850 |
] ifTrue:[ |
| 6288 | 3851 |
changeListView setSelection:(Array with:changeNr). |
| 3211 | 3852 |
]. |
3853 |
! |
|
3854 |
||
| 16467 | 3855 |
showNumberOfChanges |
3856 |
infoHolder value:(resources string:'%1 changes.' with:changeInfoList size). |
|
3857 |
! |
|
3858 |
||
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3859 |
sourceOfChange:changeNr |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3860 |
|aStream sawExcla chunk| |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3861 |
|
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3862 |
aStream := self streamForChange:changeNr. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3863 |
aStream isNil ifTrue:[ |
| 6288 | 3864 |
^ nil |
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3865 |
]. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3866 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3867 |
chunk := aStream nextChunk. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3868 |
sawExcla ifTrue:[ |
| 6288 | 3869 |
chunk := aStream nextChunk |
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3870 |
]. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3871 |
aStream close. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3872 |
^ chunk |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3873 |
! |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
3874 |
|
|
12599
827681c8f7d4
timestamp printing extracted
Claus Gittinger <cg@exept.de>
parents:
12428
diff
changeset
|
3875 |
timeStampPrintStringOf:ts |
|
827681c8f7d4
timestamp printing extracted
Claus Gittinger <cg@exept.de>
parents:
12428
diff
changeset
|
3876 |
^ ts printString |
| 17838 | 3877 |
|
3878 |
" |
|
3879 |
self basicNew timeStampPrintStringOf:(Timestamp now) |
|
3880 |
" |
|
3881 |
||
3882 |
"Modified (format): / 05-12-2017 / 15:08:48 / cg" |
|
|
12599
827681c8f7d4
timestamp printing extracted
Claus Gittinger <cg@exept.de>
parents:
12428
diff
changeset
|
3883 |
! |
|
827681c8f7d4
timestamp printing extracted
Claus Gittinger <cg@exept.de>
parents:
12428
diff
changeset
|
3884 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3885 |
unselect |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3886 |
"common unselect" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3887 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3888 |
changeListView setSelection:nil. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3889 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3890 |
"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
|
3891 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3892 |
|
| 18059 | 3893 |
updateChangeList |
3894 |
"update the selection-list; |
|
3895 |
called after the changeList has been modified" |
|
3896 |
||
3897 |
|headerList| |
|
3898 |
||
3899 |
headerList := changeInfoList collect:[:info | info headerLine]. |
|
3900 |
changeListView setList:headerList expandTabs:false redraw:false. |
|
3901 |
changeListView invalidate. |
|
3902 |
self showNumberOfChanges. |
|
3903 |
||
3904 |
"/ changeListView deselect. |
|
3905 |
||
3906 |
"Modified: / 01-05-2016 / 19:27:35 / cg" |
|
3907 |
! |
|
3908 |
||
| 3211 | 3909 |
withSelectedChangesDo:aBlock |
3910 |
"just a helper, check for a selected change and evaluate aBlock |
|
3911 |
with busy cursor" |
|
3912 |
||
3913 |
self withSelectedChangesInOrder:nil do:aBlock |
|
3914 |
! |
|
3915 |
||
3916 |
withSelectedChangesInOrder:order do:aBlock |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3917 |
"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
|
3918 |
with busy cursor" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3919 |
|
| 3211 | 3920 |
|changeNrSelection| |
3921 |
||
3922 |
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
|
3923 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
3924 |
"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
|
3925 |
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
|
3926 |
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
|
3927 |
|
| 3211 | 3928 |
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
|
3929 |
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
|
3930 |
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
|
3931 |
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
|
3932 |
] |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
3933 |
] |
| 3211 | 3934 |
] 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
|
3935 |
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
|
3936 |
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
|
3937 |
|changeNumbers| |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
3938 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
3939 |
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
|
3940 |
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
|
3941 |
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
|
3942 |
]. |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
3943 |
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
|
3944 |
] |
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
3945 |
] |
| 3211 | 3946 |
]. |
3947 |
! |
|
3948 |
||
3949 |
withSelectedChangesReverseDo:aBlock |
|
3950 |
"just a helper, check for a selected change and evaluate aBlock |
|
3951 |
with busy cursor" |
|
3952 |
||
3953 |
self withSelectedChangesInOrder:#reverse do:aBlock |
|
| 3668 | 3954 |
! |
3955 |
||
3956 |
withSingleSelectedChangeDo:aBlock |
|
3957 |
"just a helper, check for a single selection, and evaluate aBlock |
|
3958 |
with busy cursor" |
|
3959 |
||
3960 |
self theSingleSelection isNil ifTrue:[ |
|
| 6288 | 3961 |
^ self information:'Only possible if a single change is selected.'. |
| 3668 | 3962 |
]. |
3963 |
||
3964 |
self withSelectedChangesInOrder:nil do:aBlock |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3965 |
! ! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3966 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3967 |
!ChangesBrowser methodsFor:'private-change access'! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3968 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3969 |
changeIsFollowupMethodChange:changeNr |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3970 |
"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
|
3971 |
in a bunch of methodsFor-changes)" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3972 |
|
| 16372 | 3973 |
^ (changeInfoList at:changeNr) isFollowupChange |
3974 |
||
3975 |
"Created: / 06-02-1998 / 13:03:39 / cg" |
|
3976 |
"Modified: / 01-05-2016 / 19:32:06 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3977 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
3978 |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3979 |
changeIsSnapShotInfo:changeNr |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3980 |
"return true, if a change is a snapShot info chunk" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3981 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3982 |
|words chunk| |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3983 |
|
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
3984 |
(self classNameOfChange:changeNr) isNil ifTrue:[ |
| 16372 | 3985 |
" |
3986 |
get the chunk |
|
3987 |
" |
|
3988 |
chunk := self changeChunkAt:changeNr. |
|
3989 |
"mhmh - empty ??" |
|
3990 |
chunk notNil ifTrue:[ |
|
3991 |
(chunk startsWith:'''---') ifTrue:[ |
|
3992 |
words := chunk asCollectionOfWords. |
|
3993 |
words size > 2 ifTrue:[ |
|
3994 |
(words at:2) = 'snapshot' ifTrue:[ |
|
3995 |
^ true |
|
3996 |
]. |
|
3997 |
]. |
|
3998 |
]. |
|
3999 |
]. |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4000 |
]. |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4001 |
^ false |
| 16372 | 4002 |
|
4003 |
"Modified: / 01-05-2016 / 18:25:25 / cg" |
|
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4004 |
! |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4005 |
|
| 11396 | 4006 |
classNameFromAttributeChangeParseTree:aParseTree |
4007 |
"mhmh - seems to always return the name of the nonMeta class - is this OK?" |
|
4008 |
||
| 11397 | 4009 |
|recTree isMeta name| |
| 11396 | 4010 |
|
4011 |
recTree := aParseTree receiver. |
|
4012 |
||
4013 |
(recTree notNil |
|
4014 |
and:[recTree ~~ #Error |
|
4015 |
and:[recTree isMessage |
|
4016 |
and:[recTree selector == #compiledMethodAt:]]]) ifTrue:[ |
|
4017 |
isMeta := false. |
|
4018 |
recTree := recTree receiver. |
|
4019 |
recTree isUnaryMessage ifTrue:[ |
|
4020 |
(recTree selector ~~ #class) ifTrue:[^ nil]. |
|
4021 |
"id class " |
|
4022 |
recTree := recTree receiver |
|
4023 |
]. |
|
4024 |
recTree isPrimary ifTrue:[ |
|
4025 |
name := recTree name. |
|
4026 |
isMeta ifTrue:[ |
|
4027 |
^ name , ' class'. |
|
4028 |
]. |
|
4029 |
^ name |
|
4030 |
] |
|
4031 |
]. |
|
4032 |
"very strange" |
|
4033 |
^ nil |
|
4034 |
||
4035 |
"Created: / 08-03-2012 / 09:42:36 / cg" |
|
4036 |
! |
|
4037 |
||
4038 |
classNameFromClassDefinitionChange:changeNr |
|
| 11397 | 4039 |
|changeStream chunk fullParseTree sel arg1Tree ownerTree ownerName name| |
| 11396 | 4040 |
|
4041 |
"/ must parse the full changes text, to get privacy information. |
|
4042 |
||
4043 |
changeStream := self streamForChange:changeNr. |
|
4044 |
changeStream isNil ifTrue:[ ^ nil]. |
|
4045 |
||
4046 |
chunk := changeStream nextChunk. |
|
4047 |
changeStream close. |
|
4048 |
fullParseTree := self parseExpression:chunk. |
|
4049 |
(fullParseTree isNil or:[fullParseTree == #Error]) ifTrue:[ |
|
4050 |
^ nil |
|
4051 |
]. |
|
4052 |
fullParseTree isMessage ifFalse:[ |
|
4053 |
^ nil |
|
4054 |
]. |
|
4055 |
||
4056 |
sel := fullParseTree selector. |
|
4057 |
arg1Tree := fullParseTree arg1. |
|
| 16390 | 4058 |
(arg1Tree notNil and:[arg1Tree isLiteral]) ifTrue:[ |
| 11396 | 4059 |
name := arg1Tree value asString. |
4060 |
||
4061 |
"/ is it a private-class ? |
|
4062 |
('*privateIn:' match:sel) ifTrue:[
|
|
4063 |
ownerTree := fullParseTree args last. |
|
4064 |
ownerName := ownerTree name asString. |
|
4065 |
^ ownerName , '::' , name |
|
4066 |
]. |
|
4067 |
^ name |
|
4068 |
]. |
|
4069 |
"very strange" |
|
4070 |
^ nil |
|
4071 |
||
4072 |
"Created: / 08-03-2012 / 09:34:04 / cg" |
|
4073 |
! |
|
4074 |
||
4075 |
classNameFromReceiverInParseTree:aParseTree |
|
4076 |
"extrat the class name from a method-change, methodRemove or comment-change's |
|
4077 |
parse tree" |
|
4078 |
||
4079 |
|recTree isMeta cls name| |
|
4080 |
||
4081 |
recTree := aParseTree receiver. |
|
4082 |
(recTree isNil or:[recTree == #Error]) ifTrue:[ |
|
4083 |
"more strange things" |
|
4084 |
^ nil |
|
4085 |
]. |
|
4086 |
||
4087 |
isMeta := false. |
|
4088 |
recTree isUnaryMessage ifTrue:[ |
|
4089 |
(recTree selector ~~ #class) ifTrue:[^ nil]. |
|
4090 |
"id class methodsFor:..." |
|
4091 |
recTree := recTree receiver. |
|
4092 |
isMeta := true. |
|
4093 |
]. |
|
4094 |
recTree isPrimary ifTrue:[ |
|
4095 |
cls := self classFromEvaluatingTree:recTree. |
|
4096 |
cls notNil ifTrue:[^ cls name]. |
|
4097 |
||
4098 |
name := recTree name. |
|
4099 |
isMeta ifTrue:[ |
|
4100 |
^ name , ' class'. |
|
4101 |
]. |
|
4102 |
^ name |
|
4103 |
]. |
|
4104 |
||
4105 |
"more strange things" |
|
4106 |
^ nil |
|
4107 |
||
4108 |
"Created: / 08-03-2012 / 09:26:57 / cg" |
|
4109 |
! |
|
4110 |
||
4111 |
classNameFromRemoveClassParseTree:aParseTree |
|
| 11397 | 4112 |
"tree is: Smalltalk removeClass: class" |
4113 |
||
| 11396 | 4114 |
|recTree arg1Tree| |
4115 |
||
4116 |
recTree := aParseTree receiver. |
|
4117 |
||
4118 |
(recTree notNil |
|
4119 |
and:[recTree ~~ #Error |
|
4120 |
and:[recTree isPrimary |
|
4121 |
and:[recTree name = 'Smalltalk']]]) ifTrue:[ |
|
4122 |
arg1Tree := aParseTree arg1. |
|
| 13663 | 4123 |
(arg1Tree notNil and:[arg1Tree isVariable]) ifTrue:[ |
| 11397 | 4124 |
^ arg1Tree name. |
| 11396 | 4125 |
]. |
4126 |
]. |
|
4127 |
"very strange" |
|
4128 |
^ nil |
|
4129 |
||
4130 |
"Created: / 08-03-2012 / 09:36:59 / cg" |
|
4131 |
! |
|
4132 |
||
| 11397 | 4133 |
classNameFromRenameClassParseTree:aParseTree |
4134 |
"tree is: Smalltalk renameClass: oldClass to: 'newName'" |
|
4135 |
||
4136 |
|recTree arg1Tree arg2Tree oldName newName| |
|
4137 |
||
4138 |
recTree := aParseTree receiver. |
|
4139 |
||
4140 |
(recTree notNil |
|
4141 |
and:[recTree ~~ #Error |
|
4142 |
and:[recTree isPrimary |
|
4143 |
and:[recTree name = 'Smalltalk']]]) ifTrue:[ |
|
4144 |
arg1Tree := aParseTree arg1. |
|
4145 |
(arg1Tree notNil and:[arg1Tree isPrimary]) ifTrue:[ |
|
4146 |
oldName := arg1Tree name. |
|
4147 |
arg2Tree := aParseTree arg2. |
|
| 16390 | 4148 |
(arg2Tree notNil and:[arg2Tree isLiteral]) ifTrue:[ |
| 11397 | 4149 |
newName := arg2Tree evaluate. |
4150 |
(Smalltalk classNamed:oldName) notNil ifTrue:[^ oldName ]. |
|
4151 |
(Smalltalk classNamed:newName) notNil ifTrue:[^ newName ]. |
|
4152 |
]. |
|
4153 |
]. |
|
4154 |
]. |
|
4155 |
"very strange" |
|
4156 |
^ nil |
|
4157 |
||
4158 |
"Created: / 08-03-2012 / 11:42:25 / cg" |
|
4159 |
! |
|
4160 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4161 |
classNameOfChange:changeNr |
| 6288 | 4162 |
"return the classname of a change |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4163 |
(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
|
4164 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4165 |
|name| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4166 |
|
| 3364 | 4167 |
name := self realClassNameOfChange:changeNr. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4168 |
name isNil ifTrue:[^ nil]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4169 |
(name endsWith:' class') ifTrue:[ |
|
12704
6f20f7d39e75
Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents:
12656
diff
changeset
|
4170 |
name := name copyButLast:6 |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4171 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4172 |
^ name |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4173 |
|
| 3364 | 4174 |
"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
|
4175 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4176 |
|
| 3202 | 4177 |
extractSelectorOfMethodChange:changeNr |
| 17400 | 4178 |
"return a method-changes selector, or nil if it's not a methodChange" |
| 3202 | 4179 |
|
4180 |
|source parser sel chunk aParseTree | |
|
4181 |
||
4182 |
source := self sourceOfMethodChange:changeNr. |
|
4183 |
source isNil ifTrue:[ |
|
| 8665 | 4184 |
(self classNameOfChange:changeNr) notNil ifTrue:[ |
| 16372 | 4185 |
chunk := self changeChunkAt:changeNr. |
| 8665 | 4186 |
chunk isNil ifTrue:[^ nil]. "mhmh - empty" |
4187 |
||
4188 |
aParseTree := self parseExpression:chunk. |
|
4189 |
(aParseTree isNil |
|
4190 |
or:[aParseTree == #Error |
|
4191 |
or:[aParseTree isMessage not]]) ifTrue:[ |
|
4192 |
^ nil "seems strange ... (could be a comment)" |
|
4193 |
]. |
|
4194 |
sel := aParseTree selector. |
|
4195 |
(#( |
|
4196 |
#'removeSelector:' |
|
4197 |
) includes:sel) ifTrue:[ |
|
4198 |
sel := aParseTree arguments at:1. |
|
| 16390 | 4199 |
sel isLiteral ifTrue:[ |
| 8665 | 4200 |
sel := sel evaluate. |
4201 |
sel isSymbol ifTrue:[ |
|
4202 |
^ sel |
|
4203 |
] |
|
4204 |
] |
|
4205 |
] |
|
4206 |
]. |
|
4207 |
^ nil |
|
| 3202 | 4208 |
]. |
4209 |
||
4210 |
||
| 6288 | 4211 |
parser := Parser |
| 8665 | 4212 |
parseMethodArgAndVarSpecification:source |
4213 |
in:nil |
|
4214 |
ignoreErrors:true |
|
4215 |
ignoreWarnings:true |
|
4216 |
parseBody:false. |
|
| 3202 | 4217 |
|
4218 |
(parser notNil and:[parser ~~ #Error]) ifTrue:[ |
|
| 8665 | 4219 |
sel := parser selector. |
| 3202 | 4220 |
]. |
4221 |
^ sel |
|
4222 |
||
| 16372 | 4223 |
"Created: / 24-11-1995 / 14:30:46 / cg" |
4224 |
"Modified: / 01-05-2016 / 18:25:39 / cg" |
|
| 17400 | 4225 |
"Modified (comment): / 13-02-2017 / 19:57:20 / cg" |
| 3202 | 4226 |
! |
4227 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4228 |
fullClassNameOfChange:changeNr |
| 6288 | 4229 |
"return the full classname of a change |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
4230 |
(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
|
4231 |
|
| 11396 | 4232 |
|chunk aParseTree sel name prevMethodDefNr words oldDollarSetting| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4233 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4234 |
changeNr isNil ifTrue:[^ nil]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4235 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4236 |
first look, if not already known |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4237 |
" |
| 16372 | 4238 |
name := self changeClassNameAt:changeNr. |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
4239 |
name notNil ifTrue:[ |
| 7953 | 4240 |
name == #nil ifTrue:[^ nil]. |
4241 |
^ name |
|
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
4242 |
]. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4243 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4244 |
prevMethodDefNr := changeNr. |
| 16372 | 4245 |
[ (changeInfoList at:prevMethodDefNr) isFollowupChange ] whileTrue:[ |
| 7953 | 4246 |
prevMethodDefNr := prevMethodDefNr - 1. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4247 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4248 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4249 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4250 |
get the chunk |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4251 |
" |
| 16372 | 4252 |
chunk := self changeChunkAt:prevMethodDefNr. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4253 |
chunk isNil ifTrue:[^ nil]. "mhmh - empty" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4254 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4255 |
(chunk startsWith:'''---') ifTrue:[ |
| 7953 | 4256 |
words := chunk asCollectionOfWords. |
4257 |
words size > 2 ifTrue:[ |
|
4258 |
(words at:2) = 'checkin' ifTrue:[ |
|
4259 |
name := words at:3. |
|
4260 |
^ name |
|
4261 |
] |
|
4262 |
]. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4263 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4264 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4265 |
"/ fix it - otherwise, it cannot be parsed |
| 11396 | 4266 |
((chunk endsWith:'primitiveDefinitions:') |
4267 |
or:[(chunk endsWith:'primitiveFunctions:') |
|
4268 |
or:[(chunk endsWith:'primitiveVariables:')]]) ifTrue:[ |
|
| 7953 | 4269 |
chunk := chunk , '''''' |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4270 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4271 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4272 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4273 |
use parser to construct a parseTree |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4274 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4275 |
oldDollarSetting := Parser allowDollarInIdentifier. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4276 |
[ |
| 7953 | 4277 |
Parser allowDollarInIdentifier:true. |
| 5014 | 4278 |
"/ Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
4279 |
"/ do:[ |
|
| 8665 | 4280 |
aParseTree := self parseExpression:chunk. |
| 5014 | 4281 |
"/ ]. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4282 |
|
| 7953 | 4283 |
aParseTree == #Error ifTrue:[ |
4284 |
(chunk includesString:'comment') ifTrue:[ |
|
4285 |
"/ could be a comment ... |
|
| 8665 | 4286 |
aParseTree := self parseExpression:chunk , ''''. |
| 7953 | 4287 |
] |
4288 |
]. |
|
|
3597
2e7fc0ae28c9
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3586
diff
changeset
|
4289 |
] ensure:[ |
| 7953 | 4290 |
Parser allowDollarInIdentifier:oldDollarSetting |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4291 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4292 |
(aParseTree isNil or:[aParseTree == #Error]) ifTrue:[ |
| 7953 | 4293 |
^ 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
|
4294 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4295 |
aParseTree isMessage ifFalse:[ |
| 7953 | 4296 |
^ nil "very strange ... (whats that ?)" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4297 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4298 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4299 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4300 |
ask parser for selector |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4301 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4302 |
sel := aParseTree selector. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4303 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4304 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4305 |
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
|
4306 |
" |
| 6288 | 4307 |
(#(#'methodsFor:' |
4308 |
#'privateMethodsFor:' |
|
4309 |
#'protectedMethodsFor:' |
|
4310 |
#'ignoredMethodsFor:' |
|
4311 |
#'publicMethodsFor:' |
|
4312 |
#'removeSelector:' |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4313 |
#'comment:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4314 |
#'primitiveDefinitions:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4315 |
#'primitiveFunctions:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4316 |
#'primitiveVariables:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4317 |
#'renameCategory:to:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4318 |
#'instanceVariableNames:' |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4319 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4320 |
#'methodsFor:stamp:' "/ Squeak support |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4321 |
#'commentStamp:prior:' "/ Squeak support |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4322 |
#'addClassVarName:' "/ Squeak support |
|
2527
afa639104477
some support for dolphin source files
Claus Gittinger <cg@exept.de>
parents:
2511
diff
changeset
|
4323 |
#methodsFor "/ Dolphin support |
| 3472 | 4324 |
#categoriesForClass "/ Dolphin support |
4325 |
#categoriesFor: "/ Dolphin support |
|
| 2606 | 4326 |
#methods "/ STV support |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4327 |
) includes:sel) ifTrue:[ |
| 7953 | 4328 |
" |
4329 |
yes, the className is the receiver |
|
4330 |
" |
|
| 11396 | 4331 |
^ self classNameFromReceiverInParseTree:aParseTree |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4332 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4333 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4334 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4335 |
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
|
4336 |
" |
| 6288 | 4337 |
(('subclass:*' match:sel)
|
| 2322 | 4338 |
or:[('variable*ubclass:*' match:sel)]) ifTrue:[
|
| 7953 | 4339 |
"/ must parse the full changes text, to get |
4340 |
"/ privacy information. |
|
| 11396 | 4341 |
^ self classNameFromClassDefinitionChange:changeNr |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4342 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4343 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4344 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4345 |
is it a class remove ? |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4346 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4347 |
(sel == #removeClass:) ifTrue:[ |
| 11396 | 4348 |
^ self classNameFromRemoveClassParseTree:aParseTree |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4349 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4350 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4351 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4352 |
is it a method category change ? |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4353 |
" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4354 |
((sel == #category:) |
| 7953 | 4355 |
or:[sel == #package: |
4356 |
or:[sel == #privacy:]]) ifTrue:[ |
|
| 11396 | 4357 |
^ self classNameFromAttributeChangeParseTree:aParseTree |
4358 |
]. |
|
4359 |
||
4360 |
sel == #renameClass:to: ifTrue:[ |
|
| 11397 | 4361 |
^ self classNameFromRenameClassParseTree:aParseTree |
| 11396 | 4362 |
]. |
4363 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4364 |
^ nil |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4365 |
|
| 16372 | 4366 |
"Modified: / 01-05-2016 / 19:29:14 / cg" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4367 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4368 |
|
| 12428 | 4369 |
namespaceOfChange:changeNr |
4370 |
"return the namespace of a change or nil" |
|
4371 |
||
| 15116 | 4372 |
|className namespace idx| |
| 12428 | 4373 |
|
4374 |
className := self classNameOfChange:changeNr. |
|
4375 |
className isNil ifTrue:[ ^ nil ]. |
|
4376 |
||
| 15116 | 4377 |
idx := className indexOfSubCollection:'::'. |
4378 |
idx == 0 ifTrue:[ ^ nil ]. |
|
4379 |
namespace := className copyTo:idx-1. |
|
| 12428 | 4380 |
^ namespace |
4381 |
! |
|
4382 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4383 |
numberOfChanges |
| 16372 | 4384 |
^ changeInfoList size |
4385 |
||
4386 |
"Created: / 03-12-1995 / 18:15:39 / cg" |
|
4387 |
"Modified: / 01-05-2016 / 19:24:05 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4388 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4389 |
|
| 2511 | 4390 |
ownerClassNameOfChange:changeNr |
| 6288 | 4391 |
"return the owner classname of a change |
| 2511 | 4392 |
For a normal class, this is the className; |
4393 |
for a private class, this is the name of the owning class" |
|
4394 |
||
| 4706 | 4395 |
|name "ns idx" cls| |
| 2511 | 4396 |
|
4397 |
name := self classNameOfChange:changeNr. |
|
4398 |
name isNil ifTrue:[^ nil]. |
|
4399 |
cls := Smalltalk at:name asSymbol. |
|
4400 |
(cls notNil and:[cls isBehavior]) ifTrue:[ |
|
| 6288 | 4401 |
cls owningClass notNil ifTrue:[ |
4402 |
^ cls owningClass name |
|
4403 |
]. |
|
4404 |
^ cls name |
|
| 2511 | 4405 |
]. |
4406 |
||
4407 |
"/ (name includes:$:) ifTrue:[ |
|
4408 |
"/ idx := name indexOf:$:. |
|
4409 |
"/ ns := name copyTo:idx-1. |
|
4410 |
"/ ns := Smalltalk at:ns asSymbol. |
|
4411 |
"/ ns notNil ifTrue:[ |
|
| 6288 | 4412 |
"/ |
| 2511 | 4413 |
"/ ]. |
4414 |
"/ |
|
4415 |
"/ name := name copyFrom:idx+2. |
|
4416 |
"/ (Smalltalk at:ns asSymbol) notNil ifTrue:[ |
|
4417 |
"/ cls |
|
4418 |
"/ ]. |
|
| 13851 | 4419 |
"/ ^ name copyButLast:6 |
| 2511 | 4420 |
"/ ]. |
4421 |
^ name |
|
4422 |
||
4423 |
"Modified: 6.12.1995 / 17:06:31 / cg" |
|
4424 |
! |
|
4425 |
||
| 3364 | 4426 |
realClassNameOfChange:changeNr |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
4427 |
"return the classname of a change. |
| 6288 | 4428 |
- 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
|
4429 |
changeClassNames for the next query" |
| 3364 | 4430 |
|
4431 |
|name| |
|
4432 |
||
| 16372 | 4433 |
name := self changeClassNameAt:changeNr. |
| 3364 | 4434 |
name isNil ifTrue:[ |
| 16372 | 4435 |
name := self fullClassNameOfChange:changeNr. |
4436 |
name isNil ifTrue:[ |
|
4437 |
(changeInfoList at:changeNr) className:#nil. |
|
4438 |
]. |
|
| 3364 | 4439 |
]. |
|
5806
eaaab48a7e8b
tuning (cache class name of change)
Claus Gittinger <cg@exept.de>
parents:
5735
diff
changeset
|
4440 |
name == #nil ifTrue:[^ nil]. |
| 3364 | 4441 |
^ name |
4442 |
||
| 16372 | 4443 |
"Created: / 05-11-2001 / 18:09:46 / cg" |
4444 |
"Modified: / 01-05-2016 / 19:24:53 / cg" |
|
| 3364 | 4445 |
! |
4446 |
||
| 18059 | 4447 |
selectorOfMethodCategoryChange:changeNr |
4448 |
"return a methodCategory-change's selector, |
|
4449 |
or nil if it's not a methodCategoryChange" |
|
4450 |
||
4451 |
(changeInfoList at:changeNr) isMethodCategoryChange ifFalse:[^ nil]. |
|
4452 |
^ (changeInfoList at:changeNr) selector. |
|
4453 |
||
4454 |
"Modified: / 01-05-2016 / 19:26:21 / cg" |
|
4455 |
! |
|
4456 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4457 |
selectorOfMethodChange:changeNr |
| 18059 | 4458 |
"return a method-change's selector, |
| 16467 | 4459 |
or nil if it's not a methodChange" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4460 |
|
| 3202 | 4461 |
|sel | |
4462 |
||
| 16372 | 4463 |
changeInfoList size >= changeNr ifTrue:[ |
| 18059 | 4464 |
(changeInfoList at:changeNr) isMethodCategoryChange ifTrue:[^ nil]. |
| 16372 | 4465 |
sel := (changeInfoList at:changeNr) selector. |
| 15652 | 4466 |
sel notNil ifTrue:[ ^ sel ]. |
| 3202 | 4467 |
]. |
4468 |
||
4469 |
sel := self extractSelectorOfMethodChange:changeNr. |
|
4470 |
sel notNil ifTrue:[ |
|
| 18059 | 4471 |
self assert:(changeInfoList at:changeNr) isMethodCategoryChange not. |
| 16372 | 4472 |
(changeInfoList at:changeNr) selector:sel. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4473 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4474 |
^ sel |
| 16372 | 4475 |
|
4476 |
"Modified: / 01-05-2016 / 19:26:21 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4477 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4478 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4479 |
sourceOfMethodChange:changeNr |
| 17400 | 4480 |
"return a method-changes source code, or nil if it's not a methodChange." |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4481 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4482 |
|aStream chunk sawExcla parseTree sourceChunk sel| |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4483 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4484 |
aStream := self streamForChange:changeNr. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4485 |
aStream isNil ifTrue:[^ nil]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4486 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4487 |
(self changeIsFollowupMethodChange:changeNr) ifFalse:[ |
| 8665 | 4488 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
4489 |
chunk := aStream nextChunk. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4490 |
] ifTrue:[ |
| 16372 | 4491 |
chunk := self changeChunkAt:changeNr. |
| 8665 | 4492 |
sawExcla := true. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4493 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4494 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4495 |
sawExcla ifTrue:[ |
| 8665 | 4496 |
parseTree := self parseExpression:chunk. |
4497 |
(parseTree notNil |
|
4498 |
and:[parseTree ~~ #Error |
|
4499 |
and:[parseTree isMessage]]) ifTrue:[ |
|
4500 |
sel := parseTree selector. |
|
4501 |
(#( |
|
4502 |
#methodsFor: |
|
4503 |
#privateMethodsFor: |
|
4504 |
#publicMethodsFor: |
|
4505 |
#ignoredMethodsFor: |
|
4506 |
#protectedMethodsFor: |
|
4507 |
||
4508 |
#methodsFor:stamp: "/ Squeak support |
|
4509 |
#commentStamp:prior: "/ Squeak support |
|
4510 |
#methodsFor "/ Dolphin support |
|
4511 |
#methods "/ STV support |
|
4512 |
) |
|
4513 |
includes:sel) ifTrue:[ |
|
4514 |
sourceChunk := aStream nextChunk. |
|
4515 |
] |
|
4516 |
]. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4517 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4518 |
aStream close. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4519 |
^ sourceChunk |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4520 |
|
| 16372 | 4521 |
"Created: / 05-09-1996 / 17:11:32 / cg" |
4522 |
"Modified: / 01-05-2016 / 18:25:53 / cg" |
|
| 17400 | 4523 |
"Modified (comment): / 13-02-2017 / 19:57:25 / cg" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4524 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4525 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4526 |
streamForChange:changeNr |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4527 |
"answer a stream for change" |
| 6288 | 4528 |
|
| 15858 | 4529 |
|aStream encoding| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4530 |
|
| 16372 | 4531 |
(changeNr between:1 and:changeInfoList size) ifFalse:[^ nil]. |
| 5702 | 4532 |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
4533 |
aStream := changeFileName asFilename readStreamOrNil. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4534 |
aStream isNil ifTrue:[^ nil]. |
| 5702 | 4535 |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4536 |
encodingIfKnown isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4537 |
encoding := CharacterEncoder guessEncodingOfStream:aStream. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4538 |
encodingIfKnown := encoding ? #none |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4539 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4540 |
(encodingIfKnown notNil and:[encodingIfKnown ~~ #none]) ifTrue:[ |
| 15858 | 4541 |
aStream := EncodedStream stream:aStream encoding:encodingIfKnown. |
| 5702 | 4542 |
]. |
4543 |
||
| 16372 | 4544 |
aStream position:((changeInfoList at:changeNr) position)-1. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4545 |
^ aStream |
| 16372 | 4546 |
|
4547 |
"Modified: / 01-05-2016 / 19:24:17 / cg" |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4548 |
! ! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4549 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4550 |
!ChangesBrowser methodsFor:'private-changeFile access'! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4551 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4552 |
changeFileName:aFileName |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4553 |
"set the name of the changeFile" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4554 |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4555 |
changeFileName := aFileName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
4556 |
encodingIfKnown := nil. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4557 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4558 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4559 |
checkIfFileHasChanged |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4560 |
"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
|
4561 |
install a timeout for rechecking after some time." |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
4562 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4563 |
|f info | |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4564 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4565 |
Processor removeTimedBlock:checkBlock. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4566 |
f := changeFileName asFilename. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4567 |
(info := f info) isNil ifTrue:[ |
| 16092 | 4568 |
self newLabel:'(unaccessible)' |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4569 |
] ifFalse:[ |
| 16092 | 4570 |
(info modificationTime) > changeFileTimestamp ifTrue:[ |
4571 |
self newLabel:'(outdated)'. |
|
4572 |
autoUpdate value ifTrue:[ |
|
4573 |
self doUpdate |
|
4574 |
] |
|
4575 |
] ifFalse:[ |
|
4576 |
self newLabel:'' |
|
4577 |
] |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4578 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4579 |
Processor addTimedBlock:checkBlock afterSeconds:5. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4580 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4581 |
"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
|
4582 |
"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
|
4583 |
"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
|
4584 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4585 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4586 |
readChangesFile |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4587 |
"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
|
4588 |
and a list of chunk-positions (changePositions)" |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4589 |
|
| 5178 | 4590 |
self readChangesFileInBackground:false. |
4591 |
self newLabel:''. |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4592 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4593 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4594 |
readChangesFileInBackground:inBackground |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4595 |
"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
|
4596 |
and a list of chunk-positions (changePositions). |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4597 |
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
|
4598 |
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
|
4599 |
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
|
4600 |
'+' -> 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
|
4601 |
'-' -> 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
|
4602 |
'?' -> class does not exist currently |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4603 |
'=' -> 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
|
4604 |
'~' -> 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
|
4605 |
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
|
4606 |
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
|
4607 |
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
|
4608 |
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
|
4609 |
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
|
4610 |
4 timestamp |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4611 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4612 |
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
|
4613 |
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
|
4614 |
|
| 12635 | 4615 |
|inStream i f askedForEditingClassSource myProcess myPriority myPrioRange| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4616 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4617 |
editingClassSource := false. |
| 2641 | 4618 |
askedForEditingClassSource := false. |
| 17953 | 4619 |
changeInfoList := #(). "make sure, that it is non-nil on error" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4620 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4621 |
"/ maxLen := 60. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4622 |
|
| 3674 | 4623 |
self newLabel:'updating ...'. |
4624 |
||
4625 |
(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
|
4626 |
^ self class readXMLChangesFromFile:changeFileName inBackground:inBackground |
| 3674 | 4627 |
]. |
4628 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4629 |
f := changeFileName asFilename. |
| 7346 | 4630 |
f exists ifFalse:[^ self]. |
| 12635 | 4631 |
inStream := EncodedStream decodedStreamFor:(f readStream). |
| 5696 | 4632 |
|
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4633 |
i := f info. |
|
3965
e499c0dae8fc
use #fileSize instead of #size
Claus Gittinger <cg@exept.de>
parents:
3962
diff
changeset
|
4634 |
changeFileSize := i fileSize. |
|
3962
3906b10c42fd
modified -> modificationTime
Claus Gittinger <cg@exept.de>
parents:
3930
diff
changeset
|
4635 |
changeFileTimestamp := i modificationTime. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4636 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4637 |
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
|
4638 |
" |
|
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
|
4639 |
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
|
4640 |
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
|
4641 |
" |
|
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
|
4642 |
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
|
4643 |
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
|
4644 |
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
|
4645 |
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
|
4646 |
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
|
4647 |
]. |
|
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
|
4648 |
|
|
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
|
4649 |
[ |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4650 |
|reader| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4651 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4652 |
reader := ChangeFileReader new. |
|
6516
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
4653 |
reader changeFileName:changeFileName. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4654 |
reader browser:self. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4655 |
reader enforcedNameSpace:enforcedNameSpace. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4656 |
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
|
4657 |
reader autoloadAsRequired:autoloadAsRequired. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4658 |
reader tabSpec:tabSpec. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4659 |
reader inStream:inStream. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4660 |
reader noColoring:(NoColoring == true). |
| 16467 | 4661 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4662 |
reader readChangesFile. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4663 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
4664 |
editingClassSource := reader thisIsAClassSource. |
| 16372 | 4665 |
changeInfoList := reader changeInfo. |
| 16467 | 4666 |
|
4667 |
self showNumberOfChanges. |
|
| 7360 | 4668 |
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
|
4669 |
] 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
|
4670 |
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
|
4671 |
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
|
4672 |
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
|
4673 |
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
|
4674 |
]. |
|
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
|
4675 |
]. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4676 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4677 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4678 |
self checkIfFileHasChanged |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4679 |
|
| 7360 | 4680 |
"Modified: / 27-08-1995 / 23:06:55 / claus" |
| 16372 | 4681 |
"Modified: / 01-05-2016 / 19:13:09 / cg" |
| 17953 | 4682 |
"Modified (comment): / 22-01-2018 / 18:53:40 / stefan" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4683 |
! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4684 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4685 |
writeBackChanges |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4686 |
"write back the changes file. To avoid problems when the disk is full |
| 6288 | 4687 |
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
|
4688 |
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
|
4689 |
rename the old change-file to a .bak file and finally rename the |
| 6288 | 4690 |
tempfile back to the change-file. |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4691 |
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
|
4692 |
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
|
4693 |
|
| 15858 | 4694 |
|inFilename inStream outStream stamp encoding tempFilename| |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4695 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4696 |
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
|
4697 |
(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
|
4698 |
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
|
4699 |
^ 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
|
4700 |
] |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4701 |
]. |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4702 |
|
| 13123 | 4703 |
inFilename := changeFileName asFilename. |
|
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
|
4704 |
[ |
| 13123 | 4705 |
inStream := inFilename readStream. |
|
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
|
4706 |
] 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
|
4707 |
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
|
4708 |
^ 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
|
4709 |
]. |
| 9020 | 4710 |
[ |
4711 |
[ |
|
| 13123 | 4712 |
outStream := FileStream newTemporaryIn:inFilename directory. |
4713 |
tempFilename := outStream fileName. |
|
| 9020 | 4714 |
] on:FileStream openErrorSignal do:[:ex| |
4715 |
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
|
4716 |
^ false |
| 9020 | 4717 |
]. |
4718 |
||
| 11234 | 4719 |
outStream nextPutLine:'''---- encoding: utf8 ----''!!'. |
| 9020 | 4720 |
outStream := EncodedStream stream:outStream encoder:(CharacterEncoder encoderForUTF8). |
4721 |
||
4722 |
encoding := CharacterEncoder guessEncodingOfStream:inStream. |
|
4723 |
encoding notNil ifTrue:[ |
|
| 15858 | 4724 |
inStream := EncodedStream stream:inStream encoding:encoding. |
| 9020 | 4725 |
]. |
4726 |
||
| 11685 | 4727 |
self withWriteCursorDo:[ |
| 9020 | 4728 |
|excla sawExcla done first chunk |
4729 |
nChanges "{Class:SmallInteger}" |
|
|
4730 |
||
4731 |
Stream writeErrorSignal handle:[:ex | |
|
4732 |
self warn:('Could not update the changes file.\\' , ex description) withCRs.
|
|
| 13123 | 4733 |
outStream close. |
4734 |
tempFilename remove. |
|
| 9020 | 4735 |
^ false |
4736 |
] do:[ |
|
4737 |
excla := inStream class chunkSeparator. |
|
4738 |
nChanges := self numberOfChanges. |
|
4739 |
||
4740 |
1 to:nChanges do:[:index | |
|
| 16372 | 4741 |
inStream position:((changeInfoList at:index) position)-1. |
| 9020 | 4742 |
sawExcla := inStream peekFor:excla. |
4743 |
chunk := inStream nextChunk. |
|
4744 |
||
4745 |
(chunk notNil |
|
4746 |
and:[(chunk startsWith:'''---- snap') not]) ifTrue:[ |
|
| 16372 | 4747 |
(stamp := (changeInfoList at:index) timestamp) notNil ifTrue:[ |
| 9020 | 4748 |
outStream nextPutAll:'''---- timestamp ' , stamp , ' ----'''. |
4749 |
outStream nextPut:excla; cr. |
|
4750 |
]. |
|
|
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
|
4751 |
]. |
| 9020 | 4752 |
|
4753 |
sawExcla ifTrue:[ |
|
4754 |
outStream nextPut:excla. |
|
4755 |
outStream nextChunkPut:chunk. |
|
4756 |
outStream cr; cr. |
|
4757 |
" |
|
4758 |
a method-definition chunk - output followups |
|
4759 |
" |
|
4760 |
done := false. |
|
4761 |
first := true. |
|
4762 |
[done] whileFalse:[ |
|
4763 |
chunk := inStream nextChunk. |
|
4764 |
chunk isNil ifTrue:[ |
|
4765 |
outStream cr; cr. |
|
4766 |
done := true |
|
4767 |
] ifFalse:[ |
|
4768 |
chunk isEmpty ifTrue:[ |
|
4769 |
outStream space; nextChunkPut:chunk; cr; cr. |
|
4770 |
done := true. |
|
4771 |
] ifFalse:[ |
|
4772 |
first ifFalse:[ |
|
4773 |
outStream cr; cr. |
|
4774 |
]. |
|
4775 |
outStream nextChunkPut:chunk. |
|
4776 |
]. |
|
4777 |
]. |
|
4778 |
first := false. |
|
4779 |
]. |
|
4780 |
] ifFalse:[ |
|
4781 |
outStream nextChunkPut:chunk. |
|
4782 |
outStream cr |
|
4783 |
] |
|
|
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
|
4784 |
]. |
| 9020 | 4785 |
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
|
4786 |
]. |
|
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
|
4787 |
inStream close. |
| 9020 | 4788 |
|
| 17376 | 4789 |
inFilename renameTo:inFilename asBackupFilename. |
| 13123 | 4790 |
tempFilename renameTo:changeFileName. |
| 9020 | 4791 |
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
|
4792 |
]. |
| 9020 | 4793 |
] ensure:[ |
4794 |
inStream close. |
|
4795 |
]. |
|
4796 |
||
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4797 |
^ true |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4798 |
|
| 16372 | 4799 |
"Modified: / 01-05-2016 / 19:30:34 / cg" |
| 17376 | 4800 |
"Modified: / 09-02-2017 / 13:30:57 / stefan" |
|
2263
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4801 |
! ! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4802 |
|
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4803 |
!ChangesBrowser methodsFor:'private-user interaction ops'! |
|
46fc2bb1b9c1
changes to allow browsing Sqeak fileOut format.
Claus Gittinger <cg@exept.de>
parents:
2214
diff
changeset
|
4804 |
|
| 5735 | 4805 |
appendChange:changeNr toFile:aFileNameOrFileNameString |
| 202 | 4806 |
"append change to a file. return true if ok." |
4807 |
||
| 5735 | 4808 |
|fileName changeInStream outStream chunk chunk2 sawExcla separator encoding| |
4809 |
||
4810 |
changeInStream := self streamForChange:changeNr. |
|
4811 |
changeInStream isNil ifTrue:[ |
|
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4812 |
self warn:'Cannot read change'. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4813 |
^ false |
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
4814 |
]. |
| 5735 | 4815 |
changeInStream skipSeparators. |
4816 |
||
4817 |
separator := changeInStream class chunkSeparator. |
|
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
4818 |
|
|
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
4819 |
(self changeIsFollowupMethodChange:changeNr) ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4820 |
sawExcla := true. |
| 16372 | 4821 |
chunk := self changeChunkAt:changeNr. |
|
2394
0841cfed6ec5
fixed delete followed by save-change
Claus Gittinger <cg@exept.de>
parents:
2353
diff
changeset
|
4822 |
] ifFalse:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4823 |
sawExcla := changeInStream peekFor:separator. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4824 |
chunk := changeInStream nextChunk. |
| 3991 | 4825 |
]. |
4826 |
chunk withoutSeparators isEmpty ifTrue:[ |
|
| 18152 | 4827 |
self proceedableError:'Empty chunk - should not happen'. |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4828 |
^ false. |
| 5735 | 4829 |
]. |
4830 |
||
4831 |
fileName := aFileNameOrFileNameString asFilename. |
|
| 202 | 4832 |
|
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
4833 |
[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4834 |
outStream := fileName readWriteStream. |
|
4632
c16dc83e3972
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4599
diff
changeset
|
4835 |
] on:FileStream openErrorSignal do:[:ex| |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4836 |
self warn:'Cannot update file: ''%1''' with:fileName. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4837 |
^ false |
| 73 | 4838 |
]. |
| 202 | 4839 |
|
|
11476
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4840 |
outStream fileSize = 0 ifTrue:[ |
|
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4841 |
encoding := #utf8. |
| 15090 | 4842 |
outStream nextPutLine:'"{ Encoding: utf8 }" !!'.
|
|
11476
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4843 |
] ifFalse:[ |
|
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4844 |
encoding := CharacterEncoder guessEncodingOfStream:outStream. |
|
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4845 |
]. |
|
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4846 |
|
| 5735 | 4847 |
encoding notNil ifTrue:[ |
| 15858 | 4848 |
outStream := EncodedStream stream:outStream encoding:encoding. |
|
11476
a4678acc1e78
changed: #appendChange:toFile:
Stefan Vogel <sv@exept.de>
parents:
11475
diff
changeset
|
4849 |
]. |
| 202 | 4850 |
outStream setToEnd. |
4851 |
||
4852 |
sawExcla ifTrue:[ |
|
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4853 |
outStream nextPut:separator |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4854 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4855 |
outStream nextChunkPut:chunk; cr. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4856 |
sawExcla ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4857 |
chunk2 := changeInStream nextChunk. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4858 |
chunk2 withoutSeparators isEmpty ifTrue:[ |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4859 |
self error:'Empty chunk - should not happen'. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4860 |
]. |
|
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4861 |
outStream nextChunkPut:chunk2; space |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4862 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4863 |
sawExcla ifTrue:[ |
|
7618
92c7128604a4
changed #appendChange:toFile: Make error proceedable
Stefan Vogel <sv@exept.de>
parents:
7528
diff
changeset
|
4864 |
outStream nextPut:separator |
| 202 | 4865 |
]. |
4866 |
outStream cr. |
|
| 5735 | 4867 |
|
4868 |
changeInStream close. |
|
| 202 | 4869 |
outStream close. |
4870 |
^ true |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
4871 |
|
| 16372 | 4872 |
"Modified: / 01-05-2016 / 18:25:00 / cg" |
| 18152 | 4873 |
"Modified: / 24-05-2018 / 14:54:56 / Claus Gittinger" |
| 73 | 4874 |
! |
4875 |
||
| 51 | 4876 |
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
|
4877 |
"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
|
4878 |
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
|
4879 |
|
|
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4880 |
|aStream applyAction nameSpace className changeClass ownerName ownerClass reader doItChunk methodsForChunk pkg |
| 4877 | 4881 |
alternativeClass shortName orgClassName nsClass aborted| |
| 45 | 4882 |
|
| 51 | 4883 |
aStream := self streamForChange:changeNr. |
| 12973 | 4884 |
aStream isNil ifTrue:[^ false]. |
| 51 | 4885 |
|
| 2965 | 4886 |
className := self classNameOfChange:changeNr. |
4887 |
className notNil ifTrue:[ |
|
| 6378 | 4888 |
className := className asSymbol. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
4889 |
enforcedNameSpace notNil ifTrue:[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
4890 |
changeClass := enforcedNameSpace at:className ifAbsent:nil. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
4891 |
] ifFalse:[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
4892 |
changeClass := Smalltalk at:className ifAbsent:nil. |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
4893 |
]. |
| 6378 | 4894 |
changeClass isNil ifTrue:[ |
4895 |
changeClass := self classOfChange:changeNr. |
|
4896 |
]. |
|
|
8351
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
4897 |
changeClass notNil ifTrue:[ |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
4898 |
"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
|
4899 |
will create a class without methods" |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
4900 |
changeClass autoload. |
|
e99a28a6288b
changed #applyChange: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
8320
diff
changeset
|
4901 |
]. |
| 51 | 4902 |
]. |
| 45 | 4903 |
|
| 51 | 4904 |
changeNrProcessed := changeNr. |
| 4877 | 4905 |
aborted := false. |
| 45 | 4906 |
|
| 6288 | 4907 |
applyAction := |
| 6378 | 4908 |
[ |
|
7783
a0c1578e65fb
"Cancel all" did not work, when an error occured while applying multiple changes
Stefan Vogel <sv@exept.de>
parents:
7710
diff
changeset
|
4909 |
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
|
4910 |
"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
|
4911 |
Send AbortAllOperationRequest to abort multiple operations" |
| 6378 | 4912 |
aborted := true. |
4913 |
ex return. |
|
4914 |
] do:[ |
|
4915 |
nameSpace := self nameSpaceForApply. |
|
4916 |
||
4917 |
pkg := enforcedPackage ? Class packageQuerySignal query. |
|
4918 |
Class packageQuerySignal answer:pkg |
|
4919 |
do:[ |
|
4920 |
Class nameSpaceQuerySignal answer:nameSpace |
|
4921 |
do:[ |
|
| 11244 | 4922 |
Class defaultApplicationQuerySignal handle:[:ex | |
4923 |
ex proceedWith:defaultApplicationForVAGEClasses |
|
4924 |
] do:[ |
|
4925 |
Class changeDefaultApplicationNotificationSignal handle:[:ex | |
|
4926 |
defaultApplicationForVAGEClasses := ex parameter. |
|
4927 |
] do:[ |
|
| 17899 | 4928 |
|skip| |
4929 |
||
4930 |
skip := false. |
|
| 11244 | 4931 |
|
4932 |
"/ a followup methodsFor: chunk ... |
|
4933 |
(self changeIsFollowupMethodChange:changeNr) ifTrue:[ |
|
| 16372 | 4934 |
methodsForChunk := self changeChunkAt:changeNr. |
| 11244 | 4935 |
] ifFalse:[ |
4936 |
doItChunk := aStream nextChunk. "/ an empty chunk sometimes ... |
|
4937 |
doItChunk notEmpty ifTrue:[ |
|
4938 |
doItChunk first = (Character value:16rFEFF) ifTrue:[ |
|
4939 |
doItChunk := doItChunk copyFrom:2. |
|
4940 |
]. |
|
4941 |
Compiler evaluate:doItChunk notifying:self. |
|
| 6378 | 4942 |
] ifFalse:[ |
| 11244 | 4943 |
methodsForChunk := aStream nextChunk. "/ the real one |
| 6378 | 4944 |
] |
4945 |
]. |
|
| 11244 | 4946 |
methodsForChunk notNil ifTrue:[ |
4947 |
changeClass isNil ifTrue:[ |
|
4948 |
orgClassName := className. |
|
4949 |
||
4950 |
(className includes:$:) ifTrue:[ |
|
4951 |
ownerName := className copyTo:(className lastIndexOf:$:) - 1. |
|
4952 |
(ownerName endsWith:$:) ifTrue:[ |
|
|
12704
6f20f7d39e75
Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents:
12656
diff
changeset
|
4953 |
ownerName := ownerName copyButLast:1. |
| 11244 | 4954 |
]. |
4955 |
||
4956 |
ownerClass := Smalltalk at:(ownerName asSymbol) ifAbsent:[]. |
|
4957 |
ownerClass notNil ifTrue:[ |
|
4958 |
ownerClass autoload |
|
4959 |
]. |
|
4960 |
]. |
|
4961 |
(nameSpace notNil and:[nameSpace ~~ Smalltalk]) ifTrue:[ |
|
4962 |
changeClass := nameSpace at:className ifAbsent:[]. |
|
4963 |
]. |
|
4964 |
changeClass isNil ifTrue:[ |
|
4965 |
changeClass := Smalltalk at:className ifAbsent:[]. |
|
4966 |
]. |
|
4967 |
[changeClass isNil] whileTrue:[ |
|
4968 |
(NameSpace allNameSpaces |
|
| 15683 | 4969 |
contains:[:ns | (nsClass := (ns at:className asSymbol)) notNil]) |
| 11244 | 4970 |
ifTrue:[ |
4971 |
shortName := nsClass name. |
|
4972 |
] ifFalse:[ |
|
4973 |
shortName := className copyFrom:(className lastIndexOf:$:) + 1. |
|
4974 |
shortName = className ifTrue:[ |
|
4975 |
shortName := '' |
|
4976 |
]. |
|
4977 |
]. |
|
| 17899 | 4978 |
|
4979 |
skip := false. |
|
4980 |
||
4981 |
Dialog modifyingBoxWith:[:box | |
|
| 18054 | 4982 |
"/ self halt. |
| 17899 | 4983 |
box |
4984 |
addButton:(Button label:'Skip' action:[skip := true. box hide]) |
|
4985 |
after:box noButton |
|
4986 |
] do:[ |
|
4987 |
className := Dialog |
|
| 12973 | 4988 |
request:'No class ''' , className , ''' for change. Add to which class? (enter empty string to skip this change)' |
| 11244 | 4989 |
initialAnswer:shortName. |
4990 |
]. |
|
| 17899 | 4991 |
skip ifFalse:[ |
4992 |
className isNil ifTrue:[ |
|
4993 |
AbortAllOperationRequest raise. |
|
4994 |
]. |
|
4995 |
className isEmpty ifTrue:[ |
|
4996 |
^ false |
|
4997 |
]. |
|
4998 |
alternativeClass := Smalltalk classNamed:className. |
|
4999 |
alternativeClass notNil ifTrue:[ |
|
5000 |
changeClass := alternativeClass |
|
5001 |
] |
|
5002 |
]. |
|
| 11244 | 5003 |
]. |
| 17899 | 5004 |
skip ifFalse:[ |
5005 |
methodsForChunk := methodsForChunk copyFrom:(methodsForChunk indexOfSeparator). |
|
5006 |
methodsForChunk := changeClass name , methodsForChunk. |
|
5007 |
]. |
|
| 11244 | 5008 |
]. |
| 17899 | 5009 |
skip ifFalse:[ |
5010 |
reader := Compiler evaluate:methodsForChunk notifying:self. |
|
5011 |
reader fileInFrom:aStream notifying:self passChunk:false single:true. |
|
5012 |
] |
|
| 11244 | 5013 |
] |
5014 |
] |
|
| 6378 | 5015 |
] |
5016 |
] |
|
5017 |
] |
|
5018 |
]. |
|
5019 |
changeNrProcessed := nil. |
|
5020 |
]. |
|
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
5021 |
|
|
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
5022 |
"/ |
| 17026 | 5023 |
"/ if I am showing the changes file, don't update it |
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
5024 |
"/ |
|
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
5025 |
changeFileName = ObjectMemory nameForChanges ifTrue:[ |
| 6378 | 5026 |
Class withoutUpdatingChangesDo:[ |
5027 |
Class updateChangeListQuerySignal answer:updateChangeSet value do:applyAction |
|
5028 |
] |
|
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
5029 |
] ifFalse:[ |
| 6378 | 5030 |
applyAction value |
| 45 | 5031 |
]. |
| 4877 | 5032 |
aStream close. |
5033 |
||
5034 |
^ aborted not |
|
|
358
a7546792f073
update changeFile if applying changes from another changeFile
Claus Gittinger <cg@exept.de>
parents:
326
diff
changeset
|
5035 |
|
| 16372 | 5036 |
"Modified: / 01-05-2016 / 18:25:18 / cg" |
| 45 | 5037 |
! |
5038 |
||
| 7953 | 5039 |
compareCategoryChange:parseTree |
| 9888 | 5040 |
|receiverExpression method thisClass| |
| 7953 | 5041 |
|
5042 |
receiverExpression := parseTree receiver. |
|
5043 |
receiverExpression isMessage ifTrue:[ |
|
5044 |
receiverExpression selector == #compiledMethodAt: ifTrue:[ |
|
| 9888 | 5045 |
[ |
5046 |
thisClass := receiverExpression receiver evaluate. |
|
5047 |
] on:Parser undefinedVariableError do:[:ex| ]. |
|
5048 |
||
5049 |
(thisClass isBehavior |
|
| 7953 | 5050 |
and:[(method := receiverExpression evaluate) isMethod]) ifTrue:[ |
5051 |
method category = parseTree arg1 evaluate ifTrue:[ |
|
5052 |
^ true -> 'Change has no effect\\(same category)'. |
|
5053 |
] ifFalse:[ |
|
| 8173 | 5054 |
^ false -> ('Category is different (''' , method category , ''' vs. ''' , parseTree arg1 evaluate , ''')').
|
| 7953 | 5055 |
] |
5056 |
] ifFalse:[ |
|
5057 |
^ nil -> 'There is no such method'. |
|
5058 |
] |
|
5059 |
] |
|
5060 |
]. |
|
5061 |
^ nil -> 'Unhandled receiver' |
|
5062 |
! |
|
5063 |
||
| 255 | 5064 |
compareChange:changeNr |
| 18059 | 5065 |
"compare a change with the current (in-image) version; |
5066 |
show the result of the compare (as dialog)" |
|
| 2835 | 5067 |
|
5068 |
^ self compareChange:changeNr showResult:true |
|
5069 |
! |
|
5070 |
||
5071 |
compareChange:changeNr showResult:doShowResult |
|
5072 |
"compare a change with current version. |
|
| 18059 | 5073 |
Return the result of the compare |
5074 |
same -> true, |
|
5075 |
different -> false, |
|
5076 |
uncomparable -> nil. |
|
| 2835 | 5077 |
If doShowResult is true, the outcome is shown in a dialog/diffViewer." |
| 255 | 5078 |
|
| 15016 | 5079 |
|aStream chunk sawExcla parseTree thisClass cat oldSource newSource outcome showDiff d selector isLoaded beep superClass thisClassSym varsHere varsInChange addedVars removedVars |
| 9888 | 5080 |
isSame ownerClass superClassHere superClassInChange sameAndOutcome| |
| 255 | 5081 |
|
5082 |
aStream := self streamForChange:changeNr. |
|
| 2835 | 5083 |
aStream isNil ifTrue:[^ nil]. |
| 255 | 5084 |
|
|
275
604a906c0eb7
better handling of changes for autoloaded classes
Claus Gittinger <cg@exept.de>
parents:
255
diff
changeset
|
5085 |
showDiff := false. |
|
604a906c0eb7
better handling of changes for autoloaded classes
Claus Gittinger <cg@exept.de>
parents:
255
diff
changeset
|
5086 |
|
| 1472 | 5087 |
(self changeIsFollowupMethodChange:changeNr) ifFalse:[ |
| 6357 | 5088 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
5089 |
chunk := aStream nextChunk. |
|
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
5090 |
] ifTrue:[ |
| 16372 | 5091 |
chunk := self changeChunkAt:changeNr. |
| 6357 | 5092 |
sawExcla := true. |
|
703
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
5093 |
]. |
|
1b3b008d9f19
fixed to allow class-source files to be handled
Claus Gittinger <cg@exept.de>
parents:
627
diff
changeset
|
5094 |
|
| 2835 | 5095 |
isSame := nil. |
5096 |
||
| 761 | 5097 |
beep := false. |
| 255 | 5098 |
sawExcla ifFalse:[ |
| 6357 | 5099 |
outcome := 'cannot compare this change\\(i.e. this is not a method change).'. |
5100 |
||
5101 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
5102 |
do:[ |
|
| 8665 | 5103 |
parseTree := self parseExpression:chunk. |
| 6357 | 5104 |
]. |
5105 |
(parseTree notNil and:[parseTree ~~ #Error and:[ parseTree isMessage ]]) ifTrue:[ |
|
5106 |
selector := parseTree selector. |
|
5107 |
||
5108 |
selector == #'removeSelector:' ifTrue:[ |
|
| 7953 | 5109 |
sameAndOutcome := self compareRemoveSelectorChange:parseTree. |
5110 |
isSame := sameAndOutcome key. |
|
5111 |
outcome := sameAndOutcome value. |
|
5112 |
]. |
|
5113 |
selector == #'package:' ifTrue:[ |
|
5114 |
sameAndOutcome := self comparePackageChange:parseTree. |
|
5115 |
isSame := sameAndOutcome key. |
|
5116 |
outcome := sameAndOutcome value. |
|
| 6357 | 5117 |
]. |
5118 |
selector == #'category:' ifTrue:[ |
|
| 7953 | 5119 |
sameAndOutcome := self compareCategoryChange:parseTree. |
5120 |
isSame := sameAndOutcome key. |
|
5121 |
outcome := sameAndOutcome value. |
|
| 6357 | 5122 |
]. |
5123 |
selector == #'comment:' ifTrue:[ |
|
| 7953 | 5124 |
sameAndOutcome := self compareCommentChange:parseTree. |
5125 |
isSame := sameAndOutcome key. |
|
5126 |
outcome := sameAndOutcome value. |
|
| 6357 | 5127 |
]. |
5128 |
||
5129 |
selector == #'instanceVariableNames:' ifTrue:[ |
|
| 7953 | 5130 |
sameAndOutcome := self compareInstanceVariableNamesChange:parseTree. |
5131 |
isSame := sameAndOutcome key. |
|
5132 |
outcome := sameAndOutcome value. |
|
| 6357 | 5133 |
]. |
5134 |
||
5135 |
(Class definitionSelectors includes:selector) |
|
5136 |
"/ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' |
|
5137 |
ifTrue:[ |
|
| 9888 | 5138 |
[ |
5139 |
superClass := parseTree receiver evaluate. |
|
5140 |
] on:Parser undefinedVariableError do:[:ex| ]. |
|
| 6357 | 5141 |
superClass isBehavior ifFalse:[ |
5142 |
outcome := 'Cannot compare this change\\(superclass not loaded).'. |
|
5143 |
isSame := nil. |
|
5144 |
] ifTrue:[ |
|
5145 |
(self checkClassIsLoaded:superClass) ifTrue:[ |
|
5146 |
thisClassSym := (parseTree arguments at:1) evaluate. |
|
5147 |
||
5148 |
(selector endsWith:':privateIn:') ifTrue:[ |
|
|
11475
b6fdfe902263
changed: #compareChange:showResult:
Stefan Vogel <sv@exept.de>
parents:
11397
diff
changeset
|
5149 |
Parser undefinedVariableError catch:[ |
|
b6fdfe902263
changed: #compareChange:showResult:
Stefan Vogel <sv@exept.de>
parents:
11397
diff
changeset
|
5150 |
ownerClass := (parseTree arguments at:5) evaluate. |
|
b6fdfe902263
changed: #compareChange:showResult:
Stefan Vogel <sv@exept.de>
parents:
11397
diff
changeset
|
5151 |
ownerClass isBehavior ifTrue:[ |
|
b6fdfe902263
changed: #compareChange:showResult:
Stefan Vogel <sv@exept.de>
parents:
11397
diff
changeset
|
5152 |
thisClass := ownerClass privateClassesAt:thisClassSym. |
|
b6fdfe902263
changed: #compareChange:showResult:
Stefan Vogel <sv@exept.de>
parents:
11397
diff
changeset
|
5153 |
]. |
| 6357 | 5154 |
]. |
5155 |
] ifFalse:[ |
|
5156 |
thisClass := (self nameSpaceForApply) at:thisClassSym ifAbsent:nil. |
|
5157 |
]. |
|
5158 |
thisClass isNil ifTrue:[ |
|
5159 |
outcome := 'Change defines the class: ' , thisClassSym allBold. |
|
5160 |
isSame := false. |
|
5161 |
] ifFalse:[ |
|
5162 |
(isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[ |
|
5163 |
outcome := 'Cannot compare this change\\(compare requires class to be loaded).'. |
|
5164 |
isSame := nil. |
|
5165 |
] ifTrue:[ |
|
5166 |
superClassHere := thisClass superclass name. |
|
5167 |
superClassInChange := parseTree receiver name. |
|
5168 |
superClassHere ~~ superClassInChange ifTrue:[ |
|
5169 |
outcome := 'Superclass is different.'. |
|
5170 |
isSame := false. |
|
5171 |
] ifFalse:[ |
|
5172 |
varsHere := thisClass instanceVariableString asCollectionOfWords. |
|
5173 |
varsInChange := (parseTree arguments at:2) evaluate asCollectionOfWords. |
|
5174 |
varsHere = varsInChange ifTrue:[ |
|
5175 |
thisClass classVariableString asCollectionOfWords = (parseTree arguments at:3) evaluate asCollectionOfWords ifTrue:[ |
|
|
9689
72819fbf329a
changed: #compareChange:showResult:
Claus Gittinger <cg@exept.de>
parents:
9621
diff
changeset
|
5176 |
((thisClass sharedPoolNames size == 0) and:[(parseTree arguments at:4) evaluate = '']) ifTrue:[ |
| 6357 | 5177 |
((selector endsWith:':category:') |
5178 |
and:[thisClass category ~= (parseTree arguments at:5) evaluate]) ifTrue:[ |
|
5179 |
outcome := 'Category is different'. |
|
5180 |
isSame := false. |
|
5181 |
] ifFalse:[ |
|
5182 |
outcome := 'Change has no effect\\(same definition)'. |
|
5183 |
isSame := true. |
|
5184 |
] |
|
|
4296
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5185 |
"/ thisClass category = (parseTree arguments at:5) evaluate ifTrue:[ |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5186 |
"/ outcome := 'Change has no effect\\(same definition)'. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5187 |
"/ isSame := true. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5188 |
"/ ] ifFalse:[ |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5189 |
"/ outcome := 'Category is different'. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5190 |
"/ isSame := false. |
|
4ad7dde4a3db
care for unknown class in doIt;
Claus Gittinger <cg@exept.de>
parents:
4283
diff
changeset
|
5191 |
"/ ] |
| 6357 | 5192 |
] ifFalse:[ |
5193 |
outcome := 'SharedPool definition is different'. |
|
5194 |
isSame := false. |
|
5195 |
]. |
|
5196 |
] ifFalse:[ |
|
5197 |
outcome := 'ClassVariable definition is different'. |
|
5198 |
isSame := false. |
|
5199 |
] |
|
5200 |
] ifFalse:[ |
|
5201 |
outcome := 'InstanceVariable definition is different'. |
|
5202 |
isSame := false. |
|
| 12825 | 5203 |
addedVars := varsInChange reject:[:eachVar | (varsHere includes:eachVar)]. |
5204 |
removedVars := varsHere reject:[:eachVar | (varsInChange includes:eachVar)]. |
|
| 6357 | 5205 |
addedVars isEmpty ifTrue:[ |
5206 |
removedVars isEmpty ifTrue:[ |
|
5207 |
outcome := 'Change reorders instanceVariable(s)'. |
|
5208 |
] ifFalse:[ |
|
5209 |
removedVars := removedVars collect:[:eachVar | '''' , eachVar , '''']. |
|
5210 |
outcome := 'Change removes instanceVariable(s): ' , (removedVars asStringWith:Character space) allBold. |
|
5211 |
] |
|
5212 |
] ifFalse:[ |
|
5213 |
removedVars isEmpty ifTrue:[ |
|
5214 |
addedVars := addedVars collect:[:eachVar | '''' , eachVar , '''']. |
|
5215 |
outcome := 'Change adds instanceVariable(s): ' , (addedVars asStringWith:Character space) allBold. |
|
5216 |
]. |
|
5217 |
]. |
|
5218 |
] |
|
5219 |
] |
|
5220 |
] |
|
5221 |
] |
|
5222 |
] |
|
5223 |
] |
|
5224 |
] |
|
5225 |
] |
|
| 255 | 5226 |
] ifTrue:[ |
| 15016 | 5227 |
Class nameSpaceQuerySignal |
5228 |
answer:(self nameSpaceForApply) |
|
5229 |
do:[ |
|
5230 |
parseTree := self parseExpression:chunk. |
|
5231 |
]. |
|
5232 |
||
| 6357 | 5233 |
(parseTree notNil |
5234 |
and:[parseTree ~~ #Error |
|
5235 |
and:[parseTree isMessage]]) ifTrue:[ |
|
5236 |
"/ Squeak support (#methodsFor:***) |
|
5237 |
(#( |
|
5238 |
#methodsFor: |
|
5239 |
#privateMethodsFor: |
|
5240 |
#publicMethodsFor: |
|
5241 |
#ignoredMethodsFor: |
|
5242 |
#protectedMethodsFor: |
|
5243 |
||
5244 |
#methodsFor:stamp: "/ Squeak support |
|
5245 |
#methodsFor "/ Dolphin support |
|
5246 |
#methods "/ STV support |
|
5247 |
) |
|
5248 |
includes:parseTree selector) ifTrue:[ |
|
| 9888 | 5249 |
[ |
5250 |
thisClass := parseTree receiver evaluate. |
|
5251 |
] on:Parser undefinedVariableError do:[:ex| |
|
5252 |
outcome := 'Cannot compare this change\\(compare requires class to be loaded).'. |
|
5253 |
isSame := nil. |
|
5254 |
]. |
|
5255 |
thisClass notNil ifTrue:[ |
|
5256 |
(thisClass isKindOf:UndefinedVariable) ifTrue:[ |
|
| 6357 | 5257 |
|thisName path| |
5258 |
||
5259 |
thisName := thisClass name. |
|
5260 |
path := thisName asCollectionOfSubstringsSeparatedByAll:'::'. |
|
5261 |
1 to:path size do:[:length | |
|
5262 |
|ownerName owner| |
|
5263 |
||
5264 |
ownerName := (path copyTo:length) asStringCollection asStringWith:'::'. |
|
|
6820
4e8815b9e661
Do not autoload class when comparing changes.
Stefan Vogel <sv@exept.de>
parents:
6682
diff
changeset
|
5265 |
owner := Smalltalk loadedClassNamed:ownerName. |
| 6357 | 5266 |
(owner notNil and:[owner isBehavior and:[owner isLoaded not]]) ifTrue:[ |
5267 |
self checkClassIsLoaded:owner. |
|
5268 |
]. |
|
5269 |
]. |
|
| 9888 | 5270 |
thisClass := parseTree receiver evaluate. |
| 6357 | 5271 |
]. |
5272 |
||
5273 |
thisClass isBehavior ifTrue:[ |
|
5274 |
parseTree selector == #methodsFor ifTrue:[ |
|
5275 |
cat := 'Dolphin methods'. |
|
5276 |
] ifFalse:[ |
|
5277 |
parseTree selector == #methods ifTrue:[ |
|
5278 |
cat := 'STV methods'. |
|
5279 |
] ifFalse:[ |
|
5280 |
cat := parseTree arg1 evaluate. |
|
5281 |
]. |
|
5282 |
]. |
|
5283 |
newSource := aStream nextChunk. |
|
5284 |
||
| 15016 | 5285 |
isSame := self |
5286 |
compareMethodSource:newSource |
|
5287 |
withVersionInClass:thisClass |
|
5288 |
into:[:outcomeResult :beepResult :oldSourceResult| |
|
5289 |
outcome := outcomeResult. |
|
5290 |
beep := beepResult. |
|
5291 |
oldSource := oldSourceResult. |
|
5292 |
]. |
|
5293 |
||
5294 |
isSame isNil ifTrue:[ |
|
5295 |
showDiff := false. |
|
5296 |
] ifFalse:[ |
|
5297 |
showDiff := isSame not. |
|
| 6357 | 5298 |
]. |
| 15016 | 5299 |
|
| 6357 | 5300 |
doShowResult ifTrue:[ |
5301 |
(showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[ |
|
| 8102 | 5302 |
d := DiffCodeView |
| 6639 | 5303 |
openOn:oldSource label:(resources string:'Current version (in image)') |
5304 |
and:newSource label:(resources string:'Change version'). |
|
| 6357 | 5305 |
d label:'method differences'. |
5306 |
] |
|
5307 |
] |
|
5308 |
] ifFalse:[ |
|
5309 |
beep := true. |
|
5310 |
outcome := 'Class does not exist.'. |
|
5311 |
isSame := nil. |
|
5312 |
] |
|
| 9888 | 5313 |
]] ifFalse:[ |
| 6357 | 5314 |
beep := true. |
5315 |
outcome := 'Not comparable.'. |
|
5316 |
isSame := nil. |
|
5317 |
] |
|
5318 |
] ifFalse:[ |
|
5319 |
beep := true. |
|
5320 |
outcome := 'Not comparable.'. |
|
5321 |
isSame := nil. |
|
5322 |
] |
|
| 255 | 5323 |
]. |
5324 |
aStream close. |
|
| 2835 | 5325 |
|
5326 |
doShowResult ifTrue:[ |
|
| 6357 | 5327 |
showDiff ifFalse:[ |
5328 |
outcome := (resources stringWithCRs:outcome). |
|
5329 |
beep ifTrue:[ |
|
5330 |
self warn:outcome. |
|
5331 |
] ifFalse:[ |
|
5332 |
self information:outcome. |
|
5333 |
] |
|
5334 |
]. |
|
| 255 | 5335 |
]. |
| 2835 | 5336 |
^ isSame. |
| 255 | 5337 |
|
|
9689
72819fbf329a
changed: #compareChange:showResult:
Claus Gittinger <cg@exept.de>
parents:
9621
diff
changeset
|
5338 |
"Created: / 24-11-1995 / 14:30:46 / cg" |
| 16372 | 5339 |
"Modified: / 01-05-2016 / 18:25:32 / cg" |
| 255 | 5340 |
! |
5341 |
||
| 7953 | 5342 |
compareCommentChange:parseTree |
5343 |
|thisClass| |
|
5344 |
||
| 9888 | 5345 |
[ |
5346 |
thisClass := parseTree receiver evaluate. |
|
5347 |
] on:Parser undefinedVariableError do:[:ex| ]. |
|
5348 |
||
| 7953 | 5349 |
thisClass isBehavior ifTrue:[ |
5350 |
(self checkClassIsLoaded:thisClass) ifTrue:[ |
|
5351 |
(thisClass comment = parseTree arg1 evaluate) ifTrue:[ |
|
5352 |
^ true -> 'Change has no effect\\(same comment)'. |
|
5353 |
] ifFalse:[ |
|
5354 |
^ false -> 'Comment is different'. |
|
5355 |
] |
|
5356 |
] ifFalse:[ |
|
5357 |
^ nil -> 'Cannot compare this change (compare requires class to be loaded).'. |
|
5358 |
] |
|
5359 |
]. |
|
5360 |
^ nil -> 'Cannot compare this change (class not present)'. |
|
5361 |
! |
|
5362 |
||
5363 |
compareInstanceVariableNamesChange:parseTree |
|
5364 |
|receiverExpression thisClass varsHere varsInChange | |
|
5365 |
||
5366 |
receiverExpression := parseTree receiver. |
|
5367 |
receiverExpression isMessage ifTrue:[ |
|
5368 |
receiverExpression selector == #class ifTrue:[ |
|
| 9888 | 5369 |
[ |
5370 |
thisClass := receiverExpression evaluate. |
|
5371 |
] on:Parser undefinedVariableError do:[:ex| |
|
5372 |
^ nil -> 'Class is not loaded'. |
|
5373 |
]. |
|
5374 |
||
| 7953 | 5375 |
varsHere := thisClass instanceVariableString asCollectionOfWords. |
5376 |
varsInChange := (parseTree arguments at:1) evaluate asCollectionOfWords. |
|
5377 |
varsHere = varsInChange ifTrue:[ |
|
5378 |
^ true -> 'Change has no effect\\(same definition)'. |
|
5379 |
] ifFalse:[ |
|
5380 |
^ false -> 'Class-instanceVariable definition is different'. |
|
5381 |
]. |
|
5382 |
]. |
|
5383 |
]. |
|
5384 |
^ nil -> 'Unhandled receiver' |
|
5385 |
! |
|
5386 |
||
| 15016 | 5387 |
compareMethodSource:newSource withVersionInClass:thisClass into:aThreeArgBlock |
5388 |
"returns true/false/nil if same,different,undecided; |
|
5389 |
also provides a message and a beep-boolean via the passed in block" |
|
5390 |
||
| 17579 | 5391 |
<ignore: RBReturnsBooleanAndOtherRule rationale: 'done by purpose' author: 'cg'> |
5392 |
||
| 15016 | 5393 |
|parser sel oldMethod oldSource outcome t1 t2 isLoaded| |
5394 |
||
5395 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
5396 |
do:[ |
|
5397 |
parser := Parser parseMethod:newSource in:thisClass. |
|
5398 |
]. |
|
5399 |
(parser isNil or:[parser == #Error]) ifTrue:[ |
|
5400 |
outcome := 'Change is unparsable (parse error).'. |
|
5401 |
aThreeArgBlock value:outcome value:true "beep" value:nil. |
|
5402 |
^ nil. |
|
5403 |
]. |
|
5404 |
||
5405 |
sel := parser selector. |
|
5406 |
oldMethod := thisClass compiledMethodAt:sel. |
|
5407 |
oldMethod isNil ifTrue:[ |
|
5408 |
(isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[ |
|
5409 |
outcome := 'Cannot compare this change\\(compare requires class to be loaded).'. |
|
5410 |
] ifTrue:[ |
|
5411 |
outcome := 'Method does not exist.'. |
|
5412 |
]. |
|
5413 |
aThreeArgBlock value:outcome value:true "beep" value:nil. |
|
5414 |
^ nil. |
|
5415 |
]. |
|
5416 |
||
5417 |
oldSource := oldMethod source. |
|
5418 |
oldSource isNil ifTrue:[ |
|
5419 |
outcome := 'No source for compare.'. |
|
5420 |
aThreeArgBlock value:outcome value:true "beep" value:nil. |
|
5421 |
^ nil. |
|
5422 |
]. |
|
5423 |
(oldSource = newSource) ifTrue:[ |
|
5424 |
outcome := 'Same source'. |
|
5425 |
aThreeArgBlock value:outcome value:false "beep" value:oldSource. |
|
5426 |
^ true. |
|
5427 |
]. |
|
5428 |
||
5429 |
"/ |
|
5430 |
"/ compare for tabulator <-> space changes |
|
5431 |
"/ before showing diff ... |
|
5432 |
"/ |
|
5433 |
t1 := oldSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
5434 |
t2 := newSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
5435 |
t1 = t2 ifTrue:[ |
|
5436 |
outcome := 'Same source'. |
|
5437 |
aThreeArgBlock value:outcome value:false "beep" value:oldSource. |
|
5438 |
^ true. |
|
5439 |
]. |
|
5440 |
||
5441 |
"/ |
|
5442 |
"/ check if only historyLine diffs |
|
5443 |
"/ |
|
5444 |
(HistoryManager notNil |
|
5445 |
and:[HistoryManager isActive]) ifTrue:[ |
|
5446 |
(HistoryManager withoutHistoryLines:newSource) |
|
5447 |
= |
|
5448 |
(HistoryManager withoutHistoryLines:oldSource) |
|
5449 |
ifTrue:[ |
|
5450 |
outcome := 'Same source (history only)'. |
|
5451 |
aThreeArgBlock value:outcome value:false "beep" value:oldSource. |
|
5452 |
^ true. |
|
5453 |
] |
|
5454 |
]. |
|
5455 |
||
5456 |
outcome := 'Source changed.'. |
|
5457 |
aThreeArgBlock value:outcome value:false "beep" value:oldSource. |
|
5458 |
^ false. |
|
| 17579 | 5459 |
|
5460 |
"Modified: / 16-07-2017 / 13:32:05 / cg" |
|
| 15016 | 5461 |
! |
5462 |
||
| 7953 | 5463 |
comparePackageChange:parseTree |
| 9888 | 5464 |
|receiverExpression method thisClass| |
| 7953 | 5465 |
|
5466 |
receiverExpression := parseTree receiver. |
|
5467 |
receiverExpression isMessage ifTrue:[ |
|
5468 |
receiverExpression selector == #compiledMethodAt: ifTrue:[ |
|
| 9888 | 5469 |
[ |
5470 |
thisClass := receiverExpression receiver evaluate. |
|
5471 |
] on:Parser undefinedVariableError do:[:ex| ]. |
|
5472 |
(thisClass isBehavior |
|
| 7953 | 5473 |
and:[(method := receiverExpression evaluate) isMethod]) ifTrue:[ |
5474 |
method package = parseTree arg1 evaluate ifTrue:[ |
|
5475 |
^ true -> 'Change has no effect\\(same package)'. |
|
5476 |
] ifFalse:[ |
|
| 8000 | 5477 |
^ false -> ('Package is different (''<1p>'' vs. ''<2p>'')' expandMacrosWith:method package with:parseTree arg1 evaluate).
|
| 7953 | 5478 |
] |
5479 |
] ifFalse:[ |
|
5480 |
^ nil -> 'There is no such method'. |
|
5481 |
] |
|
5482 |
] |
|
5483 |
]. |
|
5484 |
^ nil -> 'Unhandled receiver' |
|
5485 |
! |
|
5486 |
||
5487 |
compareRemoveSelectorChange:parseTree |
|
5488 |
|thisClass selector| |
|
5489 |
||
| 9888 | 5490 |
[ |
5491 |
thisClass := parseTree receiver evaluate. |
|
5492 |
] on:Parser undefinedVariableError do:[:ex| ]. |
|
5493 |
||
| 7953 | 5494 |
thisClass isBehavior ifTrue:[ |
5495 |
(self checkClassIsLoaded:thisClass) ifTrue:[ |
|
5496 |
selector := (parseTree arg1 evaluate). |
|
5497 |
(thisClass includesSelector:selector) ifTrue:[ |
|
| 8000 | 5498 |
^ false -> ('Change removes the #' , selector , ' method from ' , thisClass name).
|
| 7953 | 5499 |
] ifFalse:[ |
| 8000 | 5500 |
^ true -> ('Change has no effect\\(there is no method for #' , selector , ' in ' , thisClass name , ')').
|
| 7953 | 5501 |
] |
5502 |
] ifFalse:[ |
|
5503 |
^ nil -> 'Cannot compare this change (compare requires class to be loaded).'. |
|
5504 |
] |
|
5505 |
]. |
|
5506 |
^ nil -> 'Cannot compare this change (class not present)'. |
|
5507 |
! |
|
5508 |
||
| 1359 | 5509 |
compressForClass:aClassNameOrNil |
| 6288 | 5510 |
"compress the change-set; |
| 1359 | 5511 |
this replaces multiple method-changes by the last (i.e. the most recent) change. |
5512 |
If the class argument is nil, compress for all classes. |
|
5513 |
otherwise, only changes for that class are compressed." |
|
5514 |
||
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5515 |
self |
| 6288 | 5516 |
compressForClass:aClassNameOrNil selector:nil |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5517 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5518 |
"Modified: / 19.11.2001 / 22:04:12 / cg" |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5519 |
! |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5520 |
|
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5521 |
compressForClass:aClassNameOrNil selector:selectorToCompressOrNil |
| 6288 | 5522 |
"compress the change-set; |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5523 |
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
|
5524 |
If the class argument is nil, compress for all classes. |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5525 |
otherwise, only changes for that class are compressed." |
|
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5526 |
|
| 6288 | 5527 |
|lbl aStream searchIndex anyMore deleteSet index |
| 7507 | 5528 |
str snapshotProto snapshotPrefix snapshotNameIndex| |
5529 |
||
5530 |
changeFileName notNil ifTrue:[ |
|
5531 |
aStream := changeFileName asFilename readStreamOrNil. |
|
5532 |
aStream isNil ifTrue:[^ self]. |
|
5533 |
]. |
|
| 1359 | 5534 |
|
| 4762 | 5535 |
lbl := 'compressing'. |
| 1359 | 5536 |
aClassNameOrNil isNil ifTrue:[ |
| 7507 | 5537 |
selectorToCompressOrNil notNil ifTrue:[ |
5538 |
lbl := lbl , ' for ' , selectorToCompressOrNil. |
|
5539 |
] |
|
| 1359 | 5540 |
] ifFalse:[ |
| 7507 | 5541 |
selectorToCompressOrNil isNil ifTrue:[ |
5542 |
lbl := lbl , ' for ' , aClassNameOrNil. |
|
5543 |
] ifFalse:[ |
|
5544 |
lbl := lbl , ' for ' , aClassNameOrNil , '>>' , selectorToCompressOrNil. |
|
5545 |
] |
|
| 1359 | 5546 |
]. |
| 6288 | 5547 |
lbl := lbl , '...'. |
|
3456
080399eeaab1
added compressForClass-selector function
Claus Gittinger <cg@exept.de>
parents:
3455
diff
changeset
|
5548 |
self newLabel:lbl. |
| 1359 | 5549 |
|
5550 |
CompressSnapshotInfo == true ifTrue:[ |
|
| 7507 | 5551 |
" |
5552 |
get a prototype snapshot record (to be independent of |
|
5553 |
the actual format .. |
|
5554 |
" |
|
| 16877 | 5555 |
str := WriteStream on:''. |
| 7507 | 5556 |
Class addChangeRecordForSnapshot:'foo' to:str. |
5557 |
snapshotProto := str contents. |
|
5558 |
snapshotPrefix := snapshotProto copyTo:10. |
|
5559 |
snapshotNameIndex := snapshotProto findString:'foo'. |
|
| 1359 | 5560 |
]. |
5561 |
||
5562 |
self withExecuteCursorDo:[ |
|
| 7507 | 5563 |
|numChanges classes selectors types excla sawExcla |
5564 |
chunk aParseTree parseTreeChunk |
|
5565 |
thisClass thisSelector codeChunk codeParser |
|
5566 |
compressThis fileName| |
|
5567 |
||
5568 |
numChanges := self numberOfChanges. |
|
5569 |
classes := Array new:numChanges. |
|
5570 |
selectors := Array new:numChanges. |
|
5571 |
types := Array new:numChanges. |
|
5572 |
||
5573 |
"starting at the end, get the change class and change selector; |
|
5574 |
collect all in classes / selectors" |
|
5575 |
||
5576 |
aStream notNil ifTrue:[ |
|
5577 |
excla := aStream class chunkSeparator. |
|
5578 |
numChanges to:1 by:-1 do:[:changeNr | |
|
| 16372 | 5579 |
aStream position:((changeInfoList at:changeNr) position)-1. |
| 7507 | 5580 |
sawExcla := aStream peekFor:excla. |
5581 |
chunk := aStream nextChunk. |
|
5582 |
sawExcla ifTrue:[ |
|
5583 |
"optimize a bit if multiple methods for same category arrive" |
|
5584 |
(chunk = parseTreeChunk) ifFalse:[ |
|
| 8665 | 5585 |
aParseTree := self parseExpression:chunk. |
| 7507 | 5586 |
parseTreeChunk := chunk |
5587 |
]. |
|
5588 |
(aParseTree notNil |
|
5589 |
and:[(aParseTree ~~ #Error) |
|
5590 |
and:[aParseTree isMessage]]) ifTrue:[ |
|
5591 |
(#( |
|
5592 |
#methodsFor: |
|
5593 |
#privateMethodsFor: |
|
5594 |
#publicMethodsFor: |
|
5595 |
#ignoredMethodsFor: |
|
5596 |
#protectedMethodsFor: |
|
5597 |
#methodsFor:stamp: "/ Squeak support |
|
5598 |
#methodsFor "/ Dolphin support |
|
5599 |
#methods "/ STV support |
|
5600 |
) |
|
5601 |
includes:aParseTree selector) ifTrue:[ |
|
5602 |
codeChunk := aStream nextChunk. |
|
|
9543
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5603 |
[ |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5604 |
thisClass := aParseTree receiver evaluate. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5605 |
codeParser := Parser |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5606 |
parseMethodSpecification:codeChunk |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5607 |
in:thisClass |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5608 |
ignoreErrors:true |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5609 |
ignoreWarnings:true. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5610 |
(codeParser notNil and:[codeParser ~~ #Error]) ifTrue:[ |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5611 |
selectors at:changeNr put:(codeParser selector). |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5612 |
classes at:changeNr put:thisClass. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5613 |
types at:changeNr put:#methodsFor |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5614 |
] |
| 18133 | 5615 |
] on:ParseError do:[:ex| |
|
9543
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5616 |
"ignore chunk" |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5617 |
ex return. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5618 |
]. |
| 7507 | 5619 |
] |
5620 |
] |
|
5621 |
] ifFalse:[ |
|
| 8665 | 5622 |
aParseTree := self parseExpression:chunk. |
| 7507 | 5623 |
parseTreeChunk := chunk. |
5624 |
(aParseTree notNil |
|
5625 |
and:[(aParseTree ~~ #Error) |
|
5626 |
and:[aParseTree isMessage]]) ifTrue:[ |
|
5627 |
(aParseTree selector == #removeSelector:) ifTrue:[ |
|
|
9543
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5628 |
[ |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5629 |
thisClass := aParseTree receiver evaluate. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5630 |
selectors at:changeNr put:(aParseTree arg1 value). |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5631 |
classes at:changeNr put:thisClass. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5632 |
types at:changeNr put:#removeSelector |
| 18133 | 5633 |
] on:ParseError do:[:ex| |
|
9543
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5634 |
"ignore chunk" |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5635 |
ex return. |
|
5d4b92f6e483
changed: #compressForClass:selector:
Stefan Vogel <sv@exept.de>
parents:
9527
diff
changeset
|
5636 |
]. |
| 7507 | 5637 |
] |
5638 |
] ifFalse:[ |
|
5639 |
CompressSnapshotInfo == true ifTrue:[ |
|
5640 |
(chunk startsWith:snapshotPrefix) ifTrue:[ |
|
| 13314 | 5641 |
str := chunk readStream position:snapshotNameIndex-1. |
| 7507 | 5642 |
fileName := str upTo:(Character space). |
5643 |
" |
|
5644 |
kludge to allow use of match-check below |
|
5645 |
" |
|
5646 |
selectors at:changeNr put:snapshotPrefix. |
|
5647 |
classes at:changeNr put:fileName. |
|
5648 |
] |
|
5649 |
] |
|
5650 |
] |
|
5651 |
]. |
|
5652 |
]. |
|
5653 |
aStream close. |
|
5654 |
] ifFalse:[ |
|
5655 |
numChanges to:1 by:-1 do:[:changeNr | |
|
5656 |
|change| |
|
5657 |
||
5658 |
classes at:changeNr put:(self classOfChange:changeNr ifAbsent:[:className| nil]). |
|
5659 |
selectors at:changeNr put:(self selectorOfMethodChange:changeNr). |
|
5660 |
]. |
|
5661 |
]. |
|
5662 |
||
5663 |
"for all changes, look for another class/selector occurrence later |
|
5664 |
in the list and, if there is one, add change number to the delete set" |
|
5665 |
||
5666 |
deleteSet := OrderedCollection new. |
|
5667 |
1 to:self numberOfChanges-1 do:[:changeNr | |
|
5668 |
thisClass := classes at:changeNr. |
|
5669 |
||
5670 |
compressThis := false. |
|
5671 |
aClassNameOrNil isNil ifTrue:[ |
|
5672 |
compressThis := true |
|
5673 |
] ifFalse:[ |
|
5674 |
"/ skipping unloaded/unknown classes |
|
5675 |
thisClass isBehavior ifTrue:[ |
|
5676 |
compressThis := aClassNameOrNil = thisClass theNonMetaclass name. |
|
5677 |
] |
|
5678 |
]. |
|
5679 |
compressThis ifTrue:[ |
|
5680 |
thisSelector := selectors at:changeNr. |
|
5681 |
compressThis := (selectorToCompressOrNil isNil or:[thisSelector == selectorToCompressOrNil]). |
|
5682 |
compressThis ifTrue:[ |
|
5683 |
searchIndex := changeNr. |
|
5684 |
anyMore := true. |
|
5685 |
[anyMore] whileTrue:[ |
|
5686 |
searchIndex := classes indexOf:thisClass startingAt:(searchIndex + 1). |
|
5687 |
(searchIndex ~~ 0) ifTrue:[ |
|
5688 |
((selectors at:searchIndex) == thisSelector) ifTrue:[ |
|
5689 |
thisClass notNil ifTrue:[ |
|
5690 |
deleteSet add:changeNr. |
|
5691 |
anyMore := false |
|
5692 |
] |
|
5693 |
] |
|
5694 |
] ifFalse:[ |
|
5695 |
anyMore := false |
|
5696 |
] |
|
5697 |
]. |
|
5698 |
]. |
|
5699 |
]. |
|
5700 |
]. |
|
5701 |
||
5702 |
"finally delete what has been found" |
|
5703 |
||
5704 |
(deleteSet size > 0) ifTrue:[ |
|
| 18059 | 5705 |
self unselect. |
| 7507 | 5706 |
index := deleteSet size. |
5707 |
[index > 0] whileTrue:[ |
|
5708 |
self silentDeleteChange:(deleteSet at:index). |
|
5709 |
index := index - 1 |
|
5710 |
]. |
|
| 18059 | 5711 |
self updateChangeList. |
| 7507 | 5712 |
" |
5713 |
scroll back a bit, if we are left way behind the list |
|
5714 |
" |
|
5715 |
changeListView firstLineShown > self numberOfChanges ifTrue:[ |
|
5716 |
changeListView makeLineVisible:self numberOfChanges |
|
5717 |
]. |
|
5718 |
self clearCodeView |
|
5719 |
] |
|
| 1359 | 5720 |
]. |
5721 |
self newLabel:''. |
|
5722 |
||
| 7507 | 5723 |
"Created: / 19-11-2001 / 22:03:42 / cg" |
| 16372 | 5724 |
"Modified: / 01-05-2016 / 19:23:54 / cg" |
| 1359 | 5725 |
! |
5726 |
||
| 255 | 5727 |
deleteChange:changeNr |
5728 |
"delete a change" |
|
5729 |
||
5730 |
self deleteChangesFrom:changeNr to:changeNr |
|
5731 |
! |
|
5732 |
||
5733 |
deleteChangesFrom:start to:stop |
|
5734 |
"delete a range of changes" |
|
5735 |
||
| 18059 | 5736 |
self unselect. |
| 255 | 5737 |
stop to:start by:-1 do:[:changeNr | |
| 18059 | 5738 |
self silentDeleteInternalChange:changeNr. |
| 255 | 5739 |
]. |
| 6255 | 5740 |
changeListView removeFromIndex:start toIndex:stop. |
|
744
cb962cb21e8c
faster drawing when deleting items
Claus Gittinger <cg@exept.de>
parents:
742
diff
changeset
|
5741 |
|
|
1070
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
5742 |
"/ changeListView contentsChanged. |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
5743 |
"/ changeListView redrawFromLine:start. |
| 255 | 5744 |
|
|
744
cb962cb21e8c
faster drawing when deleting items
Claus Gittinger <cg@exept.de>
parents:
742
diff
changeset
|
5745 |
"/ self setChangeList |
|
cb962cb21e8c
faster drawing when deleting items
Claus Gittinger <cg@exept.de>
parents:
742
diff
changeset
|
5746 |
|
| 1648 | 5747 |
"Modified: / 18.5.1998 / 14:22:27 / cg" |
| 255 | 5748 |
! |
5749 |
||
| 202 | 5750 |
makeChangeAPatch:changeNr |
5751 |
"append change to patchfile" |
|
5752 |
||
5753 |
self appendChange:changeNr toFile:'patches' |
|
5754 |
! |
|
5755 |
||
5756 |
makeChangePermanent:changeNr |
|
5757 |
"rewrite the source file where change changeNr lies" |
|
5758 |
||
5759 |
self notify:'this is not yet implemented' |
|
5760 |
! |
|
5761 |
||
| 73 | 5762 |
silentDeleteChange:changeNr |
5763 |
"delete a change do not update changeListView" |
|
| 57 | 5764 |
|
| 73 | 5765 |
anyChanges := true. |
| 16372 | 5766 |
changeInfoList removeIndex:changeNr. |
5767 |
"/ changeChunks removeIndex:changeNr. |
|
5768 |
"/ changePositions size >= changeNr ifTrue:[ changePositions removeIndex:changeNr ]. |
|
5769 |
"/ changeClassNames size >= changeNr ifTrue:[ changeClassNames removeIndex:changeNr ]. |
|
5770 |
"/ changeSelectors size >= changeNr ifTrue:[ changeSelectors removeIndex:changeNr ]. |
|
5771 |
"/ changeHeaderLines size >= changeNr ifTrue:[ changeHeaderLines removeIndex:changeNr ]. |
|
5772 |
"/ changeTimeStamps size >= changeNr ifTrue:[ changeTimeStamps removeIndex:changeNr ]. |
|
5773 |
"/ changeIsFollowupMethodChange size >= changeNr ifTrue:[ changeIsFollowupMethodChange removeIndex:changeNr ]. |
|
5774 |
||
5775 |
"Modified: / 01-05-2016 / 19:20:40 / cg" |
|
| 45 | 5776 |
! |
5777 |
||
| 202 | 5778 |
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
|
5779 |
"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
|
5780 |
Return the number of deleted changes." |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
5781 |
|
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
5782 |
|thisClassName index numDeleted| |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
5783 |
|
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
5784 |
numDeleted := 0. |
| 202 | 5785 |
index := stop. |
5786 |
[index >= start] whileTrue:[ |
|
| 6288 | 5787 |
thisClassName := self classNameOfChange:index. |
5788 |
thisClassName = aClassName ifTrue:[ |
|
5789 |
self silentDeleteChange:index. |
|
5790 |
numDeleted := numDeleted + 1. |
|
5791 |
]. |
|
5792 |
index := index - 1 |
|
|
1428
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
5793 |
]. |
|
180d03d00db4
fixed selection after deleting a bunch of changes
Claus Gittinger <cg@exept.de>
parents:
1427
diff
changeset
|
5794 |
^ numDeleted |
| 51 | 5795 |
|
| 45 | 5796 |
! |
5797 |
||
| 3607 | 5798 |
silentDeleteChangesFor:aClassName selector:selector from:start to:stop |
5799 |
"delete changes for given class/selector in a range. |
|
5800 |
Return the number of deleted changes." |
|
5801 |
||
5802 |
|thisClassName index numDeleted| |
|
5803 |
||
5804 |
numDeleted := 0. |
|
5805 |
index := stop. |
|
5806 |
[index >= start] whileTrue:[ |
|
| 17600 | 5807 |
thisClassName := self realClassNameOfChange:index. |
5808 |
thisClassName = aClassName ifTrue:[ |
|
5809 |
(self selectorOfMethodChange:index) == selector ifTrue:[ |
|
5810 |
self silentDeleteChange:index. |
|
5811 |
numDeleted := numDeleted + 1. |
|
5812 |
] |
|
5813 |
]. |
|
5814 |
index := index - 1 |
|
| 3607 | 5815 |
]. |
5816 |
^ numDeleted |
|
5817 |
! |
|
5818 |
||
| 2511 | 5819 |
silentDeleteChangesForClassAndPrivateClasses:aClassName from:start to:stop |
5820 |
"delete changes for a given class and its private classes in a range. |
|
5821 |
Return the number of deleted changes." |
|
5822 |
||
5823 |
|thisClassName index numDeleted| |
|
5824 |
||
5825 |
numDeleted := 0. |
|
5826 |
index := stop. |
|
5827 |
[index >= start] whileTrue:[ |
|
| 6288 | 5828 |
thisClassName := self ownerClassNameOfChange:index. |
5829 |
thisClassName = aClassName ifTrue:[ |
|
5830 |
self silentDeleteChange:index. |
|
5831 |
numDeleted := numDeleted + 1. |
|
5832 |
]. |
|
5833 |
index := index - 1 |
|
| 2511 | 5834 |
]. |
5835 |
^ numDeleted |
|
5836 |
||
5837 |
! |
|
5838 |
||
| 12428 | 5839 |
silentDeleteChangesForNamespace:aNamespace from:start to:stop |
5840 |
"delete changes for a given namespace in a range. |
|
5841 |
Return the number of deleted changes." |
|
5842 |
||
5843 |
|thisNamespace index numDeleted| |
|
5844 |
||
5845 |
numDeleted := 0. |
|
5846 |
index := stop. |
|
5847 |
[index >= start] whileTrue:[ |
|
5848 |
thisNamespace := self namespaceOfChange:index. |
|
5849 |
thisNamespace = aNamespace ifTrue:[ |
|
5850 |
self silentDeleteChange:index. |
|
5851 |
numDeleted := numDeleted + 1. |
|
5852 |
]. |
|
5853 |
index := index - 1 |
|
5854 |
]. |
|
5855 |
^ numDeleted |
|
5856 |
! |
|
5857 |
||
|
1070
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
5858 |
silentDeleteInternalChange:changeNr |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
5859 |
"delete a change do not update changeListView" |
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
5860 |
|
|
cdf5cf202f3b
faster redraw, when deleting items.
Claus Gittinger <cg@exept.de>
parents:
1027
diff
changeset
|
5861 |
anyChanges := true. |
| 16372 | 5862 |
changeInfoList removeIndex:changeNr. |
5863 |
"/ changeChunks removeIndex:changeNr. |
|
5864 |
"/ changePositions size >= changeNr ifTrue:[changePositions removeIndex:changeNr]. |
|
5865 |
"/ changeClassNames size >= changeNr ifTrue:[changeClassNames removeIndex:changeNr]. |
|
5866 |
"/ changeSelectors size >= changeNr ifTrue:[ changeSelectors removeIndex:changeNr ]. |
|
5867 |
"/ changeTimeStamps size >= changeNr ifTrue:[changeTimeStamps removeIndex:changeNr]. |
|
5868 |
"/ changeIsFollowupMethodChange size >= changeNr ifTrue:[changeIsFollowupMethodChange removeIndex:changeNr]. |
|
5869 |
||
5870 |
"Created: / 07-03-1997 / 16:28:32 / cg" |
|
5871 |
"Modified: / 26-02-1998 / 18:20:48 / stefan" |
|
5872 |
"Modified: / 01-05-2016 / 19:20:59 / cg" |
|
| 4487 | 5873 |
! |
5874 |
||
| 18059 | 5875 |
silentDeleteMethodCategoryChangesFor:aClassName selector:selector from:start to:stop |
5876 |
"delete method category changes for given class/selector in a range. |
|
5877 |
Return the number of deleted changes." |
|
5878 |
||
5879 |
|thisClassName index numDeleted| |
|
5880 |
||
5881 |
numDeleted := 0. |
|
5882 |
index := stop. |
|
5883 |
[index >= start] whileTrue:[ |
|
5884 |
thisClassName := self realClassNameOfChange:index. |
|
5885 |
thisClassName = aClassName ifTrue:[ |
|
5886 |
(self selectorOfMethodCategoryChange:index) == selector ifTrue:[ |
|
5887 |
self silentDeleteChange:index. |
|
5888 |
numDeleted := numDeleted + 1. |
|
5889 |
] |
|
5890 |
]. |
|
5891 |
index := index - 1 |
|
5892 |
]. |
|
5893 |
^ numDeleted |
|
5894 |
! |
|
5895 |
||
5896 |
silentDeleteMethodChangesFor:aClassName selector:selector from:start to:stop |
|
5897 |
"delete method changes for given class/selector in a range. |
|
5898 |
Return the number of deleted changes." |
|
5899 |
||
5900 |
|thisClassName index numDeleted| |
|
5901 |
||
5902 |
numDeleted := 0. |
|
5903 |
index := stop. |
|
5904 |
[index >= start] whileTrue:[ |
|
5905 |
thisClassName := self realClassNameOfChange:index. |
|
5906 |
thisClassName = aClassName ifTrue:[ |
|
5907 |
(self selectorOfMethodChange:index) == selector ifTrue:[ |
|
5908 |
self silentDeleteChange:index. |
|
5909 |
numDeleted := numDeleted + 1. |
|
5910 |
] |
|
5911 |
]. |
|
5912 |
index := index - 1 |
|
5913 |
]. |
|
5914 |
^ numDeleted |
|
5915 |
! |
|
5916 |
||
| 4487 | 5917 |
updateDiffView |
5918 |
self withSelectedChangesDo:[:changeNr | |
|
| 6288 | 5919 |
self updateDiffViewFor:changeNr. |
5920 |
^ self. |
|
| 4487 | 5921 |
]. |
5922 |
||
5923 |
diffView text1:'' text2:'' |
|
5924 |
! |
|
5925 |
||
5926 |
updateDiffViewFor:changeNr |
|
5927 |
|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
|
5928 |
parser sel showDiff selector oldMethod i| |
| 4487 | 5929 |
|
5930 |
aStream := self streamForChange:changeNr. |
|
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
5931 |
aStream isNil ifTrue:[ |
| 6317 | 5932 |
^ self |
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
5933 |
]. |
| 4487 | 5934 |
|
5935 |
showDiff := false. |
|
5936 |
||
5937 |
(self changeIsFollowupMethodChange:changeNr) ifFalse:[ |
|
| 6317 | 5938 |
sawExcla := aStream peekFor:(aStream class chunkSeparator). |
5939 |
chunk := aStream nextChunk. |
|
| 4487 | 5940 |
] ifTrue:[ |
| 16372 | 5941 |
chunk := self changeChunkAt:changeNr. |
| 6317 | 5942 |
sawExcla := true. |
| 4487 | 5943 |
]. |
5944 |
||
| 4857 | 5945 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
5946 |
do:[ |
|
| 8665 | 5947 |
parseTree := self parseExpression:chunk. |
| 6317 | 5948 |
(parseTree notNil and:[parseTree ~~ #Error and:[ parseTree isMessage ]]) ifTrue:[ |
5949 |
selector := parseTree selector. |
|
5950 |
] |
|
| 4857 | 5951 |
]. |
5952 |
||
5953 |
selector isNil ifTrue:[ |
|
| 6317 | 5954 |
newSource := chunk. |
5955 |
oldSource := 'Not comparable.'. |
|
| 4857 | 5956 |
] ifFalse:[ |
| 6317 | 5957 |
sawExcla ifFalse:[ |
5958 |
"/ not a method-change |
|
5959 |
newSource := chunk. |
|
|
11275
abeda3e68385
added: #currentSourceForParseTree:
Claus Gittinger <cg@exept.de>
parents:
11244
diff
changeset
|
5960 |
oldSource := self currentSourceForParseTree:parseTree. |
| 6317 | 5961 |
] ifTrue:[ |
5962 |
"/ a method-change |
|
5963 |
||
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5964 |
(self class methodDefinitionSelectors includes:selector) ifTrue:[ |
| 6317 | 5965 |
newSource := aStream nextChunk. |
|
11362
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
5966 |
thisClass := self classFromEvaluatingTree:parseTree receiver. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
5967 |
"/ Error |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
5968 |
"/ handle:[ ] |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
5969 |
"/ do:[ |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
5970 |
"/ thisClass := parseTree receiver evaluate. |
|
52ac4a5da69e
added: #classFromEvaluatingTree:
Claus Gittinger <cg@exept.de>
parents:
11347
diff
changeset
|
5971 |
"/ ]. |
| 6378 | 5972 |
thisClass isBehavior ifFalse:[ |
5973 |
thisClass := self classOfChange:changeNr. |
|
5974 |
]. |
|
| 6317 | 5975 |
thisClass isBehavior ifTrue:[ |
5976 |
(thisClass isLoaded |
|
5977 |
or:[ autoloadAsRequired value |
|
5978 |
and:[self checkClassIsLoaded:thisClass]]) ifFalse:[ |
|
5979 |
oldSource := 'Cannot compare this change\\(compare requires class to be loaded).' withCRs. |
|
5980 |
] ifTrue:[ |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5981 |
selector numArgs == 0 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5982 |
cat := '* as yet uncategorized *'. |
| 6532 | 5983 |
cat := selector. |
| 6317 | 5984 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
5985 |
cat := parseTree arg1 evaluate. |
| 6317 | 5986 |
]. |
5987 |
Class nameSpaceQuerySignal answer:(self nameSpaceForApply) |
|
5988 |
do:[ |
|
| 7709 | 5989 |
parser := Parser new. |
| 6639 | 5990 |
Error catch:[ |
| 7709 | 5991 |
parser |
5992 |
parseMethod:newSource in:thisClass |
|
5993 |
ignoreErrors:true ignoreWarnings:true. |
|
| 6317 | 5994 |
] |
5995 |
]. |
|
| 7709 | 5996 |
sel := parser selector. |
5997 |
(sel notNil) ifTrue:[ |
|
| 6317 | 5998 |
oldMethod := thisClass compiledMethodAt:sel. |
5999 |
oldMethod notNil ifTrue:[ |
|
6000 |
(oldMethod category = cat) ifFalse:[ |
|
| 6447 | 6001 |
"/ Transcript showCR:'category changed.'. |
| 6317 | 6002 |
]. |
6003 |
oldSource := oldMethod source. |
|
6004 |
(oldSource = newSource) ifFalse:[ |
|
6005 |
oldSource isNil ifTrue:[ |
|
6006 |
oldSource := 'No source for compare.'. |
|
6007 |
] ifFalse:[ |
|
6008 |
"/ |
|
6009 |
"/ compare for tabulator <-> space changes |
|
6010 |
"/ before showing diff ... |
|
6011 |
"/ |
|
6012 |
oldSource := oldSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
6013 |
newSource := newSource asCollectionOfLines collect:[:s | s withTabsExpanded]. |
|
6014 |
oldSource = newSource ifFalse:[ |
|
6015 |
"/ |
|
6016 |
"/ check if only historyLine diffs |
|
6017 |
"/ |
|
6018 |
(HistoryManager notNil |
|
6019 |
and:[HistoryManager isActive]) ifTrue:[ |
|
6020 |
oldSource := oldSource asStringCollection asString. |
|
6021 |
newSource := newSource asStringCollection asString. |
|
6022 |
(HistoryManager withoutHistoryLines:oldSource) |
|
6023 |
= |
|
6024 |
(HistoryManager withoutHistoryLines:newSource) |
|
6025 |
ifTrue:[ |
|
6026 |
oldSource := (HistoryManager withoutHistoryLines:oldSource). |
|
6027 |
newSource := (HistoryManager withoutHistoryLines:newSource). |
|
6028 |
] |
|
6029 |
]. |
|
6030 |
] |
|
6031 |
] |
|
6032 |
] |
|
6033 |
] ifFalse:[ |
|
6034 |
oldSource := 'Method does not exist.'. |
|
6035 |
] |
|
6036 |
] ifFalse:[ |
|
6037 |
oldSource := 'Change is unparsable (parse error).'. |
|
6038 |
]. |
|
6039 |
]. |
|
6040 |
] ifFalse:[ |
|
6041 |
oldSource := 'Class does not exist.'. |
|
6042 |
] |
|
6043 |
] ifFalse:[ |
|
6044 |
newSource := chunk. "/ aStream contents. |
|
6045 |
oldSource := 'Not comparable.'. |
|
6046 |
] |
|
6047 |
] |
|
| 4487 | 6048 |
]. |
6049 |
aStream close. |
|
6050 |
||
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
6051 |
oldSource := oldSource ? ''. |
|
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
6052 |
newSource := newSource ? ''. |
|
8675
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6053 |
|
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6054 |
oldSource := oldSource asStringCollection asString. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6055 |
newSource := newSource asStringCollection asString. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6056 |
|
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6057 |
"/ unify cr, crlf and lf into lf |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6058 |
(oldSource includes:Character return) ifTrue: [ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6059 |
i := oldSource indexOf:Character return. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6060 |
(oldSource at:i+1) == Character nl ifTrue:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6061 |
"/ crnl endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6062 |
oldSource := oldSource copyReplaceString:(String crlf) withString:(String lf). |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6063 |
] ifFalse:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6064 |
"/ cr endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6065 |
oldSource := oldSource copyReplaceAll:Character return with:Character nl. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6066 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6067 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6068 |
|
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6069 |
"/ unify cr, crlf and lf into lf |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6070 |
(newSource includes:Character return) ifTrue: [ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6071 |
i := newSource indexOf:Character return. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6072 |
(newSource at:i+1) == Character nl ifTrue:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6073 |
"/ crnl endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6074 |
newSource := newSource copyReplaceString:(String crlf) withString:(String lf). |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6075 |
] ifFalse:[ |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6076 |
"/ cr endings |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6077 |
newSource := newSource copyReplaceAll:Character return with:Character nl. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6078 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6079 |
]. |
|
cb829711c85c
care for cr / crlf in string
Claus Gittinger <cg@exept.de>
parents:
8665
diff
changeset
|
6080 |
|
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
6081 |
(oldSource = newSource |
|
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
6082 |
or:[ oldSource asStringCollection withTabsExpanded = newSource asStringCollection withTabsExpanded]) ifTrue:[ |
| 6317 | 6083 |
self makeDiffViewInvisible |
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
6084 |
] ifFalse:[ |
| 6317 | 6085 |
self makeDiffViewVisible. |
6086 |
diffView text1:oldSource text2:newSource. |
|
|
5237
74f82f793e1b
make diffView invisible, if there are no diffs
Claus Gittinger <cg@exept.de>
parents:
5178
diff
changeset
|
6087 |
]. |
| 4487 | 6088 |
|
| 7709 | 6089 |
"Created: / 24-11-1995 / 14:30:46 / cg" |
| 16372 | 6090 |
"Modified: / 01-05-2016 / 18:26:01 / cg" |
| 202 | 6091 |
! ! |
| 0 | 6092 |
|
| 202 | 6093 |
!ChangesBrowser methodsFor:'termination'! |
| 51 | 6094 |
|
|
3392
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6095 |
askIfChangesAreToBeWrittenBack |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6096 |
|action again| |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6097 |
|
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6098 |
anyChanges ifFalse:[^ self]. |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6099 |
|
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6100 |
again := true. |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6101 |
[again] whileTrue:[ |
| 6357 | 6102 |
action := OptionBox |
6103 |
request:(resources stringWithCRs:'The modified changelist has not been written back to the change file.\\Write change file before closing ?') |
|
6104 |
label:'ChangesBrowser' |
|
6105 |
image:(WarningBox iconBitmap) |
|
6106 |
buttonLabels:(resources array:#('Cancel' 'Don''t Write' 'Write'))
|
|
6107 |
values:#(#abort #ignore #save) |
|
6108 |
default:#save |
|
6109 |
onCancel:#abort. |
|
6110 |
||
6111 |
again := false. |
|
6112 |
action == #abort ifTrue:[AbortSignal raise. ^ self]. |
|
6113 |
action == #save ifTrue:[ |
|
6114 |
again := self writeBackChanges not |
|
6115 |
]. |
|
|
3392
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6116 |
]. |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6117 |
! |
|
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6118 |
|
| 1787 | 6119 |
closeRequest |
| 18159 | 6120 |
"window manager wants me to go away" |
| 1787 | 6121 |
|
|
3392
2dae85e52160
changeSetBrowsers writeBack fixed (when closing)
Claus Gittinger <cg@exept.de>
parents:
3378
diff
changeset
|
6122 |
self askIfChangesAreToBeWrittenBack. |
| 1787 | 6123 |
super closeRequest |
| 18159 | 6124 |
|
6125 |
"Modified (comment): / 28-05-2018 / 09:49:47 / Claus Gittinger" |
|
| 1787 | 6126 |
! |
6127 |
||
| 202 | 6128 |
saveAndTerminate |
6129 |
"update the changes file and quit. |
|
| 17026 | 6130 |
Don't depend on this being sent, not all window managers |
| 202 | 6131 |
send it; instead, they simply destroy the view." |
| 28 | 6132 |
|
| 202 | 6133 |
anyChanges ifTrue:[ |
| 17026 | 6134 |
self writeBackChanges. |
| 0 | 6135 |
]. |
| 1787 | 6136 |
super saveAndTerminate |
6137 |
||
6138 |
"Modified: / 3.8.1998 / 19:54:00 / cg" |
|
| 0 | 6139 |
! ! |
6140 |
||
| 73 | 6141 |
!ChangesBrowser methodsFor:'user interaction'! |
| 51 | 6142 |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6143 |
askForSearch:msg initialAnswer:initial thenSearchUsing:searchBlock2 onCancel:cancelBlock |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6144 |
|searchString directionHolder searchBlock| |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6145 |
|
| 6288 | 6146 |
searchString := self |
| 15674 | 6147 |
askForSearchString:msg |
6148 |
initialAnswer:initial |
|
6149 |
directionInto:(directionHolder := ValueHolder new). |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6150 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6151 |
searchString isNil ifTrue:[ |
| 15674 | 6152 |
^ cancelBlock value |
6153 |
]. |
|
| 17382 | 6154 |
lastSearchString := searchString. |
6155 |
||
| 15674 | 6156 |
directionHolder value == #first ifTrue:[ |
6157 |
self findFirstForClass:searchString. |
|
6158 |
^ self. |
|
6159 |
]. |
|
6160 |
directionHolder value == #last ifTrue:[ |
|
6161 |
self findLastForClass:searchString. |
|
6162 |
^ self. |
|
6163 |
]. |
|
6164 |
||
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6165 |
searchBlock := [:changeNr | searchBlock2 value:searchString value:changeNr]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6166 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6167 |
directionHolder value == #backward ifTrue:[ |
| 15674 | 6168 |
changeNrShown isNil ifTrue:[ |
6169 |
changeNrShown := self numberOfChanges. |
|
6170 |
]. |
|
6171 |
self findPreviousForWhich:searchBlock |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6172 |
] ifFalse:[ |
| 15674 | 6173 |
changeNrShown isNil ifTrue:[ |
6174 |
changeNrShown := 0. |
|
6175 |
]. |
|
6176 |
self findNextForWhich:searchBlock |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6177 |
]. |
| 17382 | 6178 |
|
6179 |
"Modified: / 10-02-2017 / 20:40:59 / cg" |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6180 |
! |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6181 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6182 |
askForSearchString:msg initialAnswer:initial directionInto:aValueHolder |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6183 |
"common code to open a search box" |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6184 |
|
| 17394 | 6185 |
|searchString direction choices current| |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6186 |
|
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6187 |
direction := #forward. |
| 17394 | 6188 |
choices := OrderedCollection new. |
6189 |
||
6190 |
changeNrShown notNil ifTrue:[ |
|
6191 |
current := self classNameOfChange:changeNrShown. |
|
6192 |
initial ~= current ifTrue:[ |
|
6193 |
(choices includes:current) ifFalse:[ |
|
6194 |
choices addFirst:current |
|
6195 |
]. |
|
6196 |
]. |
|
6197 |
]. |
|
6198 |
lastSearchString notNil ifTrue:[ |
|
6199 |
initial ~= lastSearchString ifTrue:[ |
|
6200 |
(choices includes:lastSearchString) ifFalse:[ |
|
6201 |
choices addFirst:lastSearchString |
|
6202 |
]. |
|
6203 |
]. |
|
6204 |
]. |
|
6205 |
||
| 15449 | 6206 |
"/ take a normal request box, but add an additional 'previous' button |
6207 |
Dialog modifyingBoxWith:[:box | |
|
| 15674 | 6208 |
|nextButton prevButton firstButton lastButton| |
| 15449 | 6209 |
|
| 13343 | 6210 |
nextButton := box okButton. |
| 15674 | 6211 |
|
6212 |
firstButton := Button label:(resources string:'First'). |
|
6213 |
firstButton action:[direction := #first. box okPressed.]. |
|
6214 |
box addButton:firstButton after:nextButton. |
|
6215 |
||
6216 |
lastButton := Button label:(resources string:'Last'). |
|
6217 |
lastButton action:[direction := #last. box okPressed.]. |
|
6218 |
box addButton:lastButton after:nextButton. |
|
6219 |
||
| 13343 | 6220 |
prevButton := Button label:(resources string:'Previous'). |
6221 |
prevButton action:[direction := #backward. box okPressed.]. |
|
6222 |
box addButton:prevButton after:nextButton. |
|
| 15674 | 6223 |
|
| 13343 | 6224 |
nextButton label:(resources string:'Next'). |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6225 |
] do:[ |
| 13343 | 6226 |
searchString := Dialog |
6227 |
request:msg |
|
| 17394 | 6228 |
list:choices |
| 13343 | 6229 |
initialAnswer:initial |
| 17394 | 6230 |
]. |
6231 |
||
6232 |
searchString isEmptyOrNil ifTrue:[ |
|
| 13343 | 6233 |
^ nil |
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6234 |
]. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6235 |
aValueHolder value:direction. |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6236 |
^ searchString |
| 15449 | 6237 |
|
6238 |
" |
|
6239 |
self new askForSearchString:'foo' initialAnswer:'bla' directionInto:(false asValue) |
|
6240 |
" |
|
| 17394 | 6241 |
|
6242 |
"Modified: / 12-02-2017 / 11:18:11 / cg" |
|
|
3292
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6243 |
! |
|
7eca3bb7b8cb
added previous buttons to searches
Claus Gittinger <cg@exept.de>
parents:
3275
diff
changeset
|
6244 |
|
| 221 | 6245 |
autoUpdate:aBoolean |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
6246 |
"enabled/disable automatic update from the change-file (for monitoring)" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
6247 |
|
| 6216 | 6248 |
autoUpdate value:aBoolean |
| 221 | 6249 |
|
6250 |
"Created: 3.12.1995 / 14:14:24 / cg" |
|
6251 |
"Modified: 3.12.1995 / 14:20:45 / cg" |
|
6252 |
! |
|
6253 |
||
| 6216 | 6254 |
autoloadAsRequired:aBoolean |
6255 |
"enabled/disable automatic load of unloaded classes" |
|
6256 |
||
6257 |
autoloadAsRequired value:aBoolean |
|
6258 |
! |
|
6259 |
||
| 3211 | 6260 |
changeSelection:lineNrCollection |
| 0 | 6261 |
"show a change in the codeView" |
6262 |
||
| 11048 | 6263 |
|chunk lineNr lineNumbers| |
| 3211 | 6264 |
|
6265 |
lineNrCollection isInteger ifTrue:[ |
|
| 11048 | 6266 |
lineNr := lineNrCollection. |
6267 |
lineNumbers := Array with:lineNr. |
|
| 3211 | 6268 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6269 |
changeListView multipleSelectOk ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6270 |
lineNrCollection size == 1 ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6271 |
lineNr := lineNrCollection first. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6272 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6273 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6274 |
lineNr := lineNrCollection |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6275 |
]. |
| 11048 | 6276 |
lineNumbers := lineNrCollection. |
6277 |
]. |
|
6278 |
||
6279 |
self changeListSelectionHolder value:lineNumbers. |
|
| 16467 | 6280 |
|
| 2293 | 6281 |
lineNr isNil ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6282 |
codeView contents:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6283 |
codeView initializeDoITAction. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6284 |
changeNrShown := nil. |
| 16467 | 6285 |
infoHolder value:nil. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6286 |
^ self |
| 2293 | 6287 |
]. |
6288 |
||
| 16467 | 6289 |
changeNrShown := lineNr. |
6290 |
self sensor |
|
6291 |
enqueueMessage:#updateSourceCodeAfterChangedSelection for:self arguments:nil; |
|
6292 |
enqueueMessage:#updateInfoAfterChangedSelection for:self arguments:nil. |
|
6293 |
^ self. |
|
6294 |
||
| 3211 | 6295 |
"/ display the changes code |
|
3785
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
6296 |
chunk := self sourceOfChange:lineNr. |
|
741890c870a4
oops - exclas in changeSetBrowsers method source
Claus Gittinger <cg@exept.de>
parents:
3771
diff
changeset
|
6297 |
chunk isNil ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6298 |
codeView initializeDoITAction. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6299 |
^ self |
| 2044 | 6300 |
]. |
| 8391 | 6301 |
|
| 0 | 6302 |
codeView contents:chunk. |
| 13 | 6303 |
codeView acceptAction:[:theCode | self doApply "noChangesAllowed"]. |
|
2043
66b5276b2760
set self in changesBrowsers doIt.
Claus Gittinger <cg@exept.de>
parents:
1996
diff
changeset
|
6304 |
codeView doItAction:[:theCode | |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6305 |
|clsName cls| |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6306 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6307 |
clsName := self classNameOfChange:lineNr. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6308 |
clsName notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6309 |
clsName := clsName asSymbolIfInterned. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6310 |
clsName notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6311 |
cls := Smalltalk at:clsName ifAbsent:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6312 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6313 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6314 |
Compiler |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6315 |
evaluate:theCode |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6316 |
in:nil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6317 |
receiver:cls |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6318 |
notifying:self |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6319 |
logged:true |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6320 |
ifFail:nil |
|
2043
66b5276b2760
set self in changesBrowsers doIt.
Claus Gittinger <cg@exept.de>
parents:
1996
diff
changeset
|
6321 |
]. |
| 15 | 6322 |
changeNrShown := lineNr. |
| 0 | 6323 |
|
| 4487 | 6324 |
self showingDiffs value ifTrue:[ |
| 8391 | 6325 |
self withWaitCursorDo:[ |
6326 |
AbortOperationRequest catch:[ |
|
6327 |
self updateDiffViewFor:changeNrShown. |
|
6328 |
] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6329 |
] |
| 4487 | 6330 |
]. |
6331 |
||
| 11048 | 6332 |
"Modified: / 03-01-2012 / 15:30:23 / cg" |
| 51 | 6333 |
! |
6334 |
||
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6335 |
classOfChange:changeNr |
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
6336 |
^ self |
| 6386 | 6337 |
classOfChange:changeNr |
6338 |
ifAbsent:[:className | |
|
6339 |
|msg| |
|
6340 |
||
6341 |
className isNil ifTrue:[ |
|
6342 |
msg := 'Could not extract classname from change'. |
|
6343 |
] ifFalse:[ |
|
6344 |
msg := 'Class not found: ''' , className , ''''. |
|
6345 |
]. |
|
|
8320
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6346 |
Transcript showCR:msg. |
| 6386 | 6347 |
"/ self warn:msg. |
6348 |
nil |
|
6349 |
] |
|
|
3806
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
6350 |
! |
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
6351 |
|
|
46e459fdde4c
added "apply to next conflict"
Claus Gittinger <cg@exept.de>
parents:
3785
diff
changeset
|
6352 |
classOfChange:changeNr ifAbsent:exceptionBlock |
| 18059 | 6353 |
"answer the class that is subject to the change at changeNr. |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6354 |
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
|
6355 |
|
|
8272
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
6356 |
|className cls isMeta nameSpaceForApply path ownerName owner| |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6357 |
|
| 5014 | 6358 |
className := self realClassNameOfChange:changeNr. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6359 |
className isNil ifTrue:[ |
| 18059 | 6360 |
^ exceptionBlock valueWithOptionalArgument:nil |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6361 |
]. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6362 |
|
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6363 |
isMeta := false. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6364 |
(className endsWith:' class') ifTrue:[ |
|
12704
6f20f7d39e75
Changed usage of deprecated #copyWithoutLast: to #copyButLast:
Stefan Vogel <sv@exept.de>
parents:
12656
diff
changeset
|
6365 |
className := className copyButLast:6. |
| 6378 | 6366 |
isMeta := true. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6367 |
]. |
| 3472 | 6368 |
|
|
8272
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
6369 |
autoloadAsRequired value ifTrue:[ |
|
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
6370 |
path := className asCollectionOfSubstringsSeparatedByAll:'::'. |
|
8320
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6371 |
path size >= 2 ifTrue:[ |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6372 |
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
|
6373 |
"/ 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
|
6374 |
"/ Transcript showCR:'loading owner'. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6375 |
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
|
6376 |
owner := Smalltalk classNamed:ownerName. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6377 |
owner notNil ifTrue:[ |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6378 |
owner autoload. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6379 |
]. |
|
c0d503e3dc91
also load private classes of an autoloaded as required
Claus Gittinger <cg@exept.de>
parents:
8272
diff
changeset
|
6380 |
]. |
|
8272
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
6381 |
]. |
|
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
6382 |
]. |
|
cd6b675fc5fd
autoload class owner if required
Claus Gittinger <cg@exept.de>
parents:
8173
diff
changeset
|
6383 |
|
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6384 |
nameSpaceForApply := self nameSpaceForApply. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6385 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6386 |
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
|
6387 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6388 |
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
|
6389 |
]. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6390 |
(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
|
6391 |
"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
|
6392 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6393 |
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
|
6394 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6395 |
cls := Smalltalk loadedClassNamed:className |
| 6378 | 6396 |
]. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6397 |
]. |
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6398 |
|
| 6378 | 6399 |
cls isNil ifTrue:[ |
| 18059 | 6400 |
^ exceptionBlock valueWithOptionalArgument:className |
| 6378 | 6401 |
]. |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6402 |
isMeta ifTrue:[ |
| 6378 | 6403 |
cls := cls class |
|
3275
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6404 |
]. |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6405 |
^ cls |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6406 |
! |
|
88c43d1cfc99
added browse-senders & browse implementors
Claus Gittinger <cg@exept.de>
parents:
3249
diff
changeset
|
6407 |
|
| 1471 | 6408 |
doubleClickOnChange:lineNr |
|
2843
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
6409 |
"action performed when a change-list entry is doubleClicked" |
|
6e3fc30cd41f
commented; much better functionality
Claus Gittinger <cg@exept.de>
parents:
2838
diff
changeset
|
6410 |
|
| 1471 | 6411 |
self doBrowse |
6412 |
||
6413 |
"Created: / 6.2.1998 / 13:08:49 / cg" |
|
6414 |
! |
|
6415 |
||
| 202 | 6416 |
noChangesAllowed |
6417 |
"show a warning that changes cannot be changed" |
|
| 93 | 6418 |
|
| 3211 | 6419 |
self warn:'Changes are not allowed to be changed.' |
| 0 | 6420 |
! |
6421 |
||
| 202 | 6422 |
saveClass:aClassName from:startNr |
6423 |
"user wants changes from current to end to be appended to a file" |
|
| 51 | 6424 |
|
| 202 | 6425 |
|changeNr fileName| |
| 51 | 6426 |
|
| 202 | 6427 |
changeNr := changeListView selection. |
6428 |
changeNr notNil ifTrue:[ |
|
| 9604 | 6429 |
fileName := Dialog |
6430 |
requestFileNameForSave:(resources string:'Append changes for class to:') |
|
6431 |
default:(lastSaveFileName ? '') |
|
6432 |
ok:(resources string:'Append') |
|
6433 |
abort:(resources string:'Abort') |
|
6434 |
pattern:'*.chg'. |
|
6435 |
||
6436 |
fileName notNil ifTrue:[ |
|
6437 |
lastSaveFileName := fileName. |
|
| 11685 | 6438 |
self withWriteCursorDo:[ |
| 9604 | 6439 |
startNr to:(self numberOfChanges) do:[:changeNr | |
6440 |
|thisClassName| |
|
6441 |
||
6442 |
thisClassName := self classNameOfChange:changeNr. |
|
6443 |
thisClassName = aClassName ifTrue:[ |
|
6444 |
self setSingleSelection:changeNr. |
|
6445 |
(self appendChange:changeNr toFile:fileName) ifFalse:[ |
|
6446 |
^ self |
|
6447 |
] |
|
6448 |
] |
|
6449 |
] |
|
6450 |
] |
|
6451 |
]. |
|
| 202 | 6452 |
] |
|
562
8f772068fd1a
#selection: now does a notification / #setSelection: does not
Claus Gittinger <cg@exept.de>
parents:
553
diff
changeset
|
6453 |
|
| 11685 | 6454 |
"Modified: / 27-07-2012 / 09:46:04 / cg" |
|
3227
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
6455 |
! |
|
442696985817
deleteAllForClass - support multiple selection
Claus Gittinger <cg@exept.de>
parents:
3224
diff
changeset
|
6456 |
|
| 11477 | 6457 |
selectionChanged |
| 12946 | 6458 |
self halt:'should not be here' |
| 11048 | 6459 |
|
6460 |
"Created: / 03-01-2012 / 15:26:36 / cg" |
|
| 16467 | 6461 |
! |
6462 |
||
6463 |
updateInfoAfterChangedSelection |
|
6464 |
"update the info label" |
|
6465 |
||
| 17172 | 6466 |
|selection lineNr selectorOrNil className nonMetaClassName metaClassName |
| 16476 | 6467 |
nClassChanges nMethodChanges uniqueSelectors |
| 17172 | 6468 |
lastLineNr firstLineNr |
6469 |
countForClassBeforeCurrent countForClassAfterLast countForClassAndSelectorAfterLast |
|
| 18186 | 6470 |
moreInfo countInfo selectorInfo| |
| 16467 | 6471 |
|
6472 |
selection := lineNr := changeListView selection. |
|
6473 |
selection isNumber ifFalse:[ |
|
6474 |
lineNr := nil. |
|
6475 |
selection notEmptyOrNil ifTrue:[ |
|
6476 |
lineNr := selection first |
|
6477 |
]. |
|
6478 |
]. |
|
6479 |
||
6480 |
lineNr isNil ifTrue:[ |
|
6481 |
infoHolder value:nil. |
|
6482 |
^ self |
|
6483 |
]. |
|
6484 |
||
6485 |
"/ |
|
6486 |
"/ now, this info is computed so fast, |
|
6487 |
"/ we can do it each time the selection changes |
|
6488 |
"/ (can we?) |
|
6489 |
className := self realClassNameOfChange:lineNr. |
|
| 16478 | 6490 |
className isNil ifTrue:[ |
6491 |
infoHolder value:nil. |
|
6492 |
^ self |
|
6493 |
]. |
|
| 17172 | 6494 |
selectorOrNil := self selectorOfMethodChange:lineNr. |
| 16478 | 6495 |
|
| 16476 | 6496 |
nonMetaClassName := (className endsWith:' class') |
6497 |
ifTrue:[ className copyButLast:' class' size ] |
|
6498 |
ifFalse:[ className ]. |
|
6499 |
metaClassName := nonMetaClassName,' class'. |
|
6500 |
||
| 16467 | 6501 |
nClassChanges := nMethodChanges := 0. |
6502 |
uniqueSelectors := Set new. |
|
| 16476 | 6503 |
lastLineNr := firstLineNr := nil. |
| 17172 | 6504 |
countForClassAfterLast := 0. |
6505 |
countForClassBeforeCurrent := 0. |
|
6506 |
countForClassAndSelectorAfterLast := 0. |
|
| 16467 | 6507 |
|
6508 |
"/ count them all |
|
6509 |
1 to:changeInfoList size do:[:i | |
|
| 16476 | 6510 |
|sel nameOfChange| |
| 17420 | 6511 |
|
6512 |
changeInfoList at:i. |
|
| 16476 | 6513 |
nameOfChange := self realClassNameOfChange:i. |
6514 |
((nameOfChange = nonMetaClassName) or:[nameOfChange = metaClassName]) ifTrue:[ |
|
| 17172 | 6515 |
sel := self selectorOfMethodChange:i. |
6516 |
||
| 16467 | 6517 |
lastLineNr := i. |
| 16476 | 6518 |
firstLineNr := firstLineNr ? i. |
| 17172 | 6519 |
i > lineNr ifTrue:[ |
6520 |
countForClassAfterLast := countForClassAfterLast + 1. |
|
6521 |
(nameOfChange = className |
|
6522 |
and:[ selectorOrNil notNil |
|
6523 |
and:[sel == selectorOrNil]]) ifTrue:[ |
|
6524 |
countForClassAndSelectorAfterLast := countForClassAndSelectorAfterLast + 1. |
|
| 16476 | 6525 |
]. |
| 17172 | 6526 |
] ifFalse:[ |
6527 |
i < lineNr ifTrue:[ |
|
6528 |
countForClassBeforeCurrent := countForClassBeforeCurrent + 1 |
|
6529 |
] |
|
6530 |
]. |
|
| 16467 | 6531 |
nClassChanges := nClassChanges + 1. |
| 17172 | 6532 |
sel notNil ifTrue:[ |
| 16467 | 6533 |
uniqueSelectors add:sel. |
6534 |
nMethodChanges := nMethodChanges + 1. |
|
6535 |
]. |
|
6536 |
]. |
|
6537 |
]. |
|
6538 |
lastLineNr == lineNr ifTrue:[ |
|
| 16476 | 6539 |
firstLineNr == lineNr ifTrue:[ |
6540 |
moreInfo := resources string:'. This is the only one for this class '. |
|
6541 |
] ifFalse:[ |
|
6542 |
moreInfo := resources string:'. This is the last for this class '. |
|
6543 |
] |
|
| 16467 | 6544 |
] ifFalse:[ |
| 16476 | 6545 |
firstLineNr == lineNr ifTrue:[ |
6546 |
moreInfo := resources string:'. This is the first for this class'. |
|
6547 |
]. |
|
| 17172 | 6548 |
countForClassAfterLast > 0 ifTrue:[ |
6549 |
moreInfo := (moreInfo ? ''),(resources string:'. %1 more for this class' with:countForClassAfterLast). |
|
6550 |
countForClassAndSelectorAfterLast > 0 ifTrue:[ |
|
| 17419 | 6551 |
moreInfo := moreInfo,(resources string:', %1 for selector' with:countForClassAndSelectorAfterLast). |
| 17172 | 6552 |
]. |
| 16467 | 6553 |
]. |
6554 |
]. |
|
| 18186 | 6555 |
|
6556 |
countInfo := resources string:'%1 changes. %2 for %3 ' |
|
6557 |
with:(changeInfoList size) |
|
6558 |
with:nClassChanges |
|
6559 |
with:className. |
|
6560 |
||
| 17381 | 6561 |
uniqueSelectors size == 1 ifTrue:[ |
6562 |
nMethodChanges == 1 ifTrue:[ |
|
| 18186 | 6563 |
selectorInfo := (resources string:'(1 for #''%1'')' |
6564 |
with:uniqueSelectors first) allBold |
|
| 17381 | 6565 |
] ifFalse:[ |
| 18186 | 6566 |
selectorInfo := (resources string:'(%1 methods / for #''%2'')' |
6567 |
with:nMethodChanges |
|
6568 |
with:uniqueSelectors first) allBold |
|
6569 |
]. |
|
| 18110 | 6570 |
] ifFalse:[ |
| 18186 | 6571 |
(nMethodChanges == 0 and:[uniqueSelectors isEmptyOrNil]) ifTrue:[ |
6572 |
selectorInfo := resources string:'(0 methods)' |
|
6573 |
] ifFalse:[ |
|
6574 |
selectorInfo := (resources string:'(%1 methods / %5 selectors)' |
|
6575 |
with:nMethodChanges |
|
6576 |
with:uniqueSelectors size) allBold |
|
6577 |
]. |
|
6578 |
]. |
|
6579 |
infoHolder value:(countInfo,selectorInfo,moreInfo). |
|
| 17381 | 6580 |
|
| 17420 | 6581 |
"Modified: / 19-02-2017 / 13:37:19 / cg" |
| 18186 | 6582 |
"Modified: / 08-06-2018 / 12:09:44 / Claus Gittinger" |
| 16467 | 6583 |
! |
6584 |
||
6585 |
updateSourceCodeAfterChangedSelection |
|
6586 |
"show a change in the codeView" |
|
6587 |
||
6588 |
|selection lineNr chunk| |
|
6589 |
||
6590 |
selection := lineNr := changeListView selection. |
|
6591 |
selection isNumber ifFalse:[ |
|
6592 |
lineNr := nil. |
|
6593 |
selection notEmptyOrNil ifTrue:[ |
|
6594 |
lineNr := selection first |
|
6595 |
]. |
|
6596 |
]. |
|
6597 |
||
6598 |
lineNr isNil ifTrue:[ |
|
6599 |
^ self |
|
6600 |
]. |
|
6601 |
||
6602 |
"/ display the changes code |
|
6603 |
chunk := self sourceOfChange:lineNr. |
|
6604 |
chunk isNil ifTrue:[ |
|
6605 |
codeView initializeDoITAction. |
|
6606 |
^ self |
|
6607 |
]. |
|
6608 |
||
6609 |
codeView contents:chunk. |
|
6610 |
codeView acceptAction:[:theCode | self doApply "noChangesAllowed"]. |
|
6611 |
codeView doItAction:[:theCode | |
|
6612 |
|clsName cls| |
|
6613 |
||
6614 |
clsName := self classNameOfChange:lineNr. |
|
6615 |
clsName notNil ifTrue:[ |
|
6616 |
clsName := clsName asSymbolIfInterned. |
|
6617 |
clsName notNil ifTrue:[ |
|
6618 |
cls := Smalltalk at:clsName ifAbsent:nil. |
|
6619 |
] |
|
6620 |
]. |
|
6621 |
Compiler |
|
6622 |
evaluate:theCode |
|
6623 |
in:nil |
|
6624 |
receiver:cls |
|
6625 |
notifying:self |
|
6626 |
logged:true |
|
6627 |
ifFail:nil |
|
6628 |
]. |
|
6629 |
||
6630 |
||
6631 |
changeNrShown := lineNr. |
|
6632 |
||
6633 |
self showingDiffs value ifTrue:[ |
|
6634 |
self withWaitCursorDo:[ |
|
6635 |
AbortOperationRequest catch:[ |
|
6636 |
self updateDiffViewFor:changeNrShown. |
|
6637 |
] |
|
6638 |
] |
|
6639 |
]. |
|
| 202 | 6640 |
! ! |
| 0 | 6641 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6642 |
!ChangesBrowser::ChangeFileReader methodsFor:'accessing'! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6643 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6644 |
autoCompare:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6645 |
autoCompare := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6646 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6647 |
|
|
7620
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6648 |
autoloadAsRequired |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6649 |
^ autoloadAsRequired |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6650 |
! |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6651 |
|
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6652 |
autoloadAsRequired:something |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6653 |
autoloadAsRequired := something. |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6654 |
! |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6655 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6656 |
browser:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6657 |
browser := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6658 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6659 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6660 |
changeChunks |
| 18054 | 6661 |
self breakPoint:#cg. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6662 |
^ changeChunks |
| 16372 | 6663 |
|
6664 |
"Modified: / 01-05-2016 / 19:10:52 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6665 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6666 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6667 |
changeClassNames |
| 18054 | 6668 |
self breakPoint:#cg. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6669 |
^ changeClassNames |
| 16372 | 6670 |
|
6671 |
"Modified: / 01-05-2016 / 19:10:47 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6672 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6673 |
|
|
6516
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6674 |
changeFileName |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6675 |
^ changeFileName |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6676 |
! |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6677 |
|
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6678 |
changeFileName:something |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6679 |
changeFileName := something. |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6680 |
! |
|
48d51ac63886
fix bug from prev version: could not read changes file
Stefan Vogel <sv@exept.de>
parents:
6512
diff
changeset
|
6681 |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6682 |
changeHeaderLines |
| 18054 | 6683 |
self breakPoint:#cg. |
| 16372 | 6684 |
^ changeHeaderLines |
6685 |
||
6686 |
"Modified: / 01-05-2016 / 19:10:41 / cg" |
|
6687 |
! |
|
6688 |
||
6689 |
changeInfo |
|
6690 |
^ changeInfo |
|
6691 |
||
6692 |
"Created: / 01-05-2016 / 19:10:05 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6693 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6694 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6695 |
changeIsFollowupMethodChange |
| 18054 | 6696 |
self breakPoint:#cg. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6697 |
^ changeIsFollowupMethodChange |
| 16372 | 6698 |
|
6699 |
"Modified: / 01-05-2016 / 19:10:24 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6700 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6701 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6702 |
changePositions |
| 18054 | 6703 |
self breakPoint:#cg. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6704 |
^ changePositions |
| 16372 | 6705 |
|
6706 |
"Modified: / 01-05-2016 / 19:10:29 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6707 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6708 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6709 |
changeTimeStamps |
| 18054 | 6710 |
self breakPoint:#cg. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6711 |
^ changeTimeStamps |
| 16372 | 6712 |
|
6713 |
"Modified: / 01-05-2016 / 19:10:34 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6714 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6715 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6716 |
enforcedNameSpace:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6717 |
enforcedNameSpace := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6718 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6719 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6720 |
inStream:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6721 |
inStream := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6722 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6723 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6724 |
noColoring:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6725 |
noColoring := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6726 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6727 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6728 |
tabSpec:something |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6729 |
tabSpec := something. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6730 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6731 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6732 |
thisIsAClassSource |
| 7360 | 6733 |
^ thisIsAClassSource ? false |
6734 |
||
6735 |
"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
|
6736 |
! ! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6737 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6738 |
!ChangesBrowser::ChangeFileReader methodsFor:'private'! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6739 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6740 |
contractClass:className selector:selector to:maxLen |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6741 |
"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
|
6742 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6743 |
|s l| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6744 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6745 |
s := className , ' ', selector. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6746 |
s size > maxLen ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6747 |
l := maxLen - 1 - selector size max:20. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6748 |
s := (className contractTo:l) , ' ' , selector. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6749 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6750 |
s size > maxLen ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6751 |
l := maxLen - 1 - className size max:20. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6752 |
s := className , ' ', (selector contractTo:l). |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6753 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6754 |
s size > maxLen ifTrue:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6755 |
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
|
6756 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6757 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6758 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6759 |
^ s |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6760 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6761 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6762 |
extractClassAndClassNameFromParseTree:rec |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6763 |
|isUnaryMessage className changeClass| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6764 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6765 |
isUnaryMessage := rec isUnaryMessage. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6766 |
|
| 9019 | 6767 |
Error |
6768 |
handle:[:ex | ^ '?' -> nil] |
|
| 6843 | 6769 |
do:[ |
| 9019 | 6770 |
isUnaryMessage ifTrue:[ |
6771 |
className := rec receiver name. |
|
6772 |
] ifFalse:[ |
|
6773 |
className := rec name. |
|
6774 |
]. |
|
| 6843 | 6775 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6776 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6777 |
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
|
6778 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6779 |
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
|
6780 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6781 |
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
|
6782 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6783 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6784 |
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
|
6785 |
autoloadAsRequired value ifTrue:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6786 |
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
|
6787 |
] ifFalse:[ |
|
6812a1ebc510
Autoload owning classes of private classes in change set only if
Stefan Vogel <sv@exept.de>
parents:
7619
diff
changeset
|
6788 |
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
|
6789 |
]. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6790 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6791 |
isUnaryMessage ifTrue:[ |
| 6843 | 6792 |
changeClass notNil ifTrue:[ |
6793 |
changeClass := changeClass class. |
|
6794 |
]. |
|
6795 |
className := className , ' class'. |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6796 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6797 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6798 |
^ className -> changeClass |
| 6843 | 6799 |
|
6800 |
"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
|
6801 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6802 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6803 |
nameSpaceForApply |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6804 |
^ browser nameSpaceForApply |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6805 |
! ! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6806 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6807 |
!ChangesBrowser::ChangeFileReader methodsFor:'reading'! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6808 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6809 |
addHeaderLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo |
| 16372 | 6810 |
changeHeaderLines add:(self headerLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo) |
6811 |
||
6812 |
"Modified: / 01-05-2016 / 19:07:49 / cg" |
|
6813 |
! |
|
6814 |
||
| 18059 | 6815 |
colorizeAsCommentChange:changeType |
6816 |
|c| |
|
6817 |
||
6818 |
NoColoring ~~ true ifTrue:[ |
|
6819 |
c := changeType allItalic. |
|
6820 |
"/ changeString := changeString allItalic. |
|
6821 |
c emphasisAllAdd:(#color -> UserPreferences current commentColor). |
|
6822 |
^ c |
|
6823 |
]. |
|
6824 |
^ changeType |
|
6825 |
! |
|
6826 |
||
| 16372 | 6827 |
headerLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6828 |
|entry| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6829 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6830 |
entry := MultiColListEntry new. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6831 |
entry tabulatorSpecification:tabSpec. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6832 |
entry colAt:1 put:changeDelta. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6833 |
entry colAt:2 put:changeString. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6834 |
entry colAt:3 put:changeType. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6835 |
timeStampInfo notNil ifTrue:[ |
|
12599
827681c8f7d4
timestamp printing extracted
Claus Gittinger <cg@exept.de>
parents:
12428
diff
changeset
|
6836 |
entry colAt:4 put:(browser timeStampPrintStringOf:timeStampInfo). |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6837 |
]. |
| 16372 | 6838 |
^ entry |
6839 |
||
6840 |
"Created: / 01-05-2016 / 19:07:20 / cg" |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6841 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6842 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6843 |
processChunk |
| 16372 | 6844 |
|info| |
6845 |
||
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6846 |
(chunkText startsWith:'''---- timestamp ') ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6847 |
timeStampInfo := (chunkText copyFrom:16 to:(chunkText size - 6)) withoutSpaces. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6848 |
^ self. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6849 |
]. |
| 11234 | 6850 |
(chunkText asLowercase startsWith:'''---- encoding: ') ifTrue:[ |
6851 |
^ self. |
|
6852 |
]. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6853 |
|
| 16372 | 6854 |
changeInfo add:(info := |
6855 |
ChangesBrowser::ChangeInfo new |
|
6856 |
position:chunkPosition chunk:chunkText className:nil selector:nil headerLine:nil |
|
6857 |
timestamp:timeStampInfo isFollowupChange:false). |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6858 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6859 |
headerLine := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6860 |
changeDelta := ' '. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6861 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6862 |
sawExcla ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6863 |
self processNonMethodChunk |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6864 |
] ifTrue:[ |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6865 |
self processMethodChunkIfNone: |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6866 |
[ |
| 16372 | 6867 |
changeInfo removeLast. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6868 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6869 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6870 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6871 |
changeString notNil ifTrue:[ |
| 16372 | 6872 |
"/ self addHeaderLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo. |
6873 |
info headerLine:(self headerLineForChangeType:changeType changeString:changeString changeDelta:changeDelta timeStampInfo:timeStampInfo) |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6874 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6875 |
headerLine notNil ifTrue:[ |
| 17723 | 6876 |
changeHeaderLines add:headerLine. |
| 16372 | 6877 |
info headerLine:headerLine. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6878 |
] |
| 16372 | 6879 |
]. |
6880 |
||
6881 |
"Modified: / 01-05-2016 / 19:13:59 / cg" |
|
| 17723 | 6882 |
"Modified: / 27-10-2017 / 14:34:51 / stefan" |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6883 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6884 |
|
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6885 |
processMethodChunkIfNone:emptyBlock |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6886 |
"sawExcla" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6887 |
|
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6888 |
|askedForEditingClassSource changeClass category anyMethod |
| 15012 | 6889 |
sel p rec clsName done first text methodPos |
| 16372 | 6890 |
singleJunkOnly methodChunks classCategoryChunks methodCategoryChunks singleInfo methodSelector nameAndClass |
6891 |
info| |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6892 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6893 |
singleJunkOnly := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6894 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6895 |
classCategoryChunks := methodCategoryChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6896 |
singleInfo := false. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6897 |
anyMethod := false. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6898 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6899 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6900 |
method definitions actually consist of |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6901 |
two (or more) chunks; skip next chunk(s) |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6902 |
up to an empty one. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6903 |
The system only writes one chunk, |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6904 |
and we cannot handle more in this ChangesBrowser .... |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6905 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6906 |
clsName := nil. |
| 8665 | 6907 |
|
| 18429 | 6908 |
(chunkText includesString:'§') ifTrue:[ |
| 18054 | 6909 |
self halt:'should no longer happen' |
6910 |
]. |
|
| 17094 | 6911 |
|
| 8665 | 6912 |
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
|
6913 |
(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
|
6914 |
rec := p receiver. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6915 |
sel := p selector. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6916 |
(ChangesBrowser methodDefinitionSelectors includes:sel) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6917 |
methodChunks := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6918 |
nameAndClass := self extractClassAndClassNameFromParseTree:rec. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6919 |
clsName := nameAndClass key. changeClass := nameAndClass value. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6920 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6921 |
sel == #categoriesForClass ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6922 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6923 |
classCategoryChunks := true. |
| 18059 | 6924 |
changeType := self colorizeAsCommentChange:'(class category change)'. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6925 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6926 |
sel == #categoriesFor: ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6927 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6928 |
methodCategoryChunks := true. |
| 18059 | 6929 |
changeType := self colorizeAsCommentChange:'(category change)'. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6930 |
methodSelector := (p args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6931 |
] ifFalse:[ |
| 6532 | 6932 |
(sel numArgs == 0) ifTrue:[ |
6933 |
category := '* As yet uncategorized *'. |
|
6934 |
category := sel. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6935 |
] ifFalse:[ |
| 6532 | 6936 |
category := (p args at:1) evaluate. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6937 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6938 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6939 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6940 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6941 |
sel == #'methodsFor:stamp:' ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6942 |
"/ Squeak timeStamp |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6943 |
timeStampInfo := (p args at:2) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6944 |
singleInfo := true |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6945 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6946 |
sel == #'commentStamp:prior:' ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6947 |
singleJunkOnly := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6948 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6949 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6950 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6951 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6952 |
sel == #reorganize ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6953 |
singleJunkOnly := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6954 |
methodChunks := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6955 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6956 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6957 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6958 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6959 |
done := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6960 |
first := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6961 |
[done] whileFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6962 |
changeDelta := ' '. |
| 13314 | 6963 |
methodPos := inStream position + 1. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6964 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6965 |
text := inStream nextChunk. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6966 |
done := text isEmptyOrNil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6967 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6968 |
done ifFalse:[ |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
6969 |
anyMethod := true. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6970 |
first ifFalse:[ |
| 16372 | 6971 |
info := ChangesBrowser::ChangeInfo new |
6972 |
position:methodPos chunk:chunkText className:clsName |
|
6973 |
selector:nil headerLine:nil timestamp:timeStampInfo isFollowupChange:true. |
|
6974 |
changeInfo add:info. |
|
6975 |
||
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6976 |
askedForEditingClassSource ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6977 |
thisIsAClassSource := (changeFileName asFilename hasSuffix:'st'). |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6978 |
askedForEditingClassSource := true. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6979 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6980 |
] ifTrue:[ |
| 16372 | 6981 |
changeInfo last className:clsName |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6982 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6983 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6984 |
first := false. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6985 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6986 |
(classCategoryChunks or:[methodCategoryChunks]) ifTrue:[ |
| 6639 | 6987 |
text := text firstLine. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6988 |
classCategoryChunks ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6989 |
changeClass isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6990 |
changeDelta := '?'. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
6991 |
] ifFalse:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6992 |
changeClass category = text ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6993 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6994 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6995 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6996 |
changeString := clsName , ' category: ' , text storeString. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6997 |
]ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6998 |
changeString := '(' , clsName , ' compiledMethodAt:' , methodSelector storeString , ') category: ' , text storeString.
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
6999 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7000 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7001 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7002 |
try to find the selector |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7003 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7004 |
methodSelector := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7005 |
clsName notNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7006 |
methodChunks ifTrue:[ |
| 17094 | 7007 |
p := Parser for:(ReadStream on:text) in:nil. |
7008 |
p ignoreErrors:true. |
|
7009 |
p ignoreWarnings:true. |
|
7010 |
p parserFlags allowDollarInIdentifier:true. |
|
7011 |
p parserFlags allowParagraphInIdentifier:true. |
|
7012 |
p parseMethodSpec. |
|
7013 |
methodSelector := p selector. |
|
7014 |
"/ p := Parser |
|
7015 |
"/ parseMethodSpecification:text |
|
7016 |
"/ in:nil |
|
7017 |
"/ ignoreErrors:true |
|
7018 |
"/ ignoreWarnings:true. |
|
7019 |
"/ (p notNil and:[p ~~ #Error]) ifTrue:[ |
|
7020 |
"/ methodSelector := p selector. |
|
7021 |
"/ ] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7022 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7023 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7024 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7025 |
methodSelector isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7026 |
changeString := (chunkText contractTo:maxLen). |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7027 |
changeType := '(change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7028 |
headerLine := chunkText , ' (change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7029 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7030 |
changeString := self contractClass:clsName selector:methodSelector to:maxLen. |
| 18059 | 7031 |
changeType := ('{ ' , category , ' }').
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7032 |
headerLine := clsName , ' ' , methodSelector , ' ' , '(change category: ''' , category , ''')'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7033 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7034 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7035 |
autoCompare value ifTrue:[ |
| 17047 | 7036 |
changeDelta := ChangeDeltaInformation |
7037 |
changeDeltaFor:text changeClass:changeClass selector:methodSelector. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7038 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7039 |
]. |
| 17047 | 7040 |
changeInfo last |
7041 |
headerLine:(self headerLineForChangeType:changeType |
|
7042 |
changeString:changeString |
|
7043 |
changeDelta:changeDelta |
|
7044 |
timeStampInfo:timeStampInfo). |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7045 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7046 |
changeString := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7047 |
headerLine := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7048 |
singleJunkOnly ifTrue:[done := true] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7049 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7050 |
singleInfo ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7051 |
timeStampInfo := nil |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7052 |
]. |
|
6658
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
7053 |
anyMethod ifFalse:[ |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
7054 |
emptyBlock value |
|
faf73551558b
handle empty methodsFor chunks
Claus Gittinger <cg@exept.de>
parents:
6639
diff
changeset
|
7055 |
]. |
| 16372 | 7056 |
|
| 17094 | 7057 |
"Modified: / 21-11-2016 / 23:32:29 / cg" |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7058 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7059 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7060 |
processNonMethodChunk |
| 18059 | 7061 |
|s changeClass sel cls parseTree rec clsName ownerTree ownerName |
7062 |
m nameAndClass args instVarsArg classVarsArg categoryArg |
|
| 18490 | 7063 |
lastInfo newCategory newPackage| |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7064 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7065 |
(chunkText startsWith:'''---- snap') ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7066 |
self processSnapshotChunk. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7067 |
^ self |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7068 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7069 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7070 |
headerLine := chunkText , ' (doIt)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7071 |
|
| 18490 | 7072 |
changeString := (chunkText contractTo:maxLen) withoutSeparators. |
7073 |
||
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7074 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7075 |
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
|
7076 |
" |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7077 |
((chunkText startsWith:'''---- file') |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7078 |
or:[(chunkText startsWith:'''---- check')]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7079 |
changeType := ''. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7080 |
timeStampInfo := nil. |
| 18490 | 7081 |
changeString := changeString withColor:Color grey. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7082 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7083 |
changeType := '(doIt)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7084 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7085 |
|
| 18059 | 7086 |
parseTree := browser parseExpression:fullChunkText inNameSpace:Smalltalk. |
7087 |
(parseTree notNil and:[parseTree ~~ #Error]) ifTrue:[ |
|
7088 |
parseTree isMessage ifTrue:[ |
|
7089 |
sel := parseTree selector. |
|
7090 |
rec := parseTree receiver. |
|
7091 |
args := parseTree args. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7092 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7093 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7094 |
sel := nil. |
| 18123 | 7095 |
Error handle:[:ex | |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7096 |
changeType := '(???)'. |
| 18123 | 7097 |
] do:[ |
7098 |
(Scanner new scanTokens:fullChunkText) size == 0 ifTrue:[ |
|
7099 |
"/ a comment only |
|
7100 |
changeType := self colorizeAsCommentChange:'(comment)'. |
|
7101 |
] ifFalse:[ |
|
7102 |
changeType := '(???)'. |
|
7103 |
] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7104 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7105 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7106 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7107 |
(sel == #comment:) ifTrue:[ |
| 18059 | 7108 |
changeType := self colorizeAsCommentChange:'(comment)'. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7109 |
clsName := rec name. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7110 |
changeClass := (self nameSpaceForApply) classNamed:clsName. |
| 16372 | 7111 |
(changeInfo last) className:clsName. |
| 18059 | 7112 |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7113 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7114 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7115 |
changeDelta := '?' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7116 |
] ifFalse:[ |
| 15087 | 7117 |
(changeClass comment = (args at:1) evaluate) ifTrue:[ |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7118 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7119 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7120 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7121 |
]. |
| 15087 | 7122 |
"/ sel := nil. |
7123 |
^ self. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7124 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7125 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7126 |
(sel == #removeSelector:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7127 |
nameAndClass := self extractClassAndClassNameFromParseTree:rec. |
| 18059 | 7128 |
clsName := nameAndClass key. |
7129 |
changeClass := nameAndClass value. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7130 |
|
| 15087 | 7131 |
sel := (args at:1) evaluate. |
| 16372 | 7132 |
(changeInfo last) className:clsName. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7133 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7134 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7135 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7136 |
changeDelta := '?' |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7137 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7138 |
(changeClass includesSelector:sel asSymbol) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7139 |
changeDelta := '-'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7140 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7141 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7142 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7143 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7144 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7145 |
changeType := '(remove)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7146 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
| 15087 | 7147 |
"/ sel := nil. |
7148 |
^ self. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7149 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7150 |
|
| 18059 | 7151 |
(parseTree notNil |
7152 |
and:[parseTree ~~ #Error |
|
7153 |
and:[parseTree isMessage |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7154 |
and:[rec isMessage |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7155 |
and:[rec selector == #compiledMethodAt:]]]]) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7156 |
nameAndClass := self extractClassAndClassNameFromParseTree:rec receiver. |
| 18059 | 7157 |
clsName := nameAndClass key. |
7158 |
changeClass := nameAndClass value. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7159 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7160 |
(sel == #category:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7161 |
sel := (rec args at:1) evaluate. |
| 18059 | 7162 |
changeType := self colorizeAsCommentChange:'(category change)'. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7163 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
| 18059 | 7164 |
newCategory := (args at:1) evaluate. |
7165 |
||
7166 |
"/ make it a category change |
|
7167 |
lastInfo := changeInfo last. |
|
7168 |
lastInfo className:clsName. |
|
7169 |
lastInfo selector:sel. |
|
7170 |
lastInfo categoryIfCategoryChange:newCategory. |
|
7171 |
||
| 15012 | 7172 |
autoCompare value ifTrue:[ |
7173 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
7174 |
changeDelta := '?' |
|
7175 |
] ifFalse:[ |
|
7176 |
m := changeClass compiledMethodAt:sel asSymbol. |
|
| 18059 | 7177 |
m isNil ifTrue:[ |
7178 |
"/ mhm - the method does not (no longer=) exist |
|
7179 |
changeDelta := '?' |
|
7180 |
] ifFalse:[ |
|
7181 |
m category = newCategory ifTrue:[ |
|
| 15012 | 7182 |
changeDelta := '='. |
7183 |
] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7184 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7185 |
] |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7186 |
]. |
| 15087 | 7187 |
^ self. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7188 |
]. |
| 18059 | 7189 |
|
| 18490 | 7190 |
(sel == #package:) ifTrue:[ |
7191 |
sel := (rec args at:1) evaluate. |
|
7192 |
changeType := self colorizeAsCommentChange:'(package change)'. |
|
7193 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
|
7194 |
newPackage := (args at:1) evaluate. |
|
7195 |
||
7196 |
"/ make it a category change |
|
7197 |
lastInfo := changeInfo last. |
|
7198 |
lastInfo className:clsName. |
|
7199 |
lastInfo selector:sel. |
|
7200 |
"/ lastInfo packageIfPackageChange:newPackage. |
|
7201 |
||
7202 |
autoCompare value ifTrue:[ |
|
7203 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
7204 |
changeDelta := '?' |
|
7205 |
] ifFalse:[ |
|
7206 |
m := changeClass compiledMethodAt:sel asSymbol. |
|
7207 |
m isNil ifTrue:[ |
|
7208 |
"/ mhm - the method does not (no longer=) exist |
|
7209 |
changeDelta := '?' |
|
7210 |
] ifFalse:[ |
|
7211 |
m package = newPackage ifTrue:[ |
|
7212 |
changeDelta := '='. |
|
7213 |
] |
|
7214 |
] |
|
7215 |
] |
|
7216 |
]. |
|
7217 |
^ self. |
|
7218 |
]. |
|
7219 |
||
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7220 |
(sel == #privacy:) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7221 |
sel := (rec args at:1) evaluate. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7222 |
changeType := '(privacy change)'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7223 |
changeString := self contractClass:clsName selector:sel to:maxLen. |
| 16372 | 7224 |
(changeInfo last) className:clsName. |
| 18059 | 7225 |
|
| 15012 | 7226 |
autoCompare value ifTrue:[ |
7227 |
(changeClass isNil or:[changeClass isLoaded not]) ifTrue:[ |
|
7228 |
changeDelta := '?' |
|
7229 |
] ifFalse:[ |
|
7230 |
changeDelta := ' ' |
|
7231 |
] |
|
7232 |
]. |
|
| 15087 | 7233 |
^ self. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7234 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7235 |
sel := nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7236 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7237 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7238 |
(Class definitionSelectors includes:sel) ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7239 |
changeType := '(class definition)'. |
| 15087 | 7240 |
clsName := (args at:1) evaluate. |
| 16372 | 7241 |
(changeInfo last) className:clsName. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7242 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7243 |
"/ is it a private-class ? |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7244 |
('*privateIn:' match:sel) ifTrue:[
|
| 15087 | 7245 |
ownerTree := args last. |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7246 |
ownerName := ownerTree name asString. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7247 |
clsName := ownerName , '::' , clsName |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7248 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7249 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7250 |
changeString := clsName. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7251 |
NoColoring ~~ true ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7252 |
changeType := changeType allBold. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7253 |
changeString := changeString allBold. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7254 |
]. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7255 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7256 |
autoCompare value ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7257 |
cls := (self nameSpaceForApply) at:clsName asSymbol ifAbsent:nil. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7258 |
cls isNil ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7259 |
changeDelta := '+'. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7260 |
] ifFalse:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7261 |
(cls definitionSelector = sel |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7262 |
or:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7263 |
"/ could be an ST/V, VAge or Dolphin definition |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7264 |
cls definitionSelector = (sel , 'category:') |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7265 |
]) |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7266 |
ifTrue:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7267 |
((cls superclass isNil |
| 18059 | 7268 |
and:[rec isLiteral |
7269 |
and:[rec evaluate isNil]]) |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7270 |
or:[ |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7271 |
cls superclass notNil |
| 18059 | 7272 |
and:[rec isLiteral not |
7273 |
and:[cls superclass name = rec name]] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7274 |
]) ifTrue:[ |
| 15087 | 7275 |
(sel == #'variableByteSubclass:classVariableNames:poolDictionaries:category:') |
7276 |
ifTrue:[ |
|
7277 |
"/ VSE definition message |
|
7278 |
instVarsArg := ''. |
|
7279 |
classVarsArg := (args at:2) evaluate. |
|
7280 |
categoryArg := (args at:4) evaluate. |
|
7281 |
] ifFalse:[ |
|
7282 |
instVarsArg := (args at:2) evaluate. |
|
7283 |
classVarsArg := (args at:3) evaluate. |
|
7284 |
categoryArg := (args at:5) evaluate. |
|
7285 |
]. |
|
7286 |
cls instanceVariableString asCollectionOfWords = instVarsArg asCollectionOfWords ifTrue:[ |
|
7287 |
cls classVariableString asCollectionOfWords = classVarsArg asCollectionOfWords ifTrue:[ |
|
7288 |
cls definitionSelector = (sel , 'category:') |
|
7289 |
ifTrue:[ |
|
7290 |
"/ ST/V, VAge or Dolphin definition |
|
7291 |
changeDelta := '='. |
|
7292 |
] ifFalse:[ |
|
7293 |
cls category = categoryArg ifTrue:[ |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7294 |
changeDelta := '='. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7295 |
] ifFalse:[ |
| 18059 | 7296 |
changeType := self colorizeAsCommentChange:'(class category change)'. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7297 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7298 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7299 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7300 |
] |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7301 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7302 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7303 |
] |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7304 |
]. |
| 15087 | 7305 |
"/ sel := nil. |
7306 |
^ self. |
|
7307 |
]. |
|
7308 |
||
7309 |
(#( |
|
7310 |
#'primitiveDefinitions:' |
|
7311 |
#'primitiveFunctions:' |
|
7312 |
#'primitiveVariables:' |
|
7313 |
) includes:sel) ifTrue:[ |
|
7314 |
changeType := '(class definition)'. |
|
7315 |
clsName := rec name. |
|
7316 |
^ self. |
|
7317 |
]. |
|
7318 |
||
7319 |
((sel == #instanceVariableNames:) |
|
7320 |
and:[rec isMessage |
|
7321 |
and:[rec selector == #class]]) ifTrue:[ |
|
7322 |
clsName := rec receiver name. |
|
7323 |
changeClass := (self nameSpaceForApply) classNamed:clsName. |
|
7324 |
changeType := '(class definition)'. |
|
| 16372 | 7325 |
(changeInfo last) className:clsName. |
| 15087 | 7326 |
|
7327 |
autoCompare value ifTrue:[ |
|
7328 |
changeClass isNil ifTrue:[ |
|
7329 |
changeDelta := '?'. |
|
7330 |
] ifFalse:[ |
|
| 18059 | 7331 |
s := (args at:1) evaluate. |
| 15087 | 7332 |
s = changeClass class instanceVariableString ifTrue:[ |
7333 |
changeDelta := '='. |
|
7334 |
] |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7335 |
] |
| 15087 | 7336 |
]. |
7337 |
^ self. |
|
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7338 |
]. |
| 9548 | 7339 |
|
| 16372 | 7340 |
"Modified: / 01-05-2016 / 19:19:54 / cg" |
| 18490 | 7341 |
"Modified: / 24-10-2018 / 13:01:41 / Claus Gittinger" |
|
6530
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7342 |
! |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7343 |
|
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7344 |
processSnapshotChunk |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7345 |
changeType := ''. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7346 |
headerLine := chunkText. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7347 |
changeString := (chunkText contractTo:maxLen) withoutSeparators. |
|
6bb6d5670055
refactorings to make reader cleaner;
Claus Gittinger <cg@exept.de>
parents:
6516
diff
changeset
|
7348 |
timeStampInfo := nil. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7349 |
! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7350 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7351 |
readChangesFile |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7352 |
"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
|
7353 |
and a list of chunk-positions (changePositions). |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7354 |
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
|
7355 |
the cols are: |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7356 |
1 delta (only if comparing) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7357 |
'+' -> new method (w.r.t. current state) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7358 |
'-' -> removed method (w.r.t. current state) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7359 |
'?' -> class does not exist currently |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7360 |
'=' -> 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
|
7361 |
'~' -> 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
|
7362 |
2 class/selector |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7363 |
3 type of change |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7364 |
doit |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7365 |
method |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7366 |
category change |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7367 |
4 timestamp |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7368 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7369 |
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
|
7370 |
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
|
7371 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7372 |
|excla| |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7373 |
|
| 16372 | 7374 |
changeInfo := OrderedCollection new. |
7375 |
||
7376 |
"/ changeChunks := OrderedCollection new. |
|
7377 |
"/ changeClassNames := OrderedCollection new. |
|
7378 |
"/ changeHeaderLines := OrderedCollection new. |
|
7379 |
"/ changePositions := OrderedCollection new. |
|
7380 |
"/ changeTimeStamps := OrderedCollection new. |
|
7381 |
"/ changeIsFollowupMethodChange := OrderedCollection new. |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7382 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7383 |
excla := inStream class chunkSeparator. |
| 9515 | 7384 |
maxLen := 100. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7385 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7386 |
[inStream atEnd] whileFalse:[ |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7387 |
" |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7388 |
get a chunk (separated by excla) |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7389 |
" |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7390 |
inStream skipSeparators. |
| 13314 | 7391 |
chunkPosition := inStream position + 1. |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7392 |
|
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7393 |
sawExcla := inStream peekFor:excla. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7394 |
chunkText := fullChunkText := inStream nextChunk. |
|
7619
95943c1bc289
Ignore empty chunks when reading from changes file
Stefan Vogel <sv@exept.de>
parents:
7618
diff
changeset
|
7395 |
chunkText notEmptyOrNil ifTrue:[ |
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7396 |
self processChunk. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7397 |
] |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7398 |
]. |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7399 |
|
| 9515 | 7400 |
"Modified: / 27-08-1995 / 23:06:55 / claus" |
| 16372 | 7401 |
"Modified: / 01-05-2016 / 18:33:36 / cg" |
7402 |
! ! |
|
7403 |
||
| 18059 | 7404 |
!ChangesBrowser::ChangeInfo class methodsFor:'documentation'! |
7405 |
||
7406 |
documentation |
|
7407 |
" |
|
7408 |
documentation to be added. |
|
7409 |
||
7410 |
[author:] |
|
7411 |
cg |
|
7412 |
||
7413 |
[instance variables:] |
|
7414 |
||
7415 |
[class variables:] |
|
7416 |
||
7417 |
[see also:] |
|
7418 |
||
7419 |
" |
|
7420 |
! ! |
|
7421 |
||
| 16372 | 7422 |
!ChangesBrowser::ChangeInfo methodsFor:'accessing'! |
7423 |
||
| 18059 | 7424 |
categoryIfCategoryChange |
7425 |
^ categoryIfCategoryChange |
|
7426 |
! |
|
7427 |
||
7428 |
categoryIfCategoryChange:something |
|
7429 |
categoryIfCategoryChange := something. |
|
7430 |
! |
|
7431 |
||
| 16372 | 7432 |
chunk |
7433 |
^ chunk |
|
7434 |
! |
|
7435 |
||
7436 |
className |
|
7437 |
^ className |
|
7438 |
! |
|
7439 |
||
7440 |
className:something |
|
7441 |
className := something. |
|
7442 |
! |
|
7443 |
||
7444 |
headerLine |
|
7445 |
^ headerLine |
|
7446 |
! |
|
7447 |
||
7448 |
headerLine:something |
|
7449 |
headerLine := something. |
|
7450 |
! |
|
7451 |
||
7452 |
isFollowupChange |
|
7453 |
^ isFollowupChange |
|
7454 |
! |
|
7455 |
||
| 18059 | 7456 |
isMethodCategoryChange |
7457 |
^ categoryIfCategoryChange notNil |
|
7458 |
! |
|
7459 |
||
| 16372 | 7460 |
position |
7461 |
^ position |
|
7462 |
! |
|
7463 |
||
7464 |
position:positionArg chunk:chunkArg className:classNameArg selector:selectorArg headerLine:headerLineArg |
|
7465 |
timestamp:timestampArg isFollowupChange:isFollowupChangeArg |
|
7466 |
||
7467 |
position := positionArg. |
|
7468 |
chunk := chunkArg. |
|
7469 |
className := classNameArg. |
|
7470 |
selector := selectorArg. |
|
7471 |
headerLine := headerLineArg. |
|
7472 |
timestamp := timestampArg. |
|
7473 |
isFollowupChange := isFollowupChangeArg. |
|
7474 |
||
7475 |
"Created: / 01-05-2016 / 19:01:03 / cg" |
|
7476 |
! |
|
7477 |
||
7478 |
selector |
|
7479 |
^ selector |
|
7480 |
! |
|
7481 |
||
7482 |
selector:something |
|
7483 |
selector := something. |
|
7484 |
! |
|
7485 |
||
7486 |
timestamp |
|
7487 |
^ timestamp |
|
|
6512
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7488 |
! ! |
|
ee424e762e33
started to refacvtorreadChanges into separate helper class.
Claus Gittinger <cg@exept.de>
parents:
6482
diff
changeset
|
7489 |
|
| 761 | 7490 |
!ChangesBrowser class methodsFor:'documentation'! |
| 202 | 7491 |
|
7492 |
version |
|
| 15683 | 7493 |
^ '$Header$' |
| 8978 | 7494 |
! |
7495 |
||
7496 |
version_CVS |
|
| 15683 | 7497 |
^ '$Header$' |
|
276
017219e571e4
more stuff for autoloaded classes
Claus Gittinger <cg@exept.de>
parents:
275
diff
changeset
|
7498 |
! ! |
| 12428 | 7499 |