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