author | Claus Gittinger <cg@exept.de> |
Fri, 18 Nov 2011 15:07:05 +0100 | |
changeset 10881 | 07359595b386 |
parent 10657 | 7df080baff44 |
child 10925 | 7cb47ef997fb |
permissions | -rw-r--r-- |
10009 | 1 |
" |
10064 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
3 |
All Rights Reserved |
|
10009 | 4 |
|
10064 | 5 |
Permission is hereby granted, free of charge, to any person |
6 |
obtaining a copy of this software and associated documentation |
|
7 |
files (the 'Software'), to deal in the Software without |
|
8 |
restriction, including without limitation the rights to use, |
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
10 |
copies of the Software, and to permit persons to whom the |
|
11 |
Software is furnished to do so, subject to the following |
|
12 |
conditions: |
|
13 |
||
14 |
The above copyright notice and this permission notice shall be |
|
15 |
included in all copies or substantial portions of the Software. |
|
16 |
||
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
24 |
OTHER DEALINGS IN THE SOFTWARE. |
|
10009 | 25 |
" |
26 |
"{ Package: 'stx:libtool' }" |
|
27 |
||
28 |
"{ NameSpace: Tools }" |
|
29 |
||
30 |
BrowserList subclass:#ChangeList |
|
10449 | 31 |
instanceVariableNames:'listHolder listView showRemovedHolder showSameHolder |
32 |
acceptEnabledHolder' |
|
10009 | 33 |
classVariableNames:'LastSelectionConditionString' |
34 |
poolDictionaries:'' |
|
35 |
category:'Interface-Browsers-ChangeSet' |
|
36 |
! |
|
37 |
||
38 |
HierarchicalItem subclass:#ListEntry |
|
39 |
instanceVariableNames:'change application x' |
|
40 |
classVariableNames:'' |
|
41 |
poolDictionaries:'' |
|
42 |
privateIn:ChangeList |
|
43 |
! |
|
44 |
||
45 |
!ChangeList class methodsFor:'documentation'! |
|
46 |
||
47 |
copyright |
|
48 |
" |
|
10064 | 49 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
50 |
All Rights Reserved |
|
51 |
||
52 |
Permission is hereby granted, free of charge, to any person |
|
53 |
obtaining a copy of this software and associated documentation |
|
54 |
files (the 'Software'), to deal in the Software without |
|
55 |
restriction, including without limitation the rights to use, |
|
56 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
57 |
copies of the Software, and to permit persons to whom the |
|
58 |
Software is furnished to do so, subject to the following |
|
59 |
conditions: |
|
10009 | 60 |
|
10064 | 61 |
The above copyright notice and this permission notice shall be |
62 |
included in all copies or substantial portions of the Software. |
|
63 |
||
64 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
65 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
66 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
67 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
68 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
69 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
70 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
71 |
OTHER DEALINGS IN THE SOFTWARE. |
|
10009 | 72 |
" |
73 |
! ! |
|
74 |
||
75 |
!ChangeList class methodsFor:'image specs'! |
|
76 |
||
77 |
iconEqual |
|
10657 | 78 |
^ ToolbarIconLibrary iconEqual12x12 |
10009 | 79 |
|
10657 | 80 |
"Modified: / 31-08-2011 / 10:52:34 / cg" |
10009 | 81 |
! |
82 |
||
83 |
iconEqualGrayed |
|
10657 | 84 |
^ ToolbarIconLibrary iconEqualGray12x12 |
10009 | 85 |
|
10657 | 86 |
"Modified: / 31-08-2011 / 10:54:00 / cg" |
10009 | 87 |
! |
88 |
||
89 |
iconMinus |
|
10657 | 90 |
^ ToolbarIconLibrary iconMinus12x12 |
10009 | 91 |
|
10657 | 92 |
"Modified: / 31-08-2011 / 10:51:26 / cg" |
10009 | 93 |
! |
94 |
||
95 |
iconMinusGrayed |
|
10657 | 96 |
^ ToolbarIconLibrary iconMinusGray12x12 |
10009 | 97 |
|
10657 | 98 |
"Modified: / 31-08-2011 / 10:54:40 / cg" |
10009 | 99 |
! |
100 |
||
101 |
iconPlus |
|
10657 | 102 |
^ ToolbarIconLibrary iconPlus12x12 |
10009 | 103 |
|
10657 | 104 |
"Modified: / 31-08-2011 / 10:51:39 / cg" |
10009 | 105 |
! |
106 |
||
107 |
iconPlusGrayed |
|
10657 | 108 |
^ ToolbarIconLibrary iconPlusGray12x12 |
10009 | 109 |
|
10657 | 110 |
"Modified: / 31-08-2011 / 10:54:46 / cg" |
10009 | 111 |
! ! |
112 |
||
113 |
!ChangeList class methodsFor:'interface specs'! |
|
114 |
||
115 |
windowSpec |
|
116 |
"This resource specification was automatically generated |
|
117 |
by the UIPainter of ST/X." |
|
118 |
||
119 |
"Do not manually edit this!! If it is corrupted, |
|
120 |
the UIPainter may not be able to read the specification." |
|
121 |
||
122 |
" |
|
123 |
UIPainter new openOnClass:Tools::ChangeList andSelector:#windowSpec |
|
124 |
Tools::ChangeList new openInterface:#windowSpec |
|
125 |
Tools::ChangeList open |
|
126 |
" |
|
127 |
||
128 |
<resource: #canvas> |
|
129 |
||
130 |
^ |
|
131 |
#(FullSpec |
|
132 |
name: windowSpec |
|
133 |
window: |
|
134 |
(WindowSpec |
|
135 |
label: 'Change List' |
|
136 |
name: 'Change List' |
|
137 |
min: (Point 10 10) |
|
138 |
bounds: (Rectangle 0 0 300 300) |
|
139 |
) |
|
140 |
component: |
|
141 |
(SpecCollection |
|
142 |
collection: ( |
|
143 |
(SelectionInListModelViewSpec |
|
10449 | 144 |
name: 'List' |
10009 | 145 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
146 |
model: selectionHolder |
|
147 |
menu: menuHolder |
|
148 |
hasHorizontalScrollBar: true |
|
149 |
hasVerticalScrollBar: true |
|
150 |
listModel: listHolder |
|
151 |
multipleSelectOk: true |
|
152 |
useIndex: false |
|
153 |
highlightMode: line |
|
154 |
doubleClickSelector: selectionDoubleclicked |
|
155 |
postBuildCallback: postBuildList: |
|
156 |
) |
|
157 |
) |
|
158 |
||
159 |
) |
|
160 |
) |
|
161 |
! ! |
|
162 |
||
163 |
!ChangeList class methodsFor:'menu specs'! |
|
164 |
||
165 |
listMenu |
|
166 |
"This resource specification was automatically generated |
|
167 |
by the MenuEditor of ST/X." |
|
168 |
||
169 |
"Do not manually edit this!! If it is corrupted, |
|
170 |
the MenuEditor may not be able to read the specification." |
|
171 |
||
172 |
" |
|
173 |
MenuEditor new openOnClass:Tools::ChangeList andSelector:#listMenu |
|
174 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeList listMenu)) startUp |
|
175 |
" |
|
176 |
||
177 |
<resource: #menu> |
|
178 |
||
179 |
^ |
|
180 |
#(Menu |
|
181 |
( |
|
182 |
(MenuItem |
|
183 |
enabled: hasChangeSelectedAndNotRemoved |
|
184 |
label: 'Apply' |
|
185 |
itemValue: listMenuApply |
|
186 |
translateLabel: true |
|
187 |
isVisible: acceptEnabledHolder |
|
188 |
shortcutKey: Accept |
|
189 |
) |
|
190 |
(MenuItem |
|
191 |
label: 'Apply all' |
|
192 |
itemValue: listMenuApplyAll |
|
193 |
translateLabel: true |
|
194 |
isVisible: acceptEnabledHolder |
|
195 |
) |
|
196 |
(MenuItem |
|
197 |
enabled: hasSingleChangeSelectedAndCanBrowse |
|
198 |
label: 'Browse' |
|
199 |
itemValue: listMenuBrowse |
|
200 |
translateLabel: true |
|
201 |
) |
|
202 |
(MenuItem |
|
203 |
label: '-' |
|
204 |
) |
|
205 |
(MenuItem |
|
206 |
label: 'Delete' |
|
207 |
itemValue: listMenuDeleteSelection |
|
208 |
nameKey: Delete |
|
209 |
translateLabel: true |
|
210 |
shortcutKey: Delete |
|
211 |
) |
|
212 |
(MenuItem |
|
213 |
label: '-' |
|
214 |
) |
|
215 |
(MenuItem |
|
216 |
label: 'Select...' |
|
217 |
translateLabel: true |
|
218 |
submenu: |
|
219 |
(Menu |
|
220 |
( |
|
221 |
(MenuItem |
|
222 |
label: 'Select same' |
|
223 |
itemValue: listMenuSelectSame |
|
224 |
translateLabel: true |
|
225 |
) |
|
226 |
(MenuItem |
|
227 |
label: 'Select additions (new classes/methods)' |
|
228 |
itemValue: listMenuSelectAdditions |
|
229 |
translateLabel: true |
|
230 |
) |
|
231 |
(MenuItem |
|
232 |
label: 'Select removals' |
|
233 |
itemValue: listMenuSelectRemovals |
|
234 |
translateLabel: true |
|
235 |
) |
|
236 |
(MenuItem |
|
237 |
label: '-' |
|
238 |
) |
|
239 |
(MenuItem |
|
240 |
label: 'Select all' |
|
241 |
itemValue: listMenuSelectAll |
|
242 |
translateLabel: true |
|
243 |
) |
|
244 |
(MenuItem |
|
245 |
label: 'Select none' |
|
246 |
itemValue: listMenuSelectNone |
|
247 |
translateLabel: true |
|
248 |
) |
|
249 |
(MenuItem |
|
250 |
label: '-' |
|
251 |
) |
|
252 |
(MenuItem |
|
253 |
label: 'Select using block' |
|
254 |
itemValue: listMenuSelectUsingBlock |
|
255 |
translateLabel: true |
|
256 |
) |
|
257 |
) |
|
258 |
nil |
|
259 |
nil |
|
260 |
) |
|
261 |
) |
|
262 |
(MenuItem |
|
263 |
label: '-' |
|
264 |
) |
|
265 |
(MenuItem |
|
266 |
label: 'Show Deleted' |
|
267 |
translateLabel: true |
|
268 |
indication: showRemovedHolder |
|
269 |
) |
|
270 |
(MenuItem |
|
271 |
label: 'Inspect change' |
|
272 |
itemValue: listMenuInspect |
|
273 |
translateLabel: true |
|
274 |
) |
|
275 |
) |
|
276 |
nil |
|
277 |
nil |
|
278 |
) |
|
279 |
! ! |
|
280 |
||
281 |
!ChangeList class methodsFor:'plugIn spec'! |
|
282 |
||
283 |
aspectSelectors |
|
284 |
"This resource specification was automatically generated |
|
285 |
by the UIPainter of ST/X." |
|
286 |
||
287 |
"Do not manually edit this. If it is corrupted, |
|
288 |
the UIPainter may not be able to read the specification." |
|
289 |
||
290 |
"Return a description of exported aspects; |
|
291 |
these can be connected to aspects of an embedding application |
|
292 |
(if this app is embedded in a subCanvas)." |
|
293 |
||
294 |
^ #( |
|
295 |
#acceptEnabledHolder |
|
296 |
#inGeneratorHolder |
|
297 |
#menuHolder |
|
298 |
#outGeneratorHolder |
|
299 |
#selectionHolder |
|
300 |
#showRemovedHolder |
|
10449 | 301 |
#showSameHolder |
10009 | 302 |
). |
303 |
||
10449 | 304 |
"Modified: / 04-08-2011 / 18:42:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 305 |
! ! |
306 |
||
307 |
!ChangeList methodsFor:'accessing'! |
|
308 |
||
309 |
acceptEnabled |
|
310 |
"return the value in 'acceptEnabledHolder'" |
|
311 |
||
312 |
^ self acceptEnabledHolder value |
|
313 |
! |
|
314 |
||
315 |
acceptEnabled: newValue |
|
316 |
"set the value in 'acceptEnabledHolder'" |
|
317 |
||
318 |
self acceptEnabledHolder value: newValue |
|
319 |
! |
|
320 |
||
321 |
selection |
|
322 |
||
323 |
^self selectionHolder value |
|
324 |
||
325 |
"Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
326 |
! |
|
327 |
||
328 |
showRemoved |
|
329 |
||
330 |
^self showRemovedHolder value ? true |
|
331 |
||
332 |
"Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
333 |
! ! |
|
334 |
||
335 |
!ChangeList methodsFor:'actions'! |
|
336 |
||
337 |
selectionDoubleclicked |
|
338 |
||
339 |
| app | |
|
340 |
||
341 |
self selection do: |
|
342 |
[:e|e removed: e removed not]. |
|
343 |
((app := self masterApplication) respondsTo: #redrawChangeListViews) |
|
344 |
ifTrue:[app redrawChangeListViews]. |
|
345 |
||
346 |
"Modified: / 16-03-2011 / 22:51:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
347 |
! ! |
|
348 |
||
349 |
!ChangeList methodsFor:'aspects'! |
|
350 |
||
351 |
acceptEnabledHolder |
|
352 |
"return/create the valueHolder 'acceptEnabledHolder'" |
|
353 |
||
354 |
acceptEnabledHolder isNil ifTrue:[ |
|
355 |
acceptEnabledHolder := ValueHolder with:nil "defaultValue here". |
|
356 |
]. |
|
357 |
^ acceptEnabledHolder |
|
358 |
! |
|
359 |
||
360 |
acceptEnabledHolder:aValueModel |
|
361 |
acceptEnabledHolder := aValueModel. |
|
362 |
! |
|
363 |
||
364 |
listHolder |
|
365 |
listHolder isNil ifTrue:[ |
|
366 |
listHolder := ValueHolder new. |
|
367 |
]. |
|
368 |
^ listHolder |
|
369 |
! |
|
370 |
||
371 |
showRemovedHolder |
|
372 |
"return/create the 'showRemovedHolder' value holder (automatically generated)" |
|
373 |
||
374 |
showRemovedHolder isNil ifTrue:[ |
|
375 |
showRemovedHolder := ValueHolder with: true. |
|
376 |
showRemovedHolder addDependent: self. |
|
377 |
]. |
|
378 |
^ showRemovedHolder |
|
379 |
! |
|
380 |
||
10449 | 381 |
showRemovedHolder:something |
10009 | 382 |
"set the 'showRemovedHolder' value holder (automatically generated)" |
383 |
||
10449 | 384 |
|oldValue newValue| |
385 |
||
386 |
showRemovedHolder notNil ifTrue:[ |
|
387 |
oldValue := showRemovedHolder value. |
|
388 |
showRemovedHolder removeDependent:self. |
|
389 |
]. |
|
390 |
showRemovedHolder := something. |
|
391 |
showRemovedHolder notNil ifTrue:[ |
|
392 |
showRemovedHolder addDependent:self. |
|
393 |
]. |
|
394 |
newValue := showRemovedHolder value. |
|
395 |
oldValue ~~ newValue ifTrue:[ |
|
396 |
self update:#value with:newValue from:showRemovedHolder. |
|
397 |
]. |
|
398 |
! |
|
399 |
||
400 |
showSameHolder |
|
401 |
"return/create the 'showSameHolder' value holder (automatically generated)" |
|
402 |
||
403 |
showSameHolder isNil ifTrue:[ |
|
404 |
showSameHolder := ValueHolder with: true. |
|
405 |
showSameHolder addDependent:self. |
|
406 |
]. |
|
407 |
^ showSameHolder |
|
408 |
||
409 |
"Modified: / 04-08-2011 / 18:39:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
410 |
! |
|
411 |
||
412 |
showSameHolder:something |
|
413 |
"set the 'showSameHolder' value holder (automatically generated)" |
|
414 |
||
415 |
|oldValue newValue| |
|
416 |
||
417 |
showSameHolder notNil ifTrue:[ |
|
418 |
oldValue := showSameHolder value. |
|
419 |
showSameHolder removeDependent:self. |
|
420 |
]. |
|
421 |
showSameHolder := something. |
|
422 |
showSameHolder notNil ifTrue:[ |
|
423 |
showSameHolder addDependent:self. |
|
424 |
]. |
|
425 |
newValue := showSameHolder value. |
|
426 |
oldValue ~~ newValue ifTrue:[ |
|
427 |
self update:#value with:newValue from:showSameHolder. |
|
428 |
]. |
|
10009 | 429 |
! ! |
430 |
||
431 |
!ChangeList methodsFor:'change & update'! |
|
432 |
||
433 |
update: aspect with: param from: sender |
|
434 |
||
10449 | 435 |
sender == selectionHolder ifTrue:[ |
436 |
self selectionChanged. |
|
437 |
^self |
|
438 |
]. |
|
439 |
sender == showSameHolder ifTrue:[ |
|
440 |
self updateList |
|
441 |
]. |
|
442 |
sender == showRemovedHolder ifTrue:[ |
|
443 |
self updateList |
|
444 |
]. |
|
445 |
||
10009 | 446 |
|
447 |
^super update: aspect with: param from: sender |
|
448 |
||
449 |
"Created: / 24-10-2009 / 19:47:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
450 |
! ! |
|
451 |
||
452 |
!ChangeList methodsFor:'event processing'! |
|
453 |
||
454 |
buttonPress:button x:x y:y view:aView |
|
455 |
||
456 |
| itemIndex item | |
|
457 |
||
458 |
button ~= 1 ifTrue:[^aView buttonPress:button x:x y:y]. |
|
459 |
||
460 |
itemIndex := aView yVisibleToLineNr:y. |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
461 |
itemIndex isNil ifTrue:[^self]. |
10009 | 462 |
itemIndex == 0 ifTrue:[^self]. |
463 |
itemIndex > aView list size ifTrue:[^self]. |
|
464 |
item := aView list at: itemIndex. |
|
465 |
||
466 |
((aView left + x) between: (item x) and: (item x + 16)) |
|
467 |
ifFalse:[^aView buttonPress:button x:x y:y]. |
|
468 |
||
469 |
item removed: item removed not. |
|
470 |
aView invalidate |
|
471 |
||
472 |
"Created: / 08-12-2009 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
473 |
"Modified: / 18-11-2011 / 14:55:41 / cg" |
10009 | 474 |
! |
475 |
||
476 |
handlesButtonPress:button inView:aView |
|
477 |
||
478 |
^listView == aView |
|
479 |
||
480 |
"Created: / 08-12-2009 / 14:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
481 |
! ! |
|
482 |
||
483 |
!ChangeList methodsFor:'generators'! |
|
484 |
||
485 |
makeGenerator |
|
486 |
"Superclass Tools::BrowserList says that I am responsible to implement this method" |
|
487 |
||
488 |
^Iterator on: |
|
489 |
[:whatToDo| |
|
490 |
selectionHolder value do: |
|
491 |
[:changeListItem| | change | |
|
492 |
change := changeListItem change. |
|
493 |
change isCompositeChange ifTrue: |
|
494 |
[change changes do: whatToDo]]]. |
|
495 |
||
496 |
"Modified: / 24-07-2009 / 23:00:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
497 |
"Modified: / 24-10-2009 / 20:00:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
498 |
! ! |
|
499 |
||
500 |
!ChangeList methodsFor:'hooks'! |
|
501 |
||
502 |
postBuildList: aView |
|
503 |
||
504 |
listView := aView scrolledView. |
|
505 |
listView delegate: self. |
|
506 |
||
507 |
"Created: / 08-12-2009 / 14:10:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
508 |
! ! |
|
509 |
||
510 |
!ChangeList methodsFor:'initialization'! |
|
511 |
||
512 |
initialize |
|
513 |
||
514 |
super initialize. |
|
515 |
menuHolder := [self menuFor: #listMenu]. |
|
516 |
||
517 |
"Created: / 29-10-2010 / 12:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
518 |
! ! |
|
519 |
||
520 |
!ChangeList methodsFor:'menu actions'! |
|
521 |
||
522 |
listMenuApply |
|
523 |
||
524 |
self acceptEnabled ifFalse:[^self]. |
|
525 |
||
526 |
self selectionHolder value do:[:e|e change apply]. |
|
527 |
||
528 |
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
529 |
! |
|
530 |
||
531 |
listMenuApplyAll |
|
532 |
||
533 |
self acceptEnabled ifFalse:[^self]. |
|
534 |
||
535 |
self selection value do: |
|
536 |
[:e|e removed ifFalse:[e change apply]]. |
|
537 |
||
538 |
"Created: / 05-12-2009 / 14:53:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
539 |
! |
|
540 |
||
541 |
listMenuBrowse |
|
542 |
||
543 |
| classes methods methodsOnly | |
|
544 |
classes := Set new. |
|
545 |
methods := Set new. |
|
546 |
methodsOnly := true. |
|
547 |
self selectionHolder value do: |
|
548 |
[:each| |
|
549 |
each change isClassChange ifTrue: |
|
550 |
[each change changeClass ifNotNil: |
|
551 |
[classes add: each change changeClass. |
|
552 |
each change isMethodCodeChange |
|
553 |
ifTrue: |
|
554 |
[each change changeMethod ifNotNil: |
|
555 |
[methods add:each change changeMethod]] |
|
556 |
ifFalse: |
|
557 |
[methodsOnly := false]]]]. |
|
558 |
||
559 |
methodsOnly |
|
560 |
ifTrue: |
|
561 |
[methods size = 1 |
|
562 |
ifTrue:[Smalltalk browserClass openInMethod: methods anyOne] |
|
563 |
ifFalse:[Smalltalk browserClass browseMethods: methods asArray title: 'Selected methods from changeset' sort: true]] |
|
564 |
ifFalse: |
|
565 |
[classes size = 1 |
|
566 |
ifTrue:[Smalltalk browserClass browseClass: classes anyOne] |
|
567 |
ifFalse:[Smalltalk browserClass browseClasses: classes]] |
|
568 |
||
569 |
||
570 |
||
571 |
||
572 |
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
573 |
! |
|
574 |
||
575 |
listMenuDeleteSelection |
|
576 |
||
577 |
self selectionHolder value do: |
|
578 |
[:each|each removed: true]. |
|
579 |
self updateList |
|
580 |
! |
|
581 |
||
582 |
listMenuInspect |
|
583 |
||
584 |
| selection | |
|
585 |
||
586 |
selection := self selectionHolder value collect:[:e|e change]. |
|
587 |
selection size = 1 |
|
588 |
ifTrue:[selection anyOne inspect] |
|
589 |
ifFalse:[selection inspect]. |
|
590 |
||
591 |
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
592 |
! |
|
593 |
||
594 |
listMenuSelectAdditions |
|
595 |
||
596 |
self listMenuSelectAllSuchThat:[:change|change delta = #+] |
|
597 |
! |
|
598 |
||
599 |
listMenuSelectAll |
|
600 |
||
601 |
self listMenuSelectAllSuchThat:[:change|true] |
|
602 |
! |
|
603 |
||
604 |
listMenuSelectAllSuchThat:conditionBlock |
|
605 |
|newSelection| |
|
606 |
||
607 |
newSelection := self listHolder value |
|
608 |
select:[:entry | conditionBlock value:entry change ]. |
|
609 |
self selectionHolder value:newSelection |
|
610 |
! |
|
611 |
||
612 |
listMenuSelectNone |
|
613 |
||
614 |
self listMenuSelectAllSuchThat:[:change|false] |
|
615 |
! |
|
616 |
||
617 |
listMenuSelectRemovals |
|
618 |
||
619 |
self listMenuSelectAllSuchThat:[:change|change delta = #-] |
|
620 |
! |
|
621 |
||
622 |
listMenuSelectSame |
|
623 |
||
624 |
self listMenuSelectAllSuchThat:[:change|change delta = #=] |
|
625 |
! |
|
626 |
||
627 |
listMenuSelectUsingBlock |
|
628 |
||
629 |
|conditionBlockString conditionBlock dialog textHolder template| |
|
630 |
||
631 |
template := |
|
632 |
'[:change| |
|
633 |
"/ Define condition for selection below: |
|
634 |
"/ change is an instance of Change |
|
635 |
"/ change will be selected if and only if block returns true |
|
636 |
||
637 |
||
638 |
true"/always select the change |
|
639 |
] |
|
640 |
'. |
|
641 |
||
642 |
LastSelectionConditionString isNil ifTrue:[ |
|
643 |
LastSelectionConditionString := template. |
|
644 |
]. |
|
645 |
||
646 |
||
647 |
textHolder := ValueHolder new. |
|
648 |
dialog := Dialog |
|
649 |
forRequestText:(resources string:'Enter condition for selection') |
|
650 |
lines:20 |
|
651 |
columns:70 |
|
652 |
initialAnswer:LastSelectionConditionString |
|
653 |
model:textHolder. |
|
654 |
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]). |
|
655 |
dialog open. |
|
656 |
dialog accepted ifFalse:[^ self]. |
|
657 |
||
658 |
conditionBlockString := textHolder value. |
|
659 |
LastSelectionConditionString := conditionBlockString. |
|
660 |
||
661 |
conditionBlock := Parser evaluate:conditionBlockString. |
|
662 |
conditionBlock isBlock ifFalse:[ |
|
663 |
self error:'Bad selection block (syntax error?)'. |
|
664 |
^ self |
|
665 |
]. |
|
666 |
||
667 |
self listMenuSelectAllSuchThat: conditionBlock |
|
668 |
! |
|
669 |
||
670 |
listMenuUndeleteSelection |
|
671 |
||
672 |
self selectionHolder value do: |
|
673 |
[:each|each removed: false]. |
|
674 |
self updateList |
|
675 |
! ! |
|
676 |
||
677 |
!ChangeList methodsFor:'private'! |
|
678 |
||
679 |
application |
|
680 |
||
681 |
^self |
|
682 |
||
683 |
"Created: / 05-12-2009 / 14:10:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
684 |
! |
|
685 |
||
686 |
browserNameList |
|
687 |
||
688 |
^'Change list' |
|
689 |
||
690 |
"Modified: / 24-07-2009 / 22:06:53 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
691 |
! |
|
692 |
||
693 |
listEntryFor:chg |
|
694 |
^ListEntry change:chg application: self |
|
695 |
||
696 |
"Modified: / 05-12-2009 / 14:39:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
697 |
! |
|
698 |
||
699 |
makeDependent |
|
700 |
||
701 |
"Modified: / 24-07-2009 / 22:06:32 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
702 |
! |
|
703 |
||
704 |
makeIndependent |
|
705 |
||
706 |
"Modified: / 24-07-2009 / 22:06:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
707 |
! |
|
708 |
||
709 |
parentOrModel |
|
710 |
||
711 |
^self |
|
712 |
||
713 |
"Created: / 05-12-2009 / 14:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
714 |
! |
|
715 |
||
716 |
updateList |
|
717 |
|inGenerator changeset| |
|
718 |
||
719 |
inGenerator := self inGeneratorHolder value. |
|
720 |
changeset := inGenerator ifNil:[ #() ] ifNotNil:[ inGenerator ]. |
|
721 |
self listHolder value:(changeset |
|
10449 | 722 |
select: |
723 |
[:chg | |
|
724 |
(self showRemovedHolder value or:[ chg removed not ]) |
|
10451 | 725 |
and:[self showSameHolder value or:[chg delta ~~ #=]] |
10449 | 726 |
] |
10009 | 727 |
thenCollect:[:chg | self listEntryFor:chg ]) |
10449 | 728 |
|
10451 | 729 |
"Modified: / 04-08-2011 / 19:07:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 730 |
! ! |
731 |
||
732 |
!ChangeList methodsFor:'queries'! |
|
733 |
||
734 |
hasChangeSelected |
|
735 |
||
736 |
^self selectionHolder value size > 0 |
|
737 |
! |
|
738 |
||
739 |
hasChangeSelectedAndNotRemoved |
|
740 |
||
741 |
| selection | |
|
742 |
selection := self selectionHolder value ? #(). |
|
743 |
^selection size > 0 and: |
|
744 |
[selection allSatisfy:[:e|e removed not]]. |
|
745 |
! |
|
746 |
||
747 |
hasSingleChangeSelected |
|
748 |
||
749 |
^self selectionHolder value size = 1 |
|
750 |
! |
|
751 |
||
752 |
hasSingleChangeSelectedAndCanBrowse |
|
753 |
||
754 |
||
755 |
self selectionHolder value ? #() do: |
|
756 |
[:each| |
|
757 |
(each change isClassChange and: |
|
758 |
[each change isMethodChange not |
|
759 |
or:[each change isMethodCodeChange]]) ifFalse:[^false]]. |
|
760 |
^true |
|
761 |
! ! |
|
762 |
||
763 |
!ChangeList::ListEntry class methodsFor:'instance creation'! |
|
764 |
||
765 |
change: aChange |
|
766 |
||
767 |
^self new change: aChange |
|
768 |
||
769 |
"Created: / 24-07-2009 / 22:43:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
770 |
! |
|
771 |
||
772 |
change: aChange application: anApplicationModel |
|
773 |
||
774 |
^self new change: aChange; application: anApplicationModel |
|
775 |
||
776 |
"Created: / 05-12-2009 / 14:16:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
777 |
! |
|
778 |
||
779 |
change: aChange parent: aChangeList |
|
780 |
||
781 |
^self new change: aChange; parent: aChangeList |
|
782 |
||
783 |
"Created: / 25-07-2009 / 23:33:00 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
784 |
! ! |
|
785 |
||
786 |
!ChangeList::ListEntry methodsFor:'accessing'! |
|
787 |
||
788 |
application |
|
789 |
^ application ifNil:[super application] |
|
790 |
||
791 |
"Modified: / 05-12-2009 / 14:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
792 |
! |
|
793 |
||
794 |
application:anApplicationModel |
|
795 |
application := anApplicationModel. |
|
796 |
||
797 |
"Modified: / 05-12-2009 / 14:15:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
798 |
! |
|
799 |
||
800 |
change |
|
801 |
^ change |
|
802 |
! |
|
803 |
||
804 |
change:aChange |
|
805 |
||
806 |
self assert: ((aChange isKindOf: Change) or:[aChange isKindOf: RefactoryChange]). |
|
807 |
||
808 |
change := aChange. |
|
809 |
||
810 |
"Modified: / 25-07-2009 / 23:40:38 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
811 |
! |
|
812 |
||
813 |
changeClass |
|
814 |
||
815 |
^change changeClass |
|
816 |
! |
|
817 |
||
10334 | 818 |
changeSource |
819 |
||
820 |
^change changeSource |
|
821 |
||
822 |
"Created: / 19-07-2011 / 12:03:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
823 |
! |
|
824 |
||
10009 | 825 |
children |
826 |
||
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
827 |
children isNil ifTrue:[ |
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
828 |
children := |
10009 | 829 |
change isCompositeChange |
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
830 |
ifTrue:[change changes |
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
831 |
select:[:chg| |
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
832 |
(self application showRemovedHolder value or:[ chg removed not ]) |
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
833 |
and:[self application showSameHolder value or:[chg delta ~~ #=]]] |
10449 | 834 |
thenCollect:[:chg|(self application listEntryFor: chg) parent: self]] |
835 |
ifFalse:[#()] |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
836 |
]. |
10009 | 837 |
^children |
838 |
||
839 |
"Created: / 25-07-2009 / 23:32:39 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10449 | 840 |
"Modified: / 04-08-2011 / 18:48:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
841 |
"Modified (format): / 18-11-2011 / 14:56:25 / cg" |
10009 | 842 |
! |
843 |
||
844 |
delta |
|
10657 | 845 |
"/ obsolete: please use deltaDetail |
10009 | 846 |
|
847 |
^change delta |
|
848 |
||
849 |
"Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10657 | 850 |
"Modified (comment): / 31-08-2011 / 10:30:02 / cg" |
851 |
! |
|
852 |
||
853 |
deltaDetail |
|
854 |
||
855 |
^change deltaDetail |
|
856 |
||
857 |
"Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
858 |
"Created: / 31-08-2011 / 10:29:21 / cg" |
|
10009 | 859 |
! |
860 |
||
861 |
iconDelta |
|
862 |
||
863 |
| iconSelector | |
|
864 |
iconSelector := self iconSelector. |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
865 |
iconSelector isNil ifTrue:[^nil]. |
10009 | 866 |
self removed ifTrue:[iconSelector := iconSelector , #Grayed]. |
867 |
^self application class perform: iconSelector asSymbol. |
|
868 |
||
869 |
"Created: / 05-12-2009 / 14:11:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
870 |
"Modified: / 18-11-2011 / 14:56:33 / cg" |
10009 | 871 |
! |
872 |
||
873 |
iconRemoved |
|
874 |
||
875 |
^self removed |
|
876 |
ifTrue: [self application class uncheckedIcon ] |
|
877 |
ifFalse:[self application class checkedIcon ] |
|
878 |
||
879 |
"Created: / 05-12-2009 / 14:11:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
880 |
! |
|
881 |
||
10334 | 882 |
imageSource |
883 |
||
884 |
^change imageSource |
|
885 |
||
886 |
"Created: / 19-07-2011 / 12:03:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
887 |
! |
|
888 |
||
10009 | 889 |
label |
890 |
||
891 |
| label | |
|
892 |
label := change displayString. |
|
893 |
self removed ifTrue:[label := label asText colorizeAllWith: Color gray]. |
|
894 |
^label |
|
895 |
||
896 |
"Created: / 05-11-2008 / 08:20:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
897 |
"Modified: / 25-07-2009 / 23:43:23 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
898 |
"Modified: / 05-12-2009 / 14:46:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
899 |
! |
|
900 |
||
901 |
removed |
|
902 |
^ change removed |
|
903 |
! |
|
904 |
||
905 |
removed:aBoolean |
|
906 |
change removed: aBoolean. |
|
907 |
! |
|
908 |
||
909 |
source |
|
910 |
||
911 |
^change source |
|
912 |
! |
|
913 |
||
914 |
x |
|
915 |
^ x |
|
916 |
! ! |
|
917 |
||
918 |
!ChangeList::ListEntry methodsFor:'displaying'! |
|
919 |
||
920 |
displayLabel:aLabel h:lH on:aGC x:newX y:y h:h |
|
921 |
||
922 |
| cx icon | |
|
923 |
cx := x := newX. |
|
924 |
self application showRemoved ifTrue: |
|
925 |
[(icon := self iconRemoved) ifNotNil: |
|
926 |
[icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) ]. |
|
927 |
cx := cx + 22."experimental value - this looks good"]. |
|
928 |
(icon := self iconDelta) ifNotNil: |
|
929 |
[icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) ]. |
|
930 |
cx := cx + 16."12 + 2px gap" |
|
931 |
||
932 |
||
933 |
super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h |
|
934 |
||
935 |
"Modified: / 05-12-2009 / 14:49:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
936 |
! ! |
|
937 |
||
938 |
!ChangeList::ListEntry methodsFor:'private'! |
|
939 |
||
940 |
iconSelector |
|
10657 | 941 |
| delta | |
10009 | 942 |
|
10657 | 943 |
delta := change deltaDetail. |
944 |
delta shortDeltaSymbol = #+ ifTrue:[^#iconPlus]. |
|
945 |
delta shortDeltaSymbol = #- ifTrue:[^#iconMinus]. |
|
946 |
delta shortDeltaSymbol = #= ifTrue:[^#iconEqual]. |
|
10009 | 947 |
|
10657 | 948 |
^ nil. |
949 |
||
950 |
"Modified: / 31-08-2011 / 10:39:32 / cg" |
|
10009 | 951 |
! ! |
952 |
||
953 |
!ChangeList class methodsFor:'documentation'! |
|
954 |
||
10451 | 955 |
version |
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
956 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.7 2011-11-18 14:07:05 cg Exp $' |
10451 | 957 |
! |
958 |
||
10009 | 959 |
version_CVS |
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
960 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.7 2011-11-18 14:07:05 cg Exp $' |
10009 | 961 |
! |
962 |
||
963 |
version_SVN |
|
964 |
^ '§Id: Tools__ChangeList.st 7486 2009-10-26 22:06:24Z vranyj1 §' |
|
965 |
! ! |