author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 30 Jan 2013 11:15:09 +0000 | |
branch | jv |
changeset 12401 | 4714b9640528 |
parent 12292 | ecc23f7c8dde |
parent 12108 | efa871deeab7 |
child 12406 | 1fbd331e4489 |
permissions | -rw-r--r-- |
10009 | 1 |
" |
10064 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
12292 | 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 |
||
12287 | 30 |
Tools::BrowserListWithFilter subclass:#ChangeList |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
31 |
instanceVariableNames:'listHolder showRemovedHolder showSameHolder showTimestampHolder |
12292 | 32 |
allowRemoveHolder allowAcceptHolder scrollToBottom applyAction' |
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 |
12292 | 50 |
All Rights Reserved |
10064 | 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 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
75 |
|
10009 | 76 |
!ChangeList class methodsFor:'image specs'! |
77 |
||
78 |
iconEqual |
|
10657 | 79 |
^ ToolbarIconLibrary iconEqual12x12 |
10009 | 80 |
|
10657 | 81 |
"Modified: / 31-08-2011 / 10:52:34 / cg" |
10009 | 82 |
! |
83 |
||
84 |
iconEqualGrayed |
|
10657 | 85 |
^ ToolbarIconLibrary iconEqualGray12x12 |
10009 | 86 |
|
10657 | 87 |
"Modified: / 31-08-2011 / 10:54:00 / cg" |
10009 | 88 |
! |
89 |
||
90 |
iconMinus |
|
11657 | 91 |
^ ToolbarIconLibrary iconMinusRed12x12 |
10009 | 92 |
|
11657 | 93 |
"Modified: / 24-07-2012 / 16:43:36 / cg" |
10009 | 94 |
! |
95 |
||
96 |
iconMinusGrayed |
|
10657 | 97 |
^ ToolbarIconLibrary iconMinusGray12x12 |
10009 | 98 |
|
10657 | 99 |
"Modified: / 31-08-2011 / 10:54:40 / cg" |
10009 | 100 |
! |
101 |
||
102 |
iconPlus |
|
11657 | 103 |
^ ToolbarIconLibrary iconPlusBlue12x12 |
10009 | 104 |
|
11657 | 105 |
"Modified: / 24-07-2012 / 16:43:31 / cg" |
10009 | 106 |
! |
107 |
||
108 |
iconPlusGrayed |
|
10657 | 109 |
^ ToolbarIconLibrary iconPlusGray12x12 |
10009 | 110 |
|
10657 | 111 |
"Modified: / 31-08-2011 / 10:54:46 / cg" |
10009 | 112 |
! ! |
113 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
114 |
|
10009 | 115 |
!ChangeList class methodsFor:'interface specs'! |
116 |
||
117 |
windowSpec |
|
118 |
"This resource specification was automatically generated |
|
119 |
by the UIPainter of ST/X." |
|
120 |
||
121 |
"Do not manually edit this!! If it is corrupted, |
|
122 |
the UIPainter may not be able to read the specification." |
|
123 |
||
124 |
" |
|
125 |
UIPainter new openOnClass:Tools::ChangeList andSelector:#windowSpec |
|
126 |
Tools::ChangeList new openInterface:#windowSpec |
|
127 |
Tools::ChangeList open |
|
128 |
" |
|
129 |
||
130 |
<resource: #canvas> |
|
131 |
||
12292 | 132 |
^ |
10009 | 133 |
#(FullSpec |
12292 | 134 |
name: windowSpec |
135 |
window: |
|
10009 | 136 |
(WindowSpec |
12292 | 137 |
label: 'Change List' |
138 |
name: 'Change List' |
|
139 |
min: (Point 10 10) |
|
140 |
bounds: (Rectangle 0 0 300 300) |
|
141 |
) |
|
142 |
component: |
|
10009 | 143 |
(SpecCollection |
12292 | 144 |
collection: ( |
145 |
(InputFieldSpec |
|
146 |
name: 'Filter' |
|
147 |
layout: (LayoutFrame 0 0 0 0 0 1 25 0) |
|
148 |
initiallyInvisible: true |
|
149 |
model: filterPatternHolder |
|
150 |
immediateAccept: true |
|
151 |
acceptOnLeave: false |
|
152 |
acceptOnReturn: false |
|
153 |
acceptOnTab: false |
|
154 |
acceptOnPointerLeave: false |
|
155 |
emptyFieldReplacementText: 'Search Filter...' |
|
156 |
postBuildCallback: postBuildFilterView: |
|
157 |
) |
|
158 |
(DataSetSpec |
|
159 |
name: 'List' |
|
160 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
161 |
model: selectionHolder |
|
162 |
menu: menuHolderWithShowFilter |
|
163 |
hasHorizontalScrollBar: true |
|
164 |
hasVerticalScrollBar: true |
|
165 |
dataList: listHolder |
|
166 |
useIndex: false |
|
167 |
doubleClickSelector: selectionDoubleclicked |
|
168 |
columnHolder: listColumns |
|
169 |
showLabels: false |
|
170 |
multipleSelectOk: true |
|
171 |
postBuildCallback: postBuildListView: |
|
172 |
properties: |
|
173 |
(PropertyListDictionary |
|
174 |
startDragSelector: nil |
|
175 |
dropObjectSelector: dragObjects: |
|
176 |
canDropSelector: canDrop: |
|
177 |
dropSelector: dropObjects: |
|
178 |
) |
|
179 |
) |
|
180 |
) |
|
181 |
||
182 |
) |
|
10009 | 183 |
) |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
184 |
! ! |
12125 | 185 |
|
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
186 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
187 |
!ChangeList class methodsFor:'list specs'! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
188 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
189 |
listColumnSpec |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
190 |
"This resource specification was automatically generated |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
191 |
by the DataSetBuilder of ST/X." |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
192 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
193 |
"Do not manually edit this!! If it is corrupted, |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
194 |
the DataSetBuilder may not be able to read the specification." |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
195 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
196 |
" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
197 |
DataSetBuilder new openOnClass:Tools::ChangeList andSelector:#listColumnSpec |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
198 |
" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
199 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
200 |
<resource: #tableColumns> |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
201 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
202 |
^#( |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
203 |
(DataSetColumnSpec |
12292 | 204 |
label: 'Removed' |
205 |
id: 'removed' |
|
206 |
labelButtonType: Button |
|
207 |
width: 20 |
|
208 |
minWidth: 20 |
|
209 |
editorType: CheckToggle |
|
210 |
rendererType: CheckToggle |
|
211 |
model: notRemoved |
|
212 |
menuFromApplication: false |
|
213 |
printSelector: notRemoved |
|
214 |
isResizeable: false |
|
215 |
showRowSeparator: false |
|
216 |
showSelectionHighLighted: false |
|
217 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
218 |
) |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
219 |
(DataSetColumnSpec |
12292 | 220 |
label: 'Delta' |
221 |
id: 'delta' |
|
222 |
labelButtonType: Button |
|
223 |
width: 20 |
|
224 |
minWidth: 20 |
|
225 |
menuFromApplication: false |
|
226 |
printSelector: iconDelta |
|
227 |
canSelect: false |
|
228 |
isResizeable: false |
|
229 |
showRowSeparator: false |
|
230 |
showSelectionHighLighted: false |
|
231 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
232 |
) |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
233 |
(DataSetColumnSpec |
12292 | 234 |
label: 'Change' |
235 |
id: change |
|
236 |
labelAlignment: left |
|
237 |
labelButtonType: Button |
|
238 |
menuFromApplication: false |
|
239 |
printSelector: label |
|
240 |
canSelect: false |
|
241 |
showRowSeparator: false |
|
242 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
243 |
) |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
244 |
(DataSetColumnSpec |
12292 | 245 |
label: 'Class' |
246 |
id: 'className' |
|
247 |
labelAlignment: left |
|
248 |
activeHelpKey: '' |
|
249 |
activeHelpKeyForLabel: '' |
|
250 |
labelButtonType: Button |
|
251 |
usePreferredWidth: true |
|
252 |
model: className |
|
253 |
menuFromApplication: false |
|
254 |
canSelect: false |
|
255 |
showRowSeparator: false |
|
256 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
257 |
) |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
258 |
(DataSetColumnSpec |
12292 | 259 |
label: 'Selector' |
260 |
id: 'selector' |
|
261 |
labelAlignment: left |
|
262 |
activeHelpKey: '' |
|
263 |
activeHelpKeyForLabel: '' |
|
264 |
labelButtonType: Button |
|
265 |
usePreferredWidth: true |
|
266 |
model: selector |
|
267 |
menuFromApplication: false |
|
268 |
canSelect: false |
|
269 |
showRowSeparator: false |
|
270 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
271 |
) |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
272 |
(DataSetColumnSpec |
12292 | 273 |
label: 'Category' |
274 |
id: category |
|
275 |
labelAlignment: left |
|
276 |
labelButtonType: Button |
|
277 |
usePreferredWidth: true |
|
278 |
model: category |
|
279 |
menuFromApplication: false |
|
280 |
canSelect: false |
|
281 |
showRowSeparator: false |
|
282 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
283 |
) |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
284 |
(DataSetColumnSpec |
12292 | 285 |
label: 'Time Stamp' |
286 |
id: timeStamp |
|
287 |
labelAlignment: left |
|
288 |
labelButtonType: Button |
|
289 |
usePreferredWidth: true |
|
290 |
model: timeStamp |
|
291 |
menuFromApplication: false |
|
292 |
canSelect: false |
|
293 |
showRowSeparator: false |
|
294 |
showColSeparator: false |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
295 |
) |
10009 | 296 |
) |
10925 | 297 |
|
10009 | 298 |
! ! |
299 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
300 |
|
10009 | 301 |
!ChangeList class methodsFor:'menu specs'! |
302 |
||
303 |
listMenu |
|
304 |
"This resource specification was automatically generated |
|
305 |
by the MenuEditor of ST/X." |
|
306 |
||
307 |
"Do not manually edit this!! If it is corrupted, |
|
308 |
the MenuEditor may not be able to read the specification." |
|
309 |
||
11194 | 310 |
|
10009 | 311 |
" |
312 |
MenuEditor new openOnClass:Tools::ChangeList andSelector:#listMenu |
|
313 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeList listMenu)) startUp |
|
314 |
" |
|
315 |
||
316 |
<resource: #menu> |
|
317 |
||
12292 | 318 |
^ |
10009 | 319 |
#(Menu |
12292 | 320 |
( |
321 |
(MenuItem |
|
322 |
enabled: hasChangeSelectedAndNotRemoved |
|
323 |
label: 'Apply' |
|
324 |
itemValue: listMenuApply |
|
325 |
translateLabel: true |
|
326 |
isVisible: allowAcceptHolder |
|
327 |
shortcutKey: Accept |
|
328 |
) |
|
329 |
(MenuItem |
|
330 |
label: 'Apply all' |
|
331 |
itemValue: listMenuApplyAll |
|
332 |
translateLabel: true |
|
333 |
isVisible: allowAcceptHolder |
|
334 |
) |
|
335 |
(MenuItem |
|
336 |
enabled: hasSingleChangeSelectedAndCanBrowse |
|
337 |
label: 'Browse' |
|
338 |
itemValue: listMenuBrowse |
|
339 |
translateLabel: true |
|
340 |
) |
|
341 |
(MenuItem |
|
342 |
label: '-' |
|
343 |
) |
|
344 |
(MenuItem |
|
345 |
label: 'Delete' |
|
346 |
itemValue: listMenuDeleteSelection |
|
347 |
nameKey: Delete |
|
348 |
translateLabel: true |
|
349 |
isVisible: allowRemoveHolder |
|
350 |
shortcutKey: Delete |
|
351 |
) |
|
352 |
(MenuItem |
|
353 |
label: '-' |
|
354 |
isVisible: allowRemoveHolder |
|
355 |
) |
|
356 |
(MenuItem |
|
357 |
label: 'Select...' |
|
358 |
translateLabel: true |
|
359 |
submenu: |
|
360 |
(Menu |
|
361 |
( |
|
362 |
(MenuItem |
|
363 |
label: 'Select same' |
|
364 |
itemValue: listMenuSelectSame |
|
365 |
translateLabel: true |
|
366 |
) |
|
367 |
(MenuItem |
|
368 |
label: 'Select additions (new classes/methods)' |
|
369 |
itemValue: listMenuSelectAdditions |
|
370 |
translateLabel: true |
|
371 |
) |
|
372 |
(MenuItem |
|
373 |
label: 'Select removals' |
|
374 |
itemValue: listMenuSelectRemovals |
|
375 |
translateLabel: true |
|
376 |
) |
|
377 |
(MenuItem |
|
378 |
label: '-' |
|
379 |
) |
|
380 |
(MenuItem |
|
381 |
label: 'Select all' |
|
382 |
itemValue: listMenuSelectAll |
|
383 |
translateLabel: true |
|
384 |
) |
|
385 |
(MenuItem |
|
386 |
label: 'Select none' |
|
387 |
itemValue: listMenuSelectNone |
|
388 |
translateLabel: true |
|
389 |
) |
|
390 |
(MenuItem |
|
391 |
label: '-' |
|
392 |
) |
|
393 |
(MenuItem |
|
394 |
label: 'Select using block' |
|
395 |
itemValue: listMenuSelectUsingBlock |
|
396 |
translateLabel: true |
|
397 |
) |
|
398 |
) |
|
399 |
nil |
|
400 |
nil |
|
401 |
) |
|
402 |
) |
|
403 |
(MenuItem |
|
404 |
label: '-' |
|
405 |
) |
|
406 |
(MenuItem |
|
407 |
label: 'Show Deleted' |
|
408 |
translateLabel: true |
|
409 |
isVisible: allowRemoveHolder |
|
410 |
indication: showRemovedHolder |
|
411 |
) |
|
412 |
(MenuItem |
|
413 |
label: 'Inspect change' |
|
414 |
itemValue: listMenuInspect |
|
415 |
translateLabel: true |
|
416 |
) |
|
417 |
) |
|
418 |
nil |
|
419 |
nil |
|
10009 | 420 |
) |
421 |
! ! |
|
422 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
423 |
|
10009 | 424 |
!ChangeList class methodsFor:'plugIn spec'! |
425 |
||
426 |
aspectSelectors |
|
427 |
"This resource specification was automatically generated |
|
428 |
by the UIPainter of ST/X." |
|
429 |
||
430 |
"Do not manually edit this. If it is corrupted, |
|
431 |
the UIPainter may not be able to read the specification." |
|
432 |
||
433 |
"Return a description of exported aspects; |
|
434 |
these can be connected to aspects of an embedding application |
|
435 |
(if this app is embedded in a subCanvas)." |
|
436 |
||
437 |
^ #( |
|
12292 | 438 |
#allowAcceptHolder |
439 |
#allowRemoveHolder |
|
440 |
#inGeneratorHolder |
|
441 |
#menuHolder |
|
442 |
#outGeneratorHolder |
|
443 |
#selectionHolder |
|
444 |
#showFilterHolder |
|
445 |
#showRemovedHolder |
|
446 |
#showSameHolder |
|
447 |
#showTimestampHolder |
|
10009 | 448 |
). |
449 |
||
450 |
! ! |
|
451 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
452 |
|
10009 | 453 |
!ChangeList methodsFor:'accessing'! |
454 |
||
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
455 |
acceptEnabled |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
456 |
^ self allowAccept |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
457 |
|
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
458 |
"Created: / 08-02-2012 / 14:45:12 / cg" |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
459 |
! |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
460 |
|
11194 | 461 |
allowAccept |
462 |
^ self allowAcceptHolder value |
|
10009 | 463 |
|
11194 | 464 |
"Created: / 24-01-2012 / 19:52:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 465 |
! |
466 |
||
11194 | 467 |
allowAccept: aBoolean |
468 |
^ self allowAcceptHolder value: aBoolean |
|
10009 | 469 |
|
11194 | 470 |
"Created: / 24-01-2012 / 19:52:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
471 |
! |
|
472 |
||
473 |
allowRemoved |
|
474 |
^ self allowRemoveHolder value ? true |
|
475 |
||
476 |
"Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10009 | 477 |
! |
478 |
||
11795 | 479 |
applyAction:aBlock |
480 |
applyAction := aBlock. |
|
481 |
||
482 |
"Modified (format): / 10-09-2012 / 14:15:30 / cg" |
|
11794 | 483 |
! |
484 |
||
11035 | 485 |
list |
486 |
^ listHolder value |
|
487 |
||
488 |
"Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
489 |
"Created: / 27-12-2011 / 14:18:25 / cg" |
|
490 |
! |
|
491 |
||
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
492 |
scrollToBottom:aBoolean |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
493 |
"If set to true, list will automaticallu scroll to bottom |
12292 | 494 |
ehen the list is updated and clears this flag. |
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
495 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
496 |
This is required as the list is updated asynchronously" |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
497 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
498 |
scrollToBottom := aBoolean. |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
499 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
500 |
"Modified (comment): / 30-03-2012 / 17:05:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
501 |
! |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
502 |
|
10009 | 503 |
selection |
504 |
||
12250 | 505 |
^(self selectionHolder value ? #()) reject:[:e|e isNil]. |
10009 | 506 |
|
507 |
"Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
508 |
! |
|
509 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
510 |
selection: selection |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
511 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
512 |
self selectionHolder value: selection |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
513 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
514 |
"Created: / 30-03-2012 / 12:29:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
515 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12166
diff
changeset
|
516 |
|
11035 | 517 |
selectionIndices |
518 |
|sel| |
|
519 |
||
520 |
(sel := self selectionHolder value) isEmptyOrNil ifTrue:[^ #()]. |
|
521 |
^ sel collect:[:each | self list identityIndexOf:each]. |
|
522 |
||
523 |
"Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
524 |
"Created: / 27-12-2011 / 10:56:20 / cg" |
|
525 |
! |
|
526 |
||
10009 | 527 |
showRemoved |
528 |
||
529 |
^self showRemovedHolder value ? true |
|
530 |
||
531 |
"Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
532 |
! ! |
|
533 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
534 |
|
10009 | 535 |
!ChangeList methodsFor:'actions'! |
536 |
||
537 |
selectionDoubleclicked |
|
538 |
||
11194 | 539 |
self listMenuBrowse |
540 |
"/ | app | |
|
541 |
"/ |
|
542 |
"/ self selection do: |
|
543 |
"/ [:e|e removed: e removed not]. |
|
544 |
"/ ((app := self masterApplication) respondsTo: #redrawChangeListViews) |
|
545 |
"/ ifTrue:[app redrawChangeListViews]. |
|
10009 | 546 |
|
11194 | 547 |
"Modified: / 24-01-2012 / 22:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 548 |
! ! |
549 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
550 |
|
10009 | 551 |
!ChangeList methodsFor:'aspects'! |
552 |
||
11194 | 553 |
allowAcceptHolder |
10009 | 554 |
"return/create the valueHolder 'acceptEnabledHolder'" |
555 |
||
11194 | 556 |
allowAcceptHolder isNil ifTrue:[ |
12292 | 557 |
allowAcceptHolder := ValueHolder with:nil "defaultValue here". |
10009 | 558 |
]. |
11194 | 559 |
^ allowAcceptHolder |
560 |
||
561 |
"Created: / 24-01-2012 / 19:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
562 |
! |
|
563 |
||
564 |
allowAcceptHolder:something |
|
565 |
"set the 'allowAcceptHolder' value holder (automatically generated)" |
|
566 |
||
567 |
allowAcceptHolder := something. |
|
10009 | 568 |
! |
569 |
||
11194 | 570 |
allowRemoveHolder |
571 |
"return/create the 'allowRemoveHolder' value holder (automatically generated)" |
|
12292 | 572 |
|
11194 | 573 |
allowRemoveHolder isNil ifTrue:[ |
12292 | 574 |
allowRemoveHolder := ValueHolder with:true. |
575 |
allowRemoveHolder addDependent:self. |
|
11194 | 576 |
]. |
577 |
^ allowRemoveHolder |
|
578 |
||
579 |
"Modified (comment): / 24-01-2012 / 19:44:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
580 |
! |
|
581 |
||
12292 | 582 |
allowRemoveHolder:something |
11194 | 583 |
"set the 'showRemovedHolder' value holder (automatically generated)" |
12292 | 584 |
|
11194 | 585 |
|oldValue newValue| |
586 |
||
587 |
allowRemoveHolder notNil ifTrue:[ |
|
12292 | 588 |
oldValue := allowRemoveHolder value. |
589 |
allowRemoveHolder removeDependent:self. |
|
11194 | 590 |
]. |
591 |
allowRemoveHolder := something. |
|
592 |
allowRemoveHolder notNil ifTrue:[ |
|
12292 | 593 |
allowRemoveHolder addDependent:self. |
11194 | 594 |
]. |
595 |
newValue := allowRemoveHolder value. |
|
596 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 597 |
self |
598 |
update:#value |
|
599 |
with:newValue |
|
600 |
from:allowRemoveHolder. |
|
11194 | 601 |
]. |
10009 | 602 |
! |
603 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
604 |
listColumns |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
605 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
606 |
|holder| |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
607 |
(holder := builder bindingAt:#listColumns) isNil ifTrue:[ |
12292 | 608 |
builder aspectAt:#listColumns put:(holder := List new). |
609 |
self listColumnShow: #delta. |
|
610 |
self listColumnShow: #change. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
611 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
612 |
^ holder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
613 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
614 |
"Created: / 26-07-2012 / 18:03:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
615 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
616 |
|
10009 | 617 |
listHolder |
618 |
listHolder isNil ifTrue:[ |
|
12292 | 619 |
listHolder := ValueHolder new. |
10009 | 620 |
]. |
621 |
^ listHolder |
|
622 |
! |
|
623 |
||
624 |
showRemovedHolder |
|
625 |
"return/create the 'showRemovedHolder' value holder (automatically generated)" |
|
626 |
||
627 |
showRemovedHolder isNil ifTrue:[ |
|
12292 | 628 |
showRemovedHolder := ValueHolder with: true. |
629 |
showRemovedHolder addDependent: self. |
|
10009 | 630 |
]. |
631 |
^ showRemovedHolder |
|
632 |
! |
|
633 |
||
10449 | 634 |
showRemovedHolder:something |
10009 | 635 |
"set the 'showRemovedHolder' value holder (automatically generated)" |
636 |
||
10449 | 637 |
|oldValue newValue| |
638 |
||
639 |
showRemovedHolder notNil ifTrue:[ |
|
12292 | 640 |
oldValue := showRemovedHolder value. |
641 |
showRemovedHolder removeDependent:self. |
|
10449 | 642 |
]. |
643 |
showRemovedHolder := something. |
|
644 |
showRemovedHolder notNil ifTrue:[ |
|
12292 | 645 |
showRemovedHolder addDependent:self. |
10449 | 646 |
]. |
647 |
newValue := showRemovedHolder value. |
|
648 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 649 |
self update:#value with:newValue from:showRemovedHolder. |
10449 | 650 |
]. |
651 |
! |
|
652 |
||
653 |
showSameHolder |
|
654 |
"return/create the 'showSameHolder' value holder (automatically generated)" |
|
655 |
||
656 |
showSameHolder isNil ifTrue:[ |
|
12292 | 657 |
showSameHolder := ValueHolder with: true. |
658 |
showSameHolder addDependent:self. |
|
10449 | 659 |
]. |
660 |
^ showSameHolder |
|
661 |
||
662 |
"Modified: / 04-08-2011 / 18:39:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
663 |
! |
|
664 |
||
665 |
showSameHolder:something |
|
666 |
"set the 'showSameHolder' value holder (automatically generated)" |
|
667 |
||
668 |
|oldValue newValue| |
|
669 |
||
670 |
showSameHolder notNil ifTrue:[ |
|
12292 | 671 |
oldValue := showSameHolder value. |
672 |
showSameHolder removeDependent:self. |
|
10449 | 673 |
]. |
674 |
showSameHolder := something. |
|
675 |
showSameHolder notNil ifTrue:[ |
|
12292 | 676 |
showSameHolder addDependent:self. |
10449 | 677 |
]. |
678 |
newValue := showSameHolder value. |
|
679 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 680 |
self update:#value with:newValue from:showSameHolder. |
10449 | 681 |
]. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
682 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
683 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
684 |
showTimestampHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
685 |
"return/create the 'showTimestampHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
686 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
687 |
showTimestampHolder isNil ifTrue:[ |
12292 | 688 |
showTimestampHolder := ValueHolder new. |
689 |
showTimestampHolder addDependent:self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
690 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
691 |
^ showTimestampHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
692 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
693 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
694 |
showTimestampHolder:something |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
695 |
"set the 'showTimestampHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
696 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
697 |
|oldValue newValue| |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
698 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
699 |
showTimestampHolder notNil ifTrue:[ |
12292 | 700 |
oldValue := showTimestampHolder value. |
701 |
showTimestampHolder removeDependent:self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
702 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
703 |
showTimestampHolder := something. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
704 |
showTimestampHolder notNil ifTrue:[ |
12292 | 705 |
showTimestampHolder addDependent:self. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
706 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
707 |
newValue := showTimestampHolder value. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
708 |
oldValue ~~ newValue ifTrue:[ |
12292 | 709 |
self update:#value with:newValue from:showTimestampHolder. |
10449 | 710 |
]. |
10009 | 711 |
! ! |
712 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
713 |
|
10009 | 714 |
!ChangeList methodsFor:'change & update'! |
715 |
||
716 |
update: aspect with: param from: sender |
|
717 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
718 |
sender == allowRemoveHolder ifTrue:[ |
12292 | 719 |
self listColumn: #removed visible: allowRemoveHolder value. |
720 |
^self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
721 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
722 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
723 |
sender == showTimestampHolder ifTrue:[ |
12292 | 724 |
self listColumn: #timeStamp visible: showTimestampHolder value. |
725 |
^self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
726 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
727 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
728 |
|
10449 | 729 |
sender == selectionHolder ifTrue:[ |
12292 | 730 |
self selectionChanged. |
731 |
^self |
|
10449 | 732 |
]. |
733 |
sender == showSameHolder ifTrue:[ |
|
12292 | 734 |
self updateList. |
735 |
^self. |
|
10449 | 736 |
]. |
737 |
sender == showRemovedHolder ifTrue:[ |
|
12292 | 738 |
self updateList. |
739 |
^self. |
|
10449 | 740 |
]. |
741 |
||
10009 | 742 |
^super update: aspect with: param from: sender |
743 |
||
744 |
"Created: / 24-10-2009 / 19:47:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11036 | 745 |
"Modified (format): / 27-12-2011 / 14:20:30 / cg" |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
746 |
"Modified: / 26-07-2012 / 18:44:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 747 |
! ! |
748 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
749 |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
750 |
!ChangeList methodsFor:'drag & drop'! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
751 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
752 |
canDrop: aDropContext |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
753 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
754 |
^(self inGeneratorHolder value isKindOf: Iterator) not |
12292 | 755 |
and:[aDropContext dropObjects allSatisfy:[:obj|(obj theObject isKindOf: Change)]]. |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
756 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
757 |
"Created: / 01-08-2012 / 17:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
758 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
759 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
760 |
dragObjects: aDropSource |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
761 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
762 |
^self selection collect:[:item|(DropObject new: item change) displayObject: (item labelAndIcon)] |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
763 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
764 |
"Created: / 01-08-2012 / 17:50:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
765 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
766 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
767 |
dropObjects:aDropContext |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
768 |
"drop manager wants to drop. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
769 |
This is ony sent, if #canDrop: returned true. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
770 |
Must be redefined in order for drop to work." |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
771 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
772 |
| changes | |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
773 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
774 |
changes := self inGeneratorHolder value. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
775 |
aDropContext dropObjects do:[:obj|changes add: obj theObject]. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
776 |
self inGeneratorHolder changed: #value |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
777 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
778 |
"Modified: / 01-08-2012 / 18:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
779 |
! ! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
780 |
|
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
781 |
|
10009 | 782 |
!ChangeList methodsFor:'event processing'! |
783 |
||
784 |
||
785 |
||
786 |
||
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
787 |
|
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
788 |
handlesKeyPress:key inView:aView |
12108 | 789 |
<resource: #keyboard (#Accept #Ctrls)> |
790 |
||
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
791 |
^(key == #Accept or:[ key == #Ctrls]) |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
792 |
and:[ listView scrolledView == aView ] |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
793 |
|
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
794 |
"Created: / 08-02-2012 / 14:43:11 / cg" |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
795 |
! |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
796 |
|
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
797 |
keyPress:key x:x y:y view:aView |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
798 |
(key == #Accept or:[ key == #Ctrls]) ifTrue:[ |
12292 | 799 |
self listMenuApply. |
800 |
^ self |
|
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
801 |
]. |
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
802 |
|
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
803 |
"Created: / 08-02-2012 / 14:42:18 / cg" |
10009 | 804 |
! ! |
805 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
806 |
|
10009 | 807 |
!ChangeList methodsFor:'generators'! |
808 |
||
809 |
makeGenerator |
|
810 |
"Superclass Tools::BrowserList says that I am responsible to implement this method" |
|
811 |
||
812 |
^Iterator on: |
|
12292 | 813 |
[:whatToDo| |
814 |
selectionHolder value do: |
|
815 |
[:changeListItem| | change | |
|
816 |
changeListItem notNil ifTrue:[ |
|
817 |
change := changeListItem change. |
|
818 |
change isCompositeChange ifTrue: |
|
819 |
[change changes do: whatToDo]]]] |
|
10009 | 820 |
|
821 |
"Modified: / 24-07-2009 / 23:00:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
12266 | 822 |
"Modified: / 25-07-2012 / 15:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 823 |
! ! |
824 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
825 |
|
10009 | 826 |
!ChangeList methodsFor:'hooks'! |
827 |
||
10925 | 828 |
postBuildListView: aView |
10009 | 829 |
|
10925 | 830 |
super postBuildListView: aView. |
10957 | 831 |
listView scrolledView delegate: self. |
10009 | 832 |
|
10925 | 833 |
"Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 834 |
! ! |
835 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
836 |
|
10009 | 837 |
!ChangeList methodsFor:'initialization'! |
838 |
||
839 |
initialize |
|
840 |
||
11794 | 841 |
super initialize. |
10009 | 842 |
menuHolder := [self menuFor: #listMenu]. |
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
843 |
scrollToBottom := false. |
11794 | 844 |
applyAction isNil ifTrue:[ |
12292 | 845 |
applyAction := [:change | change apply ]. |
11794 | 846 |
]. |
10009 | 847 |
|
848 |
"Created: / 29-10-2010 / 12:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
849 |
! ! |
|
850 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
851 |
|
10009 | 852 |
!ChangeList methodsFor:'menu actions'! |
853 |
||
854 |
listMenuApply |
|
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
855 |
|sel list idx| |
10009 | 856 |
|
857 |
self acceptEnabled ifFalse:[^self]. |
|
858 |
||
11794 | 859 |
(sel := self selectionHolder value) do:[:e| applyAction value:e change]. |
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
860 |
sel size == 1 ifTrue:[ |
12292 | 861 |
list := self listHolder value. |
862 |
idx := list indexOf:(sel first). |
|
863 |
idx < list size ifTrue:[ |
|
864 |
self selectionHolder value:(Array with:(list at:idx+1)) |
|
865 |
] ifFalse:[ |
|
866 |
self selectionHolder value:#() |
|
867 |
]. |
|
11245
bd76570b2cc4
accept (Ctrl-s) (implement it - not only claim it in the menu!);
Claus Gittinger <cg@exept.de>
parents:
11194
diff
changeset
|
868 |
]. |
10009 | 869 |
|
870 |
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11794 | 871 |
"Modified: / 10-09-2012 / 13:57:46 / cg" |
10009 | 872 |
! |
873 |
||
874 |
listMenuApplyAll |
|
875 |
||
876 |
self acceptEnabled ifFalse:[^self]. |
|
877 |
||
878 |
self selection value do: |
|
12292 | 879 |
[:e|e removed ifFalse:[applyAction value:e change]]. |
10009 | 880 |
|
881 |
"Created: / 05-12-2009 / 14:53:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11794 | 882 |
"Modified: / 10-09-2012 / 13:57:58 / cg" |
10009 | 883 |
! |
884 |
||
885 |
listMenuBrowse |
|
886 |
||
11194 | 887 |
self listMenuBrowseChanges: |
12292 | 888 |
((self selectionHolder value ? #()) collect:[:e|e change]) |
11194 | 889 |
|
890 |
"Modified: / 24-01-2012 / 22:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
891 |
! |
|
892 |
||
893 |
listMenuBrowseChanges: changes |
|
894 |
||
10009 | 895 |
| classes methods methodsOnly | |
896 |
classes := Set new. |
|
897 |
methods := Set new. |
|
898 |
methodsOnly := true. |
|
11194 | 899 |
changes do: |
12292 | 900 |
[:each| |
901 |
each isClassChange ifTrue: |
|
902 |
[each changeClass ifNotNil: |
|
903 |
[classes add: each changeClass. |
|
904 |
each isMethodCodeChange |
|
905 |
ifTrue: |
|
906 |
[each changeMethod ifNotNil: |
|
907 |
[methods add:each changeMethod]] |
|
908 |
ifFalse: |
|
909 |
[methodsOnly := false]]]]. |
|
910 |
methodsOnly |
|
911 |
ifTrue: |
|
912 |
[methods size = 1 |
|
913 |
ifTrue:[Smalltalk browserClass openInMethod: methods anyOne] |
|
914 |
ifFalse:[Smalltalk browserClass browseMethods: methods asArray title: 'Selected methods from changeset' sort: true]] |
|
915 |
ifFalse: |
|
916 |
[classes size = 1 |
|
917 |
ifTrue:[Smalltalk browserClass browseClass: classes anyOne] |
|
918 |
ifFalse:[Smalltalk browserClass browseClasses: classes]] |
|
10009 | 919 |
|
920 |
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11194 | 921 |
"Created: / 24-01-2012 / 22:00:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 922 |
! |
923 |
||
924 |
listMenuDeleteSelection |
|
925 |
||
926 |
self selectionHolder value do: |
|
12292 | 927 |
[:each|each removed: true]. |
10009 | 928 |
self updateList |
929 |
! |
|
930 |
||
931 |
listMenuInspect |
|
932 |
||
933 |
| selection | |
|
934 |
||
935 |
selection := self selectionHolder value collect:[:e|e change]. |
|
936 |
selection size = 1 |
|
12292 | 937 |
ifTrue:[selection anyOne inspect] |
938 |
ifFalse:[selection inspect]. |
|
10009 | 939 |
|
940 |
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
941 |
! |
|
942 |
||
943 |
listMenuSelectAdditions |
|
944 |
||
945 |
self listMenuSelectAllSuchThat:[:change|change delta = #+] |
|
946 |
! |
|
947 |
||
948 |
listMenuSelectAll |
|
949 |
||
950 |
self listMenuSelectAllSuchThat:[:change|true] |
|
951 |
! |
|
952 |
||
12292 | 953 |
listMenuSelectAllSuchThat:conditionBlock |
10009 | 954 |
|newSelection| |
955 |
||
12292 | 956 |
newSelection := self listHolder value |
957 |
select:[:entry | conditionBlock value:entry change ]. |
|
10009 | 958 |
self selectionHolder value:newSelection |
959 |
! |
|
960 |
||
961 |
listMenuSelectNone |
|
962 |
||
963 |
self listMenuSelectAllSuchThat:[:change|false] |
|
964 |
! |
|
965 |
||
966 |
listMenuSelectRemovals |
|
967 |
||
968 |
self listMenuSelectAllSuchThat:[:change|change delta = #-] |
|
969 |
! |
|
970 |
||
971 |
listMenuSelectSame |
|
972 |
||
973 |
self listMenuSelectAllSuchThat:[:change|change delta = #=] |
|
974 |
! |
|
975 |
||
976 |
listMenuSelectUsingBlock |
|
977 |
||
978 |
|conditionBlockString conditionBlock dialog textHolder template| |
|
979 |
||
980 |
template := |
|
981 |
'[:change| |
|
982 |
"/ Define condition for selection below: |
|
983 |
"/ change is an instance of Change |
|
984 |
"/ change will be selected if and only if block returns true |
|
985 |
||
12292 | 986 |
|
10009 | 987 |
true"/always select the change |
988 |
] |
|
989 |
'. |
|
990 |
||
991 |
LastSelectionConditionString isNil ifTrue:[ |
|
12292 | 992 |
LastSelectionConditionString := template. |
10009 | 993 |
]. |
994 |
||
995 |
||
996 |
textHolder := ValueHolder new. |
|
997 |
dialog := Dialog |
|
12292 | 998 |
forRequestText:(resources string:'Enter condition for selection') |
999 |
lines:20 |
|
1000 |
columns:70 |
|
1001 |
initialAnswer:LastSelectionConditionString |
|
1002 |
model:textHolder. |
|
10009 | 1003 |
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]). |
1004 |
dialog open. |
|
1005 |
dialog accepted ifFalse:[^ self]. |
|
1006 |
||
1007 |
conditionBlockString := textHolder value. |
|
1008 |
LastSelectionConditionString := conditionBlockString. |
|
1009 |
||
1010 |
conditionBlock := Parser evaluate:conditionBlockString. |
|
1011 |
conditionBlock isBlock ifFalse:[ |
|
12292 | 1012 |
self error:'Bad selection block (syntax error?)'. |
1013 |
^ self |
|
10009 | 1014 |
]. |
1015 |
||
1016 |
self listMenuSelectAllSuchThat: conditionBlock |
|
1017 |
! |
|
1018 |
||
1019 |
listMenuUndeleteSelection |
|
1020 |
||
1021 |
self selectionHolder value do: |
|
12292 | 1022 |
[:each|each removed: false]. |
10009 | 1023 |
self updateList |
1024 |
! ! |
|
1025 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1026 |
|
10009 | 1027 |
!ChangeList methodsFor:'private'! |
1028 |
||
1029 |
application |
|
1030 |
||
1031 |
^self |
|
1032 |
||
1033 |
"Created: / 05-12-2009 / 14:10:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1034 |
! |
|
1035 |
||
1036 |
browserNameList |
|
1037 |
||
1038 |
^'Change list' |
|
1039 |
||
1040 |
"Modified: / 24-07-2009 / 22:06:53 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1041 |
! |
|
1042 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1043 |
listColumn: columnId visible: visible |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1044 |
visible ifTrue:[ |
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1045 |
self listColumnShow: columnId |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1046 |
] ifFalse:[ |
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1047 |
self listColumnHide: columnId |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1048 |
] |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1049 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1050 |
"Created: / 26-07-2012 / 18:20:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1051 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1052 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1053 |
listColumnHide: columnId |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1054 |
self listColumns do:[:spec| |
12292 | 1055 |
spec id = columnId ifTrue:[ |
1056 |
self listColumns remove: spec. |
|
1057 |
listView notNil ifTrue:[ |
|
1058 |
listView invalidate. |
|
1059 |
]. |
|
1060 |
^self |
|
1061 |
]. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1062 |
] |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1063 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1064 |
"Created: / 26-07-2012 / 18:19:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1065 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1066 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1067 |
listColumnShow: columnId |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1068 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1069 |
| columns | |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1070 |
columns := self listColumns. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1071 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1072 |
columns do:[:spec| |
12292 | 1073 |
spec id = columnId ifTrue:[ |
1074 |
^self. |
|
1075 |
] |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1076 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1077 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1078 |
self class listColumnSpec do:[:specArray| |
12292 | 1079 |
| spec | |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1080 |
|
12292 | 1081 |
spec := specArray decodeAsLiteralArray. |
1082 |
spec id = columnId ifTrue:[ |
|
1083 |
columnId == #removed ifTrue:[ |
|
1084 |
columns addFirst: spec. |
|
1085 |
] ifFalse:[ |
|
1086 |
columns add: spec. |
|
1087 |
]. |
|
1088 |
listView notNil ifTrue:[ |
|
1089 |
listView invalidate. |
|
1090 |
]. |
|
1091 |
^self. |
|
1092 |
] |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1093 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1094 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1095 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1096 |
"Created: / 26-07-2012 / 17:56:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1097 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1098 |
|
12292 | 1099 |
listEntryFor:chg |
10009 | 1100 |
^ListEntry change:chg application: self |
1101 |
||
1102 |
"Modified: / 05-12-2009 / 14:39:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1103 |
! |
|
1104 |
||
1105 |
makeDependent |
|
1106 |
||
1107 |
"Modified: / 24-07-2009 / 22:06:32 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1108 |
! |
|
1109 |
||
1110 |
makeIndependent |
|
1111 |
||
1112 |
"Modified: / 24-07-2009 / 22:06:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1113 |
! |
|
1114 |
||
1115 |
parentOrModel |
|
1116 |
||
1117 |
^self |
|
1118 |
||
1119 |
"Created: / 05-12-2009 / 14:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1120 |
! |
|
1121 |
||
1122 |
updateList |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12217
diff
changeset
|
1123 |
|inGenerator changeset firstLineShown oldSel newList newSel | |
10009 | 1124 |
|
1125 |
inGenerator := self inGeneratorHolder value. |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12217
diff
changeset
|
1126 |
listView notNil ifTrue:[ |
12292 | 1127 |
((listView isKindOf: ScrollableView) not or:[listView scrolledView notNil]) ifTrue:[ |
1128 |
firstLineShown := listView firstLineShown |
|
1129 |
]. |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12217
diff
changeset
|
1130 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12217
diff
changeset
|
1131 |
oldSel := self selection. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12217
diff
changeset
|
1132 |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1133 |
changeset := inGenerator isNil ifTrue:[ #() ] ifFalse:[ inGenerator ]. |
12292 | 1134 |
newList := changeset |
1135 |
select: |
|
1136 |
[:chg | |
|
1137 |
(self showRemovedHolder value or:[ chg removed not ]) |
|
1138 |
and:[self showSameHolder value or:[chg delta ~~ #=]] |
|
1139 |
]. |
|
10925 | 1140 |
newList := self filterList: newList. |
1141 |
newList := newList collect:[:chg | self listEntryFor:chg ]. |
|
11039 | 1142 |
self listHolder value ~= newList ifTrue:[ |
12292 | 1143 |
self listHolder value: newList. |
1144 |
((newList size ~~ 0) and:[scrollToBottom]) ifTrue:[ |
|
1145 |
self selection: { newList last } |
|
1146 |
] ifFalse:[ |
|
1147 |
oldSel notEmptyOrNil ifTrue:[ |
|
1148 |
newSel := OrderedCollection new: oldSel size. |
|
1149 |
oldSel := oldSel reject:[:e|e isNil]. |
|
1150 |
oldSel := oldSel collect:[:e|e change]. |
|
1151 |
newList do:[:e|(oldSel includes:e change) ifTrue:[newSel add:e]]. |
|
1152 |
self selection: newSel. |
|
1153 |
]. |
|
1154 |
(listView notNil and:[firstLineShown notNil]) ifTrue:[ |
|
1155 |
listView scrollToLine: (newList size min: firstLineShown). |
|
1156 |
]. |
|
1157 |
]. |
|
1158 |
scrollToBottom := false. |
|
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
1159 |
|
11039 | 1160 |
] |
10449 | 1161 |
|
11039 | 1162 |
"Modified: / 28-12-2011 / 15:46:15 / cg" |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1163 |
"Modified: / 01-08-2012 / 18:10:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 1164 |
! ! |
1165 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1166 |
|
10009 | 1167 |
!ChangeList methodsFor:'queries'! |
1168 |
||
1169 |
hasChangeSelected |
|
1170 |
||
1171 |
^self selectionHolder value size > 0 |
|
1172 |
! |
|
1173 |
||
1174 |
hasChangeSelectedAndNotRemoved |
|
1175 |
||
1176 |
| selection | |
|
1177 |
selection := self selectionHolder value ? #(). |
|
1178 |
^selection size > 0 and: |
|
12292 | 1179 |
[selection allSatisfy:[:e|e removed not]]. |
10009 | 1180 |
! |
1181 |
||
1182 |
hasSingleChangeSelected |
|
1183 |
||
1184 |
^self selectionHolder value size = 1 |
|
1185 |
! |
|
1186 |
||
1187 |
hasSingleChangeSelectedAndCanBrowse |
|
1188 |
||
1189 |
||
1190 |
self selectionHolder value ? #() do: |
|
12292 | 1191 |
[:each| |
1192 |
(each change isClassChange and: |
|
1193 |
[each change isMethodChange not |
|
1194 |
or:[each change isMethodCodeChange]]) ifFalse:[^false]]. |
|
10009 | 1195 |
^true |
12216
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1196 |
! |
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1197 |
|
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1198 |
showColumn: columnSymbol |
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1199 |
|
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1200 |
^self showColumnSpecHolder value includes: columnSymbol. |
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1201 |
|
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1202 |
"Created: / 03-04-2012 / 11:28:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 1203 |
! ! |
1204 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1205 |
|
10009 | 1206 |
!ChangeList::ListEntry class methodsFor:'instance creation'! |
1207 |
||
1208 |
change: aChange |
|
1209 |
||
1210 |
^self new change: aChange |
|
1211 |
||
1212 |
"Created: / 24-07-2009 / 22:43:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1213 |
! |
|
1214 |
||
1215 |
change: aChange application: anApplicationModel |
|
1216 |
||
1217 |
^self new change: aChange; application: anApplicationModel |
|
1218 |
||
1219 |
"Created: / 05-12-2009 / 14:16:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1220 |
! |
|
1221 |
||
1222 |
change: aChange parent: aChangeList |
|
1223 |
||
1224 |
^self new change: aChange; parent: aChangeList |
|
1225 |
||
1226 |
"Created: / 25-07-2009 / 23:33:00 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1227 |
! ! |
|
1228 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1229 |
|
10009 | 1230 |
!ChangeList::ListEntry methodsFor:'accessing'! |
1231 |
||
1232 |
application |
|
1233 |
^ application ifNil:[super application] |
|
1234 |
||
1235 |
"Modified: / 05-12-2009 / 14:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1236 |
! |
|
1237 |
||
1238 |
application:anApplicationModel |
|
1239 |
application := anApplicationModel. |
|
1240 |
||
1241 |
"Modified: / 05-12-2009 / 14:15:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1242 |
! |
|
1243 |
||
1244 |
change |
|
1245 |
^ change |
|
1246 |
! |
|
1247 |
||
1248 |
change:aChange |
|
1249 |
self assert: ((aChange isKindOf: Change) or:[aChange isKindOf: RefactoryChange]). |
|
1250 |
change := aChange. |
|
1251 |
||
1252 |
"Modified: / 25-07-2009 / 23:40:38 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10957 | 1253 |
"Modified (format): / 04-12-2011 / 14:58:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 1254 |
! |
1255 |
||
1256 |
changeClass |
|
1257 |
||
1258 |
^change changeClass |
|
1259 |
! |
|
1260 |
||
10334 | 1261 |
changeSource |
11662 | 1262 |
"the changes source" |
10334 | 1263 |
|
1264 |
^change changeSource |
|
1265 |
||
1266 |
"Created: / 19-07-2011 / 12:03:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11662 | 1267 |
"Modified (comment): / 25-07-2012 / 17:39:39 / cg" |
10334 | 1268 |
! |
1269 |
||
10009 | 1270 |
children |
1271 |
||
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
1272 |
children isNil ifTrue:[ |
12292 | 1273 |
change isCompositeChange ifTrue:[ |
1274 |
children := OrderedCollection new: change changes size. |
|
1275 |
change changes do:[:chg| |
|
1276 |
((self application showRemovedHolder value or:[ chg removed not ]) |
|
1277 |
and:[self application showSameHolder value or:[chg delta ~~ #=]]) |
|
1278 |
ifTrue:[ |
|
1279 |
children add: ((self application listEntryFor: chg) parent: self) |
|
1280 |
] |
|
1281 |
]. |
|
1282 |
] ifFalse:[ |
|
1283 |
children := #() |
|
1284 |
] |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
1285 |
]. |
10009 | 1286 |
^children |
1287 |
||
1288 |
"Created: / 25-07-2009 / 23:32:39 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
1289 |
"Modified (format): / 18-11-2011 / 14:56:25 / cg" |
10957 | 1290 |
"Modified: / 04-12-2011 / 15:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 1291 |
! |
1292 |
||
1293 |
delta |
|
10657 | 1294 |
"/ obsolete: please use deltaDetail |
10009 | 1295 |
|
1296 |
^change delta |
|
1297 |
||
1298 |
"Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10657 | 1299 |
"Modified (comment): / 31-08-2011 / 10:30:02 / cg" |
1300 |
! |
|
1301 |
||
1302 |
deltaDetail |
|
1303 |
||
1304 |
^change deltaDetail |
|
1305 |
||
1306 |
"Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1307 |
"Created: / 31-08-2011 / 10:29:21 / cg" |
|
10009 | 1308 |
! |
1309 |
||
1310 |
iconDelta |
|
1311 |
||
1312 |
| iconSelector | |
|
1313 |
iconSelector := self iconSelector. |
|
10881
07359595b386
changed: #buttonPress:x:y:view:
Claus Gittinger <cg@exept.de>
parents:
10657
diff
changeset
|
1314 |
iconSelector isNil ifTrue:[^nil]. |
10009 | 1315 |
self removed ifTrue:[iconSelector := iconSelector , #Grayed]. |
1316 |
^self application class perform: iconSelector asSymbol. |
|
1317 |
||
1318 |
"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
|
1319 |
"Modified: / 18-11-2011 / 14:56:33 / cg" |
10009 | 1320 |
! |
1321 |
||
1322 |
iconRemoved |
|
1323 |
||
12292 | 1324 |
^self removed |
1325 |
ifTrue: [self application class uncheckedIcon ] |
|
1326 |
ifFalse:[self application class checkedIcon ] |
|
10009 | 1327 |
|
1328 |
"Created: / 05-12-2009 / 14:11:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1329 |
! |
|
1330 |
||
10334 | 1331 |
imageSource |
11662 | 1332 |
"return the source for the in-image version of the change" |
10334 | 1333 |
|
11662 | 1334 |
^ change imageSource |
10334 | 1335 |
|
1336 |
"Created: / 19-07-2011 / 12:03:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11662 | 1337 |
"Modified (comment): / 25-07-2012 / 17:38:57 / cg" |
10334 | 1338 |
! |
1339 |
||
10009 | 1340 |
label |
11710 | 1341 |
| label | |
10009 | 1342 |
|
1343 |
label := change displayString. |
|
12271 | 1344 |
|
1345 |
"Hack: if the printString contains multiple lines, then |
|
1346 |
if there are just 2 lines, then merge them, otherwise add |
|
1347 |
... to the first line" |
|
1348 |
(label includes: Character cr) ifTrue:[ |
|
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1349 |
| firstCR secondCR | |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1350 |
firstCR := label indexOf: Character cr. |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1351 |
firstCR ~~ label size ifTrue:[ |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1352 |
secondCR := label indexOf: Character cr startingAt: firstCR + 1. |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1353 |
]. |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1354 |
secondCR isNil ifTrue:[ |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1355 |
"/2 lines only |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1356 |
label := label copy at: firstCR put: Character space. |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1357 |
] ifFalse:[ |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1358 |
label := (label copyTo: firstCR - 1) , '...' |
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1359 |
]. |
12271 | 1360 |
]. |
10009 | 1361 |
self removed ifTrue:[label := label asText colorizeAllWith: Color gray]. |
1362 |
^label |
|
1363 |
||
1364 |
"Created: / 05-11-2008 / 08:20:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1365 |
"Modified: / 25-07-2009 / 23:43:23 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1366 |
"Modified: / 05-12-2009 / 14:46:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11710 | 1367 |
"Modified (format): / 27-07-2012 / 21:26:34 / cg" |
10009 | 1368 |
! |
1369 |
||
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1370 |
labelAndIcon |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1371 |
^(LabelAndIcon label: self label icon: self iconDelta) |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1372 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1373 |
"Created: / 01-08-2012 / 18:14:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1374 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
1375 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1376 |
notRemoved |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1377 |
^ self removed not |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1378 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1379 |
"Created: / 26-07-2012 / 18:31:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1380 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1381 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1382 |
notRemoved: aBoolean |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1383 |
^ self removed: aBoolean not |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1384 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1385 |
"Created: / 26-07-2012 / 18:31:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1386 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1387 |
|
10009 | 1388 |
removed |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1389 |
^ change removed == true |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1390 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1391 |
"Modified: / 26-07-2012 / 18:30:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 1392 |
! |
1393 |
||
1394 |
removed:aBoolean |
|
1395 |
change removed: aBoolean. |
|
1396 |
! |
|
1397 |
||
1398 |
source |
|
1399 |
||
1400 |
^change source |
|
1401 |
! |
|
1402 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1403 |
timeStamp |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1404 |
^change timeOfChangeIfKnown |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1405 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1406 |
"Created: / 26-07-2012 / 18:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1407 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1408 |
|
10009 | 1409 |
x |
1410 |
^ x |
|
1411 |
! ! |
|
1412 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1413 |
|
10009 | 1414 |
!ChangeList::ListEntry methodsFor:'displaying'! |
1415 |
||
12292 | 1416 |
displayLabel:aLabel h:lH on:aGC x:newX y:y h:h |
10009 | 1417 |
|
12216
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1418 |
| list cx icon colW colS | |
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1419 |
list := self application. |
10009 | 1420 |
cx := x := newX. |
12287 | 1421 |
(list allowRemoveHolder value and:[list showRemovedHolder value]) ifTrue: [ |
12292 | 1422 |
(icon := self iconRemoved) notNil ifTrue:[ |
1423 |
icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) |
|
1424 |
]. |
|
1425 |
cx := cx + 22."experimental value - this looks good" |
|
11710 | 1426 |
]. |
1427 |
(icon := self iconDelta) notNil ifTrue:[ |
|
12292 | 1428 |
icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) |
11710 | 1429 |
]. |
12216
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1430 |
cx := cx + 16."12 + 2px gap" |
10009 | 1431 |
|
12216
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12214
diff
changeset
|
1432 |
super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h. |
10009 | 1433 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1434 |
"/ "Now, display additional columns..." |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1435 |
"/ (list showColumn: #timestamp) ifTrue:[ |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1436 |
"/ cx := cx + (aLabel widthOn: aGC) + 5."px - padding" |
12292 | 1437 |
"/ colS := change timeOfChangeIfKnown notNil |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1438 |
"/ ifTrue:[change timeOfChangeIfKnown printString] |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1439 |
"/ ifFalse:['???']. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1440 |
"/ [ (colW := colS widthOn: aGC) > (aGC width - cx - 5) ] whileTrue:[ |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1441 |
"/ colS = '...' ifTrue:[ ^ self ]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1442 |
"/ colS := '...' , (colS copyFrom: 6). |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1443 |
"/ ]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1444 |
"/ super displayLabel:colS h:lH on:aGC x: (aGC width - 5 - colW) y:y h:h. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1445 |
"/ ]. |
10009 | 1446 |
|
12272 | 1447 |
"Modified: / 27-07-2012 / 17:13:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10009 | 1448 |
! ! |
1449 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1450 |
|
10009 | 1451 |
!ChangeList::ListEntry methodsFor:'private'! |
1452 |
||
1453 |
iconSelector |
|
10657 | 1454 |
| delta | |
10009 | 1455 |
|
10657 | 1456 |
delta := change deltaDetail. |
1457 |
delta shortDeltaSymbol = #+ ifTrue:[^#iconPlus]. |
|
1458 |
delta shortDeltaSymbol = #- ifTrue:[^#iconMinus]. |
|
1459 |
delta shortDeltaSymbol = #= ifTrue:[^#iconEqual]. |
|
10009 | 1460 |
|
10657 | 1461 |
^ nil. |
1462 |
||
1463 |
"Modified: / 31-08-2011 / 10:39:32 / cg" |
|
10009 | 1464 |
! ! |
1465 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1466 |
|
10957 | 1467 |
!ChangeList::ListEntry methodsFor:'protocol-queries'! |
1468 |
||
1469 |
hasChildren |
|
1470 |
^ change isCompositeChange and:[change changes notEmptyOrNil ]. |
|
1471 |
||
1472 |
"Created: / 04-12-2011 / 14:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11710 | 1473 |
"Modified (format): / 27-07-2012 / 21:25:34 / cg" |
10957 | 1474 |
! ! |
1475 |
||
12401
4714b9640528
Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1476 |
|
10009 | 1477 |
!ChangeList class methodsFor:'documentation'! |
1478 |
||
10451 | 1479 |
version |
12108 | 1480 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $' |
10451 | 1481 |
! |
1482 |
||
10009 | 1483 |
version_CVS |
12108 | 1484 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $' |
10009 | 1485 |
! |
1486 |
||
1487 |
version_SVN |
|
1488 |
^ '§Id: Tools__ChangeList.st 7486 2009-10-26 22:06:24Z vranyj1 §' |
|
1489 |
! ! |
|
12108 | 1490 |