| author | Claus Gittinger <cg@exept.de> |
| Sun, 14 Apr 2013 21:57:53 +0200 | |
| changeset 12667 | 5b04311f860d |
| parent 12660 | 3d3c8cb4f62c |
| child 12668 | bab9d5826fff |
| permissions | -rw-r--r-- |
| 10028 | 1 |
" |
| 10065 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
| 11196 | 3 |
All Rights Reserved |
| 10028 | 4 |
|
| 10065 | 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. |
|
| 10028 | 25 |
" |
26 |
"{ Package: 'stx:libtool' }"
|
|
27 |
||
28 |
"{ NameSpace: Tools }"
|
|
29 |
||
30 |
ToolApplicationModel subclass:#ChangeSetBrowser2 |
|
| 11198 | 31 |
instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile |
32 |
navigatorChangesetHolder navigatorSpecHolder list1 list1Holder |
|
33 |
selection1Holder list2 list2Holder selection2Holder classHolder |
|
34 |
languageHolder codeAspectHolder showRemovedAspect showSameAspect |
|
35 |
sourceView changeSourceHolder imageSourceHolder targetPackage |
|
36 |
targetNamespace updateChangefileHolder allowRemoveHolder |
|
| 12658 | 37 |
allowAcceptHolder showConflictsOnlyAspect' |
|
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
38 |
classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages' |
| 11198 | 39 |
poolDictionaries:'' |
40 |
category:'Interface-Browsers-ChangeSet' |
|
| 10028 | 41 |
! |
42 |
||
| 10914 | 43 |
ApplicationModel subclass:#ChangeEditor |
| 11198 | 44 |
instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder |
45 |
sourceImageHolder' |
|
46 |
classVariableNames:'' |
|
47 |
poolDictionaries:'' |
|
48 |
privateIn:ChangeSetBrowser2 |
|
| 10914 | 49 |
! |
50 |
||
| 10028 | 51 |
!ChangeSetBrowser2 class methodsFor:'documentation'! |
52 |
||
53 |
copyright |
|
54 |
" |
|
| 10065 | 55 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
| 11196 | 56 |
All Rights Reserved |
| 10065 | 57 |
|
58 |
Permission is hereby granted, free of charge, to any person |
|
59 |
obtaining a copy of this software and associated documentation |
|
60 |
files (the 'Software'), to deal in the Software without |
|
61 |
restriction, including without limitation the rights to use, |
|
62 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
63 |
copies of the Software, and to permit persons to whom the |
|
64 |
Software is furnished to do so, subject to the following |
|
65 |
conditions: |
|
| 10028 | 66 |
|
| 10065 | 67 |
The above copyright notice and this permission notice shall be |
68 |
included in all copies or substantial portions of the Software. |
|
69 |
||
70 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
71 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
72 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
73 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
74 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
75 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
76 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
77 |
OTHER DEALINGS IN THE SOFTWARE. |
|
| 10028 | 78 |
" |
79 |
! ! |
|
80 |
||
81 |
!ChangeSetBrowser2 class methodsFor:'instance creation'! |
|
82 |
||
83 |
on: aChangeSet |
|
84 |
||
85 |
^self on: aChangeSet label: aChangeSet name |
|
86 |
||
87 |
"Modified: / 26-10-2010 / 22:51:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
88 |
! |
|
89 |
||
90 |
on: aChangeSet label: aString |
|
91 |
||
92 |
^self on: aChangeSet label: aString setupWith: [:browser] |
|
93 |
||
94 |
"Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
95 |
! |
|
96 |
||
97 |
on: aChangeSet label: label setupWith: aBlock |
|
98 |
||
99 |
| browser | |
|
100 |
||
101 |
browser := self new. |
|
102 |
browser |
|
| 11196 | 103 |
changeset: aChangeSet; |
104 |
title: label. |
|
| 10028 | 105 |
aBlock value: browser. |
106 |
^browser |
|
107 |
||
108 |
"Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
109 |
! ! |
|
110 |
||
111 |
!ChangeSetBrowser2 class methodsFor:'accessing'! |
|
112 |
||
113 |
showRemoved |
|
114 |
||
115 |
^ShowRemoved == true |
|
116 |
! |
|
117 |
||
118 |
showRemoved: aBoolean |
|
119 |
||
120 |
ShowRemoved := aBoolean |
|
121 |
! ! |
|
122 |
||
123 |
!ChangeSetBrowser2 class methodsFor:'help specs'! |
|
124 |
||
| 11034 | 125 |
flyByHelpSpec |
| 10028 | 126 |
"This resource specification was automatically generated |
127 |
by the UIHelpTool of ST/X." |
|
128 |
||
129 |
"Do not manually edit this!! If it is corrupted, |
|
130 |
the UIHelpTool may not be able to read the specification." |
|
131 |
||
132 |
" |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
133 |
UIHelpTool openOnClass:Tools::ChangeSetBrowser |
| 10028 | 134 |
" |
135 |
||
136 |
<resource: #help> |
|
137 |
||
| 11034 | 138 |
^ super flyByHelpSpec addPairsFrom:#( |
| 10028 | 139 |
|
140 |
#fileLoad |
|
| 11034 | 141 |
'Select a file and show its contained changeset' |
| 10028 | 142 |
|
143 |
#fileSave |
|
| 11034 | 144 |
'Save the changeset in a file' |
| 10028 | 145 |
|
146 |
) |
|
| 11034 | 147 |
|
148 |
"Created: / 27-12-2011 / 10:37:47 / cg" |
|
| 10028 | 149 |
! ! |
150 |
||
151 |
!ChangeSetBrowser2 class methodsFor:'interface opening'! |
|
152 |
||
153 |
confirmChanges: aChangeSet |
|
154 |
||
| 11674 | 155 |
^self confirmChanges: aChangeSet label: 'Apply the following changes?' |
| 10028 | 156 |
|
157 |
"Modified: / 08-11-2010 / 18:01:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11674 | 158 |
"Modified: / 26-07-2012 / 13:19:49 / cg" |
| 10028 | 159 |
! |
160 |
||
161 |
confirmChanges:aChangeSet label: aString |
|
162 |
"Hmm, DialogBox class layout options are quite limited :-(("
|
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
163 |
|
| 10028 | 164 |
|browser browserView dialog| |
165 |
||
| 10309 | 166 |
browser := self on: aChangeSet. |
| 11196 | 167 |
browser allowAccept: false. |
168 |
browser allowRemove: true. |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
169 |
browserView := ApplicationSubView new |
| 10682 | 170 |
client:browser |
171 |
spec:#windowSpecForEmbedding. |
|
| 10028 | 172 |
dialog := (Dialog new) |
| 10682 | 173 |
addComponent:browserView withHeight: 300; |
174 |
addAbortAndOkButtons; |
|
175 |
yourself. |
|
| 10028 | 176 |
dialog label: aString. |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
177 |
dialog buttonPanel |
| 10682 | 178 |
layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0) |
179 |
offsets:(0 @ -30 corner:0 @ 0)). |
|
| 10028 | 180 |
browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0) |
| 10682 | 181 |
offsets:(0 @ 0 corner:0 @ -30)). |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
182 |
dialog |
| 10682 | 183 |
okAction: |
184 |
[^browser list1Holder value condenseChangesForRemoved]; |
|
185 |
abortAction: |
|
186 |
[^#()]. |
|
| 10345 | 187 |
dialog openWithExtent: 800@700. |
| 10028 | 188 |
^#() |
189 |
||
190 |
" |
|
| 10682 | 191 |
Tools::ChangeSetBrowser2 |
192 |
confirmChanges: |
|
193 |
(ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size) |
|
194 |
label: 'Last 10 changes...' |
|
| 10028 | 195 |
" |
196 |
||
197 |
"Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10682 | 198 |
"Modified: / 07-09-2011 / 20:19:44 / cg" |
| 11196 | 199 |
"Modified: / 24-01-2012 / 20:00:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 200 |
! |
201 |
||
| 11198 | 202 |
open |
203 |
"Open browser and load current changefile" |
|
204 |
||
| 11709 | 205 |
|app| |
206 |
||
207 |
(app := super open application) |
|
208 |
enqueueMessage:#loadCurrentChangeFile |
|
209 |
for:app |
|
210 |
arguments:#(). |
|
| 11198 | 211 |
|
212 |
"Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11709 | 213 |
"Modified: / 27-07-2012 / 21:24:19 / cg" |
| 11198 | 214 |
! |
215 |
||
| 10028 | 216 |
openOn: aChangeSet |
| 11674 | 217 |
^(self on: aChangeSet) |
218 |
open; |
|
219 |
yourself |
|
| 11196 | 220 |
|
221 |
" |
|
222 |
self openOn: ChangeSet current |
|
223 |
" |
|
224 |
||
225 |
"Modified (comment): / 24-01-2012 / 20:01:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11674 | 226 |
"Modified: / 26-07-2012 / 13:19:18 / cg" |
| 10028 | 227 |
! |
228 |
||
229 |
openOn: aChangeSet label: aString |
|
230 |
||
231 |
^self openOn: aChangeSet label: aString setupWith: [:browser] |
|
232 |
||
233 |
"Created: / 26-10-2010 / 22:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
234 |
! |
|
235 |
||
236 |
openOn: aChangeSet label: aString setupWith: aBlock |
|
237 |
||
| 11674 | 238 |
^(self on: aChangeSet label: aString setupWith: aBlock) open; yourself |
| 10028 | 239 |
|
240 |
"Created: / 26-10-2010 / 23:07:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11674 | 241 |
"Modified: / 26-07-2012 / 13:19:30 / cg" |
| 10028 | 242 |
! ! |
243 |
||
244 |
!ChangeSetBrowser2 class methodsFor:'interface specs'! |
|
245 |
||
246 |
hierarchicalNavigatorSpec |
|
247 |
"This resource specification was automatically generated |
|
248 |
by the UIPainter of ST/X." |
|
249 |
||
250 |
"Do not manually edit this!! If it is corrupted, |
|
251 |
the UIPainter may not be able to read the specification." |
|
252 |
||
253 |
" |
|
| 10448 | 254 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#hierarchicalNavigatorSpec |
255 |
Tools::ChangeSetBrowser2 new openInterface:#hierarchicalNavigatorSpec |
|
| 10028 | 256 |
" |
257 |
||
258 |
<resource: #canvas> |
|
259 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
260 |
^ |
| 10028 | 261 |
#(FullSpec |
| 11196 | 262 |
name: hierarchicalNavigatorSpec |
263 |
window: |
|
| 10028 | 264 |
(WindowSpec |
| 11196 | 265 |
label: 'Hierarchical Navigator' |
266 |
name: 'Hierarchical Navigator' |
|
267 |
min: (Point 10 10) |
|
268 |
bounds: (Rectangle 0 0 300 300) |
|
269 |
) |
|
270 |
component: |
|
| 10028 | 271 |
(SpecCollection |
| 11196 | 272 |
collection: ( |
273 |
(SubCanvasSpec |
|
274 |
name: 'ChangeList' |
|
275 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
276 |
hasHorizontalScrollBar: false |
|
277 |
hasVerticalScrollBar: false |
|
278 |
majorKey: #'Tools::HierarchicalChangeList' |
|
279 |
subAspectHolders: |
|
280 |
(Array |
|
281 |
||
282 |
(SubChannelInfoSpec |
|
283 |
subAspect: allowAcceptHolder |
|
284 |
aspect: allowAcceptHolder |
|
285 |
) |
|
286 |
(SubChannelInfoSpec |
|
287 |
subAspect: allowRemoveHolder |
|
288 |
aspect: allowRemoveHolder |
|
289 |
) |
|
290 |
(SubChannelInfoSpec |
|
291 |
subAspect: inGeneratorHolder |
|
292 |
aspect: list1Holder |
|
293 |
) |
|
294 |
||
295 |
(SubChannelInfoSpec |
|
296 |
subAspect: menuHolder |
|
297 |
aspect: list1MenuHolder |
|
298 |
) |
|
299 |
(SubChannelInfoSpec |
|
300 |
subAspect: selectionHolder |
|
301 |
aspect: selection1Holder |
|
302 |
) |
|
303 |
||
304 |
(SubChannelInfoSpec |
|
305 |
subAspect: showRemovedHolder |
|
306 |
aspect: showRemovedAspect |
|
307 |
) |
|
308 |
(SubChannelInfoSpec |
|
309 |
subAspect: showSameHolder |
|
310 |
aspect: showSameAspect |
|
311 |
) |
|
| 12658 | 312 |
(SubChannelInfoSpec |
313 |
subAspect: showConflictsOnlyHolder |
|
314 |
aspect: showConflictsOnlyAspect |
|
315 |
) |
|
| 11196 | 316 |
|
317 |
) |
|
318 |
createNewApplication: true |
|
319 |
createNewBuilder: true |
|
320 |
postBuildCallback: list1View: |
|
321 |
) |
|
322 |
) |
|
323 |
||
324 |
) |
|
| 10028 | 325 |
) |
| 10448 | 326 |
|
| 11196 | 327 |
"Modified: / 24-01-2012 / 19:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 328 |
! |
329 |
||
330 |
oneColumnNavigatorSpec |
|
331 |
"This resource specification was automatically generated |
|
332 |
by the UIPainter of ST/X." |
|
333 |
||
334 |
"Do not manually edit this!! If it is corrupted, |
|
335 |
the UIPainter may not be able to read the specification." |
|
336 |
||
337 |
" |
|
| 10448 | 338 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#oneColumnNavigatorSpec |
339 |
Tools::ChangeSetBrowser2 new openInterface:#oneColumnNavigatorSpec |
|
| 10028 | 340 |
" |
341 |
||
342 |
<resource: #canvas> |
|
343 |
||
| 11196 | 344 |
^ |
| 10028 | 345 |
#(FullSpec |
| 11196 | 346 |
name: oneColumnNavigatorSpec |
347 |
window: |
|
| 10028 | 348 |
(WindowSpec |
| 11196 | 349 |
label: 'One Column Navigator' |
350 |
name: 'One Column Navigator' |
|
351 |
min: (Point 10 10) |
|
352 |
bounds: (Rectangle 0 0 300 300) |
|
353 |
) |
|
354 |
component: |
|
| 10028 | 355 |
(SpecCollection |
| 11196 | 356 |
collection: ( |
357 |
(SubCanvasSpec |
|
358 |
name: 'ChangeList' |
|
359 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
360 |
hasHorizontalScrollBar: false |
|
361 |
hasVerticalScrollBar: false |
|
362 |
majorKey: #'Tools::ChangeList' |
|
363 |
subAspectHolders: |
|
364 |
(Array |
|
365 |
||
366 |
(SubChannelInfoSpec |
|
367 |
subAspect: allowAcceptHolder |
|
368 |
aspect: allowAcceptHolder |
|
369 |
) |
|
370 |
(SubChannelInfoSpec |
|
371 |
subAspect: allowRemoveHolder |
|
372 |
aspect: allowRemoveHolder |
|
373 |
) |
|
374 |
||
375 |
(SubChannelInfoSpec |
|
376 |
subAspect: inGeneratorHolder |
|
377 |
aspect: list1Holder |
|
378 |
) |
|
379 |
(SubChannelInfoSpec |
|
380 |
subAspect: menuHolder |
|
381 |
aspect: list1MenuHolder |
|
382 |
) |
|
383 |
||
384 |
(SubChannelInfoSpec |
|
385 |
subAspect: selectionHolder |
|
386 |
aspect: selection1Holder |
|
387 |
) |
|
388 |
(SubChannelInfoSpec |
|
389 |
subAspect: showRemovedHolder |
|
390 |
aspect: showRemovedAspect |
|
391 |
) |
|
392 |
||
393 |
(SubChannelInfoSpec |
|
394 |
subAspect: showSameHolder |
|
395 |
aspect: showSameAspect |
|
396 |
) |
|
| 12658 | 397 |
(SubChannelInfoSpec |
398 |
subAspect: showConflictsOnlyHolder |
|
399 |
aspect: showConflictsOnlyAspect |
|
400 |
) |
|
| 11196 | 401 |
) |
402 |
createNewApplication: true |
|
403 |
createNewBuilder: true |
|
404 |
postBuildCallback: list1View: |
|
405 |
) |
|
406 |
) |
|
407 |
||
408 |
) |
|
| 10028 | 409 |
) |
410 |
! |
|
411 |
||
412 |
twoColumnNavigatorSpec |
|
413 |
"This resource specification was automatically generated |
|
414 |
by the UIPainter of ST/X." |
|
415 |
||
416 |
"Do not manually edit this!! If it is corrupted, |
|
417 |
the UIPainter may not be able to read the specification." |
|
418 |
||
419 |
" |
|
| 10448 | 420 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#twoColumnNavigatorSpec |
421 |
Tools::ChangeSetBrowser2 new openInterface:#twoColumnNavigatorSpec |
|
| 10028 | 422 |
" |
423 |
||
424 |
<resource: #canvas> |
|
425 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
426 |
^ |
| 10028 | 427 |
#(FullSpec |
| 11196 | 428 |
name: twoColumnNavigatorSpec |
429 |
window: |
|
| 10028 | 430 |
(WindowSpec |
| 11196 | 431 |
label: 'Two Column Navigator' |
432 |
name: 'Two Column Navigator' |
|
433 |
min: (Point 10 10) |
|
434 |
bounds: (Rectangle 0 0 300 300) |
|
435 |
) |
|
436 |
component: |
|
| 10028 | 437 |
(SpecCollection |
| 11196 | 438 |
collection: ( |
439 |
(VariableHorizontalPanelSpec |
|
440 |
name: 'Columns' |
|
441 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
442 |
component: |
|
443 |
(SpecCollection |
|
444 |
collection: ( |
|
445 |
(SubCanvasSpec |
|
446 |
name: 'FirstColumn' |
|
447 |
hasHorizontalScrollBar: false |
|
448 |
hasVerticalScrollBar: false |
|
449 |
majorKey: #'Tools::ChangeList' |
|
450 |
subAspectHolders: |
|
451 |
(Array |
|
452 |
||
453 |
(SubChannelInfoSpec |
|
454 |
subAspect: allowAcceptHolder |
|
455 |
aspect: allowAcceptHolder |
|
456 |
) |
|
457 |
(SubChannelInfoSpec |
|
458 |
subAspect: allowRemoveHolder |
|
459 |
aspect: allowRemoveHolder |
|
460 |
) |
|
461 |
(SubChannelInfoSpec |
|
462 |
subAspect: inGeneratorHolder |
|
463 |
aspect: list1Holder |
|
464 |
) |
|
465 |
||
466 |
(SubChannelInfoSpec |
|
467 |
subAspect: menuHolder |
|
468 |
aspect: list1MenuHolder |
|
469 |
) |
|
470 |
(SubChannelInfoSpec |
|
471 |
subAspect: outGeneratorHolder |
|
472 |
aspect: list2Holder |
|
473 |
) |
|
474 |
||
475 |
(SubChannelInfoSpec |
|
476 |
subAspect: selectionHolder |
|
477 |
aspect: selection1Holder |
|
478 |
) |
|
479 |
(SubChannelInfoSpec |
|
480 |
subAspect: showRemovedHolder |
|
481 |
aspect: showRemovedAspect |
|
482 |
) |
|
483 |
(SubChannelInfoSpec |
|
484 |
subAspect: showSameHolder |
|
485 |
aspect: showSameAspect |
|
486 |
) |
|
| 12658 | 487 |
(SubChannelInfoSpec |
488 |
subAspect: showConflictsOnlyHolder |
|
489 |
aspect: showConflictsOnlyAspect |
|
490 |
) |
|
| 11196 | 491 |
) |
492 |
createNewApplication: true |
|
493 |
createNewBuilder: true |
|
494 |
postBuildCallback: list1View: |
|
495 |
) |
|
496 |
(SubCanvasSpec |
|
497 |
name: 'SecondColumn' |
|
498 |
hasHorizontalScrollBar: false |
|
499 |
hasVerticalScrollBar: false |
|
500 |
majorKey: #'Tools::ChangeList' |
|
501 |
subAspectHolders: |
|
502 |
(Array |
|
503 |
||
504 |
(SubChannelInfoSpec |
|
505 |
subAspect: allowAcceptHolder |
|
506 |
aspect: allowAcceptHolder |
|
507 |
) |
|
508 |
(SubChannelInfoSpec |
|
509 |
subAspect: allowRemoveHolder |
|
510 |
aspect: allowRemoveHolder |
|
511 |
) |
|
512 |
(SubChannelInfoSpec |
|
513 |
subAspect: inGeneratorHolder |
|
514 |
aspect: list2Holder |
|
515 |
) |
|
516 |
||
517 |
(SubChannelInfoSpec |
|
518 |
subAspect: menuHolder |
|
519 |
aspect: list2MenuHolder |
|
520 |
) |
|
521 |
(SubChannelInfoSpec |
|
522 |
subAspect: selectionHolder |
|
523 |
aspect: selection2Holder |
|
524 |
) |
|
525 |
||
526 |
(SubChannelInfoSpec |
|
527 |
subAspect: showRemovedHolder |
|
528 |
aspect: showRemovedAspect |
|
529 |
) |
|
530 |
(SubChannelInfoSpec |
|
531 |
subAspect: showSameHolder |
|
532 |
aspect: showSameAspect |
|
533 |
) |
|
| 12658 | 534 |
(SubChannelInfoSpec |
535 |
subAspect: showConflictsOnlyHolder |
|
536 |
aspect: showConflictsOnlyAspect |
|
537 |
) |
|
| 11196 | 538 |
) |
539 |
createNewApplication: true |
|
540 |
createNewBuilder: true |
|
541 |
postBuildCallback: list2View: |
|
542 |
) |
|
543 |
) |
|
544 |
||
545 |
) |
|
546 |
handles: (Any 0.5 1.0) |
|
547 |
) |
|
548 |
) |
|
549 |
||
550 |
) |
|
| 10028 | 551 |
) |
| 10448 | 552 |
|
| 11196 | 553 |
"Modified: / 24-01-2012 / 19:57:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 554 |
! |
555 |
||
556 |
windowSpec |
|
557 |
"This resource specification was automatically generated |
|
558 |
by the UIPainter of ST/X." |
|
559 |
||
560 |
"Do not manually edit this!! If it is corrupted, |
|
561 |
the UIPainter may not be able to read the specification." |
|
562 |
||
563 |
" |
|
564 |
UIPainter new openOnClass:Tools::ChangeSetBrowser andSelector:#windowSpec |
|
565 |
Tools::ChangeSetBrowser new openInterface:#windowSpec |
|
566 |
Tools::ChangeSetBrowser open |
|
567 |
" |
|
568 |
||
569 |
<resource: #canvas> |
|
570 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
571 |
^ |
| 10028 | 572 |
#(FullSpec |
| 11196 | 573 |
name: windowSpec |
574 |
window: |
|
| 10028 | 575 |
(WindowSpec |
| 11196 | 576 |
label: 'ChangeSet browser' |
577 |
name: 'ChangeSet browser' |
|
578 |
labelChannel: titleHolder |
|
579 |
min: (Point 10 10) |
|
580 |
bounds: (Rectangle 0 0 653 488) |
|
581 |
menu: mainMenu |
|
582 |
) |
|
583 |
component: |
|
| 10028 | 584 |
(SpecCollection |
| 11196 | 585 |
collection: ( |
586 |
(MenuPanelSpec |
|
587 |
name: 'ToolBar' |
|
588 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
589 |
menu: toolbarMenu |
|
590 |
textDefault: true |
|
591 |
) |
|
592 |
(UISubSpecification |
|
593 |
name: 'Contents' |
|
594 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
595 |
minorKey: windowSpecWithoutToolbar |
|
596 |
) |
|
597 |
) |
|
598 |
||
599 |
) |
|
| 10028 | 600 |
) |
601 |
! |
|
602 |
||
603 |
windowSpecForEmbedding |
|
604 |
||
605 |
^self windowSpecWithoutToolbar |
|
606 |
! |
|
607 |
||
608 |
windowSpecWithoutToolbar |
|
609 |
"This resource specification was automatically generated |
|
610 |
by the UIPainter of ST/X." |
|
611 |
||
612 |
"Do not manually edit this!! If it is corrupted, |
|
613 |
the UIPainter may not be able to read the specification." |
|
614 |
||
615 |
" |
|
| 10333 | 616 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#windowSpecWithoutToolbar |
617 |
Tools::ChangeSetBrowser2 new openInterface:#windowSpecWithoutToolbar |
|
| 10028 | 618 |
" |
619 |
||
620 |
<resource: #canvas> |
|
621 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
622 |
^ |
| 10028 | 623 |
#(FullSpec |
| 10953 | 624 |
name: windowSpecWithoutToolbar |
625 |
window: |
|
| 10028 | 626 |
(WindowSpec |
| 10953 | 627 |
label: 'ChangeSet browser' |
628 |
name: 'ChangeSet browser' |
|
629 |
min: (Point 10 10) |
|
630 |
bounds: (Rectangle 0 0 653 488) |
|
631 |
menu: mainMenu |
|
632 |
) |
|
633 |
component: |
|
| 10028 | 634 |
(SpecCollection |
| 10953 | 635 |
collection: ( |
636 |
(VariableVerticalPanelSpec |
|
637 |
name: 'VerticalPanel' |
|
638 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
639 |
component: |
|
640 |
(SpecCollection |
|
641 |
collection: ( |
|
642 |
(SubCanvasSpec |
|
643 |
name: 'NavigatorPanel' |
|
644 |
hasHorizontalScrollBar: false |
|
645 |
hasVerticalScrollBar: false |
|
646 |
specHolder: navigatorSpecHolder |
|
647 |
createNewBuilder: false |
|
648 |
) |
|
649 |
(SubCanvasSpec |
|
650 |
name: 'TextDiffTool' |
|
651 |
hasHorizontalScrollBar: false |
|
652 |
hasVerticalScrollBar: false |
|
653 |
majorKey: #'Tools::TextDiffTool' |
|
654 |
minorKey: windowSpecForEmbedding |
|
655 |
subAspectHolders: |
|
656 |
(Array |
|
657 |
||
658 |
(SubChannelInfoSpec |
|
659 |
subAspect: classHolder |
|
660 |
aspect: classHolder |
|
661 |
) |
|
662 |
(SubChannelInfoSpec |
|
663 |
subAspect: languageHolder |
|
664 |
aspect: languageHolder |
|
665 |
) |
|
666 |
(SubChannelInfoSpec |
|
667 |
subAspect: codeAspectHolder |
|
668 |
aspect: codeAspectHolder |
|
669 |
) |
|
670 |
||
671 |
(SubChannelInfoSpec |
|
672 |
subAspect: labelAHolder |
|
673 |
aspect: labelAHolder |
|
674 |
) |
|
675 |
(SubChannelInfoSpec |
|
676 |
subAspect: labelBHolder |
|
677 |
aspect: labelBHolder |
|
678 |
) |
|
679 |
||
680 |
(SubChannelInfoSpec |
|
681 |
subAspect: textAHolder |
|
682 |
aspect: changeSourceHolder |
|
683 |
) |
|
684 |
(SubChannelInfoSpec |
|
685 |
subAspect: textBHolder |
|
686 |
aspect: imageSourceHolder |
|
687 |
) |
|
688 |
) |
|
689 |
createNewApplication: true |
|
690 |
createNewBuilder: true |
|
691 |
) |
|
692 |
) |
|
693 |
||
694 |
) |
|
695 |
handles: (Any 0.5 1.0) |
|
696 |
) |
|
697 |
) |
|
698 |
||
699 |
) |
|
| 10028 | 700 |
) |
| 10953 | 701 |
|
702 |
"Modified: / 03-12-2011 / 10:36:40 / cg" |
|
| 10028 | 703 |
! ! |
704 |
||
705 |
!ChangeSetBrowser2 class methodsFor:'menu specs'! |
|
706 |
||
707 |
changeMenu |
|
708 |
"This resource specification was automatically generated |
|
709 |
by the MenuEditor of ST/X." |
|
710 |
||
711 |
"Do not manually edit this!! If it is corrupted, |
|
712 |
the MenuEditor may not be able to read the specification." |
|
713 |
||
| 10658 | 714 |
|
| 10028 | 715 |
" |
| 10448 | 716 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu |
717 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu)) startUp |
|
| 10028 | 718 |
" |
719 |
||
720 |
<resource: #menu> |
|
721 |
||
| 10643 | 722 |
^ |
| 10028 | 723 |
#(Menu |
| 10643 | 724 |
( |
725 |
(MenuItem |
|
726 |
enabled: hasChangeSelectedAndNotRemoved: |
|
727 |
label: 'Apply' |
|
728 |
itemValue: changeMenuApplySelection: |
|
| 11196 | 729 |
isVisible: allowAcceptHolder |
| 10643 | 730 |
shortcutKey: Accept |
731 |
auxValue: 100 |
|
732 |
) |
|
733 |
(MenuItem |
|
734 |
label: 'Apply all' |
|
735 |
itemValue: changeMenuApply: |
|
| 11196 | 736 |
isVisible: allowAcceptHolder |
| 10643 | 737 |
) |
738 |
(MenuItem |
|
739 |
label: '-' |
|
| 11196 | 740 |
isVisible: allowAcceptHolder |
| 10643 | 741 |
) |
742 |
(MenuItem |
|
743 |
label: 'Delete' |
|
744 |
itemValue: changeMenuDeleteSelection: |
|
745 |
nameKey: Delete |
|
| 11196 | 746 |
isVisible: allowRemoveHolder |
| 10643 | 747 |
shortcutKey: Delete |
748 |
) |
|
749 |
(MenuItem |
|
750 |
label: 'Undelete' |
|
751 |
itemValue: changeMenuUndeleteSelection: |
|
752 |
nameKey: Undelete |
|
| 11196 | 753 |
isVisible: allowRemoveHolder |
| 10643 | 754 |
) |
755 |
(MenuItem |
|
756 |
label: '-' |
|
| 11196 | 757 |
isVisible: allowRemoveHolder |
| 10643 | 758 |
) |
759 |
(MenuItem |
|
760 |
label: 'Select...' |
|
761 |
submenu: |
|
762 |
(Menu |
|
763 |
( |
|
764 |
(MenuItem |
|
765 |
label: 'Select same' |
|
766 |
itemValue: changeMenuSelectSame: |
|
767 |
) |
|
768 |
(MenuItem |
|
769 |
label: 'Select additions (new classes/methods)' |
|
770 |
itemValue: changeMenuSelectAdditions: |
|
771 |
) |
|
772 |
(MenuItem |
|
773 |
label: 'Select removals' |
|
774 |
itemValue: changeMenuSelectRemovals: |
|
775 |
) |
|
776 |
(MenuItem |
|
777 |
label: 'Select differences' |
|
778 |
itemValue: changeMenuSelectDifferences: |
|
779 |
) |
|
780 |
(MenuItem |
|
781 |
label: '-' |
|
782 |
) |
|
783 |
(MenuItem |
|
784 |
label: 'Select all' |
|
785 |
itemValue: changeMenuSelectAll: |
|
| 11677 | 786 |
shortcutKey: SelectAll |
| 10643 | 787 |
) |
788 |
(MenuItem |
|
789 |
label: 'Select none' |
|
790 |
itemValue: changeMenuSelectNone: |
|
791 |
) |
|
792 |
(MenuItem |
|
793 |
label: '-' |
|
794 |
) |
|
795 |
(MenuItem |
|
796 |
label: 'Select using block' |
|
797 |
itemValue: changeMenuSelectUsingBlock: |
|
798 |
) |
|
799 |
) |
|
800 |
nil |
|
801 |
nil |
|
802 |
) |
|
803 |
) |
|
804 |
(MenuItem |
|
805 |
label: '-' |
|
806 |
) |
|
807 |
(MenuItem |
|
| 12658 | 808 |
enabled: notShowConflictsOnlyAspect |
| 10643 | 809 |
label: 'Show Deleted' |
| 11196 | 810 |
isVisible: allowRemoveHolder |
| 10643 | 811 |
indication: showRemovedAspect |
812 |
) |
|
813 |
(MenuItem |
|
| 12658 | 814 |
enabled: notShowConflictsOnlyAspect |
| 10643 | 815 |
label: 'Show Same' |
816 |
indication: showSameAspect |
|
817 |
) |
|
818 |
(MenuItem |
|
| 12658 | 819 |
label: 'Show Conflicts Only' |
820 |
indication: showConflictsOnlyAspect |
|
821 |
) |
|
822 |
(MenuItem |
|
| 10643 | 823 |
label: '-' |
824 |
) |
|
825 |
(MenuItem |
|
826 |
label: 'Inspect change' |
|
827 |
itemValue: changeMenuInspect: |
|
828 |
) |
|
829 |
(MenuItem |
|
830 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
| 10658 | 831 |
label: 'Browse Method(s)' |
| 10643 | 832 |
itemValue: changeMenuBrowse: |
833 |
) |
|
834 |
) |
|
835 |
nil |
|
836 |
nil |
|
| 10028 | 837 |
) |
838 |
! |
|
839 |
||
| 10666 | 840 |
changeMenu1 |
841 |
"This resource specification was automatically generated |
|
842 |
by the MenuEditor of ST/X." |
|
843 |
||
844 |
"Do not manually edit this!! If it is corrupted, |
|
845 |
the MenuEditor may not be able to read the specification." |
|
846 |
||
847 |
||
848 |
" |
|
849 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu1 |
|
850 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu1)) startUp |
|
851 |
" |
|
852 |
||
853 |
<resource: #menu> |
|
854 |
||
855 |
^ |
|
856 |
#(Menu |
|
857 |
( |
|
858 |
(MenuItem |
|
859 |
enabled: hasChangeSelectedAndNotRemoved: |
|
860 |
label: 'Apply' |
|
861 |
itemValue: changeMenuApplySelection: |
|
| 11196 | 862 |
isVisible: allowAcceptHolder |
| 10666 | 863 |
shortcutKey: Accept |
864 |
auxValue: 100 |
|
865 |
) |
|
866 |
(MenuItem |
|
| 11037 | 867 |
label: 'Apply All' |
| 10666 | 868 |
itemValue: changeMenuApply: |
| 11196 | 869 |
isVisible: allowAcceptHolder |
| 10666 | 870 |
) |
871 |
(MenuItem |
|
872 |
label: '-' |
|
| 11196 | 873 |
isVisible: allowAcceptHolder |
| 10666 | 874 |
) |
875 |
(MenuItem |
|
876 |
label: 'Delete' |
|
877 |
itemValue: changeMenuDeleteSelection: |
|
878 |
nameKey: Delete |
|
| 11196 | 879 |
isVisible: allowRemoveHolder |
| 10666 | 880 |
shortcutKey: Delete |
881 |
) |
|
882 |
(MenuItem |
|
883 |
label: 'Undelete' |
|
884 |
itemValue: changeMenuUndeleteSelection: |
|
885 |
nameKey: Undelete |
|
| 11196 | 886 |
isVisible: allowRemoveHolder |
| 10666 | 887 |
) |
888 |
(MenuItem |
|
889 |
label: '-' |
|
| 11196 | 890 |
isVisible: allowRemoveHolder |
| 10666 | 891 |
) |
892 |
(MenuItem |
|
893 |
label: 'Select...' |
|
894 |
submenu: |
|
895 |
(Menu |
|
896 |
( |
|
897 |
(MenuItem |
|
| 11037 | 898 |
label: 'Select Same' |
| 10666 | 899 |
itemValue: changeMenuSelectSame: |
900 |
) |
|
901 |
(MenuItem |
|
| 11037 | 902 |
label: 'Select Additions (new Classes/Methods)' |
| 10666 | 903 |
itemValue: changeMenuSelectAdditions: |
904 |
) |
|
905 |
(MenuItem |
|
| 11037 | 906 |
label: 'Select Removals' |
| 10666 | 907 |
itemValue: changeMenuSelectRemovals: |
908 |
) |
|
909 |
(MenuItem |
|
| 11037 | 910 |
label: 'Select Differences' |
| 10666 | 911 |
itemValue: changeMenuSelectDifferences: |
912 |
) |
|
913 |
(MenuItem |
|
914 |
label: '-' |
|
915 |
) |
|
916 |
(MenuItem |
|
| 11037 | 917 |
label: 'Select All' |
| 10666 | 918 |
itemValue: changeMenuSelectAll: |
919 |
) |
|
920 |
(MenuItem |
|
| 11037 | 921 |
label: 'Select None' |
| 10666 | 922 |
itemValue: changeMenuSelectNone: |
923 |
) |
|
924 |
(MenuItem |
|
925 |
label: '-' |
|
926 |
) |
|
927 |
(MenuItem |
|
| 11037 | 928 |
label: 'Select using Block' |
| 10666 | 929 |
itemValue: changeMenuSelectUsingBlock: |
930 |
) |
|
931 |
) |
|
932 |
nil |
|
933 |
nil |
|
934 |
) |
|
935 |
) |
|
936 |
(MenuItem |
|
937 |
label: '-' |
|
938 |
) |
|
939 |
(MenuItem |
|
| 12658 | 940 |
enabled: notShowConflictsOnlyAspect |
| 10666 | 941 |
label: 'Show Deleted' |
| 11196 | 942 |
isVisible: allowRemoveHolder |
| 10666 | 943 |
indication: showRemovedAspect |
944 |
) |
|
945 |
(MenuItem |
|
| 12658 | 946 |
enabled: notShowConflictsOnlyAspect |
| 10666 | 947 |
label: 'Show Same' |
948 |
indication: showSameAspect |
|
949 |
) |
|
950 |
(MenuItem |
|
| 12658 | 951 |
label: 'Show Conflicts Only' |
952 |
indication: showConflictsOnlyAspect |
|
953 |
) |
|
954 |
(MenuItem |
|
| 10666 | 955 |
label: '-' |
956 |
) |
|
957 |
(MenuItem |
|
| 11037 | 958 |
label: 'Inspect Change' |
| 10666 | 959 |
itemValue: changeMenuInspect: |
960 |
) |
|
961 |
(MenuItem |
|
962 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
963 |
label: 'Browse Method(s)' |
|
964 |
itemValue: changeMenuBrowse: |
|
965 |
) |
|
966 |
(MenuItem |
|
967 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
968 |
label: 'Browse Class(s)' |
|
969 |
itemValue: changeMenuBrowseClass: |
|
970 |
) |
|
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
971 |
(MenuItem |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
972 |
label: '-' |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
973 |
) |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
974 |
(MenuItem |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
975 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
976 |
label: 'Compare Class Against...' |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
977 |
itemValue: changeMenuCompareClass: |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
978 |
) |
| 10666 | 979 |
) |
980 |
nil |
|
981 |
nil |
|
982 |
) |
|
983 |
! |
|
984 |
||
985 |
changeMenu2 |
|
986 |
"This resource specification was automatically generated |
|
987 |
by the MenuEditor of ST/X." |
|
988 |
||
989 |
"Do not manually edit this!! If it is corrupted, |
|
990 |
the MenuEditor may not be able to read the specification." |
|
991 |
||
992 |
||
993 |
" |
|
994 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu2 |
|
995 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu2)) startUp |
|
996 |
" |
|
997 |
||
998 |
<resource: #menu> |
|
999 |
||
1000 |
^ |
|
1001 |
#(Menu |
|
1002 |
( |
|
1003 |
(MenuItem |
|
1004 |
enabled: hasChangeSelectedAndNotRemoved: |
|
1005 |
label: 'Apply' |
|
1006 |
itemValue: changeMenuApplySelection: |
|
| 11196 | 1007 |
isVisible: allowAcceptHolder |
| 10666 | 1008 |
shortcutKey: Accept |
1009 |
auxValue: 100 |
|
1010 |
) |
|
1011 |
(MenuItem |
|
| 11037 | 1012 |
label: 'Apply to End' |
1013 |
itemValue: changeMenuApplyToEnd: |
|
| 11196 | 1014 |
isVisible: allowAcceptHolder |
| 10666 | 1015 |
) |
1016 |
(MenuItem |
|
1017 |
label: '-' |
|
| 11196 | 1018 |
isVisible: allowAcceptHolder |
| 10666 | 1019 |
) |
1020 |
(MenuItem |
|
1021 |
label: 'Delete' |
|
1022 |
itemValue: changeMenuDeleteSelection: |
|
1023 |
nameKey: Delete |
|
| 11196 | 1024 |
isVisible: allowRemoveHolder |
| 10666 | 1025 |
shortcutKey: Delete |
1026 |
) |
|
1027 |
(MenuItem |
|
1028 |
label: 'Undelete' |
|
1029 |
itemValue: changeMenuUndeleteSelection: |
|
1030 |
nameKey: Undelete |
|
| 11196 | 1031 |
isVisible: allowRemoveHolder |
| 10666 | 1032 |
) |
1033 |
(MenuItem |
|
1034 |
label: '-' |
|
| 11196 | 1035 |
isVisible: allowRemoveHolder |
| 10666 | 1036 |
) |
1037 |
(MenuItem |
|
1038 |
label: 'Select...' |
|
1039 |
submenu: |
|
1040 |
(Menu |
|
1041 |
( |
|
1042 |
(MenuItem |
|
| 11037 | 1043 |
label: 'Select Same' |
| 10666 | 1044 |
itemValue: changeMenuSelectSame: |
1045 |
) |
|
1046 |
(MenuItem |
|
| 11037 | 1047 |
label: 'Select Additions (new Classes/Methods)' |
| 10666 | 1048 |
itemValue: changeMenuSelectAdditions: |
1049 |
) |
|
1050 |
(MenuItem |
|
| 11037 | 1051 |
label: 'Select Removals' |
| 10666 | 1052 |
itemValue: changeMenuSelectRemovals: |
1053 |
) |
|
1054 |
(MenuItem |
|
| 11037 | 1055 |
label: 'Select Differences' |
| 10666 | 1056 |
itemValue: changeMenuSelectDifferences: |
1057 |
) |
|
1058 |
(MenuItem |
|
1059 |
label: '-' |
|
1060 |
) |
|
1061 |
(MenuItem |
|
| 11037 | 1062 |
label: 'Select All' |
| 10666 | 1063 |
itemValue: changeMenuSelectAll: |
1064 |
) |
|
1065 |
(MenuItem |
|
| 11037 | 1066 |
label: 'Select None' |
| 10666 | 1067 |
itemValue: changeMenuSelectNone: |
1068 |
) |
|
1069 |
(MenuItem |
|
1070 |
label: '-' |
|
1071 |
) |
|
1072 |
(MenuItem |
|
| 11037 | 1073 |
label: 'Select using Block' |
| 10666 | 1074 |
itemValue: changeMenuSelectUsingBlock: |
1075 |
) |
|
1076 |
) |
|
1077 |
nil |
|
1078 |
nil |
|
1079 |
) |
|
1080 |
) |
|
1081 |
(MenuItem |
|
1082 |
label: '-' |
|
1083 |
) |
|
1084 |
(MenuItem |
|
| 12658 | 1085 |
enabled: notShowConflictsOnlyAspect |
| 10666 | 1086 |
label: 'Show Deleted' |
| 11196 | 1087 |
isVisible: allowRemoveHolder |
| 10666 | 1088 |
indication: showRemovedAspect |
1089 |
) |
|
1090 |
(MenuItem |
|
| 12658 | 1091 |
enabled: notShowConflictsOnlyAspect |
| 10666 | 1092 |
label: 'Show Same' |
1093 |
indication: showSameAspect |
|
1094 |
) |
|
1095 |
(MenuItem |
|
| 12658 | 1096 |
label: 'Show Conflicts Only' |
1097 |
indication: showConflictsOnlyAspect |
|
1098 |
) |
|
1099 |
(MenuItem |
|
| 10666 | 1100 |
label: '-' |
1101 |
) |
|
1102 |
(MenuItem |
|
| 11037 | 1103 |
label: 'Inspect Change' |
| 10666 | 1104 |
itemValue: changeMenuInspect: |
1105 |
) |
|
1106 |
(MenuItem |
|
1107 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
1108 |
label: 'Browse Method(s)' |
|
1109 |
itemValue: changeMenuBrowse: |
|
1110 |
) |
|
1111 |
) |
|
1112 |
nil |
|
1113 |
nil |
|
1114 |
) |
|
1115 |
! |
|
1116 |
||
| 10028 | 1117 |
mainMenu |
1118 |
"This resource specification was automatically generated |
|
1119 |
by the MenuEditor of ST/X." |
|
1120 |
||
1121 |
"Do not manually edit this!! If it is corrupted, |
|
1122 |
the MenuEditor may not be able to read the specification." |
|
1123 |
||
| 10682 | 1124 |
|
| 10028 | 1125 |
" |
| 10448 | 1126 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#mainMenu |
1127 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 mainMenu)) startUp |
|
| 10028 | 1128 |
" |
1129 |
||
1130 |
<resource: #menu> |
|
1131 |
||
| 10682 | 1132 |
^ |
| 10028 | 1133 |
#(Menu |
| 10682 | 1134 |
( |
1135 |
(MenuItem |
|
1136 |
label: 'File' |
|
1137 |
submenu: |
|
1138 |
(Menu |
|
1139 |
( |
|
1140 |
(MenuItem |
|
| 11034 | 1141 |
label: 'Open...' |
| 10682 | 1142 |
itemValue: doOpen |
1143 |
isVisible: allowOpenHolder |
|
1144 |
shortcutKey: Ctrlo |
|
1145 |
) |
|
1146 |
(MenuItem |
|
| 11709 | 1147 |
label: 'Open on Current Changes File' |
1148 |
itemValue: doOpenCurrentChangeFile |
|
| 10682 | 1149 |
isVisible: allowOpenHolder |
1150 |
) |
|
1151 |
(MenuItem |
|
1152 |
label: 'Save' |
|
1153 |
itemValue: doSave |
|
1154 |
) |
|
1155 |
(MenuItem |
|
1156 |
label: 'Save As...' |
|
1157 |
itemValue: doSaveAs |
|
1158 |
) |
|
1159 |
(MenuItem |
|
1160 |
label: '-' |
|
1161 |
) |
|
1162 |
(MenuItem |
|
1163 |
label: 'Exit' |
|
1164 |
itemValue: closeRequest |
|
1165 |
) |
|
1166 |
) |
|
1167 |
nil |
|
1168 |
nil |
|
1169 |
) |
|
1170 |
) |
|
1171 |
(MenuItem |
|
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1172 |
label: 'Change' |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1173 |
submenu: |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1174 |
(Menu |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1175 |
( |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1176 |
(MenuItem |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1177 |
label: 'Apply' |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1178 |
itemValue: doApplySelectedChanges |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1179 |
) |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1180 |
) |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1181 |
nil |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1182 |
nil |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1183 |
) |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1184 |
) |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1185 |
(MenuItem |
| 10682 | 1186 |
label: 'View' |
1187 |
submenu: |
|
1188 |
(Menu |
|
1189 |
( |
|
1190 |
(MenuItem |
|
1191 |
label: 'List' |
|
1192 |
choice: navigatorSpecHolder |
|
1193 |
choiceValue: oneColumnNavigatorSpec |
|
1194 |
) |
|
1195 |
(MenuItem |
|
1196 |
label: 'Hierarchical List' |
|
1197 |
choice: navigatorSpecHolder |
|
1198 |
choiceValue: hierarchicalNavigatorSpec |
|
1199 |
) |
|
1200 |
(MenuItem |
|
1201 |
label: 'Browser Like' |
|
1202 |
choice: navigatorSpecHolder |
|
1203 |
choiceValue: twoColumnNavigatorSpec |
|
1204 |
) |
|
1205 |
(MenuItem |
|
1206 |
label: '-' |
|
1207 |
) |
|
1208 |
(MenuItem |
|
| 12658 | 1209 |
enabled: notShowConflictsOnlyAspect |
| 10682 | 1210 |
label: 'Show Deleted' |
1211 |
indication: showRemovedAspect |
|
1212 |
) |
|
1213 |
(MenuItem |
|
| 12658 | 1214 |
enabled: notShowConflictsOnlyAspect |
| 10682 | 1215 |
label: 'Show Same' |
1216 |
indication: showSameAspect |
|
1217 |
) |
|
|
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1218 |
(MenuItem |
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1219 |
label: 'Show Conflicts Only' |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1220 |
indication: showConflictsOnlyAspect |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1221 |
) |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1222 |
(MenuItem |
|
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1223 |
label: '-' |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1224 |
) |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1225 |
(MenuItem |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1226 |
label: 'Update' |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1227 |
itemValue: menuUpdate |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1228 |
) |
| 10682 | 1229 |
) |
1230 |
nil |
|
1231 |
nil |
|
1232 |
) |
|
1233 |
) |
|
1234 |
(MenuItem |
|
1235 |
label: 'Loading' |
|
1236 |
submenu: |
|
1237 |
(Menu |
|
1238 |
( |
|
1239 |
(MenuItem |
|
1240 |
label: 'Set Target Package...' |
|
1241 |
itemValue: setTargetPackage |
|
1242 |
) |
|
1243 |
(MenuItem |
|
1244 |
label: 'Set Target Namespace...' |
|
1245 |
itemValue: setTargetNamespace |
|
1246 |
) |
|
1247 |
(MenuItem |
|
1248 |
label: '-' |
|
1249 |
) |
|
1250 |
(MenuItem |
|
1251 |
label: 'Update Changefile' |
|
1252 |
indication: updateChangeFileHolder |
|
1253 |
) |
|
1254 |
) |
|
1255 |
nil |
|
1256 |
nil |
|
1257 |
) |
|
1258 |
) |
|
1259 |
) |
|
1260 |
nil |
|
1261 |
nil |
|
| 10028 | 1262 |
) |
1263 |
! |
|
1264 |
||
1265 |
toolbarMenu |
|
1266 |
"This resource specification was automatically generated |
|
1267 |
by the MenuEditor of ST/X." |
|
1268 |
||
1269 |
"Do not manually edit this!! If it is corrupted, |
|
1270 |
the MenuEditor may not be able to read the specification." |
|
1271 |
||
| 11034 | 1272 |
|
| 10028 | 1273 |
" |
| 11034 | 1274 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#toolbarMenu |
1275 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 toolbarMenu)) startUp |
|
| 10028 | 1276 |
" |
1277 |
||
1278 |
<resource: #menu> |
|
1279 |
||
| 11034 | 1280 |
^ |
| 10028 | 1281 |
#(Menu |
| 10854 | 1282 |
( |
1283 |
(MenuItem |
|
1284 |
activeHelpKey: fileLoad |
|
1285 |
label: 'Open' |
|
1286 |
itemValue: doOpen |
|
1287 |
translateLabel: true |
|
1288 |
isButton: true |
|
1289 |
isVisible: allowOpenHolder |
|
1290 |
labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFileIcon) |
|
1291 |
) |
|
1292 |
(MenuItem |
|
1293 |
activeHelpKey: fileSave |
|
1294 |
label: 'Save' |
|
1295 |
itemValue: doSave |
|
1296 |
translateLabel: true |
|
1297 |
isButton: true |
|
| 11034 | 1298 |
labelImage: (ResourceRetriever ToolbarIconLibrary saveToFileAsIcon) |
| 10854 | 1299 |
) |
1300 |
) |
|
1301 |
nil |
|
1302 |
nil |
|
| 10028 | 1303 |
) |
1304 |
! ! |
|
1305 |
||
1306 |
!ChangeSetBrowser2 class methodsFor:'plugIn spec'! |
|
1307 |
||
1308 |
aspectSelectors |
|
1309 |
"This resource specification was automatically generated |
|
1310 |
by the UIPainter of ST/X." |
|
1311 |
||
1312 |
"Do not manually edit this. If it is corrupted, |
|
1313 |
the UIPainter may not be able to read the specification." |
|
1314 |
||
1315 |
"Return a description of exported aspects; |
|
1316 |
these can be connected to aspects of an embedding application |
|
1317 |
(if this app is embedded in a subCanvas)." |
|
1318 |
||
1319 |
^ #( |
|
| 11196 | 1320 |
#changesetHolder |
| 10028 | 1321 |
). |
1322 |
||
1323 |
! ! |
|
1324 |
||
1325 |
!ChangeSetBrowser2 methodsFor:'accessing'! |
|
1326 |
||
| 11196 | 1327 |
allowAccept: aBoolean |
1328 |
||
1329 |
^self allowAcceptHolder value: aBoolean |
|
1330 |
||
1331 |
"Created: / 24-01-2012 / 19:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10028 | 1332 |
! |
1333 |
||
1334 |
allowOpen: aBoolean |
|
1335 |
||
1336 |
self allowOpenHolder value: aBoolean |
|
1337 |
||
1338 |
"Created: / 26-10-2010 / 23:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1339 |
! |
|
1340 |
||
| 11196 | 1341 |
allowRemove: aBoolean |
1342 |
||
1343 |
^self allowRemoveHolder value: aBoolean |
|
1344 |
||
1345 |
"Created: / 24-01-2012 / 20:00:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1346 |
! |
|
1347 |
||
| 10028 | 1348 |
beHierarchical |
1349 |
||
1350 |
^self navigatorSpecHolder value: #hierarchicalNavigatorSpec |
|
1351 |
||
1352 |
"Modified: / 14-10-2010 / 15:52:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1353 |
! |
|
1354 |
||
1355 |
beOneColumn |
|
1356 |
||
1357 |
^self navigatorSpecHolder value: #oneColumnNavigatorSpec |
|
1358 |
||
1359 |
"Modified: / 14-10-2010 / 15:52:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1360 |
! |
|
1361 |
||
1362 |
beTwoColumn |
|
1363 |
||
1364 |
^self navigatorSpecHolder value: #twoColumnNavigatorSpec |
|
1365 |
||
1366 |
"Modified: / 14-10-2010 / 15:51:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1367 |
! |
|
1368 |
||
1369 |
changeset |
|
1370 |
||
1371 |
^self changesetHolder value |
|
1372 |
! |
|
1373 |
||
1374 |
changeset: aChangeSet |
|
1375 |
||
1376 |
self changesetHolder value: aChangeSet |
|
1377 |
! |
|
1378 |
||
1379 |
readOnly: aBoolean |
|
| 11677 | 1380 |
self allowAcceptHolder value:false. |
| 10028 | 1381 |
|
1382 |
"Created: / 20-07-2010 / 09:48:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11677 | 1383 |
"Modified: / 26-07-2012 / 14:31:50 / cg" |
| 10028 | 1384 |
! |
1385 |
||
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1386 |
selectedChanges |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1387 |
| sel | |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1388 |
|
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1389 |
sel := selection2Holder value. |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1390 |
sel isEmptyOrNil ifTrue:[ |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1391 |
sel := selection1Holder value. |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1392 |
]. |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1393 |
^ sel select:[:each | each notNil]. |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1394 |
! |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1395 |
|
| 10682 | 1396 |
targetNamespace:something |
1397 |
targetNamespace := something. |
|
1398 |
! |
|
1399 |
||
1400 |
targetPackage:something |
|
1401 |
targetPackage := something. |
|
1402 |
! |
|
1403 |
||
| 10028 | 1404 |
theSingleSelectedChange |
| 12658 | 1405 |
| sel | |
1406 |
||
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1407 |
sel := self selectedChanges. |
| 12658 | 1408 |
sel size == 1 ifTrue:[ ^ sel first ]. |
1409 |
^ nil |
|
| 10448 | 1410 |
|
1411 |
"Modified: / 04-08-2011 / 18:55:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10028 | 1412 |
! |
1413 |
||
1414 |
title: aString |
|
1415 |
||
1416 |
self titleHolder value: aString |
|
1417 |
||
1418 |
"Created: / 26-10-2010 / 23:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1419 |
! ! |
|
1420 |
||
1421 |
!ChangeSetBrowser2 methodsFor:'accessing - defaults'! |
|
1422 |
||
1423 |
defaultTitle |
|
1424 |
^ 'No changeset' |
|
1425 |
||
1426 |
"Modified: / 08-04-2011 / 10:10:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1427 |
! ! |
|
1428 |
||
1429 |
!ChangeSetBrowser2 methodsFor:'accessing - menus'! |
|
1430 |
||
| 10448 | 1431 |
list1MenuHolder |
| 10666 | 1432 |
^ [ |
1433 |
|menu| |
|
| 10448 | 1434 |
|
| 10666 | 1435 |
menu := builder menuFor:#changeMenu1. |
1436 |
menu allItemsDo:[:item | item argument:list1 ]. |
|
1437 |
menu |
|
| 10448 | 1438 |
] |
| 10028 | 1439 |
|
| 10448 | 1440 |
"Created: / 04-08-2011 / 18:11:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10666 | 1441 |
"Modified (format): / 05-09-2011 / 16:07:20 / cg" |
| 10448 | 1442 |
! |
1443 |
||
1444 |
list2MenuHolder |
|
| 10666 | 1445 |
^ [ |
1446 |
|menu| |
|
| 10028 | 1447 |
|
| 10666 | 1448 |
menu := builder menuFor:#changeMenu2. |
1449 |
menu allItemsDo:[:item | item argument:list2 ]. |
|
1450 |
menu |
|
| 10448 | 1451 |
] |
1452 |
||
1453 |
"Created: / 04-08-2011 / 18:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10666 | 1454 |
"Modified (format): / 05-09-2011 / 16:07:34 / cg" |
| 10028 | 1455 |
! ! |
1456 |
||
1457 |
!ChangeSetBrowser2 methodsFor:'actions'! |
|
1458 |
||
1459 |
accept: source |
|
1460 |
||
| 10880 | 1461 |
| entry chg | |
1462 |
(entry := self theSingleSelectedChange) isNil ifTrue:[^self]. |
|
1463 |
chg := entry change. |
|
1464 |
chg isMethodCodeChange ifTrue: |
|
1465 |
[chg source: source asString] |
|
| 10028 | 1466 |
|
1467 |
"Modified: / 29-11-2010 / 22:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10880 | 1468 |
"Modified: / 18-11-2011 / 14:56:53 / cg" |
| 10028 | 1469 |
! |
1470 |
||
1471 |
postBuildSourceView: aView |
|
1472 |
||
| 10309 | 1473 |
sourceView := aView. |
1474 |
||
| 10345 | 1475 |
"Modified: / 19-07-2011 / 19:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 1476 |
! ! |
1477 |
||
1478 |
!ChangeSetBrowser2 methodsFor:'aspects'! |
|
1479 |
||
| 11196 | 1480 |
allowAcceptHolder |
| 10028 | 1481 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
1482 |
||
| 11196 | 1483 |
allowAcceptHolder isNil ifTrue:[ |
1484 |
allowAcceptHolder := ValueHolder with: true. |
|
| 10028 | 1485 |
]. |
| 11196 | 1486 |
^ allowAcceptHolder |
| 10028 | 1487 |
|
1488 |
"Modified: / 24-10-2009 / 19:56:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11196 | 1489 |
"Created: / 24-01-2012 / 19:50:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 1490 |
! |
1491 |
||
1492 |
allowOpenHolder |
|
1493 |
"return/create the 'allowOpenHolder' value holder (automatically generated)" |
|
1494 |
||
1495 |
allowOpenHolder isNil ifTrue:[ |
|
| 11196 | 1496 |
allowOpenHolder := ValueHolder with: true. |
| 10028 | 1497 |
]. |
1498 |
^ allowOpenHolder |
|
1499 |
||
1500 |
"Modified: / 17-03-2011 / 22:32:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1501 |
! |
|
1502 |
||
| 11196 | 1503 |
allowRemoveHolder |
1504 |
"return/create the 'allowRemoveHolder' value holder (automatically generated)" |
|
1505 |
||
1506 |
allowRemoveHolder isNil ifTrue:[ |
|
1507 |
allowRemoveHolder := ValueHolder with:false. |
|
1508 |
allowRemoveHolder addDependent:self. |
|
1509 |
]. |
|
1510 |
^ allowRemoveHolder |
|
1511 |
||
1512 |
"Modified: / 24-01-2012 / 19:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1513 |
! |
|
1514 |
||
1515 |
allowRemoveHolder:something |
|
1516 |
"set the 'showRemovedHolder' value holder (automatically generated)" |
|
1517 |
||
1518 |
|oldValue newValue| |
|
1519 |
||
1520 |
allowRemoveHolder notNil ifTrue:[ |
|
1521 |
oldValue := allowRemoveHolder value. |
|
1522 |
allowRemoveHolder removeDependent:self. |
|
1523 |
]. |
|
1524 |
allowRemoveHolder := something. |
|
1525 |
allowRemoveHolder notNil ifTrue:[ |
|
1526 |
allowRemoveHolder addDependent:self. |
|
1527 |
]. |
|
1528 |
newValue := allowRemoveHolder value. |
|
1529 |
oldValue ~~ newValue ifTrue:[ |
|
1530 |
self |
|
1531 |
update:#value |
|
1532 |
with:newValue |
|
1533 |
from:allowRemoveHolder. |
|
1534 |
]. |
|
1535 |
||
1536 |
"Modified (format): / 24-01-2012 / 19:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1537 |
! |
|
1538 |
||
| 10333 | 1539 |
changeSourceHolder |
1540 |
<resource: #uiAspect> |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1541 |
changeSourceHolder isNil ifTrue: [ |
| 11196 | 1542 |
changeSourceHolder := nil asValue. |
| 10333 | 1543 |
]. |
1544 |
^ changeSourceHolder. |
|
1545 |
||
1546 |
"Modified: / 19-07-2011 / 11:54:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1547 |
! |
|
1548 |
||
| 10028 | 1549 |
changesetHolder |
1550 |
"return/create the 'changesetHolder' value holder (automatically generated)" |
|
1551 |
||
1552 |
changesetHolder isNil ifTrue:[ |
|
| 11196 | 1553 |
changesetHolder := ValueHolder new. |
1554 |
changesetHolder addDependent:self. |
|
| 10028 | 1555 |
]. |
1556 |
^ changesetHolder |
|
1557 |
! |
|
1558 |
||
1559 |
changesetHolder:something |
|
1560 |
"set the 'changesetHolder' value holder (automatically generated)" |
|
1561 |
||
1562 |
|oldValue newValue| |
|
1563 |
||
1564 |
changesetHolder notNil ifTrue:[ |
|
| 11196 | 1565 |
oldValue := changesetHolder value. |
1566 |
changesetHolder removeDependent:self. |
|
| 10028 | 1567 |
]. |
1568 |
changesetHolder := something. |
|
1569 |
changesetHolder notNil ifTrue:[ |
|
| 11196 | 1570 |
changesetHolder addDependent:self. |
| 10028 | 1571 |
]. |
1572 |
newValue := changesetHolder value. |
|
1573 |
oldValue ~~ newValue ifTrue:[ |
|
| 11196 | 1574 |
self update:#value with:newValue from:changesetHolder. |
| 10028 | 1575 |
]. |
1576 |
! |
|
1577 |
||
1578 |
classHolder |
|
1579 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
1580 |
||
1581 |
classHolder isNil ifTrue:[ |
|
| 11196 | 1582 |
classHolder := ValueHolder with:nil. |
| 10028 | 1583 |
]. |
1584 |
^ classHolder |
|
| 10345 | 1585 |
|
1586 |
"Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1587 |
! |
|
1588 |
||
1589 |
codeAspectHolder |
|
1590 |
"return/create the 'codeAspectHolder' value holder (automatically generated)" |
|
1591 |
||
1592 |
codeAspectHolder isNil ifTrue:[ |
|
| 11709 | 1593 |
codeAspectHolder := SyntaxHighlighter codeAspectMethod asValue. |
| 10345 | 1594 |
]. |
1595 |
^ codeAspectHolder |
|
| 11709 | 1596 |
|
1597 |
"Modified: / 27-07-2012 / 22:04:12 / cg" |
|
| 10028 | 1598 |
! |
1599 |
||
| 10333 | 1600 |
imageSourceHolder |
1601 |
<resource: #uiAspect> |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1602 |
imageSourceHolder isNil ifTrue: [ |
| 11196 | 1603 |
imageSourceHolder := nil asValue. |
| 10333 | 1604 |
]. |
1605 |
^ imageSourceHolder. |
|
1606 |
||
1607 |
"Created: / 19-07-2011 / 11:54:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1608 |
! |
|
1609 |
||
1610 |
labelAHolder |
|
1611 |
||
1612 |
^'Change' asValue |
|
1613 |
||
1614 |
"Created: / 19-07-2011 / 11:46:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1615 |
! |
|
1616 |
||
1617 |
labelBHolder |
|
1618 |
||
1619 |
^'Image' asValue |
|
1620 |
||
1621 |
"Created: / 19-07-2011 / 11:46:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1622 |
! |
|
1623 |
||
| 10953 | 1624 |
languageHolder |
1625 |
languageHolder isNil ifTrue:[ |
|
1626 |
languageHolder := ValueHolder with:nil. |
|
1627 |
]. |
|
1628 |
^ languageHolder |
|
1629 |
||
1630 |
"Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1631 |
"Created: / 03-12-2011 / 10:37:39 / cg" |
|
1632 |
! |
|
1633 |
||
| 10448 | 1634 |
list1Holder |
1635 |
"return/create the 'list1Holder' value holder (automatically generated)" |
|
| 10028 | 1636 |
|
| 10448 | 1637 |
list1Holder isNil ifTrue:[ |
| 11196 | 1638 |
list1Holder := ValueHolder new. |
| 10028 | 1639 |
]. |
| 10448 | 1640 |
^ list1Holder |
| 10028 | 1641 |
! |
1642 |
||
| 10448 | 1643 |
list1Holder:something |
1644 |
"set the 'list1Holder' value holder (automatically generated)" |
|
| 10028 | 1645 |
|
| 10448 | 1646 |
list1Holder := something. |
| 10028 | 1647 |
! |
1648 |
||
| 10448 | 1649 |
list2Holder |
1650 |
"return/create the 'list2Holder' value holder (automatically generated)" |
|
| 10028 | 1651 |
|
| 10448 | 1652 |
list2Holder isNil ifTrue:[ |
| 11196 | 1653 |
list2Holder := ValueHolder new. |
| 10448 | 1654 |
]. |
1655 |
^ list2Holder |
|
1656 |
! |
|
| 10028 | 1657 |
|
| 10448 | 1658 |
list2Holder:something |
1659 |
"set the 'list2Holder' value holder (automatically generated)" |
|
1660 |
||
1661 |
list2Holder := something. |
|
| 10028 | 1662 |
! |
1663 |
||
1664 |
navigatorChangesetHolder |
|
1665 |
"return/create the 'navigatorChangesetHolder' value holder (automatically generated)" |
|
1666 |
||
1667 |
navigatorChangesetHolder isNil ifTrue:[ |
|
| 11196 | 1668 |
navigatorChangesetHolder := ValueHolder new. |
| 10028 | 1669 |
]. |
1670 |
^ navigatorChangesetHolder |
|
1671 |
! |
|
1672 |
||
1673 |
navigatorSpecHolder |
|
1674 |
<resource: #uiAspect> |
|
1675 |
||
1676 |
navigatorSpecHolder isNil ifTrue:[ |
|
| 11193 | 1677 |
navigatorSpecHolder := ValueHolder with: |
1678 |
"/#hierarchicalNavigatorSpec |
|
1679 |
"/#twoColumnNavigatorSpec |
|
1680 |
#oneColumnNavigatorSpec |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1681 |
|
| 10028 | 1682 |
]. |
1683 |
^ navigatorSpecHolder. |
|
1684 |
||
| 11196 | 1685 |
|
| 11193 | 1686 |
"Modified: / 24-01-2012 / 17:13:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 1687 |
! |
1688 |
||
| 12658 | 1689 |
notShowConflictsOnlyAspect |
1690 |
^ BlockValue forLogicalNot:(self showConflictsOnlyAspect) |
|
1691 |
! |
|
1692 |
||
| 10028 | 1693 |
selection1Holder |
1694 |
"return/create the 'selection1Holder' value holder (automatically generated)" |
|
1695 |
||
1696 |
selection1Holder isNil ifTrue:[ |
|
| 11196 | 1697 |
selection1Holder := ValueHolder new. |
1698 |
selection1Holder addDependent:self. |
|
| 10028 | 1699 |
]. |
1700 |
^ selection1Holder |
|
| 10448 | 1701 |
! |
| 10028 | 1702 |
|
| 10448 | 1703 |
selection1Holder:something |
1704 |
"set the 'selection1Holder' value holder (automatically generated)" |
|
1705 |
||
| 10450 | 1706 |
|oldValue newValue| |
1707 |
||
1708 |
selection1Holder notNil ifTrue:[ |
|
| 11196 | 1709 |
oldValue := selection1Holder value. |
1710 |
selection1Holder removeDependent:self. |
|
| 10450 | 1711 |
]. |
| 10448 | 1712 |
selection1Holder := something. |
| 10450 | 1713 |
selection1Holder notNil ifTrue:[ |
| 11196 | 1714 |
selection1Holder addDependent:self. |
| 10450 | 1715 |
]. |
1716 |
newValue := selection1Holder value. |
|
1717 |
oldValue ~~ newValue ifTrue:[ |
|
| 11196 | 1718 |
self update:#value with:newValue from:selection1Holder. |
| 10450 | 1719 |
]. |
| 10028 | 1720 |
! |
1721 |
||
| 10448 | 1722 |
selection2Holder |
1723 |
"return/create the 'selection2Holder' value holder (automatically generated)" |
|
| 10028 | 1724 |
|
| 10448 | 1725 |
selection2Holder isNil ifTrue:[ |
| 11196 | 1726 |
selection2Holder := ValueHolder new. |
1727 |
selection2Holder addDependent:self. |
|
| 10028 | 1728 |
]. |
| 10448 | 1729 |
^ selection2Holder |
1730 |
! |
|
| 10028 | 1731 |
|
| 10448 | 1732 |
selection2Holder:something |
1733 |
"set the 'selection2Holder' value holder (automatically generated)" |
|
1734 |
||
| 10450 | 1735 |
|oldValue newValue| |
1736 |
||
1737 |
selection2Holder notNil ifTrue:[ |
|
| 11196 | 1738 |
oldValue := selection2Holder value. |
1739 |
selection2Holder removeDependent:self. |
|
| 10450 | 1740 |
]. |
| 10448 | 1741 |
selection2Holder := something. |
| 10450 | 1742 |
selection2Holder notNil ifTrue:[ |
| 11196 | 1743 |
selection2Holder addDependent:self. |
| 10450 | 1744 |
]. |
1745 |
newValue := selection2Holder value. |
|
1746 |
oldValue ~~ newValue ifTrue:[ |
|
| 11196 | 1747 |
self update:#value with:newValue from:selection2Holder. |
| 10450 | 1748 |
]. |
| 10028 | 1749 |
! |
1750 |
||
| 12658 | 1751 |
showConflictsOnlyAspect |
1752 |
"return/create the 'showConflictsOnlyAspect' value holder (automatically generated)" |
|
1753 |
||
1754 |
showConflictsOnlyAspect isNil ifTrue:[ |
|
1755 |
showConflictsOnlyAspect := ValueHolder with: false. |
|
1756 |
]. |
|
1757 |
^ showConflictsOnlyAspect |
|
1758 |
! |
|
1759 |
||
1760 |
showConflictsOnlyAspect:aValueHolder |
|
1761 |
showConflictsOnlyAspect := aValueHolder. |
|
1762 |
! |
|
1763 |
||
| 10028 | 1764 |
showRemovedAspect |
1765 |
"return/create the 'showDeletedAspect' value holder (automatically generated)" |
|
1766 |
||
1767 |
showRemovedAspect isNil ifTrue:[ |
|
| 11196 | 1768 |
showRemovedAspect := (AspectAdaptor forAspect:#showRemoved) |
1769 |
subject: self class. |
|
| 10028 | 1770 |
]. |
1771 |
^ showRemovedAspect |
|
1772 |
! |
|
1773 |
||
1774 |
showRemovedAspect:aValueHolder |
|
1775 |
showRemovedAspect := aValueHolder. |
|
1776 |
! |
|
1777 |
||
| 10448 | 1778 |
showSameAspect |
1779 |
"return/create the 'showSameAspect' value holder (automatically generated)" |
|
1780 |
||
1781 |
showSameAspect isNil ifTrue:[ |
|
| 11196 | 1782 |
showSameAspect := ValueHolder with: true. |
| 10448 | 1783 |
]. |
1784 |
^ showSameAspect |
|
1785 |
||
1786 |
"Modified: / 04-08-2011 / 18:42:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1787 |
! |
|
1788 |
||
1789 |
showSameAspect:something |
|
1790 |
"set the 'showSameAspect' value holder (automatically generated)" |
|
1791 |
||
1792 |
showSameAspect := something. |
|
1793 |
! |
|
1794 |
||
| 10028 | 1795 |
titleHolder |
1796 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1797 |
|
|
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1798 |
titleHolder isNil |
| 11196 | 1799 |
ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ]. |
| 10028 | 1800 |
^ titleHolder |
1801 |
||
1802 |
"Modified: / 26-10-2010 / 22:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10682 | 1803 |
! |
1804 |
||
1805 |
updateChangefileHolder |
|
1806 |
updateChangefileHolder isNil ifTrue:[ |
|
1807 |
updateChangefileHolder := false asValue. |
|
1808 |
]. |
|
1809 |
^ updateChangefileHolder |
|
1810 |
||
1811 |
"Created: / 07-09-2011 / 15:54:03 / cg" |
|
| 10028 | 1812 |
! ! |
1813 |
||
1814 |
!ChangeSetBrowser2 methodsFor:'change & update'! |
|
1815 |
||
1816 |
changesetChanged |
|
1817 |
||
| 11716 | 1818 |
self titleHolder value: (self changeset name ifNil:[self defaultTitle]). |
| 10448 | 1819 |
self list1Holder value: self getNavigatorChangeSet |
| 10028 | 1820 |
|
| 10448 | 1821 |
"Modified: / 04-08-2011 / 18:05:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 11716 | 1822 |
"Modified: / 29-07-2012 / 13:18:54 / cg" |
| 10028 | 1823 |
! |
1824 |
||
1825 |
selectionChanged |
|
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1826 |
| listEntry change srcImage srcChange| |
| 11663 | 1827 |
|
1828 |
listEntry := self theSingleSelectedChange. |
|
1829 |
(listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[ |
|
| 11709 | 1830 |
codeAspectHolder setValue: |
| 11663 | 1831 |
(change isMethodCodeChange |
| 11709 | 1832 |
ifTrue:[SyntaxHighlighter codeAspectMethod] |
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1833 |
ifFalse:[ |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1834 |
(change isClassDefinitionChange |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1835 |
ifTrue:[SyntaxHighlighter codeAspectClassDefinition] |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1836 |
ifFalse:[SyntaxHighlighter codeAspectExpression])]). |
| 11709 | 1837 |
self classHolder value: change changeClass. |
1838 |
changeSourceHolder setValue: change changeSource"; changed: #value". |
|
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1839 |
srcImage := change imageSource. |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1840 |
srcChange := change changeSource. |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1841 |
srcImage = srcChange ifTrue:[ |
| 11709 | 1842 |
imageSourceHolder setValue: nil"; changed: #value". |
1843 |
] ifFalse:[ |
|
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1844 |
imageSourceHolder setValue: srcImage"; changed: #value". |
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1845 |
|
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1846 |
"/ check agan, based on parser (ignoring indentation) |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1847 |
change isClassDefinitionChange ifTrue:[ |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1848 |
|parseError treeA treeB| |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1849 |
|
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1850 |
(srcImage notEmptyOrNil and:[ srcChange notEmptyOrNil ]) ifTrue:[ |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1851 |
parseError := false. |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1852 |
treeA := RBParser parseExpression:srcImage onError: [:str :pos | parseError := true]. |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1853 |
treeB := RBParser parseExpression:srcChange onError: [:str :pos | parseError := true]. |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1854 |
parseError ifFalse:[ |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1855 |
(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1856 |
imageSourceHolder setValue: nil |
|
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
1857 |
] |
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1858 |
] |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1859 |
] |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1860 |
]. |
| 11709 | 1861 |
]. |
1862 |
changeSourceHolder changed. |
|
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1863 |
imageSourceHolder changed. |
| 11709 | 1864 |
codeAspectHolder changed. |
1865 |
||
| 10953 | 1866 |
self showSource: true |
| 10309 | 1867 |
] ifFalse:[ |
| 10953 | 1868 |
self showSource: false. |
1869 |
self classHolder value: nil. |
|
1870 |
changeSourceHolder setValue: nil; changed: #value. |
|
1871 |
imageSourceHolder setValue: nil; changed: #value. |
|
| 10309 | 1872 |
]. |
| 10028 | 1873 |
|
1874 |
"Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11709 | 1875 |
"Modified: / 27-07-2012 / 23:42:46 / cg" |
| 10028 | 1876 |
! |
1877 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1878 |
update: aspect with: param from: sender |
| 10028 | 1879 |
|
1880 |
sender == changesetHolder ifTrue: [ ^ self changesetChanged ]. |
|
| 10448 | 1881 |
sender == selection1Holder ifTrue: [ ^ self selectionChanged ]. |
1882 |
sender == selection2Holder ifTrue: [ ^ self selectionChanged ]. |
|
| 10028 | 1883 |
|
1884 |
"Created: / 24-10-2009 / 19:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1885 |
! ! |
|
1886 |
||
|
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1887 |
!ChangeSetBrowser2 methodsFor:'initialization'! |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1888 |
|
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1889 |
list1View: aSubApplicationView |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1890 |
aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change]. |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1891 |
list1 := aSubApplicationView application |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1892 |
|
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1893 |
"Created: / 04-08-2011 / 17:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1894 |
"Modified: / 10-09-2012 / 14:22:37 / cg" |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1895 |
! |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1896 |
|
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1897 |
list2View: aSubApplicationView |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1898 |
aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change]. |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1899 |
list2 := aSubApplicationView application |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1900 |
|
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1901 |
"Created: / 04-08-2011 / 17:57:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1902 |
"Modified: / 10-09-2012 / 14:22:50 / cg" |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1903 |
! ! |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
1904 |
|
| 10028 | 1905 |
!ChangeSetBrowser2 methodsFor:'menu actions'! |
1906 |
||
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1907 |
doApplySelectedChanges |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1908 |
self selectedChanges. |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1909 |
self halt. |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1910 |
! |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1911 |
|
| 10028 | 1912 |
doOpen |
1913 |
| file changeset | |
|
| 11709 | 1914 |
|
| 11034 | 1915 |
file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'. |
| 10880 | 1916 |
file isNil ifTrue:[^self]. |
| 11709 | 1917 |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1918 |
[changeset := ChangeSet fromFile: file] |
| 10880 | 1919 |
on: Error |
1920 |
do: [:ex|Dialog error: 'Error when loading changeset: ',ex description. ^self]. |
|
| 10028 | 1921 |
changesetFile := file. |
1922 |
self title: file asFilename baseName asString. |
|
| 11709 | 1923 |
self loadChangeSet: changeset |
| 10028 | 1924 |
|
1925 |
"Modified: / 08-04-2011 / 10:11:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11709 | 1926 |
"Modified: / 27-07-2012 / 21:21:40 / cg" |
| 10028 | 1927 |
! |
1928 |
||
1929 |
doOpen: aChangeSet |
|
| 11709 | 1930 |
<resource: #obsolete> |
1931 |
"/ a bad name - implying opening a window... |
|
1932 |
self loadChangeSet: aChangeSet |
|
| 10028 | 1933 |
|
1934 |
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11709 | 1935 |
"Modified: / 27-07-2012 / 21:21:24 / cg" |
| 10028 | 1936 |
! |
1937 |
||
| 11709 | 1938 |
doOpenCurrentChangeFile |
1939 |
self withWaitCursorDo:[ |
|
1940 |
self class openOn: (ChangeSet fromFile: ObjectMemory nameForChanges) |
|
1941 |
]. |
|
| 10028 | 1942 |
|
1943 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11709 | 1944 |
"Created: / 27-07-2012 / 21:16:42 / cg" |
| 10028 | 1945 |
! |
1946 |
||
1947 |
doSave |
|
1948 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1949 |
changesetFile |
| 11196 | 1950 |
ifNil:[self doSaveAs] |
1951 |
ifNotNil:[self doSaveAs: changesetFile] |
|
| 10028 | 1952 |
|
1953 |
"Modified: / 24-10-2009 / 22:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1954 |
! |
|
1955 |
||
1956 |
doSaveAs |
|
1957 |
| file | |
|
| 11709 | 1958 |
|
| 11034 | 1959 |
file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg').
|
| 10880 | 1960 |
file isNil ifTrue:[^self]. |
| 10028 | 1961 |
self doSaveAs: file. |
| 10880 | 1962 |
|
| 11034 | 1963 |
"Modified: / 27-12-2011 / 10:39:52 / cg" |
| 11709 | 1964 |
"Modified (format): / 27-07-2012 / 21:22:09 / cg" |
| 10028 | 1965 |
! |
1966 |
||
1967 |
doSaveAs: newFile |
|
1968 |
[ |
|
| 11196 | 1969 |
| s | |
1970 |
s := newFile asFilename writeStream. |
|
1971 |
[self changeset fileOutOn: s] ensure:[s close]. |
|
1972 |
changesetFile := newFile. |
|
| 10028 | 1973 |
] on: Error do: |
| 11196 | 1974 |
[:ex|Dialog warn: 'Erorr saving changes: ' , ex description] |
| 11709 | 1975 |
|
1976 |
"Modified (format): / 27-07-2012 / 21:22:14 / cg" |
|
1977 |
! |
|
1978 |
||
1979 |
loadChangeSet: aChangeSet |
|
1980 |
self changesetHolder value: aChangeSet |
|
1981 |
||
1982 |
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1983 |
"Created: / 27-07-2012 / 21:20:50 / cg" |
|
1984 |
! |
|
1985 |
||
1986 |
loadCurrentChangeFile |
|
1987 |
self withWaitCursorDo:[ |
|
1988 |
self loadChangeSet: (ChangeSet fromFile: ObjectMemory nameForChanges) |
|
1989 |
]. |
|
1990 |
||
1991 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1992 |
"Created: / 27-07-2012 / 21:20:44 / cg" |
|
| 10682 | 1993 |
! |
1994 |
||
|
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1995 |
menuUpdate |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1996 |
self changesetChanged. |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1997 |
"/ list1 updateList. |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1998 |
"/ list2 updateList. |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1999 |
! |
|
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2000 |
|
| 10682 | 2001 |
setTargetNamespace |
2002 |
"specify an st/x namespace to be used as default" |
|
2003 |
||
2004 |
| nsName | |
|
2005 |
||
2006 |
nsName := Dialog |
|
2007 |
requestNameSpace:'Namepace to load code into:' |
|
2008 |
initialAnswer:targetNamespace. |
|
2009 |
nsName isEmptyOrNil ifTrue:[^self]. |
|
2010 |
||
2011 |
targetNamespace := nsName. |
|
2012 |
"/ self targetNamespaceNameHolder value:('Target-Namespace: ',targetNamespace).
|
|
2013 |
||
| 11447 | 2014 |
list1 list do:[:each | |
2015 |
each change nameSpaceOverride:nsName |
|
2016 |
]. |
|
2017 |
list2 list do:[:each | |
|
2018 |
each change nameSpaceOverride:nsName |
|
2019 |
]. |
|
2020 |
self changeset do:[:chg | chg nameSpaceOverride:nsName]. |
|
2021 |
||
| 10682 | 2022 |
"Created: / 07-09-2011 / 12:49:42 / cg" |
2023 |
! |
|
2024 |
||
2025 |
setTargetPackage |
|
2026 |
"specify an st/x package identifier to be used as default" |
|
2027 |
||
2028 |
| package | |
|
2029 |
||
2030 |
package := Dialog |
|
2031 |
requestProject:'Default Smalltalk/X package to load code into:' |
|
2032 |
initialAnswer:targetPackage |
|
|
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2033 |
suggestions:(RecentTargetPackages ? #()). |
| 10880 | 2034 |
package isNil ifTrue:[^self]. |
| 10682 | 2035 |
|
|
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2036 |
RecentTargetPackages isNil ifTrue:[ |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2037 |
RecentTargetPackages := OrderedCollection new. |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2038 |
]. |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2039 |
RecentTargetPackages remove:package ifAbsent:[]. |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2040 |
RecentTargetPackages addFirst:package. |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2041 |
|
| 10682 | 2042 |
targetPackage := "lastPackage := "package. |
2043 |
"/ self targetPackageHolder value:('Target-Package: ',targetPackage).
|
|
2044 |
||
2045 |
"Created: / 07-09-2011 / 12:47:15 / cg" |
|
| 10028 | 2046 |
! ! |
2047 |
||
2048 |
!ChangeSetBrowser2 methodsFor:'menu actions - changes'! |
|
2049 |
||
| 10448 | 2050 |
changeMenuApply: changeList |
| 10028 | 2051 |
| changesToApply | |
| 11037 | 2052 |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2053 |
changesToApply := OrderedCollection new. |
| 10028 | 2054 |
self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]]. |
| 10448 | 2055 |
self changeMenuApplyChanges: changesToApply. |
| 11038 | 2056 |
list2 notNil ifTrue:[ |
2057 |
"/ to get the =-icons |
|
2058 |
list2 updateList |
|
2059 |
]. |
|
| 10028 | 2060 |
|
| 10448 | 2061 |
"Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 11038 | 2062 |
"Modified: / 28-12-2011 / 15:49:00 / cg" |
| 10028 | 2063 |
! |
2064 |
||
| 10448 | 2065 |
changeMenuApplySelection: changeList |
| 10028 | 2066 |
|
| 10450 | 2067 |
changeList selection do:[:change|self changeMenuApplyChange:change change]. |
| 11038 | 2068 |
list2 notNil ifTrue:[ |
2069 |
"/ to get the =-icons |
|
2070 |
list2 updateList |
|
2071 |
]. |
|
| 10028 | 2072 |
|
| 10448 | 2073 |
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 11038 | 2074 |
"Modified (format): / 28-12-2011 / 15:48:53 / cg" |
| 11037 | 2075 |
! |
2076 |
||
2077 |
changeMenuApplyToEnd: changeList |
|
2078 |
|lastIdx| |
|
2079 |
||
2080 |
lastIdx := changeList selectionIndices max. |
|
2081 |
changeList list from:lastIdx do:[:change | self changeMenuApplyChange:change change]. |
|
| 11038 | 2082 |
list2 notNil ifTrue:[ |
2083 |
"/ to get the =-icons |
|
2084 |
list2 updateList |
|
2085 |
]. |
|
| 11037 | 2086 |
|
2087 |
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2088 |
"Created: / 27-12-2011 / 10:53:00 / cg" |
|
| 10028 | 2089 |
! |
2090 |
||
| 10448 | 2091 |
changeMenuBrowse: changeList |
|
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2092 |
|changes methods classes| |
| 10028 | 2093 |
|
| 11651 | 2094 |
changes := self selectedChangesIn: changeList. |
| 10666 | 2095 |
"/ changes := changeList listHolder value collect:[:c | c change]. |
| 11651 | 2096 |
|
|
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2097 |
(changes conform:[:c | c isClassDefinitionChange]) ifTrue:[ |
|
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2098 |
classes := (changes collect:[:c | c changeClass]). |
|
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2099 |
UserPreferences current systemBrowserClass |
|
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2100 |
browseClasses:classes title:'selected monticello classes'. |
|
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2101 |
] ifFalse:[ |
| 10658 | 2102 |
methods := OrderedCollection new. |
2103 |
changes do:[:each | |
|
2104 |
each isCompositeChange ifTrue:[ |
|
2105 |
each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]] |
|
2106 |
] ifFalse:[ |
|
2107 |
each isMethodChange ifTrue:[ |
|
2108 |
methods add:(each changeMethod). |
|
2109 |
] |
|
2110 |
] |
|
2111 |
]. |
|
2112 |
(methods includes:nil) ifTrue:[ |
|
2113 |
Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
|
|
2114 |
methods := methods reject:[:m | m isNil]. |
|
|
10665
bbaa7c4154de
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10658
diff
changeset
|
2115 |
methods isEmpty ifTrue:[^ self]. |
| 10658 | 2116 |
]. |
|
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2117 |
UserPreferences current systemBrowserClass |
|
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2118 |
browseMethods:methods title:'selected monticello methods' sort:false. |
|
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
2119 |
]. |
| 10028 | 2120 |
|
| 10448 | 2121 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 11651 | 2122 |
"Modified: / 23-07-2012 / 13:13:37 / cg" |
| 10666 | 2123 |
! |
2124 |
||
2125 |
changeMenuBrowseClass: changeList |
|
|
10906
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
2126 |
|changes classes addThemChanges cls| |
| 10666 | 2127 |
|
| 11651 | 2128 |
changes := self selectedChangesIn: changeList. |
| 10666 | 2129 |
|
2130 |
classes := Set new. |
|
2131 |
addThemChanges := |
|
2132 |
[:c | |
|
2133 |
c isClassDefinitionChange ifTrue:[ |
|
2134 |
classes add:c changeClass theNonMetaclass |
|
2135 |
] ifFalse:[ |
|
2136 |
c isMethodChange ifTrue:[ |
|
|
10906
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
2137 |
cls := c changeMethod isNil |
|
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
2138 |
ifTrue:[ c changeClass ] |
|
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
2139 |
ifFalse:[ c changeMethod mclass theNonMetaclass ]. |
|
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
2140 |
classes add:cls |
| 10666 | 2141 |
] ifFalse:[ |
2142 |
c isCompositeChange ifTrue:[ |
|
2143 |
c changes do:addThemChanges |
|
2144 |
] |
|
2145 |
] |
|
2146 |
] |
|
2147 |
]. |
|
2148 |
changes do:addThemChanges. |
|
2149 |
||
2150 |
UserPreferences current systemBrowserClass |
|
2151 |
browseClasses:classes title:'selected monticello classes'. |
|
2152 |
||
2153 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2154 |
"Created: / 05-09-2011 / 16:08:35 / cg" |
|
| 10028 | 2155 |
! |
2156 |
||
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2157 |
changeMenuCompareClass: changeList |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2158 |
|changes classNames classNameToClassMapping lastNameSpace |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2159 |
addClassName addThemChanges existingClasses |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2160 |
allChanges changeSet1 changeSet2 diffSet| |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2161 |
|
| 11651 | 2162 |
changes := self selectedChangesIn: changeList. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2163 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2164 |
classNameToClassMapping := Dictionary new. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2165 |
classNames := Set new. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2166 |
allChanges := ChangeSet new. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2167 |
existingClasses := Set new. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2168 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2169 |
addClassName := |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2170 |
[:nmArg | |
|
11650
c955fe2bbcb5
changed: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
11649
diff
changeset
|
2171 |
|nm ns existingClass goodAnswer cls| |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2172 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2173 |
nm := nmArg. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2174 |
existingClass := Smalltalk classNamed:nm. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2175 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2176 |
existingClass notNil ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2177 |
goodAnswer := nm |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2178 |
] ifFalse:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2179 |
ns := NameSpace allNameSpaces |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2180 |
detect:[:ns | (ns classNamed:nm) notNil ] |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2181 |
ifNone:nil. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2182 |
ns notNil ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2183 |
goodAnswer := (ns classNamed:nm) name. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2184 |
] ifFalse:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2185 |
goodAnswer := nm. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2186 |
(lastNameSpace notNil |
|
11649
2fe26afb9af1
changed: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
11447
diff
changeset
|
2187 |
and:[ lastNameSpace isNameSpace |
|
11650
c955fe2bbcb5
changed: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
11649
diff
changeset
|
2188 |
and:[(cls := lastNameSpace classNamed:nm) notNil ]] |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2189 |
) ifTrue:[ |
|
11650
c955fe2bbcb5
changed: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
11649
diff
changeset
|
2190 |
goodAnswer := cls name. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2191 |
] ifFalse:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2192 |
(lastNameSpace notNil |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2193 |
and:[ lastNameSpace isBehavior |
|
11650
c955fe2bbcb5
changed: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
11649
diff
changeset
|
2194 |
and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]] |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2195 |
) ifTrue:[ |
|
11650
c955fe2bbcb5
changed: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
11649
diff
changeset
|
2196 |
goodAnswer := cls name. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2197 |
] |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2198 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2199 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2200 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2201 |
nm := Dialog |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2202 |
request:('Class to compare for "%1"?' bindWith:nmArg)
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2203 |
initialAnswer:goodAnswer. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2204 |
nm isNil ifTrue:[^ self]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2205 |
nm notEmpty ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2206 |
existingClass := Smalltalk at:nm asSymbol. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2207 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2208 |
existingClass notNil ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2209 |
classNameToClassMapping at:nmArg put:existingClass. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2210 |
existingClasses add:existingClass. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2211 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2212 |
classNames add:nmArg |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2213 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2214 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2215 |
addThemChanges := [:changes | |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2216 |
"/ collect classes and mappings |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2217 |
changes do:[:c | |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2218 |
c isClassDefinitionChange ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2219 |
addClassName value:(c className). |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2220 |
allChanges add:c. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2221 |
]]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2222 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2223 |
changes do:[:c | |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2224 |
c isMethodChange ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2225 |
(classNames includes:(c className)) ifFalse:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2226 |
addClassName value:(c className). |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2227 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2228 |
allChanges add:c. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2229 |
]]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2230 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2231 |
changes do:[:c | |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2232 |
c isCompositeChange ifTrue:[ |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2233 |
addThemChanges value:(c changes) |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2234 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2235 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2236 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2237 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2238 |
changes do:addThemChanges. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2239 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2240 |
"/ now, build a diffset and present it... |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2241 |
changeSet1 := allChanges. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2242 |
changeSet2 := ChangeSet new. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2243 |
existingClasses do:[:cls | |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2244 |
changeSet2 addAll:(ChangeSet forExistingClass:cls). |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2245 |
]. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2246 |
diffSet := changeSet1 diffSetsAgainst:changeSet2. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2247 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2248 |
(UserPreferences versionDiffViewerClass) |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2249 |
openOnDiffSet:diffSet |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2250 |
labelA:'Monticello' |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2251 |
labelB:'Current (In Image)' |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2252 |
title:'Diffs' |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2253 |
ignoreExtensions:false. |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2254 |
|
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2255 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2256 |
"Created: / 01-12-2011 / 18:36:44 / cg" |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2257 |
! |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
2258 |
|
| 10448 | 2259 |
changeMenuDeleteSelection: changeList |
| 10028 | 2260 |
|
2261 |
self selectionDo:[:chg|chg removed: true] |
|
2262 |
||
2263 |
"Modified: / 29-10-2010 / 13:53:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10448 | 2264 |
"Created: / 04-08-2011 / 17:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2265 |
! |
2266 |
||
| 10448 | 2267 |
changeMenuInspect: changeList |
| 10028 | 2268 |
|
2269 |
| changes | |
|
2270 |
changes := OrderedCollection new: 1. |
|
2271 |
self selectionDo:[:chg|changes add: chg]. |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2272 |
changes size = 1 |
| 11196 | 2273 |
ifTrue:[changes anyOne inspect] |
2274 |
ifFalse:[changes inspect]. |
|
| 10028 | 2275 |
|
| 10448 | 2276 |
"Created: / 04-08-2011 / 17:28:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2277 |
! |
2278 |
||
| 10448 | 2279 |
changeMenuInspectChangeset: changeList |
| 10028 | 2280 |
self changesetHolder value inspect. |
| 10448 | 2281 |
|
2282 |
"Created: / 04-08-2011 / 17:28:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10028 | 2283 |
! |
2284 |
||
| 10448 | 2285 |
changeMenuSelectAdditions: changeList |
| 10028 | 2286 |
|
| 10448 | 2287 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #+] |
| 10028 | 2288 |
|
| 10448 | 2289 |
"Created: / 04-08-2011 / 17:29:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2290 |
! |
2291 |
||
| 10448 | 2292 |
changeMenuSelectAll: changeList |
| 10028 | 2293 |
|
| 10448 | 2294 |
self changeMenuSelectIn: changeList suchThat:[:change|true] |
| 10028 | 2295 |
|
| 10448 | 2296 |
"Created: / 04-08-2011 / 17:29:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2297 |
! |
2298 |
||
| 10448 | 2299 |
changeMenuSelectDifferences: changeList |
| 10028 | 2300 |
|
| 10448 | 2301 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #~] |
| 10028 | 2302 |
|
| 10448 | 2303 |
"Created: / 04-08-2011 / 17:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2304 |
! |
2305 |
||
| 10448 | 2306 |
changeMenuSelectNone: changeList |
| 10028 | 2307 |
|
| 10448 | 2308 |
self changeMenuSelectIn: changeList suchThat:[:change|false] |
| 10028 | 2309 |
|
| 10448 | 2310 |
"Created: / 04-08-2011 / 17:30:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2311 |
! |
2312 |
||
| 10448 | 2313 |
changeMenuSelectRemovals: changeList |
| 10028 | 2314 |
|
| 10448 | 2315 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #-] |
| 10028 | 2316 |
|
| 10448 | 2317 |
"Modified: / 29-10-2010 / 13:18:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2318 |
"Created: / 04-08-2011 / 17:35:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10028 | 2319 |
! |
2320 |
||
| 10448 | 2321 |
changeMenuSelectSame: changeList |
| 10028 | 2322 |
|
| 10448 | 2323 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #=] |
| 10028 | 2324 |
|
| 10448 | 2325 |
"Modified: / 29-10-2010 / 13:18:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2326 |
"Created: / 04-08-2011 / 17:35:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10028 | 2327 |
! |
2328 |
||
| 10448 | 2329 |
changeMenuSelectUsingBlock: changeList |
| 10028 | 2330 |
|
2331 |
|conditionBlockString conditionBlock dialog textHolder template| |
|
2332 |
||
2333 |
template := |
|
2334 |
'[:change| |
|
2335 |
"/ Define condition for selection below: |
|
2336 |
"/ change is an instance of Change |
|
2337 |
"/ change will be selected if and only if block returns true |
|
2338 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2339 |
|
| 10028 | 2340 |
true"/always select the change |
2341 |
] |
|
2342 |
'. |
|
2343 |
||
2344 |
LastSelectionConditionString isNil ifTrue:[ |
|
| 11196 | 2345 |
LastSelectionConditionString := template. |
| 10028 | 2346 |
]. |
2347 |
||
2348 |
||
2349 |
textHolder := ValueHolder new. |
|
2350 |
dialog := Dialog |
|
| 11196 | 2351 |
forRequestText:(resources string:'Enter condition for selection') |
2352 |
lines:20 |
|
2353 |
columns:70 |
|
2354 |
initialAnswer:LastSelectionConditionString |
|
2355 |
model:textHolder. |
|
| 10028 | 2356 |
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]). |
2357 |
dialog open. |
|
2358 |
dialog accepted ifFalse:[^ self]. |
|
2359 |
||
2360 |
conditionBlockString := textHolder value. |
|
2361 |
LastSelectionConditionString := conditionBlockString. |
|
2362 |
||
2363 |
conditionBlock := Parser evaluate:conditionBlockString. |
|
2364 |
conditionBlock isBlock ifFalse:[ |
|
| 11196 | 2365 |
self error:'Bad selection block (syntax error?)'. |
2366 |
^ self |
|
| 10028 | 2367 |
]. |
2368 |
||
| 10448 | 2369 |
self changeMenuSelectIn: changeList suchThat: conditionBlock |
| 10028 | 2370 |
|
2371 |
"Modified: / 29-10-2010 / 13:05:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10448 | 2372 |
"Created: / 04-08-2011 / 17:42:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2373 |
! |
2374 |
||
| 10448 | 2375 |
changeMenuUndeleteSelection: changeList |
| 10028 | 2376 |
|
2377 |
self selectionDo:[:chg|chg removed: false] |
|
2378 |
||
2379 |
"Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10448 | 2380 |
"Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 11651 | 2381 |
! |
2382 |
||
2383 |
selectedChangesIn: changeList |
|
2384 |
|changes| |
|
2385 |
||
2386 |
changes := (changeList == list1 |
|
2387 |
ifTrue:[ selection1Holder ] |
|
2388 |
ifFalse:[ selection2Holder ]) value. |
|
2389 |
^ changes collect:[:eachListEntry | eachListEntry change]. |
|
2390 |
||
2391 |
"Created: / 23-07-2012 / 13:13:11 / cg" |
|
| 10448 | 2392 |
! ! |
2393 |
||
2394 |
!ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'! |
|
2395 |
||
2396 |
changeMenuApplyChange: aChange |
|
2397 |
||
|
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
2398 |
"/ aChange isClassDefinitionChange ifTrue: |
|
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
2399 |
"/ [(Smalltalk at: aChange superClassName asSymbol) |
|
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
2400 |
"/ ifNil:[^self error: 'Nil superclass']]. |
| 10682 | 2401 |
|
2402 |
self withWaitCursorDo:[ |
|
|
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
2403 |
(MCStXNamespaceQuery , Class nameSpaceQuerySignal) |
| 10682 | 2404 |
answer:(NameSpace name:(targetNamespace ? 'Smalltalk')) |
2405 |
do: [ |
|
|
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
2406 |
(MCStXPackageQuery , Class packageQuerySignal) |
| 10682 | 2407 |
answer: self targetPackage |
2408 |
do: [ |
|
2409 |
MCInteractiveLoadingQuery answer: true do:[ |
|
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2410 |
self updateChangefileHolder value ifTrue:[ |
| 10682 | 2411 |
aChange apply |
2412 |
] ifFalse:[ |
|
2413 |
Class withoutUpdatingChangesDo:[ |
|
2414 |
aChange apply |
|
2415 |
] |
|
2416 |
]. |
|
2417 |
] |
|
2418 |
]. |
|
2419 |
]. |
|
2420 |
]. |
|
| 10448 | 2421 |
|
2422 |
"Modified: / 29-10-2010 / 14:57:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
|
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
2423 |
"Modified: / 07-09-2011 / 22:24:57 / cg" |
| 10448 | 2424 |
! |
2425 |
||
2426 |
changeMenuApplyChanges: changesToApply |
|
2427 |
||
2428 |
| changesThatFailToApply | |
|
2429 |
||
2430 |
changesThatFailToApply := ChangeSet new. |
|
2431 |
ProgressIndicator |
|
| 11196 | 2432 |
displayProgress:'Applying changes...' |
|
12088
5ae808a3d675
class: Tools::ChangeSetBrowser2
Stefan Vogel <sv@exept.de>
parents:
11797
diff
changeset
|
2433 |
at:(Screen default centerOfMonitorHavingPointer) |
| 11196 | 2434 |
from:200 to:400 |
2435 |
during:[:val | |
|
2436 |
1 to: changesToApply size do: |
|
2437 |
[:i| |
|
2438 |
val value:((100 / changesToApply size) * i) rounded. |
|
2439 |
[self changeMenuApplyChange: (changesToApply at: i)] |
|
2440 |
on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]] |
|
| 10448 | 2441 |
|
2442 |
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2443 |
! |
|
2444 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2445 |
changeMenuSelectIn: changeList suchThat:conditionBlock |
| 10448 | 2446 |
|
2447 |
| sel | |
|
2448 |
sel := OrderedCollection new. |
|
2449 |
changeList listHolder value do: [:chg|(conditionBlock value: chg) ifTrue:[sel add: chg]]. |
|
2450 |
changeList selectionHolder value: sel. |
|
2451 |
||
2452 |
"Created: / 04-08-2011 / 17:29:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10028 | 2453 |
! ! |
2454 |
||
2455 |
!ChangeSetBrowser2 methodsFor:'private'! |
|
2456 |
||
| 10655 | 2457 |
changesDo:aBlock |
2458 |
self changeset do:aBlock. |
|
2459 |
||
2460 |
"Created: / 30-08-2011 / 14:30:58 / cg" |
|
2461 |
! |
|
2462 |
||
| 10028 | 2463 |
getNavigatorChangeSet |
2464 |
||
2465 |
| changeset | |
|
2466 |
changeset := changesetHolder value deepCopy. |
|
2467 |
(changeset isKindOf: ChangeSet) ifFalse: |
|
| 11196 | 2468 |
[changeset := ChangeSet withAll: changeset]. |
| 10028 | 2469 |
|
2470 |
(self navigatorSpecHolder value ~= #oneColumnNavigatorSpec) |
|
| 11196 | 2471 |
ifTrue:[^changeset groupByClass]. |
| 10028 | 2472 |
|
2473 |
"Default" |
|
2474 |
^changeset |
|
2475 |
||
2476 |
"Created: / 24-10-2009 / 19:31:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2477 |
"Modified: / 20-07-2010 / 09:46:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2478 |
! |
|
2479 |
||
|
12667
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2480 |
iconSelectorForChange:aChange |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2481 |
|currentMethod| |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2482 |
|
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2483 |
targetPackage notNil ifTrue:[ |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2484 |
aChange isMethodChange ifTrue:[ |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2485 |
(currentMethod := aChange changeMethod) notNil ifTrue:[ |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2486 |
currentMethod package ~= targetPackage ifTrue:[ |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2487 |
^ #iconExcla |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2488 |
] |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2489 |
] |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2490 |
]. |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2491 |
]. |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2492 |
^ nil. |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2493 |
! |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2494 |
|
| 10028 | 2495 |
redrawChangeListViews |
2496 |
||
| 10448 | 2497 |
list1 notNil ifTrue:[ |
| 11196 | 2498 |
list1 builder window allSubViewsDo: [:v|v redraw] |
| 10448 | 2499 |
]. |
2500 |
list2 notNil ifTrue:[ |
|
| 11196 | 2501 |
list2 builder window allSubViewsDo: [:v|v redraw] |
| 10448 | 2502 |
]. |
| 10028 | 2503 |
|
2504 |
"Created: / 16-03-2011 / 22:41:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2505 |
! |
|
2506 |
||
| 10453 | 2507 |
selectionDo: aBlock |
2508 |
||
| 11447 | 2509 |
| applyBlock | |
2510 |
||
2511 |
applyBlock := [:e|aBlock value: e change]. |
|
2512 |
||
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2513 |
"/ selectionHolder value isEmptyOrNil ifTrue:[ |
|
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2514 |
"/ (self navigatorChangesetHolder value ? #()) do: aBlock |
|
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2515 |
"/ ] ifFalse:[ |
| 11447 | 2516 |
selection2Holder value isEmptyOrNil not |
2517 |
ifTrue:[selection2Holder value do: applyBlock] |
|
2518 |
ifFalse:[selection1Holder value do: applyBlock]. |
|
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2519 |
"/ ]. |
| 11447 | 2520 |
self redrawChangeListViews |
| 10453 | 2521 |
|
2522 |
"Created: / 29-10-2010 / 13:47:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2523 |
"Modified: / 08-04-2011 / 10:15:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11447 | 2524 |
"Modified: / 20-03-2012 / 17:16:40 / cg" |
| 10453 | 2525 |
! |
2526 |
||
| 10309 | 2527 |
showSource: aBoolean |
2528 |
| panel | |
|
2529 |
||
2530 |
"Not yet implemented" |
|
2531 |
||
2532 |
^self. |
|
2533 |
||
| 11663 | 2534 |
"/ cg: but what is it supposed to do??? |
2535 |
"/ sourceView ifNil:[^self]. |
|
2536 |
"/ panel := builder componentAt: #VerticalPanel. |
|
2537 |
"/ aBoolean ifTrue:[ |
|
2538 |
"/ (panel subViews includes: sourceView) ifTrue:[^self]. |
|
2539 |
"/ panel addSubView: sourceView. |
|
2540 |
"/ ] ifFalse:[ |
|
2541 |
"/ (panel subViews includes: sourceView) ifFalse:[^self]. |
|
2542 |
"/ panel removeSubView: sourceView. |
|
2543 |
"/ sourceView setId: nil. |
|
2544 |
"/ ] |
|
| 10309 | 2545 |
|
2546 |
"Created: / 11-07-2011 / 16:06:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11663 | 2547 |
"Modified: / 25-07-2012 / 17:44:01 / cg" |
| 10682 | 2548 |
! |
| 10028 | 2549 |
|
| 10682 | 2550 |
targetPackage |
2551 |
^ targetPackage ? PackageId noProjectID |
|
| 10028 | 2552 |
|
| 10682 | 2553 |
"Created: / 07-09-2011 / 20:12:04 / cg" |
| 10028 | 2554 |
! ! |
2555 |
||
2556 |
!ChangeSetBrowser2 methodsFor:'queries'! |
|
2557 |
||
2558 |
canApplyChanges |
|
2559 |
||
2560 |
^true |
|
2561 |
||
2562 |
"Created: / 29-10-2010 / 13:07:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2563 |
! |
|
2564 |
||
2565 |
canDrop: somethign |
|
2566 |
||
| 10682 | 2567 |
self breakPoint:#jv. |
| 10028 | 2568 |
|
2569 |
"Created: / 20-03-2011 / 21:34:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 10682 | 2570 |
"Modified: / 07-09-2011 / 20:21:15 / cg" |
| 10028 | 2571 |
! |
2572 |
||
| 10448 | 2573 |
hasChangeSelectedAndNotRemoved: changeList |
| 10028 | 2574 |
|
| 10448 | 2575 |
| sel | |
2576 |
sel := changeList selection. |
|
2577 |
sel isEmptyOrNil ifTrue:[^false]. |
|
2578 |
^(sel anySatisfy:[:each|each removed]) not |
|
| 10028 | 2579 |
|
|
10380
f2a255ec6fc9
not ifTrue -> ifFalse (trying the rewrite tool ;-)
Claus Gittinger <cg@exept.de>
parents:
10370
diff
changeset
|
2580 |
"Modified: / 24-07-2011 / 06:52:28 / cg" |
| 10448 | 2581 |
"Created: / 04-08-2011 / 18:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2582 |
! |
2583 |
||
| 10448 | 2584 |
hasSingleChangeSelectedAndCanBrowse: changeList |
| 10028 | 2585 |
|
| 10448 | 2586 |
| sel | |
2587 |
sel := changeList selection. |
|
2588 |
sel isEmptyOrNil ifTrue:[^false]. |
|
2589 |
^true |
|
| 10028 | 2590 |
|
| 10448 | 2591 |
"Created: / 04-08-2011 / 18:25:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
| 10028 | 2592 |
! ! |
2593 |
||
| 10914 | 2594 |
!ChangeSetBrowser2::ChangeEditor class methodsFor:'documentation'! |
2595 |
||
2596 |
documentation |
|
2597 |
" |
|
2598 |
A simple, embeddable window to show a single change. |
|
2599 |
If readonlyHolder's value is false, then user is |
|
2600 |
allowed to edit the change (i.e., modify the source code) |
|
2601 |
||
2602 |
[author:] |
|
2603 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
|
2604 |
||
2605 |
[instance variables:] |
|
2606 |
||
2607 |
[class variables:] |
|
2608 |
||
2609 |
[see also:] |
|
2610 |
||
2611 |
" |
|
2612 |
! |
|
2613 |
||
2614 |
examples |
|
2615 |
" |
|
2616 |
Starting the application: |
|
2617 |
[exBegin] |
|
2618 |
Tools::ChangeEditor open |
|
2619 |
||
2620 |
[exEnd] |
|
2621 |
||
2622 |
more examples to be added: |
|
2623 |
[exBegin] |
|
2624 |
... add code fragment for |
|
2625 |
... executable example here ... |
|
2626 |
[exEnd] |
|
2627 |
" |
|
2628 |
! ! |
|
2629 |
||
2630 |
!ChangeSetBrowser2::ChangeEditor class methodsFor:'interface specs'! |
|
2631 |
||
2632 |
windowSpec |
|
2633 |
"This resource specification was automatically generated |
|
2634 |
by the UIPainter of ST/X." |
|
2635 |
||
2636 |
"Do not manually edit this!! If it is corrupted, |
|
2637 |
the UIPainter may not be able to read the specification." |
|
2638 |
||
2639 |
" |
|
2640 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2::ChangeEditor andSelector:#windowSpec |
|
2641 |
Tools::ChangeSetBrowser2::ChangeEditor new openInterface:#windowSpec |
|
2642 |
Tools::ChangeSetBrowser2::ChangeEditor open |
|
2643 |
" |
|
2644 |
||
2645 |
<resource: #canvas> |
|
2646 |
||
2647 |
^ |
|
2648 |
#(FullSpec |
|
2649 |
name: windowSpec |
|
2650 |
window: |
|
2651 |
(WindowSpec |
|
2652 |
label: 'Change Editor' |
|
2653 |
name: 'Change Editor' |
|
2654 |
min: (Point 10 10) |
|
2655 |
bounds: (Rectangle 0 0 579 341) |
|
2656 |
) |
|
2657 |
component: |
|
2658 |
(SpecCollection |
|
2659 |
collection: ( |
|
2660 |
(SubCanvasSpec |
|
2661 |
name: 'TextDiffTool' |
|
2662 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
2663 |
hasHorizontalScrollBar: false |
|
2664 |
hasVerticalScrollBar: false |
|
2665 |
majorKey: #'Tools::TextDiffTool' |
|
2666 |
minorKey: windowSpecForEmbedding |
|
2667 |
subAspectHolders: |
|
2668 |
(Array |
|
2669 |
||
2670 |
(SubChannelInfoSpec |
|
2671 |
subAspect: classHolder |
|
2672 |
aspect: classAspect |
|
2673 |
) |
|
2674 |
(SubChannelInfoSpec |
|
2675 |
subAspect: codeAspectHolder |
|
2676 |
aspect: codeAspect |
|
2677 |
) |
|
2678 |
||
2679 |
(SubChannelInfoSpec |
|
2680 |
subAspect: labelAHolder |
|
2681 |
aspect: labelAHolder |
|
2682 |
) |
|
2683 |
(SubChannelInfoSpec |
|
2684 |
subAspect: labelBHolder |
|
2685 |
aspect: labelBHolder |
|
2686 |
) |
|
2687 |
||
2688 |
(SubChannelInfoSpec |
|
2689 |
subAspect: showDiffHolder |
|
2690 |
aspect: showdiffHolder |
|
2691 |
) |
|
2692 |
(SubChannelInfoSpec |
|
2693 |
subAspect: textAHolder |
|
2694 |
aspect: sourceChangeHolder |
|
2695 |
) |
|
2696 |
||
2697 |
(SubChannelInfoSpec |
|
2698 |
subAspect: textBHolder |
|
2699 |
aspect: sourceImageHolder |
|
2700 |
) |
|
2701 |
) |
|
2702 |
createNewApplication: true |
|
2703 |
createNewBuilder: true |
|
2704 |
) |
|
2705 |
) |
|
2706 |
||
2707 |
) |
|
2708 |
) |
|
2709 |
! ! |
|
2710 |
||
2711 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'accessing'! |
|
2712 |
||
2713 |
sourceChangeHolder |
|
2714 |
^ sourceChangeHolder |
|
2715 |
! |
|
2716 |
||
2717 |
sourceChangeHolder:something |
|
2718 |
sourceChangeHolder := something. |
|
2719 |
! |
|
2720 |
||
2721 |
sourceImageHolder |
|
2722 |
^ sourceImageHolder |
|
2723 |
! |
|
2724 |
||
2725 |
sourceImageHolder:something |
|
2726 |
sourceImageHolder := something. |
|
2727 |
! ! |
|
2728 |
||
2729 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'aspects'! |
|
2730 |
||
2731 |
changeHolder |
|
2732 |
"return/create the 'changeHolder' value holder (automatically generated)" |
|
2733 |
||
2734 |
changeHolder isNil ifTrue:[ |
|
2735 |
changeHolder := ValueHolder new. |
|
2736 |
changeHolder addDependent:self. |
|
2737 |
]. |
|
2738 |
^ changeHolder |
|
2739 |
! |
|
2740 |
||
2741 |
changeHolder:something |
|
2742 |
"set the 'changeHolder' value holder (automatically generated)" |
|
2743 |
||
2744 |
|oldValue newValue| |
|
2745 |
||
2746 |
changeHolder notNil ifTrue:[ |
|
2747 |
oldValue := changeHolder value. |
|
2748 |
changeHolder removeDependent:self. |
|
2749 |
]. |
|
2750 |
changeHolder := something. |
|
2751 |
changeHolder notNil ifTrue:[ |
|
2752 |
changeHolder addDependent:self. |
|
2753 |
]. |
|
2754 |
newValue := changeHolder value. |
|
2755 |
oldValue ~~ newValue ifTrue:[ |
|
2756 |
self update:#value with:newValue from:changeHolder. |
|
2757 |
]. |
|
2758 |
! |
|
2759 |
||
2760 |
classAspect |
|
2761 |
||
2762 |
^(AspectAdaptor forAspect: #changeClass) |
|
2763 |
subjectChannel: self changeHolder |
|
2764 |
||
2765 |
"Created: / 29-11-2011 / 11:21:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2766 |
! |
|
2767 |
||
2768 |
codeAspect |
|
2769 |
||
2770 |
^BlockValue |
|
2771 |
with: [:change| |
|
2772 |
change isMethodCodeChange |
|
| 11709 | 2773 |
ifTrue:[ SyntaxHighlighter codeAspectMethod ] |
2774 |
ifFalse:[ SyntaxHighlighter codeAspectExpression ] |
|
| 10914 | 2775 |
] argument: self changeHolder |
2776 |
||
2777 |
"Created: / 29-11-2011 / 11:21:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11709 | 2778 |
"Modified: / 27-07-2012 / 22:03:31 / cg" |
| 10914 | 2779 |
! |
2780 |
||
2781 |
labelAText |
|
2782 |
||
2783 |
^'Change' |
|
2784 |
||
2785 |
"Created: / 27-11-2011 / 14:59:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2786 |
! |
|
2787 |
||
2788 |
labelBText |
|
2789 |
||
2790 |
^'Current (in image)' |
|
2791 |
||
2792 |
"Created: / 27-11-2011 / 14:59:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2793 |
! |
|
2794 |
||
2795 |
readonlyHolder |
|
2796 |
"return/create the 'readonlyHolder' value holder (automatically generated)" |
|
2797 |
||
2798 |
readonlyHolder isNil ifTrue:[ |
|
2799 |
readonlyHolder := ValueHolder new. |
|
2800 |
readonlyHolder addDependent:self. |
|
2801 |
]. |
|
2802 |
^ readonlyHolder |
|
2803 |
! |
|
2804 |
||
2805 |
readonlyHolder:something |
|
2806 |
"set the 'readonlyHolder' value holder (automatically generated)" |
|
2807 |
||
2808 |
|oldValue newValue| |
|
2809 |
||
2810 |
readonlyHolder notNil ifTrue:[ |
|
2811 |
oldValue := readonlyHolder value. |
|
2812 |
readonlyHolder removeDependent:self. |
|
2813 |
]. |
|
2814 |
readonlyHolder := something. |
|
2815 |
readonlyHolder notNil ifTrue:[ |
|
2816 |
readonlyHolder addDependent:self. |
|
2817 |
]. |
|
2818 |
newValue := readonlyHolder value. |
|
2819 |
oldValue ~~ newValue ifTrue:[ |
|
2820 |
self update:#value with:newValue from:readonlyHolder. |
|
2821 |
]. |
|
2822 |
! |
|
2823 |
||
2824 |
showdiffHolder |
|
2825 |
"return/create the 'showdiffHolder' value holder (automatically generated)" |
|
2826 |
||
2827 |
showdiffHolder isNil ifTrue:[ |
|
2828 |
showdiffHolder := ValueHolder new. |
|
2829 |
]. |
|
2830 |
^ showdiffHolder |
|
2831 |
! |
|
2832 |
||
2833 |
showdiffHolder:something |
|
2834 |
"set the 'showdiffHolder' value holder (automatically generated)" |
|
2835 |
||
2836 |
showdiffHolder := something. |
|
2837 |
! ! |
|
2838 |
||
2839 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'change & update'! |
|
2840 |
||
2841 |
changeChanged |
|
2842 |
"changeHolder has changed, update sources etc..." |
|
2843 |
||
2844 |
| change | |
|
| 11663 | 2845 |
|
| 10914 | 2846 |
change := changeHolder value. |
2847 |
||
2848 |
sourceChangeHolder value: change changeSource. |
|
2849 |
sourceImageHolder value: change imageSource. |
|
2850 |
||
2851 |
"Created: / 29-11-2011 / 11:15:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
| 11663 | 2852 |
"Modified (format): / 25-07-2012 / 17:39:48 / cg" |
| 10914 | 2853 |
! |
2854 |
||
2855 |
update:something with:aParameter from:changedObject |
|
2856 |
"Invoked when an object that I depend upon sends a change notification." |
|
2857 |
||
2858 |
||
2859 |
changedObject == changeHolder ifTrue:[ |
|
2860 |
self changeChanged. |
|
2861 |
^ self. |
|
2862 |
]. |
|
2863 |
super update:something with:aParameter from:changedObject |
|
2864 |
||
2865 |
"Modified: / 29-11-2011 / 11:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2866 |
! ! |
|
2867 |
||
| 10028 | 2868 |
!ChangeSetBrowser2 class methodsFor:'documentation'! |
2869 |
||
| 10450 | 2870 |
version |
|
12667
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2871 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.49 2013-04-14 19:57:53 cg Exp $' |
| 10450 | 2872 |
! |
2873 |
||
| 10028 | 2874 |
version_CVS |
|
12667
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
2875 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.49 2013-04-14 19:57:53 cg Exp $' |
| 10028 | 2876 |
! |
2877 |
||
2878 |
version_SVN |
|
2879 |
^ '§Id: Tools__ChangeSetBrowser.st 7486 2009-10-26 22:06:24Z vranyj1 §' |
|
2880 |
! ! |
|
|
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2881 |