author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Tue, 19 Nov 2013 12:17:07 +0000 | |
branch | jv |
changeset 13743 | d789bfa8a626 |
parent 13676 | b14ed2a36bae |
child 15566 | 184cea584be5 |
permissions | -rw-r--r-- |
10028 | 1 |
" |
10065 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
12292 | 3 |
All Rights Reserved |
10028 | 4 |
|
10065 | 5 |
Permission is hereby granted, free of charge, to any person |
6 |
obtaining a copy of this software and associated documentation |
|
7 |
files (the 'Software'), to deal in the Software without |
|
8 |
restriction, including without limitation the rights to use, |
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
10 |
copies of the Software, and to permit persons to whom the |
|
11 |
Software is furnished to do so, subject to the following |
|
12 |
conditions: |
|
13 |
||
14 |
The above copyright notice and this permission notice shall be |
|
15 |
included in all copies or substantial portions of the Software. |
|
16 |
||
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
24 |
OTHER DEALINGS IN THE SOFTWARE. |
|
10028 | 25 |
" |
26 |
"{ Package: 'stx:libtool' }" |
|
27 |
||
28 |
"{ NameSpace: Tools }" |
|
29 |
||
30 |
ToolApplicationModel subclass:#ChangeSetBrowser2 |
|
11198 | 31 |
instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile |
32 |
navigatorChangesetHolder navigatorSpecHolder list1 list1Holder |
|
33 |
selection1Holder list2 list2Holder selection2Holder classHolder |
|
34 |
languageHolder codeAspectHolder showRemovedAspect showSameAspect |
|
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
35 |
showTimestampHolder sourceView changeSourceHolder |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
36 |
imageSourceHolder targetPackage allowRemoveHolder |
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
37 |
allowAcceptHolder infoPanel updateChangeFileHolder |
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
38 |
showFilterHolder showingRegularChangesetHolder isWorkingHolder |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
39 |
isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
40 |
targetNameSpaceName' |
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
41 |
classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages' |
11198 | 42 |
poolDictionaries:'' |
43 |
category:'Interface-Browsers-ChangeSet' |
|
10028 | 44 |
! |
45 |
||
10914 | 46 |
ApplicationModel subclass:#ChangeEditor |
11198 | 47 |
instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder |
48 |
sourceImageHolder' |
|
49 |
classVariableNames:'' |
|
50 |
poolDictionaries:'' |
|
51 |
privateIn:ChangeSetBrowser2 |
|
10914 | 52 |
! |
53 |
||
10028 | 54 |
!ChangeSetBrowser2 class methodsFor:'documentation'! |
55 |
||
56 |
copyright |
|
57 |
" |
|
10065 | 58 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
12292 | 59 |
All Rights Reserved |
10065 | 60 |
|
61 |
Permission is hereby granted, free of charge, to any person |
|
62 |
obtaining a copy of this software and associated documentation |
|
63 |
files (the 'Software'), to deal in the Software without |
|
64 |
restriction, including without limitation the rights to use, |
|
65 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
66 |
copies of the Software, and to permit persons to whom the |
|
67 |
Software is furnished to do so, subject to the following |
|
68 |
conditions: |
|
10028 | 69 |
|
10065 | 70 |
The above copyright notice and this permission notice shall be |
71 |
included in all copies or substantial portions of the Software. |
|
72 |
||
73 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
74 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
75 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
76 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
77 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
78 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
79 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
80 |
OTHER DEALINGS IN THE SOFTWARE. |
|
10028 | 81 |
" |
82 |
! ! |
|
83 |
||
84 |
!ChangeSetBrowser2 class methodsFor:'instance creation'! |
|
85 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
86 |
on: aStringOrChangeSet |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
87 |
"Opens a browser on given changeset. If the argument is |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
88 |
string, then loads the changeset from given file - for |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
89 |
compatibility with other tools" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
90 |
|
12252
2ea15e194087
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12249
diff
changeset
|
91 |
^aStringOrChangeSet isString ifTrue:[ |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
92 |
self onFile: aStringOrChangeSet |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
93 |
] ifFalse:[ |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
94 |
self on: aStringOrChangeSet label: aStringOrChangeSet name |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
95 |
] |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
96 |
|
12252
2ea15e194087
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12249
diff
changeset
|
97 |
"Modified: / 21-05-2012 / 13:55:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 98 |
! |
99 |
||
100 |
on: aChangeSet label: aString |
|
101 |
||
102 |
^self on: aChangeSet label: aString setupWith: [:browser] |
|
103 |
||
104 |
"Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
105 |
! |
|
106 |
||
107 |
on: aChangeSet label: label setupWith: aBlock |
|
108 |
||
109 |
| browser | |
|
110 |
||
111 |
browser := self new. |
|
112 |
browser |
|
12292 | 113 |
changeset: aChangeSet; |
114 |
title: label. |
|
10028 | 115 |
aBlock value: browser. |
116 |
^browser |
|
117 |
||
118 |
"Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
119 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
120 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
121 |
onFile: aString |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
122 |
| browser | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
123 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
124 |
browser := self new. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
125 |
browser enqueueDelayedAction:[browser doOpenFile: aString]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
126 |
^browser |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
127 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
128 |
"Created: / 17-05-2012 / 23:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 129 |
! ! |
130 |
||
131 |
!ChangeSetBrowser2 class methodsFor:'accessing'! |
|
132 |
||
133 |
showRemoved |
|
134 |
||
135 |
^ShowRemoved == true |
|
136 |
! |
|
137 |
||
138 |
showRemoved: aBoolean |
|
139 |
||
140 |
ShowRemoved := aBoolean |
|
141 |
! ! |
|
142 |
||
143 |
!ChangeSetBrowser2 class methodsFor:'help specs'! |
|
144 |
||
11034 | 145 |
flyByHelpSpec |
10028 | 146 |
"This resource specification was automatically generated |
147 |
by the UIHelpTool of ST/X." |
|
148 |
||
149 |
"Do not manually edit this!! If it is corrupted, |
|
150 |
the UIHelpTool may not be able to read the specification." |
|
151 |
||
152 |
" |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
153 |
UIHelpTool openOnClass:Tools::ChangeSetBrowser |
10028 | 154 |
" |
155 |
||
156 |
<resource: #help> |
|
157 |
||
11034 | 158 |
^ super flyByHelpSpec addPairsFrom:#( |
10028 | 159 |
|
160 |
#fileLoad |
|
11034 | 161 |
'Select a file and show its contained changeset' |
10028 | 162 |
|
163 |
#fileSave |
|
11034 | 164 |
'Save the changeset in a file' |
10028 | 165 |
|
12211 | 166 |
#applyAll |
167 |
'Apply all changes.' |
|
168 |
||
169 |
#applyForClassToEnd |
|
170 |
'Apply changes which affect this class to the end.' |
|
171 |
||
172 |
#applyFromLastSnapshot |
|
173 |
'Apply changes from the last snapshot to the end.' |
|
174 |
||
175 |
#applyLine |
|
176 |
'Apply the selected change.' |
|
177 |
||
178 |
#applyToEnd |
|
179 |
'Apply all changes from the selected one to the end.' |
|
180 |
||
181 |
#deleteAll |
|
182 |
'Deletes all changes.' |
|
183 |
||
184 |
#deleteCompress |
|
185 |
'Deletes all obsolete changes.' |
|
186 |
||
187 |
#deleteCompressForClass |
|
188 |
'Deletes obsolete changes for this class, leaving the last one.' |
|
189 |
||
190 |
#deleteForClassToEnd |
|
191 |
'Deletes changes for this class from the selection to the end.' |
|
192 |
||
193 |
#deleteLine |
|
194 |
'Deletes the selected change.' |
|
195 |
||
196 |
#deleteToEnd |
|
197 |
'Deletes changes from the selected one to the end.' |
|
198 |
||
199 |
#fileLoad |
|
200 |
'Opens a dialog for selecting and loading another changes file.' |
|
201 |
||
202 |
#fileReload |
|
203 |
'Reloads the changes file (undo your modifications).' |
|
204 |
||
205 |
#fileSave |
|
206 |
'Saves the list of changes into the current changes file.' |
|
207 |
||
208 |
#filterField |
|
209 |
'Matching patterns filtering the changes (separate patterns by blanks).' |
|
210 |
||
211 |
#settingsAutoUpdate |
|
212 |
'Toggle automatic update.' |
|
213 |
||
214 |
#settingsColumns |
|
215 |
'Configure which columns are shown in the list.' |
|
216 |
||
217 |
#settingsColumnsCategory |
|
218 |
'Toggle display of the changes category in the list.' |
|
219 |
||
220 |
#settingsColumnsDeltaInfo |
|
221 |
'Toggle display of the delta-info in the list.' |
|
222 |
||
223 |
#settingsColumnsPosition |
|
224 |
'Togle display of the changes file-position in the list.' |
|
225 |
||
226 |
#settingsColumnsTimeStamp |
|
227 |
'Toggle display of the changes time stamp in the list.' |
|
228 |
||
229 |
#settingsColumnsType |
|
230 |
'Toggle display of the change-type in the list.' |
|
231 |
||
232 |
#settingsPrivateAsSeparate |
|
233 |
'Toggle if changes for private private are included when applying, deleting, or compressing for a class.' |
|
234 |
||
235 |
#testCompareWithCurrentVersion |
|
236 |
'Opens a info dialog showing the difference between the changes code and the method current code.' |
|
237 |
||
238 |
#testFindPreviousSnapshot |
|
239 |
'Searches backward for the previous snapshot entry.' |
|
240 |
||
241 |
#testFindNextSnapshot |
|
242 |
'Searches forward for the next snapshot entry.' |
|
243 |
||
10028 | 244 |
) |
11034 | 245 |
|
246 |
"Created: / 27-12-2011 / 10:37:47 / cg" |
|
12211 | 247 |
"Modified: / 29-03-2012 / 12:13:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
248 |
! |
|
249 |
||
250 |
helpSpec |
|
251 |
"This resource specification was automatically generated |
|
252 |
by the UIHelpTool of ST/X." |
|
253 |
||
254 |
"Do not manually edit this!! If it is corrupted, |
|
255 |
the UIHelpTool may not be able to read the specification." |
|
256 |
||
257 |
" |
|
12292 | 258 |
UIHelpTool openOnClass:Tools::ChangeSetBrowser2 |
12211 | 259 |
" |
260 |
||
261 |
<resource: #help> |
|
262 |
||
263 |
^ super helpSpec addPairsFrom:#( |
|
264 |
||
265 |
#applyAll |
|
266 |
'Apply all changes.' |
|
267 |
||
268 |
#applyForClassToEnd |
|
269 |
'Apply changes to the end which affect this class.' |
|
270 |
||
271 |
#applyFromLastSnapshot |
|
272 |
'Apply changes from the last snapshot to the end.' |
|
273 |
||
274 |
#applyLine |
|
275 |
'Apply the selected change.' |
|
276 |
||
277 |
#applyToEnd |
|
278 |
'Apply all changes from the selected one to the end.' |
|
279 |
||
280 |
#deleteAll |
|
281 |
'Deletes all changes.' |
|
282 |
||
283 |
#deleteCompress |
|
284 |
'Deletes all obsolete changes.' |
|
285 |
||
286 |
#deleteCompressForClass |
|
287 |
'Deletes obsolete changes for this class, leaving the last one.' |
|
288 |
||
289 |
#deleteForClassToEnd |
|
290 |
'Deletes changes for this class from the selection to the end.' |
|
291 |
||
292 |
#deleteLine |
|
293 |
'Deletes the selected change.' |
|
294 |
||
295 |
#deleteToEnd |
|
296 |
'Deletes changes from the selected one to the end.' |
|
297 |
||
298 |
#fileLoad |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
299 |
'Open a changeset file (.chg or .st)' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
300 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
301 |
#fileOpenSelection |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
302 |
'' |
12211 | 303 |
|
304 |
#fileReload |
|
305 |
'Reloads the changes file (undo your modifications).' |
|
306 |
||
307 |
#fileSave |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
308 |
'Saves changes to current change file.' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
309 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
310 |
#fileSaveAs |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
311 |
'Save changes to a file' |
12211 | 312 |
|
313 |
#filterField |
|
314 |
'Matching patterns filtering the changes (separate patterns by blanks).' |
|
315 |
||
316 |
#settingsAutoUpdate |
|
317 |
'Toggle automatic update.' |
|
318 |
||
319 |
#settingsColumns |
|
320 |
'Configure which columns are shown in the list.' |
|
321 |
||
322 |
#settingsColumnsCategory |
|
323 |
'Toggle display of the changes category in the list.' |
|
324 |
||
325 |
#settingsColumnsClassName |
|
326 |
'Toggle display of the className in the list.' |
|
327 |
||
328 |
#settingsColumnsDeltaInfo |
|
329 |
'Toggle display of the delta-info in the list.' |
|
330 |
||
331 |
#settingsColumnsPosition |
|
332 |
'Togle display of the changes file-position in the list.' |
|
333 |
||
334 |
#settingsColumnsTimeStamp |
|
335 |
'Toggle display of the changes time stamp in the list.' |
|
336 |
||
337 |
#settingsColumnsType |
|
338 |
'Toggle display of the change-type in the list.' |
|
339 |
||
340 |
#settingsPrivateAsSeparate |
|
341 |
'Toggle if changes for private private are included when applying, deleting, or compressing for a class.' |
|
342 |
||
343 |
#testCompareWithCurrentVersion |
|
344 |
'Opens a info dialog showing the difference between the changes code and the method current code.' |
|
345 |
||
346 |
#testFindLastSnapshot |
|
347 |
'Searches backward for the previous snapshot entry.' |
|
348 |
||
349 |
#testFindNextSnapshot |
|
350 |
'Searches forward for the next snapshot entry.' |
|
351 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
352 |
#testFindPreviousSnapshot |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
353 |
'Searches backward for the previous snapshot entry.' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
354 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
355 |
#fileOpenCurrent |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
356 |
'Open current system changeset' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
357 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
358 |
#fileOpenSelection |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
359 |
'Opens a new browser on currently selected changes' |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
360 |
|
12211 | 361 |
) |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
362 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
363 |
"Modified: / 01-08-2012 / 18:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 364 |
! ! |
365 |
||
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
366 |
!ChangeSetBrowser2 class methodsFor:'image specs'! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
367 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
368 |
applyFromLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
369 |
^ self applyFromLastSnapshotIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
370 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
371 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
372 |
applyFromLastSnapshotIcon1 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
373 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
374 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
375 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
376 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
377 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
378 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
379 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
380 |
self applyFromLastSnapshotIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
381 |
ImageEditor openOnClass:self andSelector:#applyFromLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
382 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
383 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
384 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
385 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
386 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
387 |
^Icon |
12292 | 388 |
constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon' |
389 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
390 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@BH"H"H@@@@@@@@@H"H"H @@@@@@@@@@@@@B@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
391 |
@@;.;.; H@@@@@@@C.;.;.@@@@@@@@@@@@@@8@@N@@@@C?????C @@@N@@@O????<@@@8@@@@@@@@@C0@@@@8@@O????<O@@C @@@@?????0@@@@C @@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
392 |
@O@@@N@@@@DQDQDP<@C @@@@@_??DQ@@@@@@@@@A????D@@@@@@@@@DQDQDP@@@@C @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@C?0@B@P@B@P@O?P@O?P@O?0@??@@??@@??LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
393 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
394 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
395 |
applyFromLastSnapshotIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
396 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
397 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
398 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
399 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
400 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
401 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
402 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
403 |
self applyFromLastSnapshotIcon1 inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
404 |
ImageEditor openOnClass:self andSelector:#applyFromLastSnapshotIcon1 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
405 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
406 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
407 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
408 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
409 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
410 |
^Icon |
12292 | 411 |
constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon1' |
412 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
413 |
@@@BH@@@@@@QDQ<@@BH @@@@@AH"H@@@H"@@@@@@D"H H H"@@@@@@@RH"@"H"@@@@@@@AH"H@H"H@@@@@@@<@@@@BH@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
414 |
@@;.;.; @@@@@@@@C.;.;.@@@@@@@@@@@@@@8@@N@@@@C?????C @@@N@@@O????<@@@8@@@@@@@@@C0@@@@8@@O????<O@@C @@@@?????0@@@@C @@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
415 |
@O@@@N@@@@DQDQDP<@C @@@@@_??DQ@@@@@@@@@A????D@@@@@@@@@DQDQDP@@@@C @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A@C<C@C<C@C<&@C<<@C<\@C<H@@@@?<@@?<@@?<LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
416 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
417 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
418 |
applyIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
419 |
^ self applyIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
420 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
421 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
422 |
applyIcon1 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
423 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
424 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
425 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
426 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
427 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
428 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
429 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
430 |
self applyIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
431 |
ImageEditor openOnClass:self andSelector:#applyIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
432 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
433 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
434 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
435 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
436 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
437 |
^Icon |
12292 | 438 |
constantNamed:#'NewChangesBrowser class applyIcon' |
439 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
440 |
UUUUUUUPUUUUUU?PUUUUUU?[UUUUUW=PP@@@@C<QQUUU=_4PQUUU?_4VQ**U_?TPQUUUW?TPQUUUW=TXQ***U=TPQ**UUUTPQ*****TPQ***%UTPQ****)TP |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
441 |
QUUUUUTPQUUUUUTUP@@@@@@PUUUUUUUPUUUUUUUPUUUUUUUPUUUUUUUP') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
442 |
@@@@@@@8@@@8@@A0_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
443 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
444 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
445 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
446 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
447 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
448 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
449 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
450 |
applyIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
451 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
452 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
453 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
454 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
455 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
456 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
457 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
458 |
self applyIcon2 inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
459 |
ImageEditor openOnClass:self andSelector:#applyIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
460 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
461 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
462 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
463 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
464 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
465 |
^Icon |
12292 | 466 |
constantNamed:#'NewChangesBrowser class applyIcon2' |
467 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
468 |
DQDQDQDQDQDQP3PQDQDQDQDQDQECMADQDQDQDQDQECMADQDQDQEDPQDTL4DP@@@@@DL4@DL4@Q@QDQDQP3MAP3PADADQDQDTL3P3PPDPD"H"HQECL3MA@Q@Q |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
469 |
DQDQDQP3MADADADQDQDQDTL4DPDPD"H"H"HQEDDQ@Q@RH"H!!DQDQDQDADAH"H"H"H"H"DPDPD"H"H"H!!DQDQ@Q@RH"H"H"H"HQDADADQDQDQDQDQDPDPDQDQ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
470 |
DQDQDQDQ@Q@@@@@@@@@@@@@ADQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDb') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 255 0 0 85 85 85]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
471 |
@@@<@@@<@@A8@C!!8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
472 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
473 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
474 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
475 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
476 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
477 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
478 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
479 |
applyToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
480 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
481 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
482 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
483 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
484 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
485 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
486 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
487 |
self applyToEndIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
488 |
ImageEditor openOnClass:self andSelector:#applyToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
489 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
490 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
491 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
492 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
493 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
494 |
^Icon |
12292 | 495 |
constantNamed:#'NewChangesBrowser class applyToEndIcon' |
496 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
497 |
@@@DP@@@@@@@@@@@@DQ@@@@@@@@@@@@@QD@@@"H"H"@@Q@QD@@@BH"H"H@ADQD@@@@@@@@@ @@QDP@@BH"H"HB@@@DP@@@H"H"H @@@@@@@@@@@@@B@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
498 |
@@L3L3L0H@@@@@@@@3L3L3@@@@@@@@@@@@@@L@@B@@@@@3L3L3@0@@@B@@@CL3L3L@@@H@@@@@@@@@@0@@@@H@@ADQDQDC@@@ @@@@DQDQDP@@@@@ @@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
499 |
@A@@@B@@@@DQDQDPD@@ @@@@@SL3DQ@@@@@@@@@AL3L3D@@@@@@@@@DQDQDP@@@@@ @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A@@@CC?0CC?0&C?0<O?0\O?0HO?0@??@@??@@??LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
500 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
501 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
502 |
compressIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
503 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
504 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
505 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
506 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
507 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
508 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
509 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
510 |
ImageEditor openOnClass:self andSelector:#compressIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
511 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
512 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
513 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
514 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
515 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
516 |
constantNamed:#'NewChangesBrowser compressIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
517 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@????<@@@:***(@@@8@@@8@@@8@@@8@@@@@@@8@@@@@@@8A@@@@@@8@@:**0@8HC**+@@8@@@@@@@8H@@@@@@8@@@@@@@8@@@@@@@8@@@@@@@8@@C????8@@C****(@@@@@@@@H@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 124 124 124 170 170 170 255 255 255]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@??0A??8A??8A??8A8A8G>A8@@A8G?98O?18_?!!8??A8@@A8G>A8@0A8C??8C??8C??8C??0@0@@D2@@G>@@D2@@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
518 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
519 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
520 |
deleteIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
521 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
522 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
523 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
524 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
525 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
526 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
527 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
528 |
ImageEditor openOnClass:self andSelector:#deleteIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
529 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
530 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
531 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
532 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
533 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
534 |
constantNamed:#'NewChangesBrowser deleteIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
535 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@AUUUU@@OA??UU@@@AUUUU@@@AUUUU@B@A???U@H@A??5U@@@A???0@@@AUUUB@B@@@@@@@@@@@@@A@BK@@@@A_:@@@@@AO2G@@@@AL2@@@@@AL2C@@@@AL2@@@@@AL2@@@@@AL2H@@@@AL2@@@@@A\:@@@@@H_8 @@@@@@@H') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'_?<@_?<@_?<P_?<P_?<X_?<X_?<H_? H_?O<_?XL@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@G0') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
536 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
537 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
538 |
deleteToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
539 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
540 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
541 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
542 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
543 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
544 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
545 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
546 |
ImageEditor openOnClass:self andSelector:#deleteToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
547 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
548 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
549 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
550 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
551 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
552 |
constantNamed:#'NewChangesBrowser deleteToEndIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
553 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@B** @@O@B** @@@@@@@ @@@@??< @B@@??<@@H@@@@L@@@@EUUL@@@@G?U@B@B@G?=@@@@@EUU@A@BK@@@@A_:@@@@@AO2G@@@@AL2@@@@@AL2C@@@@AL2@@@@@AL2@@@@@AL2H@@@@AL2@@@@@A\:@@@@@H_8 @@@@@@@H') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C?0@C?0@C?0PO?0PO?0XO?0X??@H??@H??O<?<XL?<_<?<_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@G0') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
554 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
555 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
556 |
findLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
557 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
558 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
559 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
560 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
561 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
562 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
563 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
564 |
ImageEditor openOnClass:self andSelector:#findLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
565 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
566 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
567 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
568 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
569 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
570 |
constantNamed:#'NewChangesBrowser findLastSnapshotIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
571 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@EUUUW@A@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@A@F***(@M@F***(@H@F***(@@@F***(@@@F***(@I@L@@@@@@@@@@@@@A@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
572 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
573 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
574 |
findNextSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
575 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
576 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
577 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
578 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
579 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
580 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
581 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
582 |
ImageEditor openOnClass:self andSelector:#findNextSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
583 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
584 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
585 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
586 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
587 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
588 |
constantNamed:#'NewChangesBrowser findNextSnapshotIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
589 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@DA@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@D@B@@@@@@@@@@@@@@@E@@@@@@@@@EUUUW@N@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@V***(@H@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@L@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@G @@G @@G @@_8@@O0@@G @@C@@@@@@C??@C??@C??@C??@C??@C??BC??BC??BC??BC??@C??@C??@C??@C??@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
590 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
591 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
592 |
findPreviousForClassIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
593 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
594 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
595 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
596 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
597 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
598 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
599 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
600 |
self findPreviousForClassIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
601 |
ImageEditor openOnClass:self andSelector:#findPreviousForClassIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
602 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
603 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
604 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
605 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
606 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
607 |
^Icon |
12292 | 608 |
constantNamed:#'NewChangesBrowser class findPreviousForClassIcon' |
609 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
610 |
@EUUUW@A@G???<@@@G???<@@@G???<@@@G???<@@@G???<@@@G???<@@@G???<@A@G???<@M@G???<@H@G???<@@@G???<@@@G???<@I@L@@@@@@@@@@@@@A |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
611 |
@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
612 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
613 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
614 |
findPreviousSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
615 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
616 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
617 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
618 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
619 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
620 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
621 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
622 |
self findPreviousSnapshotIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
623 |
ImageEditor openOnClass:self andSelector:#findPreviousSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
624 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
625 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
626 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
627 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
628 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
629 |
^Icon |
12292 | 630 |
constantNamed:#'NewChangesBrowser class findPreviousSnapshotIcon' |
631 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
632 |
@EUUUW@A@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@A@F***(@M@F***(@H@F***(@@@F***(@@@F***(@I@L@@@@@@@@@@@@@A |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
633 |
@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself] |
10028 | 634 |
! ! |
635 |
||
636 |
!ChangeSetBrowser2 class methodsFor:'interface opening'! |
|
637 |
||
638 |
confirmChanges: aChangeSet |
|
639 |
||
11674 | 640 |
^self confirmChanges: aChangeSet label: 'Apply the following changes?' |
10028 | 641 |
|
642 |
"Modified: / 08-11-2010 / 18:01:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11674 | 643 |
"Modified: / 26-07-2012 / 13:19:49 / cg" |
10028 | 644 |
! |
645 |
||
646 |
confirmChanges:aChangeSet label: aString |
|
647 |
"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
|
648 |
|
10028 | 649 |
|browser browserView dialog| |
650 |
||
10309 | 651 |
browser := self on: aChangeSet. |
11196 | 652 |
browser allowAccept: false. |
653 |
browser allowRemove: true. |
|
12272 | 654 |
browser showRemovedAspect: true asValue. |
12144 | 655 |
browser beHierarchical. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
656 |
browserView := ApplicationSubView new |
12292 | 657 |
client:browser |
658 |
spec:#windowSpecForEmbedding. |
|
10028 | 659 |
dialog := (Dialog new) |
12292 | 660 |
addComponent:browserView withHeight: 300; |
661 |
addAbortAndOkButtons; |
|
662 |
yourself. |
|
10028 | 663 |
dialog label: aString. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
664 |
dialog buttonPanel |
12292 | 665 |
layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0) |
666 |
offsets:(0 @ -30 corner:0 @ 0)). |
|
10028 | 667 |
browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0) |
12292 | 668 |
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
|
669 |
dialog |
12292 | 670 |
okAction: |
671 |
[^browser list1Holder value condenseChangesForRemoved]; |
|
672 |
abortAction: |
|
673 |
[^#()]. |
|
10345 | 674 |
dialog openWithExtent: 800@700. |
10028 | 675 |
^#() |
676 |
||
677 |
" |
|
12292 | 678 |
Tools::ChangeSetBrowser2 |
679 |
confirmChanges: |
|
680 |
(ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size) |
|
681 |
label: 'Last 10 changes...' |
|
10028 | 682 |
" |
683 |
||
684 |
"Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10682 | 685 |
"Modified: / 07-09-2011 / 20:19:44 / cg" |
12272 | 686 |
"Modified: / 27-07-2012 / 17:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 687 |
! |
688 |
||
11198 | 689 |
open |
690 |
"Open browser and load current changefile" |
|
691 |
||
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
692 |
| browser | |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
693 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
694 |
browser := self new. |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
695 |
browser open. |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
696 |
"JV: I would like to open current changefile only if the tool is opened from |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
697 |
launcher toolbar button" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
698 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
699 |
(thisContext sender sender receiver isKindOf: AbstractLauncherApplication) ifTrue:[ |
12292 | 700 |
browser builder window sensor |
701 |
pushUserEvent: #doOpenCurrent for: browser. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
702 |
] ifFalse:[ |
12292 | 703 |
browser builder window sensor |
704 |
pushUserEvent: #doOpenNew for: browser. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
705 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
706 |
] |
11198 | 707 |
|
708 |
"Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 709 |
"Modified: / 27-07-2012 / 21:24:19 / cg" |
11198 | 710 |
! |
711 |
||
10028 | 712 |
openOn: aChangeSet |
11674 | 713 |
^(self on: aChangeSet) |
714 |
open; |
|
715 |
yourself |
|
11196 | 716 |
|
717 |
" |
|
718 |
self openOn: ChangeSet current |
|
719 |
" |
|
720 |
||
721 |
"Modified (comment): / 24-01-2012 / 20:01:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11674 | 722 |
"Modified: / 26-07-2012 / 13:19:18 / cg" |
10028 | 723 |
! |
724 |
||
725 |
openOn: aChangeSet label: aString |
|
726 |
||
727 |
^self openOn: aChangeSet label: aString setupWith: [:browser] |
|
728 |
||
729 |
"Created: / 26-10-2010 / 22:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
730 |
! |
|
731 |
||
732 |
openOn: aChangeSet label: aString setupWith: aBlock |
|
733 |
||
11674 | 734 |
^(self on: aChangeSet label: aString setupWith: aBlock) open; yourself |
10028 | 735 |
|
736 |
"Created: / 26-10-2010 / 23:07:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11674 | 737 |
"Modified: / 26-07-2012 / 13:19:30 / cg" |
10028 | 738 |
! ! |
739 |
||
740 |
!ChangeSetBrowser2 class methodsFor:'interface specs'! |
|
741 |
||
742 |
hierarchicalNavigatorSpec |
|
743 |
"This resource specification was automatically generated |
|
744 |
by the UIPainter of ST/X." |
|
745 |
||
746 |
"Do not manually edit this!! If it is corrupted, |
|
747 |
the UIPainter may not be able to read the specification." |
|
748 |
||
749 |
" |
|
10448 | 750 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#hierarchicalNavigatorSpec |
751 |
Tools::ChangeSetBrowser2 new openInterface:#hierarchicalNavigatorSpec |
|
10028 | 752 |
" |
753 |
||
754 |
<resource: #canvas> |
|
755 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
756 |
^ |
10028 | 757 |
#(FullSpec |
11196 | 758 |
name: hierarchicalNavigatorSpec |
759 |
window: |
|
10028 | 760 |
(WindowSpec |
11196 | 761 |
label: 'Hierarchical Navigator' |
762 |
name: 'Hierarchical Navigator' |
|
763 |
min: (Point 10 10) |
|
764 |
bounds: (Rectangle 0 0 300 300) |
|
765 |
) |
|
766 |
component: |
|
10028 | 767 |
(SpecCollection |
11196 | 768 |
collection: ( |
769 |
(SubCanvasSpec |
|
770 |
name: 'ChangeList' |
|
771 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
772 |
hasHorizontalScrollBar: false |
|
773 |
hasVerticalScrollBar: false |
|
774 |
majorKey: #'Tools::HierarchicalChangeList' |
|
775 |
subAspectHolders: |
|
776 |
(Array |
|
777 |
||
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
778 |
(SubChannelInfoSpec |
11196 | 779 |
subAspect: allowAcceptHolder |
780 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
781 |
) |
11196 | 782 |
(SubChannelInfoSpec |
783 |
subAspect: allowRemoveHolder |
|
784 |
aspect: allowRemoveHolder |
|
785 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
786 |
|
11196 | 787 |
(SubChannelInfoSpec |
788 |
subAspect: inGeneratorHolder |
|
789 |
aspect: list1Holder |
|
790 |
) |
|
791 |
(SubChannelInfoSpec |
|
792 |
subAspect: menuHolder |
|
793 |
aspect: list1MenuHolder |
|
794 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
795 |
|
11196 | 796 |
(SubChannelInfoSpec |
797 |
subAspect: selectionHolder |
|
798 |
aspect: selection1Holder |
|
799 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
800 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
801 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
802 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
803 |
) |
11196 | 804 |
|
805 |
(SubChannelInfoSpec |
|
806 |
subAspect: showRemovedHolder |
|
807 |
aspect: showRemovedAspect |
|
808 |
) |
|
809 |
(SubChannelInfoSpec |
|
810 |
subAspect: showSameHolder |
|
811 |
aspect: showSameAspect |
|
812 |
) |
|
12658 | 813 |
(SubChannelInfoSpec |
814 |
subAspect: showConflictsOnlyHolder |
|
815 |
aspect: showConflictsOnlyAspect |
|
816 |
) |
|
11196 | 817 |
) |
818 |
createNewApplication: true |
|
819 |
createNewBuilder: true |
|
820 |
postBuildCallback: list1View: |
|
821 |
) |
|
822 |
) |
|
823 |
||
824 |
) |
|
10028 | 825 |
) |
826 |
! |
|
827 |
||
828 |
oneColumnNavigatorSpec |
|
829 |
"This resource specification was automatically generated |
|
830 |
by the UIPainter of ST/X." |
|
831 |
||
832 |
"Do not manually edit this!! If it is corrupted, |
|
833 |
the UIPainter may not be able to read the specification." |
|
834 |
||
835 |
" |
|
10448 | 836 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#oneColumnNavigatorSpec |
837 |
Tools::ChangeSetBrowser2 new openInterface:#oneColumnNavigatorSpec |
|
10028 | 838 |
" |
839 |
||
840 |
<resource: #canvas> |
|
841 |
||
12292 | 842 |
^ |
10028 | 843 |
#(FullSpec |
11196 | 844 |
name: oneColumnNavigatorSpec |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
845 |
window: |
10028 | 846 |
(WindowSpec |
11196 | 847 |
label: 'One Column Navigator' |
848 |
name: 'One Column Navigator' |
|
849 |
min: (Point 10 10) |
|
850 |
bounds: (Rectangle 0 0 300 300) |
|
851 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
852 |
component: |
10028 | 853 |
(SpecCollection |
11196 | 854 |
collection: ( |
855 |
(SubCanvasSpec |
|
856 |
name: 'ChangeList' |
|
857 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
858 |
hasHorizontalScrollBar: false |
|
859 |
hasVerticalScrollBar: false |
|
860 |
majorKey: #'Tools::ChangeList' |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
861 |
subAspectHolders: |
11196 | 862 |
(Array |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
863 |
|
11196 | 864 |
(SubChannelInfoSpec |
865 |
subAspect: allowAcceptHolder |
|
866 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
867 |
) |
11196 | 868 |
(SubChannelInfoSpec |
869 |
subAspect: allowRemoveHolder |
|
870 |
aspect: allowRemoveHolder |
|
871 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
872 |
|
11196 | 873 |
(SubChannelInfoSpec |
874 |
subAspect: inGeneratorHolder |
|
875 |
aspect: list1Holder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
876 |
) |
11196 | 877 |
(SubChannelInfoSpec |
878 |
subAspect: menuHolder |
|
879 |
aspect: list1MenuHolder |
|
880 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
881 |
|
11196 | 882 |
(SubChannelInfoSpec |
883 |
subAspect: selectionHolder |
|
884 |
aspect: selection1Holder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
885 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
886 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
887 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
888 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
889 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
890 |
|
11196 | 891 |
(SubChannelInfoSpec |
892 |
subAspect: showRemovedHolder |
|
893 |
aspect: showRemovedAspect |
|
894 |
) |
|
895 |
(SubChannelInfoSpec |
|
896 |
subAspect: showSameHolder |
|
897 |
aspect: showSameAspect |
|
898 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
899 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
900 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
901 |
subAspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
902 |
aspect: showTimestampHolder |
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
903 |
) |
12658 | 904 |
(SubChannelInfoSpec |
905 |
subAspect: showConflictsOnlyHolder |
|
906 |
aspect: showConflictsOnlyAspect |
|
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
907 |
|
12658 | 908 |
) |
11196 | 909 |
) |
910 |
createNewApplication: true |
|
911 |
createNewBuilder: true |
|
912 |
postBuildCallback: list1View: |
|
913 |
) |
|
914 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
915 |
|
11196 | 916 |
) |
10028 | 917 |
) |
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
918 |
|
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
919 |
"Modified: / 16-04-2013 / 16:10:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 920 |
! |
921 |
||
922 |
twoColumnNavigatorSpec |
|
923 |
"This resource specification was automatically generated |
|
924 |
by the UIPainter of ST/X." |
|
925 |
||
926 |
"Do not manually edit this!! If it is corrupted, |
|
927 |
the UIPainter may not be able to read the specification." |
|
928 |
||
929 |
" |
|
10448 | 930 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#twoColumnNavigatorSpec |
931 |
Tools::ChangeSetBrowser2 new openInterface:#twoColumnNavigatorSpec |
|
10028 | 932 |
" |
933 |
||
934 |
<resource: #canvas> |
|
935 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
936 |
^ |
10028 | 937 |
#(FullSpec |
11196 | 938 |
name: twoColumnNavigatorSpec |
939 |
window: |
|
10028 | 940 |
(WindowSpec |
11196 | 941 |
label: 'Two Column Navigator' |
942 |
name: 'Two Column Navigator' |
|
943 |
min: (Point 10 10) |
|
944 |
bounds: (Rectangle 0 0 300 300) |
|
945 |
) |
|
946 |
component: |
|
10028 | 947 |
(SpecCollection |
11196 | 948 |
collection: ( |
949 |
(VariableHorizontalPanelSpec |
|
950 |
name: 'Columns' |
|
951 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
952 |
component: |
|
953 |
(SpecCollection |
|
954 |
collection: ( |
|
955 |
(SubCanvasSpec |
|
956 |
name: 'FirstColumn' |
|
957 |
hasHorizontalScrollBar: false |
|
958 |
hasVerticalScrollBar: false |
|
959 |
majorKey: #'Tools::ChangeList' |
|
960 |
subAspectHolders: |
|
961 |
(Array |
|
962 |
||
963 |
(SubChannelInfoSpec |
|
964 |
subAspect: allowAcceptHolder |
|
965 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
966 |
) |
11196 | 967 |
(SubChannelInfoSpec |
968 |
subAspect: allowRemoveHolder |
|
969 |
aspect: allowRemoveHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
970 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
971 |
|
11196 | 972 |
(SubChannelInfoSpec |
973 |
subAspect: inGeneratorHolder |
|
974 |
aspect: list1Holder |
|
975 |
) |
|
976 |
(SubChannelInfoSpec |
|
977 |
subAspect: menuHolder |
|
978 |
aspect: list1MenuHolder |
|
979 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
980 |
|
11196 | 981 |
(SubChannelInfoSpec |
982 |
subAspect: outGeneratorHolder |
|
983 |
aspect: list2Holder |
|
984 |
) |
|
985 |
(SubChannelInfoSpec |
|
986 |
subAspect: selectionHolder |
|
987 |
aspect: selection1Holder |
|
988 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
989 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
990 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
991 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
992 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
993 |
) |
11196 | 994 |
(SubChannelInfoSpec |
995 |
subAspect: showRemovedHolder |
|
996 |
aspect: showRemovedAspect |
|
997 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
998 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
999 |
(SubChannelInfoSpec |
11196 | 1000 |
subAspect: showSameHolder |
1001 |
aspect: showSameAspect |
|
1002 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1003 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1004 |
subAspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1005 |
aspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1006 |
) |
12658 | 1007 |
(SubChannelInfoSpec |
1008 |
subAspect: showConflictsOnlyHolder |
|
1009 |
aspect: showConflictsOnlyAspect |
|
1010 |
) |
|
11196 | 1011 |
) |
1012 |
createNewApplication: true |
|
1013 |
createNewBuilder: true |
|
1014 |
postBuildCallback: list1View: |
|
1015 |
) |
|
1016 |
(SubCanvasSpec |
|
1017 |
name: 'SecondColumn' |
|
1018 |
hasHorizontalScrollBar: false |
|
1019 |
hasVerticalScrollBar: false |
|
1020 |
majorKey: #'Tools::ChangeList' |
|
1021 |
subAspectHolders: |
|
1022 |
(Array |
|
1023 |
||
1024 |
(SubChannelInfoSpec |
|
1025 |
subAspect: allowAcceptHolder |
|
1026 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1027 |
) |
11196 | 1028 |
(SubChannelInfoSpec |
1029 |
subAspect: allowRemoveHolder |
|
1030 |
aspect: allowRemoveHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1031 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1032 |
|
11196 | 1033 |
(SubChannelInfoSpec |
1034 |
subAspect: inGeneratorHolder |
|
1035 |
aspect: list2Holder |
|
1036 |
) |
|
1037 |
(SubChannelInfoSpec |
|
1038 |
subAspect: menuHolder |
|
1039 |
aspect: list2MenuHolder |
|
1040 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1041 |
|
11196 | 1042 |
(SubChannelInfoSpec |
1043 |
subAspect: selectionHolder |
|
1044 |
aspect: selection2Holder |
|
1045 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1046 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1047 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1048 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1049 |
) |
11196 | 1050 |
|
1051 |
(SubChannelInfoSpec |
|
1052 |
subAspect: showRemovedHolder |
|
1053 |
aspect: showRemovedAspect |
|
1054 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1055 |
(SubChannelInfoSpec |
11196 | 1056 |
subAspect: showSameHolder |
1057 |
aspect: showSameAspect |
|
1058 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1059 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1060 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1061 |
subAspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1062 |
aspect: showTimestampHolder |
12805
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1063 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1064 |
(SubChannelInfoSpec |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1065 |
subAspect: showConflictsOnlyHolder |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1066 |
aspect: showConflictsOnlyAspect |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1067 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1068 |
|
11196 | 1069 |
) |
1070 |
createNewApplication: true |
|
1071 |
createNewBuilder: true |
|
1072 |
postBuildCallback: list2View: |
|
1073 |
) |
|
1074 |
) |
|
1075 |
handles: (Any 0.5 1.0) |
|
1076 |
) |
|
1077 |
) |
|
1078 |
||
1079 |
) |
|
12805
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1080 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1081 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1082 |
|
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1083 |
"Modified: / 01-05-2013 / 11:22:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1084 |
! |
1085 |
||
1086 |
windowSpec |
|
1087 |
"This resource specification was automatically generated |
|
1088 |
by the UIPainter of ST/X." |
|
1089 |
||
1090 |
"Do not manually edit this!! If it is corrupted, |
|
1091 |
the UIPainter may not be able to read the specification." |
|
1092 |
||
1093 |
" |
|
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
1094 |
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
|
1095 |
Tools::ChangeSetBrowser2 new openInterface:#windowSpec |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
1096 |
Tools::ChangeSetBrowser2 open |
10028 | 1097 |
" |
1098 |
||
1099 |
<resource: #canvas> |
|
1100 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1101 |
^ |
10028 | 1102 |
#(FullSpec |
12292 | 1103 |
name: windowSpec |
1104 |
window: |
|
10028 | 1105 |
(WindowSpec |
12292 | 1106 |
label: 'ChangeSet browser' |
1107 |
name: 'ChangeSet browser' |
|
1108 |
labelChannel: titleHolder |
|
1109 |
min: (Point 10 10) |
|
1110 |
bounds: (Rectangle 0 0 800 600) |
|
1111 |
menu: mainMenu |
|
1112 |
) |
|
1113 |
component: |
|
10028 | 1114 |
(SpecCollection |
12292 | 1115 |
collection: ( |
1116 |
(MenuPanelSpec |
|
1117 |
name: 'ToolBar' |
|
1118 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
1119 |
menu: toolbarMenu |
|
1120 |
textDefault: true |
|
1121 |
) |
|
1122 |
(SubCanvasSpec |
|
1123 |
name: 'InfoPanel' |
|
1124 |
layout: (LayoutFrame 0 0 30 0 0 1 70 0) |
|
1125 |
level: 0 |
|
1126 |
initiallyInvisible: true |
|
1127 |
hasHorizontalScrollBar: false |
|
1128 |
hasVerticalScrollBar: false |
|
1129 |
clientKey: infoPanel |
|
1130 |
createNewBuilder: false |
|
1131 |
) |
|
1132 |
(UISubSpecification |
|
1133 |
name: 'Contents' |
|
1134 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
1135 |
minorKey: windowSpecWithoutToolbar |
|
1136 |
) |
|
1137 |
) |
|
1138 |
||
1139 |
) |
|
10028 | 1140 |
) |
1141 |
! |
|
1142 |
||
1143 |
windowSpecForEmbedding |
|
1144 |
||
1145 |
^self windowSpecWithoutToolbar |
|
1146 |
! |
|
1147 |
||
1148 |
windowSpecWithoutToolbar |
|
1149 |
"This resource specification was automatically generated |
|
1150 |
by the UIPainter of ST/X." |
|
1151 |
||
1152 |
"Do not manually edit this!! If it is corrupted, |
|
1153 |
the UIPainter may not be able to read the specification." |
|
1154 |
||
1155 |
" |
|
10333 | 1156 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#windowSpecWithoutToolbar |
1157 |
Tools::ChangeSetBrowser2 new openInterface:#windowSpecWithoutToolbar |
|
10028 | 1158 |
" |
1159 |
||
1160 |
<resource: #canvas> |
|
1161 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1162 |
^ |
10028 | 1163 |
#(FullSpec |
12292 | 1164 |
name: windowSpecWithoutToolbar |
1165 |
window: |
|
10028 | 1166 |
(WindowSpec |
12292 | 1167 |
label: 'ChangeSet browser' |
1168 |
name: 'ChangeSet browser' |
|
1169 |
min: (Point 10 10) |
|
1170 |
bounds: (Rectangle 0 0 653 488) |
|
1171 |
menu: mainMenu |
|
1172 |
) |
|
1173 |
component: |
|
10028 | 1174 |
(SpecCollection |
12292 | 1175 |
collection: ( |
1176 |
(VariableVerticalPanelSpec |
|
1177 |
name: 'VerticalPanel' |
|
1178 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
1179 |
component: |
|
1180 |
(SpecCollection |
|
1181 |
collection: ( |
|
1182 |
(SubCanvasSpec |
|
1183 |
name: 'NavigatorPanel' |
|
1184 |
hasHorizontalScrollBar: false |
|
1185 |
hasVerticalScrollBar: false |
|
1186 |
specHolder: navigatorSpecHolder |
|
1187 |
createNewBuilder: false |
|
1188 |
) |
|
1189 |
(SubCanvasSpec |
|
1190 |
name: 'TextDiffTool' |
|
1191 |
hasHorizontalScrollBar: false |
|
1192 |
hasVerticalScrollBar: false |
|
1193 |
majorKey: #'Tools::TextDiff2Tool' |
|
1194 |
minorKey: windowSpecForEmbedding |
|
1195 |
subAspectHolders: |
|
1196 |
(Array |
|
1197 |
||
1198 |
(SubChannelInfoSpec |
|
1199 |
subAspect: classHolder |
|
1200 |
aspect: classHolder |
|
1201 |
) |
|
1202 |
(SubChannelInfoSpec |
|
1203 |
subAspect: languageHolder |
|
1204 |
aspect: languageHolder |
|
1205 |
) |
|
1206 |
(SubChannelInfoSpec |
|
1207 |
subAspect: codeAspectHolder |
|
1208 |
aspect: codeAspectHolder |
|
1209 |
) |
|
1210 |
||
1211 |
(SubChannelInfoSpec |
|
1212 |
subAspect: labelAHolder |
|
1213 |
aspect: labelAHolder |
|
1214 |
) |
|
1215 |
(SubChannelInfoSpec |
|
1216 |
subAspect: labelBHolder |
|
1217 |
aspect: labelBHolder |
|
1218 |
) |
|
1219 |
||
1220 |
(SubChannelInfoSpec |
|
1221 |
subAspect: textAHolder |
|
1222 |
aspect: changeSourceHolder |
|
1223 |
) |
|
1224 |
(SubChannelInfoSpec |
|
1225 |
subAspect: textBHolder |
|
1226 |
aspect: imageSourceHolder |
|
1227 |
) |
|
1228 |
) |
|
1229 |
createNewApplication: true |
|
1230 |
createNewBuilder: true |
|
1231 |
) |
|
1232 |
) |
|
1233 |
||
1234 |
) |
|
1235 |
handles: (Any 0.5 1.0) |
|
1236 |
) |
|
1237 |
) |
|
1238 |
||
1239 |
) |
|
10028 | 1240 |
) |
10953 | 1241 |
|
1242 |
"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
|
1243 |
"Modified: / 16-03-2012 / 13:09:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1244 |
! ! |
1245 |
||
1246 |
!ChangeSetBrowser2 class methodsFor:'menu specs'! |
|
1247 |
||
1248 |
changeMenu |
|
1249 |
"This resource specification was automatically generated |
|
1250 |
by the MenuEditor of ST/X." |
|
1251 |
||
1252 |
"Do not manually edit this!! If it is corrupted, |
|
1253 |
the MenuEditor may not be able to read the specification." |
|
1254 |
||
10658 | 1255 |
|
10028 | 1256 |
" |
10448 | 1257 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu |
1258 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu)) startUp |
|
10028 | 1259 |
" |
1260 |
||
1261 |
<resource: #menu> |
|
1262 |
||
13674
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1263 |
^ |
10028 | 1264 |
#(Menu |
10643 | 1265 |
( |
1266 |
(MenuItem |
|
1267 |
enabled: hasChangeSelectedAndNotRemoved: |
|
1268 |
label: 'Apply' |
|
1269 |
itemValue: changeMenuApplySelection: |
|
11196 | 1270 |
isVisible: allowAcceptHolder |
10643 | 1271 |
shortcutKey: Accept |
1272 |
auxValue: 100 |
|
1273 |
) |
|
1274 |
(MenuItem |
|
1275 |
label: 'Apply all' |
|
1276 |
itemValue: changeMenuApply: |
|
11196 | 1277 |
isVisible: allowAcceptHolder |
10643 | 1278 |
) |
1279 |
(MenuItem |
|
1280 |
label: '-' |
|
11196 | 1281 |
isVisible: allowAcceptHolder |
10643 | 1282 |
) |
1283 |
(MenuItem |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1284 |
label: 'Delete (selected)' |
10643 | 1285 |
itemValue: changeMenuDeleteSelection: |
1286 |
nameKey: Delete |
|
11196 | 1287 |
isVisible: allowRemoveHolder |
10643 | 1288 |
shortcutKey: Delete |
1289 |
) |
|
1290 |
(MenuItem |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1291 |
label: 'Delete (unselected)' |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1292 |
itemValue: changeMenuDeleteSelectionInverted: |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1293 |
nameKey: Delete |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1294 |
isVisible: allowRemoveHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1295 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1296 |
(MenuItem |
10643 | 1297 |
label: 'Undelete' |
1298 |
itemValue: changeMenuUndeleteSelection: |
|
1299 |
nameKey: Undelete |
|
11196 | 1300 |
isVisible: allowRemoveHolder |
10643 | 1301 |
) |
1302 |
(MenuItem |
|
1303 |
label: '-' |
|
11196 | 1304 |
isVisible: allowRemoveHolder |
10643 | 1305 |
) |
1306 |
(MenuItem |
|
1307 |
label: 'Select...' |
|
13674
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1308 |
submenu: |
10643 | 1309 |
(Menu |
1310 |
( |
|
1311 |
(MenuItem |
|
1312 |
label: 'Select same' |
|
1313 |
itemValue: changeMenuSelectSame: |
|
1314 |
) |
|
1315 |
(MenuItem |
|
1316 |
label: 'Select additions (new classes/methods)' |
|
1317 |
itemValue: changeMenuSelectAdditions: |
|
1318 |
) |
|
1319 |
(MenuItem |
|
1320 |
label: 'Select removals' |
|
1321 |
itemValue: changeMenuSelectRemovals: |
|
1322 |
) |
|
1323 |
(MenuItem |
|
1324 |
label: 'Select differences' |
|
1325 |
itemValue: changeMenuSelectDifferences: |
|
1326 |
) |
|
1327 |
(MenuItem |
|
1328 |
label: '-' |
|
1329 |
) |
|
1330 |
(MenuItem |
|
1331 |
label: 'Select all' |
|
1332 |
itemValue: changeMenuSelectAll: |
|
11677 | 1333 |
shortcutKey: SelectAll |
10643 | 1334 |
) |
1335 |
(MenuItem |
|
1336 |
label: 'Select none' |
|
1337 |
itemValue: changeMenuSelectNone: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1338 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1339 |
(MenuItem |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1340 |
label: 'Invert Selection' |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1341 |
itemValue: changeMenuSelectInversion: |
13674
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1342 |
) |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1343 |
(MenuItem |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1344 |
label: '-' |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1345 |
) |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1346 |
(MenuItem |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1347 |
label: 'Select version_XXX methods' |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1348 |
itemValue: changeMenuSelectVersionMethods: |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1349 |
) |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1350 |
(MenuItem |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1351 |
label: 'Select copyright methods' |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
1352 |
itemValue: changeMenuSelectCopyrightMethods: |
10643 | 1353 |
) |
1354 |
(MenuItem |
|
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
1355 |
label: 'Select class initialize doIts' |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
1356 |
itemValue: changeMenuSelectClassInitializeDoIts: |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
1357 |
) |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
1358 |
(MenuItem |
10643 | 1359 |
label: '-' |
1360 |
) |
|
1361 |
(MenuItem |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1362 |
label: 'Select Using Block...' |
10643 | 1363 |
itemValue: changeMenuSelectUsingBlock: |
1364 |
) |
|
1365 |
) |
|
1366 |
nil |
|
1367 |
nil |
|
1368 |
) |
|
1369 |
) |
|
1370 |
(MenuItem |
|
1371 |
label: '-' |
|
1372 |
) |
|
1373 |
(MenuItem |
|
12658 | 1374 |
enabled: notShowConflictsOnlyAspect |
10643 | 1375 |
label: 'Show Deleted' |
11196 | 1376 |
isVisible: allowRemoveHolder |
10643 | 1377 |
indication: showRemovedAspect |
1378 |
) |
|
1379 |
(MenuItem |
|
12658 | 1380 |
enabled: notShowConflictsOnlyAspect |
10643 | 1381 |
label: 'Show Same' |
1382 |
indication: showSameAspect |
|
1383 |
) |
|
1384 |
(MenuItem |
|
12658 | 1385 |
label: 'Show Conflicts Only' |
1386 |
indication: showConflictsOnlyAspect |
|
1387 |
) |
|
1388 |
(MenuItem |
|
10643 | 1389 |
label: '-' |
1390 |
) |
|
1391 |
(MenuItem |
|
1392 |
label: 'Inspect change' |
|
1393 |
itemValue: changeMenuInspect: |
|
1394 |
) |
|
1395 |
(MenuItem |
|
1396 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
10658 | 1397 |
label: 'Browse Method(s)' |
10643 | 1398 |
itemValue: changeMenuBrowse: |
1399 |
) |
|
1400 |
) |
|
1401 |
nil |
|
1402 |
nil |
|
10028 | 1403 |
) |
1404 |
! |
|
1405 |
||
10666 | 1406 |
changeMenu1 |
1407 |
<resource: #menu> |
|
1408 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1409 |
^self changeMenu |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1410 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1411 |
"Modified: / 17-05-2012 / 22:51:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 1412 |
! |
1413 |
||
1414 |
changeMenu2 |
|
1415 |
<resource: #menu> |
|
1416 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1417 |
^self changeMenu |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1418 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1419 |
"Modified: / 17-05-2012 / 22:51:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 1420 |
! |
1421 |
||
10028 | 1422 |
mainMenu |
1423 |
"This resource specification was automatically generated |
|
1424 |
by the MenuEditor of ST/X." |
|
1425 |
||
1426 |
"Do not manually edit this!! If it is corrupted, |
|
1427 |
the MenuEditor may not be able to read the specification." |
|
1428 |
||
10682 | 1429 |
|
10028 | 1430 |
" |
10448 | 1431 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#mainMenu |
1432 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 mainMenu)) startUp |
|
10028 | 1433 |
" |
1434 |
||
1435 |
<resource: #menu> |
|
1436 |
||
12292 | 1437 |
^ |
10028 | 1438 |
#(Menu |
10682 | 1439 |
( |
1440 |
(MenuItem |
|
1441 |
label: 'File' |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1442 |
submenu: |
10682 | 1443 |
(Menu |
1444 |
( |
|
1445 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1446 |
label: 'New' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1447 |
submenu: |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1448 |
(Menu |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1449 |
( |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1450 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1451 |
activeHelpKey: fileNew |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1452 |
label: 'New Changeset' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1453 |
itemValue: doOpenNew |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1454 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1455 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1456 |
label: 'New Window' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1457 |
itemValue: doOpenNewWindow |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1458 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1459 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1460 |
nil |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1461 |
nil |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1462 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1463 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1464 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1465 |
label: '-' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1466 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1467 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1468 |
activeHelpKey: fileOpenSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1469 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1470 |
label: 'Spawn Browser on Selection' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1471 |
itemValue: doOpenOnSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1472 |
isVisible: allowOpenHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1473 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1474 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1475 |
activeHelpKey: fileOpenSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1476 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1477 |
label: 'Spawn on Selection' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1478 |
itemValue: doOpenOnSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1479 |
isVisible: allowOpenHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1480 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1481 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1482 |
label: '-' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1483 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1484 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1485 |
activeHelpKey: fileLoad |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1486 |
enabled: isWorkingNotHolder |
11034 | 1487 |
label: 'Open...' |
10682 | 1488 |
itemValue: doOpen |
1489 |
isVisible: allowOpenHolder |
|
1490 |
shortcutKey: Ctrlo |
|
1491 |
) |
|
1492 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1493 |
activeHelpKey: fileOpenCurrent |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1494 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1495 |
label: 'Open Current' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1496 |
itemValue: doOpenCurrent |
10682 | 1497 |
isVisible: allowOpenHolder |
1498 |
) |
|
1499 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1500 |
activeHelpKey: fileOpenCurrent |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1501 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1502 |
label: 'Open Cypress Package' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1503 |
itemValue: doOpenCypress |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1504 |
isVisible: allowOpenHolderAndCypressPresent |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1505 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1506 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1507 |
activeHelpKey: fileSaveAs |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1508 |
enabled: isWorkingNotHolder |
10682 | 1509 |
label: 'Save' |
1510 |
itemValue: doSave |
|
1511 |
) |
|
1512 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1513 |
enabled: isWorkingNotHolder |
10682 | 1514 |
label: 'Save As...' |
1515 |
itemValue: doSaveAs |
|
1516 |
) |
|
1517 |
(MenuItem |
|
1518 |
label: '-' |
|
1519 |
) |
|
1520 |
(MenuItem |
|
1521 |
label: 'Exit' |
|
1522 |
itemValue: closeRequest |
|
1523 |
) |
|
1524 |
) |
|
1525 |
nil |
|
1526 |
nil |
|
1527 |
) |
|
1528 |
) |
|
1529 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1530 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1531 |
label: 'Changes' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1532 |
isVisible: isTwoColumnHolderNot |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1533 |
submenuChannel: list1MenuHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1534 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1535 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1536 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1537 |
label: 'Left' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1538 |
isVisible: isTwoColumnHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1539 |
submenuChannel: list1MenuHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1540 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1541 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1542 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1543 |
label: 'Right' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1544 |
isVisible: isTwoColumnHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1545 |
submenuChannel: list2MenuHolder |
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1546 |
) |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1547 |
(MenuItem |
10682 | 1548 |
label: 'View' |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1549 |
submenu: |
10682 | 1550 |
(Menu |
1551 |
( |
|
1552 |
(MenuItem |
|
1553 |
label: 'List' |
|
1554 |
choice: navigatorSpecHolder |
|
1555 |
choiceValue: oneColumnNavigatorSpec |
|
1556 |
) |
|
1557 |
(MenuItem |
|
1558 |
label: 'Hierarchical List' |
|
1559 |
choice: navigatorSpecHolder |
|
1560 |
choiceValue: hierarchicalNavigatorSpec |
|
1561 |
) |
|
1562 |
(MenuItem |
|
1563 |
label: 'Browser Like' |
|
1564 |
choice: navigatorSpecHolder |
|
1565 |
choiceValue: twoColumnNavigatorSpec |
|
1566 |
) |
|
1567 |
(MenuItem |
|
1568 |
label: '-' |
|
1569 |
) |
|
1570 |
(MenuItem |
|
12658 | 1571 |
enabled: notShowConflictsOnlyAspect |
10682 | 1572 |
label: 'Show Deleted' |
1573 |
indication: showRemovedAspect |
|
1574 |
) |
|
1575 |
(MenuItem |
|
12658 | 1576 |
enabled: notShowConflictsOnlyAspect |
10682 | 1577 |
label: 'Show Same' |
1578 |
indication: showSameAspect |
|
1579 |
) |
|
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1580 |
(MenuItem |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1581 |
label: 'Show Conflicts Only' |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1582 |
indication: showConflictsOnlyAspect |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1583 |
) |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1584 |
(MenuItem |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1585 |
label: '-' |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1586 |
) |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1587 |
(MenuItem |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1588 |
label: 'Show Filter' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1589 |
indication: showFilterHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1590 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1591 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1592 |
label: '-' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1593 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1594 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1595 |
label: 'Show Timestamp' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1596 |
indication: showTimestampHolder |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1597 |
) |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1598 |
(MenuItem |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1599 |
label: 'Update' |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1600 |
itemValue: menuUpdate |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1601 |
) |
10682 | 1602 |
) |
1603 |
nil |
|
1604 |
nil |
|
1605 |
) |
|
1606 |
) |
|
1607 |
(MenuItem |
|
1608 |
label: 'Loading' |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1609 |
submenu: |
10682 | 1610 |
(Menu |
1611 |
( |
|
1612 |
(MenuItem |
|
1613 |
label: 'Set Target Package...' |
|
1614 |
itemValue: setTargetPackage |
|
1615 |
) |
|
1616 |
(MenuItem |
|
1617 |
label: 'Set Target Namespace...' |
|
1618 |
itemValue: setTargetNamespace |
|
1619 |
) |
|
1620 |
(MenuItem |
|
1621 |
label: '-' |
|
1622 |
) |
|
1623 |
(MenuItem |
|
1624 |
label: 'Update Changefile' |
|
1625 |
indication: updateChangeFileHolder |
|
1626 |
) |
|
1627 |
) |
|
1628 |
nil |
|
1629 |
nil |
|
1630 |
) |
|
1631 |
) |
|
12668
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1632 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1633 |
label: 'MENU_Help' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1634 |
startGroup: conditionalRight |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1635 |
submenu: |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1636 |
(Menu |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1637 |
( |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1638 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1639 |
label: 'ChangesBrowser Documentation' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1640 |
itemValue: openHTMLDocument: |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1641 |
argument: 'tools/cbrowser/TOP.html' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1642 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1643 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1644 |
label: '-' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1645 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1646 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1647 |
label: 'About ChangesBrowser...' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1648 |
itemValue: openAboutThisApplication |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1649 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1650 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1651 |
nil |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1652 |
nil |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1653 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1654 |
) |
10682 | 1655 |
) |
1656 |
nil |
|
1657 |
nil |
|
10028 | 1658 |
) |
11034 | 1659 |
|
11709 | 1660 |
"Modified: / 27-07-2012 / 21:17:20 / cg" |
10028 | 1661 |
! |
1662 |
||
1663 |
toolbarMenu |
|
1664 |
"This resource specification was automatically generated |
|
1665 |
by the MenuEditor of ST/X." |
|
1666 |
||
1667 |
"Do not manually edit this!! If it is corrupted, |
|
1668 |
the MenuEditor may not be able to read the specification." |
|
1669 |
||
11034 | 1670 |
|
10028 | 1671 |
" |
11034 | 1672 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#toolbarMenu |
1673 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 toolbarMenu)) startUp |
|
10028 | 1674 |
" |
1675 |
||
1676 |
<resource: #menu> |
|
1677 |
||
12292 | 1678 |
^ |
10028 | 1679 |
#(Menu |
12292 | 1680 |
( |
1681 |
(MenuItem |
|
1682 |
activeHelpKey: fileLoad |
|
1683 |
enabled: isWorkingNotHolder |
|
1684 |
label: 'Load' |
|
1685 |
itemValue: doOpen |
|
1686 |
translateLabel: true |
|
1687 |
isButton: true |
|
1688 |
labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon) |
|
1689 |
) |
|
1690 |
(MenuItem |
|
1691 |
activeHelpKey: fileSave |
|
1692 |
enabled: isWorkingNotHolder |
|
1693 |
label: 'Save' |
|
1694 |
itemValue: doSave |
|
1695 |
translateLabel: true |
|
1696 |
isButton: true |
|
1697 |
labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon) |
|
1698 |
) |
|
1699 |
(MenuItem |
|
1700 |
label: '-' |
|
1701 |
) |
|
1702 |
(MenuItem |
|
1703 |
activeHelpKey: applyLine |
|
1704 |
enabled: hasSelectionHolder |
|
1705 |
label: 'Apply' |
|
1706 |
itemValue: doApply |
|
1707 |
translateLabel: true |
|
1708 |
isButton: true |
|
1709 |
labelImage: (ResourceRetriever nil applyIcon) |
|
1710 |
) |
|
1711 |
(MenuItem |
|
1712 |
activeHelpKey: applyToEnd |
|
1713 |
enabled: hasSelectionHolder |
|
1714 |
label: 'Apply To End' |
|
1715 |
itemValue: doApplyToEnd |
|
1716 |
translateLabel: true |
|
1717 |
isButton: true |
|
1718 |
labelImage: (ResourceRetriever nil applyToEndIcon) |
|
1719 |
) |
|
1720 |
(MenuItem |
|
1721 |
activeHelpKey: applyFromLastSnapshot |
|
1722 |
enabled: hasSelectionHolder |
|
1723 |
label: 'Apply From Last Snapshot' |
|
1724 |
itemValue: doApplyFromLastSnapshot |
|
1725 |
translateLabel: true |
|
1726 |
isButton: true |
|
1727 |
labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon) |
|
1728 |
) |
|
1729 |
(MenuItem |
|
1730 |
label: '-' |
|
1731 |
) |
|
1732 |
(MenuItem |
|
1733 |
activeHelpKey: deleteLine |
|
1734 |
enabled: hasSelectionHolder |
|
1735 |
label: 'Delete' |
|
1736 |
itemValue: doDelete |
|
1737 |
translateLabel: true |
|
1738 |
isButton: true |
|
1739 |
labelImage: (ResourceRetriever nil deleteIcon) |
|
1740 |
) |
|
1741 |
(MenuItem |
|
1742 |
activeHelpKey: deleteToEnd |
|
1743 |
enabled: hasSelectionHolder |
|
1744 |
label: 'Delete To End' |
|
1745 |
itemValue: doDeleteToEnd |
|
1746 |
translateLabel: true |
|
1747 |
isButton: true |
|
1748 |
labelImage: (ResourceRetriever nil deleteToEndIcon) |
|
1749 |
) |
|
1750 |
(MenuItem |
|
1751 |
activeHelpKey: deleteCompress |
|
1752 |
enabled: isWorkingNotHolder |
|
1753 |
label: 'Compress' |
|
1754 |
itemValue: doCompress |
|
1755 |
translateLabel: true |
|
1756 |
isButton: true |
|
1757 |
isVisible: showingRegularChangesetHolder |
|
1758 |
labelImage: (ResourceRetriever nil compressIcon) |
|
1759 |
) |
|
1760 |
(MenuItem |
|
1761 |
label: '-' |
|
1762 |
isVisible: showingRegularChangesetHolder |
|
1763 |
) |
|
1764 |
(MenuItem |
|
1765 |
activeHelpKey: testFindPreviousSnapshot |
|
1766 |
enabled: hasSelectionHolder |
|
1767 |
label: 'Find Previous Snapshot' |
|
1768 |
itemValue: doFindSnapshot: |
|
1769 |
translateLabel: true |
|
1770 |
isButton: true |
|
1771 |
isVisible: showingRegularChangesetHolder |
|
1772 |
labelImage: (ResourceRetriever nil findPreviousSnapshotIcon) |
|
1773 |
argument: 'previous' |
|
1774 |
) |
|
1775 |
(MenuItem |
|
1776 |
activeHelpKey: testFindNextSnapshot |
|
1777 |
enabled: hasSelectionHolder |
|
1778 |
label: 'Find Next Snapshot' |
|
1779 |
itemValue: doFindSnapshot: |
|
1780 |
translateLabel: true |
|
1781 |
isButton: true |
|
1782 |
isVisible: showingRegularChangesetHolder |
|
1783 |
labelImage: (ResourceRetriever nil findNextSnapshotIcon) |
|
1784 |
argument: 'next' |
|
1785 |
) |
|
1786 |
) |
|
1787 |
nil |
|
1788 |
nil |
|
10028 | 1789 |
) |
1790 |
! ! |
|
1791 |
||
1792 |
!ChangeSetBrowser2 class methodsFor:'plugIn spec'! |
|
1793 |
||
1794 |
aspectSelectors |
|
1795 |
"This resource specification was automatically generated |
|
1796 |
by the UIPainter of ST/X." |
|
1797 |
||
1798 |
"Do not manually edit this. If it is corrupted, |
|
1799 |
the UIPainter may not be able to read the specification." |
|
1800 |
||
1801 |
"Return a description of exported aspects; |
|
1802 |
these can be connected to aspects of an embedding application |
|
1803 |
(if this app is embedded in a subCanvas)." |
|
1804 |
||
1805 |
^ #( |
|
12292 | 1806 |
#changesetHolder |
10028 | 1807 |
). |
1808 |
||
1809 |
! ! |
|
1810 |
||
1811 |
!ChangeSetBrowser2 methodsFor:'accessing'! |
|
1812 |
||
11196 | 1813 |
allowAccept: aBoolean |
1814 |
||
1815 |
^self allowAcceptHolder value: aBoolean |
|
1816 |
||
1817 |
"Created: / 24-01-2012 / 19:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 1818 |
! |
1819 |
||
1820 |
allowOpen: aBoolean |
|
1821 |
||
1822 |
self allowOpenHolder value: aBoolean |
|
1823 |
||
1824 |
"Created: / 26-10-2010 / 23:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1825 |
! |
|
1826 |
||
11196 | 1827 |
allowRemove: aBoolean |
1828 |
||
1829 |
^self allowRemoveHolder value: aBoolean |
|
1830 |
||
1831 |
"Created: / 24-01-2012 / 20:00:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1832 |
! |
|
1833 |
||
10028 | 1834 |
beHierarchical |
1835 |
||
1836 |
^self navigatorSpecHolder value: #hierarchicalNavigatorSpec |
|
1837 |
||
1838 |
"Modified: / 14-10-2010 / 15:52:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1839 |
! |
|
1840 |
||
1841 |
beOneColumn |
|
1842 |
||
1843 |
^self navigatorSpecHolder value: #oneColumnNavigatorSpec |
|
1844 |
||
1845 |
"Modified: / 14-10-2010 / 15:52:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1846 |
! |
|
1847 |
||
1848 |
beTwoColumn |
|
1849 |
||
1850 |
^self navigatorSpecHolder value: #twoColumnNavigatorSpec |
|
1851 |
||
1852 |
"Modified: / 14-10-2010 / 15:51:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1853 |
! |
|
1854 |
||
1855 |
changeset |
|
1856 |
||
1857 |
^self changesetHolder value |
|
1858 |
! |
|
1859 |
||
1860 |
changeset: aChangeSet |
|
1861 |
||
1862 |
self changesetHolder value: aChangeSet |
|
1863 |
! |
|
1864 |
||
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1865 |
codeAspect |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1866 |
^self codeAspectHolder value |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1867 |
|
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1868 |
"Created: / 04-04-2013 / 18:28:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1869 |
! |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1870 |
|
10028 | 1871 |
readOnly: aBoolean |
11677 | 1872 |
self allowAcceptHolder value:false. |
10028 | 1873 |
|
1874 |
"Created: / 20-07-2010 / 09:48:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11677 | 1875 |
"Modified: / 26-07-2012 / 14:31:50 / cg" |
10028 | 1876 |
! |
1877 |
||
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1878 |
selectedChanges |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1879 |
| sel | |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1880 |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1881 |
sel := selection2Holder value. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1882 |
sel isEmptyOrNil ifTrue:[ |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1883 |
sel := selection1Holder value. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1884 |
]. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1885 |
^ sel select:[:each | each notNil]. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1886 |
! |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1887 |
|
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1888 |
showFilter: aBoolean |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1889 |
self showFilterHolder value: aBoolean |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1890 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1891 |
"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
|
1892 |
! |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1893 |
|
10682 | 1894 |
targetNamespace:something |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
1895 |
targetNameSpaceName := something. |
10682 | 1896 |
! |
1897 |
||
1898 |
targetPackage:something |
|
1899 |
targetPackage := something. |
|
1900 |
! |
|
1901 |
||
10028 | 1902 |
theSingleSelectedChange |
10448 | 1903 |
| change sel | |
10028 | 1904 |
change := nil. |
10448 | 1905 |
sel := selection2Holder value. |
1906 |
sel isNil ifTrue:[ |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1907 |
sel := selection1Holder value. |
10448 | 1908 |
]. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1909 |
sel isNil ifTrue:[ |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1910 |
^nil |
10448 | 1911 |
]. |
1912 |
sel do: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1913 |
[:each| |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1914 |
change notNil ifTrue:[nil]. |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1915 |
change isNil ifTrue:[change := each]]. |
10028 | 1916 |
^change |
10448 | 1917 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1918 |
"Modified: / 26-07-2012 / 19:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1919 |
! |
1920 |
||
1921 |
title: aString |
|
1922 |
||
1923 |
self titleHolder value: aString |
|
1924 |
||
1925 |
"Created: / 26-10-2010 / 23:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1926 |
! ! |
|
1927 |
||
1928 |
!ChangeSetBrowser2 methodsFor:'accessing - defaults'! |
|
1929 |
||
1930 |
defaultTitle |
|
1931 |
^ 'No changeset' |
|
1932 |
||
1933 |
"Modified: / 08-04-2011 / 10:10:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1934 |
! ! |
|
1935 |
||
1936 |
!ChangeSetBrowser2 methodsFor:'accessing - menus'! |
|
1937 |
||
10448 | 1938 |
list1MenuHolder |
10666 | 1939 |
^ [ |
12292 | 1940 |
|menu| |
1941 |
||
1942 |
menu := builder menuFor:#changeMenu1. |
|
1943 |
menu allItemsDo:[:item | item argument:list1 ]. |
|
1944 |
menu |
|
10448 | 1945 |
] |
10028 | 1946 |
|
10448 | 1947 |
"Created: / 04-08-2011 / 18:11:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 1948 |
"Modified (format): / 05-09-2011 / 16:07:20 / cg" |
10448 | 1949 |
! |
1950 |
||
1951 |
list2MenuHolder |
|
10666 | 1952 |
^ [ |
12292 | 1953 |
|menu| |
1954 |
||
1955 |
menu := builder menuFor:#changeMenu2. |
|
1956 |
menu allItemsDo:[:item | item argument:list2 ]. |
|
1957 |
menu |
|
10448 | 1958 |
] |
1959 |
||
1960 |
"Created: / 04-08-2011 / 18:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10666 | 1961 |
"Modified (format): / 05-09-2011 / 16:07:34 / cg" |
10028 | 1962 |
! ! |
1963 |
||
1964 |
!ChangeSetBrowser2 methodsFor:'actions'! |
|
1965 |
||
1966 |
accept: source |
|
1967 |
||
10880 | 1968 |
| entry chg | |
1969 |
(entry := self theSingleSelectedChange) isNil ifTrue:[^self]. |
|
1970 |
chg := entry change. |
|
1971 |
chg isMethodCodeChange ifTrue: |
|
12292 | 1972 |
[chg source: source asString] |
10028 | 1973 |
|
1974 |
"Modified: / 29-11-2010 / 22:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10880 | 1975 |
"Modified: / 18-11-2011 / 14:56:53 / cg" |
10028 | 1976 |
! |
1977 |
||
1978 |
postBuildSourceView: aView |
|
1979 |
||
10309 | 1980 |
sourceView := aView. |
1981 |
||
10345 | 1982 |
"Modified: / 19-07-2011 / 19:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1983 |
! ! |
1984 |
||
1985 |
!ChangeSetBrowser2 methodsFor:'aspects'! |
|
1986 |
||
11196 | 1987 |
allowAcceptHolder |
10028 | 1988 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
1989 |
||
11196 | 1990 |
allowAcceptHolder isNil ifTrue:[ |
12292 | 1991 |
allowAcceptHolder := ValueHolder with: true. |
10028 | 1992 |
]. |
11196 | 1993 |
^ allowAcceptHolder |
10028 | 1994 |
|
1995 |
"Modified: / 24-10-2009 / 19:56:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11196 | 1996 |
"Created: / 24-01-2012 / 19:50:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1997 |
! |
1998 |
||
1999 |
allowOpenHolder |
|
2000 |
"return/create the 'allowOpenHolder' value holder (automatically generated)" |
|
2001 |
||
2002 |
allowOpenHolder isNil ifTrue:[ |
|
12292 | 2003 |
allowOpenHolder := ValueHolder with: true. |
10028 | 2004 |
]. |
2005 |
^ allowOpenHolder |
|
2006 |
||
2007 |
"Modified: / 17-03-2011 / 22:32:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2008 |
! |
|
2009 |
||
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2010 |
allowOpenHolderAndCypressPresent |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2011 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2012 |
^BlockValue |
12292 | 2013 |
with: [:value| |
2014 |
value and: [ ConfigurableFeatures includesFeature:#Cypress ] |
|
2015 |
] |
|
2016 |
argument: self allowOpenHolder. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2017 |
|
12289
75613e714c3d
- Cypress support improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12287
diff
changeset
|
2018 |
"Modified (format): / 07-09-2012 / 20:09:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2019 |
! |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2020 |
|
11196 | 2021 |
allowRemoveHolder |
2022 |
"return/create the 'allowRemoveHolder' value holder (automatically generated)" |
|
12292 | 2023 |
|
11196 | 2024 |
allowRemoveHolder isNil ifTrue:[ |
12292 | 2025 |
allowRemoveHolder := ValueHolder with:false. |
2026 |
allowRemoveHolder addDependent:self. |
|
11196 | 2027 |
]. |
2028 |
^ allowRemoveHolder |
|
2029 |
||
2030 |
"Modified: / 24-01-2012 / 19:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2031 |
! |
|
2032 |
||
12292 | 2033 |
allowRemoveHolder:something |
11196 | 2034 |
"set the 'showRemovedHolder' value holder (automatically generated)" |
12292 | 2035 |
|
11196 | 2036 |
|oldValue newValue| |
2037 |
||
2038 |
allowRemoveHolder notNil ifTrue:[ |
|
12292 | 2039 |
oldValue := allowRemoveHolder value. |
2040 |
allowRemoveHolder removeDependent:self. |
|
11196 | 2041 |
]. |
2042 |
allowRemoveHolder := something. |
|
2043 |
allowRemoveHolder notNil ifTrue:[ |
|
12292 | 2044 |
allowRemoveHolder addDependent:self. |
11196 | 2045 |
]. |
2046 |
newValue := allowRemoveHolder value. |
|
2047 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2048 |
self |
2049 |
update:#value |
|
2050 |
with:newValue |
|
2051 |
from:allowRemoveHolder. |
|
11196 | 2052 |
]. |
2053 |
||
2054 |
"Modified (format): / 24-01-2012 / 19:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2055 |
! |
|
2056 |
||
10333 | 2057 |
changeSourceHolder |
2058 |
<resource: #uiAspect> |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2059 |
changeSourceHolder isNil ifTrue: [ |
12292 | 2060 |
changeSourceHolder := nil asValue. |
10333 | 2061 |
]. |
2062 |
^ changeSourceHolder. |
|
2063 |
||
2064 |
"Modified: / 19-07-2011 / 11:54:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2065 |
! |
|
2066 |
||
10028 | 2067 |
changesetHolder |
2068 |
"return/create the 'changesetHolder' value holder (automatically generated)" |
|
2069 |
||
2070 |
changesetHolder isNil ifTrue:[ |
|
12292 | 2071 |
changesetHolder := ValueHolder new. |
2072 |
changesetHolder addDependent:self. |
|
10028 | 2073 |
]. |
2074 |
^ changesetHolder |
|
2075 |
! |
|
2076 |
||
2077 |
changesetHolder:something |
|
2078 |
"set the 'changesetHolder' value holder (automatically generated)" |
|
2079 |
||
2080 |
|oldValue newValue| |
|
2081 |
||
2082 |
changesetHolder notNil ifTrue:[ |
|
12292 | 2083 |
oldValue := changesetHolder value. |
2084 |
changesetHolder removeDependent:self. |
|
10028 | 2085 |
]. |
2086 |
changesetHolder := something. |
|
2087 |
changesetHolder notNil ifTrue:[ |
|
12292 | 2088 |
changesetHolder addDependent:self. |
10028 | 2089 |
]. |
2090 |
newValue := changesetHolder value. |
|
2091 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2092 |
self update:#value with:newValue from:changesetHolder. |
10028 | 2093 |
]. |
2094 |
! |
|
2095 |
||
2096 |
classHolder |
|
2097 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
2098 |
||
2099 |
classHolder isNil ifTrue:[ |
|
12292 | 2100 |
classHolder := ValueHolder with:nil. |
10028 | 2101 |
]. |
2102 |
^ classHolder |
|
10345 | 2103 |
|
2104 |
"Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2105 |
! |
|
2106 |
||
2107 |
codeAspectHolder |
|
2108 |
"return/create the 'codeAspectHolder' value holder (automatically generated)" |
|
2109 |
||
2110 |
codeAspectHolder isNil ifTrue:[ |
|
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
2111 |
codeAspectHolder := ValueHolder with: nil. |
10345 | 2112 |
]. |
2113 |
^ codeAspectHolder |
|
11709 | 2114 |
|
2115 |
"Modified: / 27-07-2012 / 22:04:12 / cg" |
|
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
2116 |
"Modified: / 04-04-2013 / 18:28:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2117 |
! |
2118 |
||
10333 | 2119 |
imageSourceHolder |
2120 |
<resource: #uiAspect> |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2121 |
imageSourceHolder isNil ifTrue: [ |
12292 | 2122 |
imageSourceHolder := nil asValue. |
10333 | 2123 |
]. |
2124 |
^ imageSourceHolder. |
|
2125 |
||
2126 |
"Created: / 19-07-2011 / 11:54:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2127 |
! |
|
2128 |
||
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2129 |
infoPanel |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2130 |
infoPanel isNil ifTrue:[ |
12292 | 2131 |
infoPanel := InlineMessageDialog new |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2132 |
]. |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2133 |
^ infoPanel |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2134 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2135 |
"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
|
2136 |
! |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2137 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2138 |
isTwoColumnHolder |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2139 |
| holder | |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2140 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2141 |
holder := builder bindings at: #isTwoColumnHolder ifAbsentPut:[ |
12292 | 2142 |
BlockValue |
2143 |
with:[:v| v value == #twoColumnNavigatorSpec] |
|
2144 |
argument: self navigatorSpecHolder. |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2145 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2146 |
^holder |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2147 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2148 |
"Created: / 30-03-2012 / 12:07:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2149 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2150 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2151 |
isTwoColumnHolderNot |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2152 |
| holder | |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2153 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2154 |
holder := builder bindings at: #isTwoColumnHolderNot ifAbsentPut:[ |
12292 | 2155 |
BlockValue |
2156 |
with:[:v| v value ~~ #twoColumnNavigatorSpec] |
|
2157 |
argument: self navigatorSpecHolder. |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2158 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2159 |
^holder |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2160 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2161 |
"Created: / 30-03-2012 / 12:08:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2162 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2163 |
|
10333 | 2164 |
labelAHolder |
2165 |
||
2166 |
^'Change' asValue |
|
2167 |
||
2168 |
"Created: / 19-07-2011 / 11:46:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2169 |
! |
|
2170 |
||
2171 |
labelBHolder |
|
2172 |
||
2173 |
^'Image' asValue |
|
2174 |
||
2175 |
"Created: / 19-07-2011 / 11:46:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2176 |
! |
|
2177 |
||
10953 | 2178 |
languageHolder |
2179 |
languageHolder isNil ifTrue:[ |
|
12292 | 2180 |
languageHolder := ValueHolder with:nil. |
10953 | 2181 |
]. |
2182 |
^ languageHolder |
|
2183 |
||
2184 |
"Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2185 |
"Created: / 03-12-2011 / 10:37:39 / cg" |
|
2186 |
! |
|
2187 |
||
10448 | 2188 |
list1Holder |
2189 |
"return/create the 'list1Holder' value holder (automatically generated)" |
|
10028 | 2190 |
|
10448 | 2191 |
list1Holder isNil ifTrue:[ |
12292 | 2192 |
list1Holder := ValueHolder new. |
10028 | 2193 |
]. |
10448 | 2194 |
^ list1Holder |
10028 | 2195 |
! |
2196 |
||
10448 | 2197 |
list1Holder:something |
2198 |
"set the 'list1Holder' value holder (automatically generated)" |
|
10028 | 2199 |
|
10448 | 2200 |
list1Holder := something. |
10028 | 2201 |
! |
2202 |
||
10448 | 2203 |
list2Holder |
2204 |
"return/create the 'list2Holder' value holder (automatically generated)" |
|
10028 | 2205 |
|
10448 | 2206 |
list2Holder isNil ifTrue:[ |
12292 | 2207 |
list2Holder := ValueHolder new. |
10448 | 2208 |
]. |
2209 |
^ list2Holder |
|
2210 |
! |
|
10028 | 2211 |
|
10448 | 2212 |
list2Holder:something |
2213 |
"set the 'list2Holder' value holder (automatically generated)" |
|
2214 |
||
2215 |
list2Holder := something. |
|
10028 | 2216 |
! |
2217 |
||
2218 |
navigatorChangesetHolder |
|
2219 |
"return/create the 'navigatorChangesetHolder' value holder (automatically generated)" |
|
2220 |
||
2221 |
navigatorChangesetHolder isNil ifTrue:[ |
|
12292 | 2222 |
navigatorChangesetHolder := ValueHolder new. |
10028 | 2223 |
]. |
2224 |
^ navigatorChangesetHolder |
|
2225 |
! |
|
2226 |
||
2227 |
navigatorSpecHolder |
|
2228 |
<resource: #uiAspect> |
|
2229 |
||
2230 |
navigatorSpecHolder isNil ifTrue:[ |
|
11193 | 2231 |
navigatorSpecHolder := ValueHolder with: |
2232 |
"/#hierarchicalNavigatorSpec |
|
2233 |
"/#twoColumnNavigatorSpec |
|
12626
7ae48abfedac
Merged 482496b7e155 and af982630f6ad (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
2234 |
#oneColumnNavigatorSpec. |
7ae48abfedac
Merged 482496b7e155 and af982630f6ad (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
2235 |
navigatorSpecHolder addDependent: self. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2236 |
|
10028 | 2237 |
]. |
2238 |
^ navigatorSpecHolder. |
|
2239 |
||
12144 | 2240 |
"Modified: / 04-02-2012 / 21:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2241 |
! |
2242 |
||
12658 | 2243 |
notShowConflictsOnlyAspect |
2244 |
^ BlockValue forLogicalNot:(self showConflictsOnlyAspect) |
|
2245 |
! |
|
2246 |
||
10028 | 2247 |
selection1Holder |
2248 |
"return/create the 'selection1Holder' value holder (automatically generated)" |
|
2249 |
||
2250 |
selection1Holder isNil ifTrue:[ |
|
12292 | 2251 |
selection1Holder := ValueHolder new. |
2252 |
selection1Holder addDependent:self. |
|
10028 | 2253 |
]. |
2254 |
^ selection1Holder |
|
10448 | 2255 |
! |
10028 | 2256 |
|
10448 | 2257 |
selection1Holder:something |
2258 |
"set the 'selection1Holder' value holder (automatically generated)" |
|
2259 |
||
10450 | 2260 |
|oldValue newValue| |
2261 |
||
2262 |
selection1Holder notNil ifTrue:[ |
|
12292 | 2263 |
oldValue := selection1Holder value. |
2264 |
selection1Holder removeDependent:self. |
|
10450 | 2265 |
]. |
10448 | 2266 |
selection1Holder := something. |
10450 | 2267 |
selection1Holder notNil ifTrue:[ |
12292 | 2268 |
selection1Holder addDependent:self. |
10450 | 2269 |
]. |
2270 |
newValue := selection1Holder value. |
|
2271 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2272 |
self update:#value with:newValue from:selection1Holder. |
10450 | 2273 |
]. |
10028 | 2274 |
! |
2275 |
||
10448 | 2276 |
selection2Holder |
2277 |
"return/create the 'selection2Holder' value holder (automatically generated)" |
|
10028 | 2278 |
|
10448 | 2279 |
selection2Holder isNil ifTrue:[ |
12292 | 2280 |
selection2Holder := ValueHolder new. |
2281 |
selection2Holder addDependent:self. |
|
10028 | 2282 |
]. |
10448 | 2283 |
^ selection2Holder |
2284 |
! |
|
10028 | 2285 |
|
10448 | 2286 |
selection2Holder:something |
2287 |
"set the 'selection2Holder' value holder (automatically generated)" |
|
2288 |
||
10450 | 2289 |
|oldValue newValue| |
2290 |
||
2291 |
selection2Holder notNil ifTrue:[ |
|
12292 | 2292 |
oldValue := selection2Holder value. |
2293 |
selection2Holder removeDependent:self. |
|
10450 | 2294 |
]. |
10448 | 2295 |
selection2Holder := something. |
10450 | 2296 |
selection2Holder notNil ifTrue:[ |
12292 | 2297 |
selection2Holder addDependent:self. |
10450 | 2298 |
]. |
2299 |
newValue := selection2Holder value. |
|
2300 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2301 |
self update:#value with:newValue from:selection2Holder. |
10450 | 2302 |
]. |
10028 | 2303 |
! |
2304 |
||
12658 | 2305 |
showConflictsOnlyAspect |
2306 |
"return/create the 'showConflictsOnlyAspect' value holder (automatically generated)" |
|
2307 |
||
2308 |
showConflictsOnlyAspect isNil ifTrue:[ |
|
2309 |
showConflictsOnlyAspect := ValueHolder with: false. |
|
2310 |
]. |
|
2311 |
^ showConflictsOnlyAspect |
|
2312 |
! |
|
2313 |
||
2314 |
showConflictsOnlyAspect:aValueHolder |
|
2315 |
showConflictsOnlyAspect := aValueHolder. |
|
2316 |
! |
|
2317 |
||
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2318 |
showFilterHolder |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2319 |
"return/create the 'showFilterHolder' value holder (automatically generated)" |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2320 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2321 |
showFilterHolder isNil ifTrue:[ |
12292 | 2322 |
showFilterHolder := false asValue. |
10450 | 2323 |
]. |
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2324 |
^ showFilterHolder |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2325 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2326 |
"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
|
2327 |
! |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2328 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2329 |
showFilterHolder:something |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2330 |
"set the 'showFilterHolder' value holder (automatically generated)" |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2331 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2332 |
showFilterHolder := something. |
10028 | 2333 |
! |
2334 |
||
2335 |
showRemovedAspect |
|
2336 |
"return/create the 'showDeletedAspect' value holder (automatically generated)" |
|
2337 |
||
2338 |
showRemovedAspect isNil ifTrue:[ |
|
12292 | 2339 |
showRemovedAspect := (AspectAdaptor forAspect:#showRemoved) |
2340 |
subject: self class. |
|
10028 | 2341 |
]. |
2342 |
^ showRemovedAspect |
|
2343 |
! |
|
2344 |
||
2345 |
showRemovedAspect:aValueHolder |
|
2346 |
showRemovedAspect := aValueHolder. |
|
2347 |
! |
|
2348 |
||
10448 | 2349 |
showSameAspect |
2350 |
"return/create the 'showSameAspect' value holder (automatically generated)" |
|
2351 |
||
2352 |
showSameAspect isNil ifTrue:[ |
|
12292 | 2353 |
showSameAspect := ValueHolder with: true. |
10448 | 2354 |
]. |
2355 |
^ showSameAspect |
|
2356 |
||
2357 |
"Modified: / 04-08-2011 / 18:42:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2358 |
! |
|
2359 |
||
2360 |
showSameAspect:something |
|
2361 |
"set the 'showSameAspect' value holder (automatically generated)" |
|
2362 |
||
2363 |
showSameAspect := something. |
|
2364 |
! |
|
2365 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2366 |
showTimestampHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2367 |
"return/create the 'showTimestampHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2368 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2369 |
showTimestampHolder isNil ifTrue:[ |
12292 | 2370 |
showTimestampHolder := ValueHolder with: false. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2371 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2372 |
^ showTimestampHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2373 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2374 |
"Modified: / 26-07-2012 / 18:47:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2375 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2376 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2377 |
showTimestampHolder:something |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2378 |
"set the 'showTimestampHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2379 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2380 |
showTimestampHolder := something. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2381 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2382 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2383 |
showingRegularChangesetHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2384 |
"return/create the 'showingRegularChangesetHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2385 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2386 |
showingRegularChangesetHolder isNil ifTrue:[ |
12292 | 2387 |
showingRegularChangesetHolder := ValueHolder with: false. |
2388 |
showingRegularChangesetHolder addDependent:self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2389 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2390 |
^ showingRegularChangesetHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2391 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2392 |
"Modified: / 26-07-2012 / 19:45:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2393 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2394 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2395 |
showingRegularChangesetHolder:something |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2396 |
"set the 'showingRegularChangesetHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2397 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2398 |
|oldValue newValue| |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2399 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2400 |
showingRegularChangesetHolder notNil ifTrue:[ |
12292 | 2401 |
oldValue := showingRegularChangesetHolder value. |
2402 |
showingRegularChangesetHolder removeDependent:self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2403 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2404 |
showingRegularChangesetHolder := something. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2405 |
showingRegularChangesetHolder notNil ifTrue:[ |
12292 | 2406 |
showingRegularChangesetHolder addDependent:self. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2407 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2408 |
newValue := showingRegularChangesetHolder value. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2409 |
oldValue ~~ newValue ifTrue:[ |
12292 | 2410 |
self update:#value with:newValue from:showingRegularChangesetHolder. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2411 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2412 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2413 |
|
10028 | 2414 |
titleHolder |
2415 |
"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
|
2416 |
|
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2417 |
titleHolder isNil |
12292 | 2418 |
ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ]. |
10028 | 2419 |
^ titleHolder |
2420 |
||
2421 |
"Modified: / 26-10-2010 / 22:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10682 | 2422 |
! |
2423 |
||
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2424 |
updateChangeFileHolder |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2425 |
updateChangeFileHolder isNil ifTrue:[ |
12292 | 2426 |
updateChangeFileHolder := false asValue. |
10682 | 2427 |
]. |
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2428 |
^ updateChangeFileHolder |
10682 | 2429 |
|
2430 |
"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
|
2431 |
"Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13612
1acb01525f56
Fix in Tools::ChangeSetBrowser2 - do not update change file but update internal changeset...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13178
diff
changeset
|
2432 |
! ! |
10028 | 2433 |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2434 |
!ChangeSetBrowser2 methodsFor:'aspects-queries'! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2435 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2436 |
hasSelectionHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2437 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2438 |
hasSelectionHolder isNil ifTrue:[ |
12292 | 2439 |
hasSelectionHolder := |
2440 |
BlockValue |
|
2441 |
with:[:sel1 :sel2| |
|
2442 |
sel1 value notEmptyOrNil or:[sel2 value notEmptyOrNil] |
|
2443 |
] |
|
2444 |
argument: self selection1Holder |
|
2445 |
argument: self selection2Holder |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2446 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2447 |
^hasSelectionHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2448 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2449 |
"Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2450 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2451 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2452 |
isWorkingHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2453 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2454 |
isWorkingHolder isNil ifTrue:[ |
12292 | 2455 |
isWorkingHolder := ValueHolder with: false. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2456 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2457 |
^isWorkingHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2458 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2459 |
"Created: / 17-05-2012 / 20:45:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2460 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2461 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2462 |
isWorkingNotHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2463 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2464 |
isWorkingNotHolder isNil ifTrue:[ |
12292 | 2465 |
isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2466 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2467 |
^isWorkingNotHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2468 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2469 |
"Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2470 |
! ! |
2471 |
||
2472 |
!ChangeSetBrowser2 methodsFor:'change & update'! |
|
2473 |
||
2474 |
changesetChanged |
|
2475 |
||
11716 | 2476 |
self titleHolder value: (self changeset name ifNil:[self defaultTitle]). |
10448 | 2477 |
self list1Holder value: self getNavigatorChangeSet |
10028 | 2478 |
|
10448 | 2479 |
"Modified: / 04-08-2011 / 18:05:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11716 | 2480 |
"Modified: / 29-07-2012 / 13:18:54 / cg" |
10028 | 2481 |
! |
2482 |
||
2483 |
selectionChanged |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2484 |
| listEntry change srcImage srcChange| |
11663 | 2485 |
|
2486 |
listEntry := self theSingleSelectedChange. |
|
2487 |
(listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[ |
|
11709 | 2488 |
codeAspectHolder setValue: |
11663 | 2489 |
(change isMethodCodeChange |
11709 | 2490 |
ifTrue:[SyntaxHighlighter codeAspectMethod] |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2491 |
ifFalse:[ |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2492 |
(change isClassDefinitionChange |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2493 |
ifTrue:[SyntaxHighlighter codeAspectClassDefinition] |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2494 |
ifFalse:[SyntaxHighlighter codeAspectExpression])]). |
11709 | 2495 |
self classHolder value: change changeClass. |
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2496 |
srcImage := change imageSource. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2497 |
srcChange := change changeSource. |
13676
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2498 |
"/ Hack to make sure code is displayed in similar way |
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2499 |
"/ (i.e., with no namespace pragma) |
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2500 |
(change isClassDefinitionChange and:[change isPrivateClassDefinitionChange]) ifTrue:[ |
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2501 |
srcChange := change definitionStringInNamespace: nil. |
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2502 |
]. |
13743
d789bfa8a626
Fix in Tools::ChangeSetBrowser2>>#selectionChanged - care for changes with no image version.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13676
diff
changeset
|
2503 |
srcImage notNil ifTrue:[ |
d789bfa8a626
Fix in Tools::ChangeSetBrowser2>>#selectionChanged - care for changes with no image version.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13676
diff
changeset
|
2504 |
srcImage := srcImage trimSeparators. |
d789bfa8a626
Fix in Tools::ChangeSetBrowser2>>#selectionChanged - care for changes with no image version.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13676
diff
changeset
|
2505 |
]. |
13676
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2506 |
srcChange := srcChange trimSeparators. |
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2507 |
|
b14ed2a36bae
UUI fixes for ChangeSetBrowser2: correctly display diffs for class definition change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13675
diff
changeset
|
2508 |
changeSourceHolder setValue: srcChange"; changed: #value". |
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2509 |
srcImage = srcChange ifTrue:[ |
11709 | 2510 |
imageSourceHolder setValue: nil"; changed: #value". |
2511 |
] ifFalse:[ |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2512 |
imageSourceHolder setValue: srcImage"; changed: #value". |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2513 |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2514 |
"/ check agan, based on parser (ignoring indentation) |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2515 |
change isClassDefinitionChange ifTrue:[ |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2516 |
|parseError treeA treeB| |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2517 |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2518 |
(srcImage notEmptyOrNil and:[ srcChange notEmptyOrNil ]) ifTrue:[ |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2519 |
parseError := false. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2520 |
treeA := RBParser parseExpression:srcImage onError: [:str :pos | parseError := true]. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2521 |
treeB := RBParser parseExpression:srcChange onError: [:str :pos | parseError := true]. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2522 |
parseError ifFalse:[ |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2523 |
(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2524 |
imageSourceHolder setValue: nil |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2525 |
] |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2526 |
] |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2527 |
] |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2528 |
]. |
11709 | 2529 |
]. |
2530 |
changeSourceHolder changed. |
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2531 |
imageSourceHolder changed. |
11709 | 2532 |
codeAspectHolder changed. |
2533 |
||
10953 | 2534 |
self showSource: true |
10309 | 2535 |
] ifFalse:[ |
10953 | 2536 |
self showSource: false. |
2537 |
self classHolder value: nil. |
|
2538 |
changeSourceHolder setValue: nil; changed: #value. |
|
2539 |
imageSourceHolder setValue: nil; changed: #value. |
|
10309 | 2540 |
]. |
10028 | 2541 |
|
2542 |
"Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2543 |
"Modified: / 27-07-2012 / 23:42:46 / cg" |
13743
d789bfa8a626
Fix in Tools::ChangeSetBrowser2>>#selectionChanged - care for changes with no image version.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13676
diff
changeset
|
2544 |
"Modified: / 19-11-2013 / 12:16:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2545 |
! |
2546 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2547 |
showingRegularChangesetChanged |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2548 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2549 |
self showTimestampHolder value: showingRegularChangesetHolder value. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2550 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2551 |
"Created: / 26-07-2012 / 19:40:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2552 |
! |
2553 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2554 |
update: aspect with: param from: sender |
10028 | 2555 |
|
12292 | 2556 |
sender == changesetHolder ifTrue: [ |
2557 |
self changesetChanged . |
|
2558 |
^self |
|
12144 | 2559 |
]. |
12292 | 2560 |
sender == navigatorSpecHolder ifTrue: [ |
2561 |
self changesetChanged . |
|
2562 |
^self |
|
12144 | 2563 |
]. |
12292 | 2564 |
sender == selection1Holder ifTrue: [ |
2565 |
self selectionChanged. |
|
2566 |
^self |
|
12144 | 2567 |
]. |
12292 | 2568 |
sender == selection2Holder ifTrue: [ |
2569 |
self selectionChanged. |
|
2570 |
^self |
|
12144 | 2571 |
]. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2572 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2573 |
sender == showingRegularChangesetHolder ifTrue:[ |
12292 | 2574 |
self showingRegularChangesetChanged. |
2575 |
^self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2576 |
]. |
12144 | 2577 |
super update: aspect with: param from: sender |
10028 | 2578 |
|
2579 |
"Created: / 24-10-2009 / 19:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2580 |
! ! |
|
2581 |
||
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2582 |
!ChangeSetBrowser2 methodsFor:'initialization'! |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2583 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2584 |
list1View: aSubApplicationView |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2585 |
aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2586 |
list1 := aSubApplicationView application |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2587 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2588 |
"Created: / 04-08-2011 / 17:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2589 |
"Modified: / 10-09-2012 / 14:22:37 / cg" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2590 |
! |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2591 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2592 |
list2View: aSubApplicationView |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2593 |
aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2594 |
list2 := aSubApplicationView application |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2595 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2596 |
"Created: / 04-08-2011 / 17:57:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2597 |
"Modified: / 10-09-2012 / 14:22:50 / cg" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2598 |
! ! |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2599 |
|
10028 | 2600 |
!ChangeSetBrowser2 methodsFor:'menu actions'! |
2601 |
||
12211 | 2602 |
doApply |
2603 |
"Applies currently selected change" |
|
2604 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2605 |
self changeMenuApplySelection: self list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2606 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2607 |
"Modified: / 30-03-2012 / 12:18:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2608 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2609 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2610 |
doApplyFromLastSnapshot |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2611 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2612 |
self doFindSnapshot: #last. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2613 |
self doApplyToEnd. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2614 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2615 |
"Modified: / 30-03-2012 / 12:19:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2616 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2617 |
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2618 |
doApplySelectedChanges |
12757
7ce7a0cab142
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12669
diff
changeset
|
2619 |
self selectedChanges do:[:chgListEntry | |
7ce7a0cab142
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12669
diff
changeset
|
2620 |
self changeMenuApplyChange: chgListEntry change. |
7ce7a0cab142
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12669
diff
changeset
|
2621 |
]. |
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2622 |
! |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2623 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2624 |
doApplyToEnd |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2625 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2626 |
self changeMenuApplyToEnd: self list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2627 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2628 |
"Modified: / 30-03-2012 / 12:35:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2629 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2630 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2631 |
doCompress |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2632 |
self breakPoint: #jv. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2633 |
Dialog warn: 'Sorry, not yet implemented' |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2634 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2635 |
"Modified: / 30-03-2012 / 12:20:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2636 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2637 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2638 |
doDelete |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2639 |
self changeMenuDeleteSelection: self list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2640 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2641 |
"Modified: / 30-03-2012 / 12:21:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2642 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2643 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2644 |
doDeleteToEnd |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2645 |
"automatically generated by UIEditor ..." |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2646 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2647 |
"*** the code below performs no action" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2648 |
"*** (except for some feedback on the Transcript)" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2649 |
"*** Please change as required and accept in the browser." |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2650 |
"*** (and replace this comment by something more useful ;-)" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2651 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2652 |
"action to be added ..." |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2653 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2654 |
Transcript showCR:self class name, ': action for #doDeleteToEnd ...'. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2655 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2656 |
|
12271 | 2657 |
doFindSnapshot:previousOrNext |
2658 |
self doFindSnapshot: previousOrNext in: self list. |
|
2659 |
||
2660 |
"Modified: / 27-07-2012 / 15:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2661 |
! |
|
2662 |
||
2663 |
doFindSnapshot:previousOrNext in: changeList |
|
2664 |
| snapshot selection searchBlock notFoundMessage | |
|
2665 |
||
2666 |
||
2667 |
selection := self theSingleSelectedChange. |
|
2668 |
searchBlock := [:listEntry| |
|
12292 | 2669 |
listEntry == selection ifTrue:[ |
2670 |
snapshot notNil ifTrue:[ |
|
2671 |
changeList selection: (OrderedCollection with: snapshot). |
|
2672 |
] ifFalse:[ |
|
2673 |
self infoPanel showMessage: notFoundMessage closeAfter: 5"sec". |
|
2674 |
]. |
|
2675 |
^self. |
|
2676 |
] ifFalse:[ |
|
2677 |
(listEntry change isOtherChange and:[listEntry change type == #snapshot]) ifTrue:[ |
|
2678 |
snapshot := listEntry |
|
2679 |
]. |
|
2680 |
]. |
|
12271 | 2681 |
]. |
2682 |
previousOrNext = 'previous' ifTrue:[ |
|
12292 | 2683 |
selection isNil ifTrue:[ |
2684 |
selection := changeList list last. |
|
2685 |
changeList selection: (Array with: selection). |
|
2686 |
]. |
|
2687 |
notFoundMessage := resources string:'No snapshot prior selected change found.'. |
|
2688 |
changeList list do: searchBlock. |
|
12271 | 2689 |
] ifFalse:[ |
12292 | 2690 |
selection isNil ifTrue:[ |
2691 |
selection := changeList list first. |
|
2692 |
changeList selection: (Array with: selection). |
|
2693 |
]. |
|
2694 |
notFoundMessage := resources string:'No snapshot after selected change found.'. |
|
2695 |
changeList list reverseDo: searchBlock. |
|
12271 | 2696 |
] |
2697 |
||
2698 |
"Created: / 27-07-2012 / 15:38:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12211 | 2699 |
! |
2700 |
||
10028 | 2701 |
doOpen |
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2702 |
| file | |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2703 |
[ |
12292 | 2704 |
file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'. |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2705 |
] on: Dialog aboutToOpenBoxNotificationSignal do:[:ex| |
12292 | 2706 |
| dialog | |
2707 |
||
2708 |
dialog := ex parameter. |
|
2709 |
||
2710 |
ex pass. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2711 |
]. |
10880 | 2712 |
file isNil ifTrue:[^self]. |
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2713 |
self doOpenFile: file |
10028 | 2714 |
|
2715 |
"Modified: / 08-04-2011 / 10:11:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2716 |
"Modified: / 27-07-2012 / 21:21:40 / cg" |
10028 | 2717 |
! |
2718 |
||
2719 |
doOpen: aChangeSet |
|
11709 | 2720 |
<resource: #obsolete> |
2721 |
"/ a bad name - implying opening a window... |
|
2722 |
self loadChangeSet: aChangeSet |
|
10028 | 2723 |
|
2724 |
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2725 |
"Modified: / 27-07-2012 / 21:21:24 / cg" |
10028 | 2726 |
! |
2727 |
||
2728 |
doOpenCurrent |
|
2729 |
||
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2730 |
self doOpenFile: ObjectMemory nameForChanges. |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2731 |
self showFilter: true. |
10028 | 2732 |
|
2733 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2734 |
! |
|
2735 |
||
11709 | 2736 |
doOpenCurrentChangeFile |
2737 |
self withWaitCursorDo:[ |
|
12292 | 2738 |
self class openOn: (ChangeSet fromFile: ObjectMemory nameForChanges) |
11709 | 2739 |
]. |
10028 | 2740 |
|
2741 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2742 |
"Created: / 27-07-2012 / 21:16:42 / cg" |
10028 | 2743 |
! |
2744 |
||
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2745 |
doOpenCypress |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2746 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2747 |
| file | |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2748 |
[ |
12292 | 2749 |
file := Dialog requestDirectoryName:(resources string: 'Select Cypress Package')."/ pattern:'*.package'. |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2750 |
] on: Dialog aboutToOpenBoxNotificationSignal do:[:ex| |
12292 | 2751 |
| dialog | |
2752 |
||
2753 |
dialog := ex parameter. |
|
2754 |
||
2755 |
ex pass. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2756 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2757 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2758 |
file isNil ifTrue:[^self]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2759 |
self doOpenCypress: file |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2760 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2761 |
"Modified: / 03-09-2012 / 11:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2762 |
! |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2763 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2764 |
doOpenCypress: aStringOrFilename |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2765 |
"Opens a Cypress package in given directory" |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2766 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2767 |
| dir changeset | |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2768 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2769 |
dir := aStringOrFilename asFilename. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2770 |
dir exists ifFalse:[ |
12292 | 2771 |
Dialog warn: (resources string:'Selected directory does not exists'). |
2772 |
^self. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2773 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2774 |
dir isDirectory ifFalse:[ |
12292 | 2775 |
Dialog warn: (resources string:'Selected file is not a directory'). |
2776 |
^self. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2777 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2778 |
(dir / 'properties.json') isReadable ifFalse:[ |
12292 | 2779 |
Dialog warn: (resources string:'No properties.json found. Perhaps not a Cypress package directory?'). |
2780 |
^self. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2781 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2782 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2783 |
self showProgress: (resources string: 'Reading Cypress Package...') while: [ |
12292 | 2784 |
changeset := ((Smalltalk at:#CypressPackageReader) readPackageFrom: dir) asChangeSet. |
2785 |
self doOpen: changeset. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2786 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2787 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2788 |
"Created: / 03-09-2012 / 11:44:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2789 |
! |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2790 |
|
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2791 |
doOpenFile: aStringOrFilename |
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2792 |
| cs fn | |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2793 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2794 |
self showProgress: 'Reading ' , (fn := aStringOrFilename asFilename) baseName while:[ |
12312
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2795 |
[ |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2796 |
cs := ChangeSet fromFile: aStringOrFilename. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2797 |
] on: ChangeSet::InvalidChangeChunkError do:[:ex| |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2798 |
ex proceed. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2799 |
]. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2800 |
((fn suffix = 'chg') or:[fn pathName = ObjectMemory nameForChanges]) ifTrue:[ |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2801 |
self list scrollToBottom: true. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2802 |
self showingRegularChangesetHolder value: true. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2803 |
] ifFalse:[ |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2804 |
self showingRegularChangesetHolder value: false. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2805 |
]. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2806 |
self allowRemove: false."/true. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2807 |
self doOpen: cs. |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2808 |
]. |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2809 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2810 |
"Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12312
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2811 |
"Modified: / 05-12-2012 / 11:38:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2812 |
! |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2813 |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2814 |
doOpenNew |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2815 |
self doOpen: ChangeSet new. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2816 |
self showFilterHolder value: false. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2817 |
self infoPanel |
12292 | 2818 |
reset; |
2819 |
beInformation; |
|
2820 |
message: (resources string:'Open file or drag''n''drop changes from other changeset/diff browser'); |
|
2821 |
addButtonWithLabel: (resources string:'Open File') action:[self doOpen]; |
|
2822 |
addButtonOK; |
|
2823 |
show. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2824 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2825 |
"Modified: / 01-08-2012 / 18:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2826 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2827 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2828 |
doOpenNewWindow |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2829 |
| new | |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2830 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2831 |
new := self class new. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2832 |
new open. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2833 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2834 |
"Created: / 01-08-2012 / 18:22:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2835 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2836 |
|
12266 | 2837 |
doOpenOnSelection |
2838 |
||
2839 |
| selection | |
|
2840 |
||
2841 |
selection := ChangeSet new. |
|
2842 |
self selectionDo: [:each|selection add: each]. |
|
2843 |
self class openOn: selection label: (self titleHolder value , ' ' , (resources string:'(Selected changes)')) |
|
2844 |
||
2845 |
"Modified: / 25-07-2012 / 15:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2846 |
! |
|
2847 |
||
10028 | 2848 |
doSave |
2849 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2850 |
changesetFile |
12292 | 2851 |
ifNil:[self doSaveAs] |
2852 |
ifNotNil:[self doSaveAs: changesetFile] |
|
10028 | 2853 |
|
2854 |
"Modified: / 24-10-2009 / 22:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2855 |
! |
|
2856 |
||
2857 |
doSaveAs |
|
2858 |
| file | |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2859 |
Dialog aboutToOpenBoxNotificationSignal handle:[:ex| |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2860 |
"/ OOPS, not supported!!!!!!!! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2861 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2862 |
"/ | box | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2863 |
"/ box := ex parameter. |
12292 | 2864 |
"/ box verticalPanel |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2865 |
"/ add:(CheckBox label:'x' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2866 |
"/ model:true asValue). |
12292 | 2867 |
ex pass. |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2868 |
] do:[ |
12292 | 2869 |
file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg'). |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2870 |
]. |
10880 | 2871 |
file isNil ifTrue:[^self]. |
10028 | 2872 |
self doSaveAs: file. |
10880 | 2873 |
|
11034 | 2874 |
"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
|
2875 |
"Modified: / 20-03-2012 / 13:52:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2876 |
! |
2877 |
||
2878 |
doSaveAs: newFile |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2879 |
| changesetToSave | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2880 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2881 |
changesetToSave := ChangeSet new. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2882 |
self list1Holder value do:[:e| |
12292 | 2883 |
e removed ~~ true ifTrue:[changesetToSave add:e]. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2884 |
]. |
10028 | 2885 |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2886 |
"/ [ |
12292 | 2887 |
(newFile asFilename suffix = 'st') ifTrue:[ |
2888 |
changesetToSave saveToFile: newFile format: #classSource. |
|
2889 |
] ifFalse:[ |
|
2890 |
changesetToSave saveToFile: newFile |
|
2891 |
]. |
|
2892 |
changesetFile := newFile. |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2893 |
"/ ] on: Error do: |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2894 |
"/ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2895 |
|
12125 | 2896 |
! |
2897 |
||
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2898 |
doScrollToBottom |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2899 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2900 |
| changeList | |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2901 |
changeList := self list. |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2902 |
changeList selection: { changeList list last } |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2903 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2904 |
"Created: / 30-03-2012 / 16:56:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11709 | 2905 |
! |
2906 |
||
2907 |
loadChangeSet: aChangeSet |
|
2908 |
self changesetHolder value: aChangeSet |
|
2909 |
||
2910 |
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2911 |
"Created: / 27-07-2012 / 21:20:50 / cg" |
|
2912 |
! |
|
2913 |
||
2914 |
loadCurrentChangeFile |
|
2915 |
self withWaitCursorDo:[ |
|
12292 | 2916 |
self loadChangeSet: (ChangeSet fromFile: ObjectMemory nameForChanges) |
11709 | 2917 |
]. |
2918 |
||
2919 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2920 |
"Created: / 27-07-2012 / 21:20:44 / cg" |
|
10682 | 2921 |
! |
2922 |
||
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2923 |
menuUpdate |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2924 |
self changesetChanged. |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2925 |
"/ list1 updateList. |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2926 |
"/ list2 updateList. |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2927 |
! |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2928 |
|
10682 | 2929 |
setTargetNamespace |
2930 |
"specify an st/x namespace to be used as default" |
|
2931 |
||
2932 |
| nsName | |
|
2933 |
||
12292 | 2934 |
nsName := Dialog |
2935 |
requestNameSpace:'Namepace to load code into:' |
|
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
2936 |
initialAnswer:targetNameSpaceName. |
10682 | 2937 |
nsName isEmptyOrNil ifTrue:[^self]. |
2938 |
||
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
2939 |
targetNameSpaceName := nsName. |
10682 | 2940 |
"/ self targetNamespaceNameHolder value:('Target-Namespace: ',targetNamespace). |
2941 |
||
11447 | 2942 |
list1 list do:[:each | |
12292 | 2943 |
each change nameSpaceOverride:nsName |
11447 | 2944 |
]. |
2945 |
list2 list do:[:each | |
|
12292 | 2946 |
each change nameSpaceOverride:nsName |
11447 | 2947 |
]. |
2948 |
self changeset do:[:chg | chg nameSpaceOverride:nsName]. |
|
2949 |
||
10682 | 2950 |
"Created: / 07-09-2011 / 12:49:42 / cg" |
2951 |
! |
|
2952 |
||
2953 |
setTargetPackage |
|
2954 |
"specify an st/x package identifier to be used as default" |
|
2955 |
||
2956 |
| package | |
|
2957 |
||
12292 | 2958 |
package := Dialog |
2959 |
requestProject:'Default Smalltalk/X package to load code into:' |
|
2960 |
initialAnswer:targetPackage |
|
2961 |
suggestions:(RecentTargetPackages ? #()). |
|
10880 | 2962 |
package isNil ifTrue:[^self]. |
10682 | 2963 |
|
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2964 |
RecentTargetPackages isNil ifTrue:[ |
12292 | 2965 |
RecentTargetPackages := OrderedCollection new. |
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2966 |
]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2967 |
RecentTargetPackages remove:package ifAbsent:[]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2968 |
RecentTargetPackages addFirst:package. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2969 |
|
10682 | 2970 |
targetPackage := "lastPackage := "package. |
2971 |
"/ self targetPackageHolder value:('Target-Package: ',targetPackage). |
|
2972 |
||
2973 |
"Created: / 07-09-2011 / 12:47:15 / cg" |
|
10028 | 2974 |
! ! |
2975 |
||
2976 |
!ChangeSetBrowser2 methodsFor:'menu actions - changes'! |
|
2977 |
||
10448 | 2978 |
changeMenuApply: changeList |
10028 | 2979 |
| changesToApply | |
11037 | 2980 |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2981 |
changesToApply := OrderedCollection new. |
10028 | 2982 |
self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]]. |
10448 | 2983 |
self changeMenuApplyChanges: changesToApply. |
11038 | 2984 |
list2 notNil ifTrue:[ |
12292 | 2985 |
"/ to get the =-icons |
2986 |
list2 updateList |
|
11038 | 2987 |
]. |
10028 | 2988 |
|
10448 | 2989 |
"Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11038 | 2990 |
"Modified: / 28-12-2011 / 15:49:00 / cg" |
10028 | 2991 |
! |
2992 |
||
10448 | 2993 |
changeMenuApplySelection: changeList |
10028 | 2994 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2995 |
changeList selection do:[:change| |
12292 | 2996 |
| changeIdx | |
2997 |
||
2998 |
self changeMenuApplyChange:change change. |
|
2999 |
||
3000 |
"Advance to next change" |
|
3001 |
changeIdx := changeList list identityIndexOf: change. |
|
3002 |
changeIdx < changeList list size ifTrue:[ |
|
3003 |
changeList selection: { changeList list at: changeIdx + 1 } |
|
3004 |
]. |
|
11038 | 3005 |
]. |
10028 | 3006 |
|
10448 | 3007 |
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11038 | 3008 |
"Modified (format): / 28-12-2011 / 15:48:53 / cg" |
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3009 |
"Modified (comment): / 30-03-2012 / 13:18:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11037 | 3010 |
! |
3011 |
||
3012 |
changeMenuApplyToEnd: changeList |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3013 |
| start stop list | |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3014 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3015 |
list := changeList list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3016 |
start := changeList selectionIndices max. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3017 |
stop := list size. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3018 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3019 |
start to: stop do:[:idx| |
12292 | 3020 |
| chg | |
3021 |
||
3022 |
chg := list at: idx. |
|
3023 |
changeList selection: { chg }. |
|
3024 |
self changeMenuApplyChange:chg change. |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3025 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3026 |
|
11038 | 3027 |
list2 notNil ifTrue:[ |
12292 | 3028 |
"/ to get the =-icons |
3029 |
list2 updateList |
|
11038 | 3030 |
]. |
11037 | 3031 |
|
3032 |
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3033 |
"Created: / 27-12-2011 / 10:53:00 / cg" |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3034 |
"Modified: / 30-03-2012 / 12:34:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3035 |
! |
3036 |
||
10448 | 3037 |
changeMenuBrowse: changeList |
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3038 |
|changes methods classes| |
10028 | 3039 |
|
11651 | 3040 |
changes := self selectedChangesIn: changeList. |
10666 | 3041 |
"/ changes := changeList listHolder value collect:[:c | c change]. |
11651 | 3042 |
|
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3043 |
(changes conform:[:c | c isClassDefinitionChange]) ifTrue:[ |
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3044 |
classes := (changes collect:[:c | c changeClass]). |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3045 |
UserPreferences systemBrowserClass |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3046 |
browseClasses:classes label:'selected monticello classes'. |
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3047 |
] ifFalse:[ |
10658 | 3048 |
methods := OrderedCollection new. |
3049 |
changes do:[:each | |
|
3050 |
each isCompositeChange ifTrue:[ |
|
3051 |
each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]] |
|
3052 |
] ifFalse:[ |
|
3053 |
each isMethodChange ifTrue:[ |
|
3054 |
methods add:(each changeMethod). |
|
3055 |
] |
|
3056 |
] |
|
3057 |
]. |
|
3058 |
(methods includes:nil) ifTrue:[ |
|
3059 |
Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)). |
|
3060 |
methods := methods reject:[:m | m isNil]. |
|
10665
bbaa7c4154de
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10658
diff
changeset
|
3061 |
methods isEmpty ifTrue:[^ self]. |
10658 | 3062 |
]. |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3063 |
UserPreferences systemBrowserClass |
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3064 |
browseMethods:methods title:'selected monticello methods' sort:false. |
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3065 |
]. |
10028 | 3066 |
|
10448 | 3067 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11651 | 3068 |
"Modified: / 23-07-2012 / 13:13:37 / cg" |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3069 |
"Modified: / 13-11-2013 / 11:49:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 3070 |
! |
3071 |
||
3072 |
changeMenuBrowseClass: changeList |
|
10906
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3073 |
|changes classes addThemChanges cls| |
10666 | 3074 |
|
11651 | 3075 |
changes := self selectedChangesIn: changeList. |
10666 | 3076 |
|
3077 |
classes := Set new. |
|
3078 |
addThemChanges := |
|
3079 |
[:c | |
|
3080 |
c isClassDefinitionChange ifTrue:[ |
|
3081 |
classes add:c changeClass theNonMetaclass |
|
3082 |
] ifFalse:[ |
|
3083 |
c isMethodChange ifTrue:[ |
|
10906
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3084 |
cls := c changeMethod isNil |
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3085 |
ifTrue:[ c changeClass ] |
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3086 |
ifFalse:[ c changeMethod mclass theNonMetaclass ]. |
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3087 |
classes add:cls |
10666 | 3088 |
] ifFalse:[ |
3089 |
c isCompositeChange ifTrue:[ |
|
3090 |
c changes do:addThemChanges |
|
3091 |
] |
|
3092 |
] |
|
3093 |
] |
|
3094 |
]. |
|
3095 |
changes do:addThemChanges. |
|
3096 |
||
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3097 |
UserPreferences systemBrowserClass |
10666 | 3098 |
browseClasses:classes title:'selected monticello classes'. |
3099 |
||
3100 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3101 |
"Created: / 05-09-2011 / 16:08:35 / cg" |
|
10028 | 3102 |
! |
3103 |
||
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3104 |
changeMenuCompareClass: changeList |
12292 | 3105 |
|changes classNames classNameToClassMapping lastNameSpace |
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3106 |
addClassName addThemChanges existingClasses |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3107 |
allChanges changeSet1 changeSet2 diffSet| |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3108 |
|
11651 | 3109 |
changes := self selectedChangesIn: changeList. |
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3110 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3111 |
classNameToClassMapping := Dictionary new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3112 |
classNames := Set new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3113 |
allChanges := ChangeSet new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3114 |
existingClasses := Set new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3115 |
|
12292 | 3116 |
addClassName := |
3117 |
[:nmArg | |
|
3118 |
|nm ns existingClass goodAnswer cls| |
|
3119 |
||
3120 |
nm := nmArg. |
|
3121 |
existingClass := Smalltalk classNamed:nm. |
|
3122 |
||
3123 |
existingClass notNil ifTrue:[ |
|
3124 |
goodAnswer := nm |
|
3125 |
] ifFalse:[ |
|
3126 |
ns := NameSpace allNameSpaces |
|
3127 |
detect:[:ns | (ns classNamed:nm) notNil ] |
|
3128 |
ifNone:nil. |
|
3129 |
ns notNil ifTrue:[ |
|
3130 |
goodAnswer := (ns classNamed:nm) name. |
|
3131 |
] ifFalse:[ |
|
3132 |
goodAnswer := nm. |
|
3133 |
(lastNameSpace notNil |
|
3134 |
and:[ lastNameSpace isNameSpace |
|
3135 |
and:[(cls := lastNameSpace classNamed:nm) notNil ]] |
|
3136 |
) ifTrue:[ |
|
3137 |
goodAnswer := cls name. |
|
3138 |
] ifFalse:[ |
|
3139 |
(lastNameSpace notNil |
|
3140 |
and:[ lastNameSpace isBehavior |
|
3141 |
and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]] |
|
3142 |
) ifTrue:[ |
|
3143 |
goodAnswer := cls name. |
|
3144 |
] |
|
3145 |
]. |
|
3146 |
]. |
|
3147 |
]. |
|
3148 |
nm := Dialog |
|
3149 |
request:('Class to compare for "%1"?' bindWith:nmArg) |
|
3150 |
initialAnswer:goodAnswer. |
|
3151 |
nm isNil ifTrue:[^ self]. |
|
3152 |
nm notEmpty ifTrue:[ |
|
3153 |
existingClass := Smalltalk at:nm asSymbol. |
|
3154 |
]. |
|
3155 |
existingClass notNil ifTrue:[ |
|
3156 |
classNameToClassMapping at:nmArg put:existingClass. |
|
3157 |
existingClasses add:existingClass. |
|
3158 |
]. |
|
3159 |
classNames add:nmArg |
|
3160 |
]. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3161 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3162 |
addThemChanges := [:changes | |
12292 | 3163 |
"/ collect classes and mappings |
3164 |
changes do:[:c | |
|
3165 |
c isClassDefinitionChange ifTrue:[ |
|
3166 |
addClassName value:(c className). |
|
3167 |
allChanges add:c. |
|
3168 |
]]. |
|
3169 |
||
3170 |
changes do:[:c | |
|
3171 |
c isMethodChange ifTrue:[ |
|
3172 |
(classNames includes:(c className)) ifFalse:[ |
|
3173 |
addClassName value:(c className). |
|
3174 |
]. |
|
3175 |
allChanges add:c. |
|
3176 |
]]. |
|
3177 |
||
3178 |
changes do:[:c | |
|
3179 |
c isCompositeChange ifTrue:[ |
|
3180 |
addThemChanges value:(c changes) |
|
3181 |
]. |
|
3182 |
]. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3183 |
]. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3184 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3185 |
changes do:addThemChanges. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3186 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3187 |
"/ now, build a diffset and present it... |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3188 |
changeSet1 := allChanges. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3189 |
changeSet2 := ChangeSet new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3190 |
existingClasses do:[:cls | |
12292 | 3191 |
changeSet2 addAll:(ChangeSet forExistingClass:cls). |
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3192 |
]. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3193 |
diffSet := changeSet1 diffSetsAgainst:changeSet2. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3194 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3195 |
(UserPreferences versionDiffViewerClass) |
12292 | 3196 |
openOnDiffSet:diffSet |
3197 |
labelA:'Monticello' |
|
3198 |
labelB:'Current (In Image)' |
|
3199 |
title:'Diffs' |
|
3200 |
ignoreExtensions:false. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3201 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3202 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3203 |
"Created: / 01-12-2011 / 18:36:44 / cg" |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3204 |
! |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3205 |
|
10448 | 3206 |
changeMenuDeleteSelection: changeList |
10028 | 3207 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3208 |
changeList selection do:[:change|self changeMenuDeleteChange:change change]. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3209 |
changeList updateList. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3210 |
(list2 notNil and:[changeList ~~ list2]) ifTrue:[ |
12292 | 3211 |
"/ to get the =-icons |
3212 |
list2 updateList |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3213 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3214 |
|
10448 | 3215 |
"Created: / 04-08-2011 / 17:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3216 |
! |
3217 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3218 |
changeMenuDeleteSelectionInverted: changeList |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3219 |
| sel | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3220 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3221 |
sel := changeList selection ? #(). |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3222 |
changeList list do:[:change| |
12292 | 3223 |
(sel includes: change) ifFalse:[ |
3224 |
self changeMenuDeleteChange:change change |
|
3225 |
]. |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3226 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3227 |
changeList updateList. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3228 |
(list2 notNil and:[changeList ~~ list2]) ifTrue:[ |
12292 | 3229 |
"/ to get the =-icons |
3230 |
list2 updateList |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3231 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3232 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3233 |
"Created: / 17-05-2012 / 22:55:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3234 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3235 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3236 |
changeMenuDeleteToEnd: changeList |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3237 |
|lastIdx| |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3238 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3239 |
lastIdx := changeList selectionIndices max. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3240 |
changeList list from:lastIdx do:[:change | self changeMenuDeleteChange:change change]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3241 |
list2 notNil ifTrue:[ |
12292 | 3242 |
"/ to get the =-icons |
3243 |
list2 updateList |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3244 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3245 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3246 |
"Created: / 27-12-2011 / 10:53:00 / cg" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3247 |
"Created: / 30-03-2012 / 12:22:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3248 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3249 |
|
10448 | 3250 |
changeMenuInspect: changeList |
10028 | 3251 |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
3252 |
changeList selection size == 1 ifTrue:[ |
12292 | 3253 |
changeList selection anyOne change inspect |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
3254 |
] ifFalse:[ |
12292 | 3255 |
(changeList selection collect:[:each|each change]) inspect |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
3256 |
] |
10028 | 3257 |
|
10448 | 3258 |
"Created: / 04-08-2011 / 17:28:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3259 |
! |
3260 |
||
10448 | 3261 |
changeMenuInspectChangeset: changeList |
10028 | 3262 |
self changesetHolder value inspect. |
10448 | 3263 |
|
3264 |
"Created: / 04-08-2011 / 17:28:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 3265 |
! |
3266 |
||
10448 | 3267 |
changeMenuSelectAdditions: changeList |
10028 | 3268 |
|
10448 | 3269 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #+] |
10028 | 3270 |
|
10448 | 3271 |
"Created: / 04-08-2011 / 17:29:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3272 |
! |
3273 |
||
10448 | 3274 |
changeMenuSelectAll: changeList |
10028 | 3275 |
|
10448 | 3276 |
self changeMenuSelectIn: changeList suchThat:[:change|true] |
10028 | 3277 |
|
10448 | 3278 |
"Created: / 04-08-2011 / 17:29:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3279 |
! |
3280 |
||
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3281 |
changeMenuSelectClassInitializeDoIts: changeList |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3282 |
|
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3283 |
self changeMenuSelectIn: changeList suchThat:[:changeEntry| |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3284 |
| change | |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3285 |
|
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3286 |
change := changeEntry change. |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3287 |
change isDoIt |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3288 |
and:[change source endsWith: ' initialize'] |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3289 |
] |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3290 |
|
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3291 |
"Created: / 13-11-2013 / 18:40:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3292 |
! |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3293 |
|
13674
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3294 |
changeMenuSelectCopyrightMethods: changeList |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3295 |
|
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3296 |
self changeMenuSelectIn: changeList suchThat:[:changeEntry| |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3297 |
| change | |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3298 |
|
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3299 |
change := changeEntry change. |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3300 |
change isMethodCodeChange |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3301 |
and:[change selector == #copyright |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3302 |
and:[change isForMeta]] |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3303 |
] |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3304 |
|
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3305 |
"Created: / 12-11-2013 / 17:22:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3306 |
! |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3307 |
|
10448 | 3308 |
changeMenuSelectDifferences: changeList |
10028 | 3309 |
|
10448 | 3310 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #~] |
10028 | 3311 |
|
10448 | 3312 |
"Created: / 04-08-2011 / 17:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3313 |
! |
3314 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3315 |
changeMenuSelectInversion: changeList |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3316 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3317 |
| oldSel newSel | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3318 |
oldSel := changeList selection. |
12249 | 3319 |
newSel := OrderedCollection new. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3320 |
changeList list do:[:change| |
12292 | 3321 |
(oldSel includes: change) ifFalse:[ |
3322 |
newSel add: change. |
|
3323 |
] |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3324 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3325 |
changeList selection: newSel. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3326 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3327 |
"Created: / 17-05-2012 / 23:03:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3328 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3329 |
|
10448 | 3330 |
changeMenuSelectNone: changeList |
10028 | 3331 |
|
10448 | 3332 |
self changeMenuSelectIn: changeList suchThat:[:change|false] |
10028 | 3333 |
|
10448 | 3334 |
"Created: / 04-08-2011 / 17:30:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3335 |
! |
3336 |
||
10448 | 3337 |
changeMenuSelectRemovals: changeList |
10028 | 3338 |
|
10448 | 3339 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #-] |
10028 | 3340 |
|
10448 | 3341 |
"Modified: / 29-10-2010 / 13:18:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3342 |
"Created: / 04-08-2011 / 17:35:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 3343 |
! |
3344 |
||
10448 | 3345 |
changeMenuSelectSame: changeList |
10028 | 3346 |
|
10448 | 3347 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #=] |
10028 | 3348 |
|
10448 | 3349 |
"Modified: / 29-10-2010 / 13:18:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3350 |
"Created: / 04-08-2011 / 17:35:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 3351 |
! |
3352 |
||
10448 | 3353 |
changeMenuSelectUsingBlock: changeList |
10028 | 3354 |
|
3355 |
|conditionBlockString conditionBlock dialog textHolder template| |
|
3356 |
||
3357 |
template := |
|
3358 |
'[:change| |
|
3359 |
"/ Define condition for selection below: |
|
3360 |
"/ change is an instance of Change |
|
3361 |
"/ change will be selected if and only if block returns true |
|
3362 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3363 |
|
10028 | 3364 |
true"/always select the change |
3365 |
] |
|
3366 |
'. |
|
3367 |
||
3368 |
LastSelectionConditionString isNil ifTrue:[ |
|
11196 | 3369 |
LastSelectionConditionString := template. |
10028 | 3370 |
]. |
3371 |
||
3372 |
||
3373 |
textHolder := ValueHolder new. |
|
3374 |
dialog := Dialog |
|
11196 | 3375 |
forRequestText:(resources string:'Enter condition for selection') |
3376 |
lines:20 |
|
3377 |
columns:70 |
|
3378 |
initialAnswer:LastSelectionConditionString |
|
3379 |
model:textHolder. |
|
10028 | 3380 |
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]). |
3381 |
dialog open. |
|
3382 |
dialog accepted ifFalse:[^ self]. |
|
3383 |
||
3384 |
conditionBlockString := textHolder value. |
|
3385 |
LastSelectionConditionString := conditionBlockString. |
|
3386 |
||
3387 |
conditionBlock := Parser evaluate:conditionBlockString. |
|
3388 |
conditionBlock isBlock ifFalse:[ |
|
11196 | 3389 |
self error:'Bad selection block (syntax error?)'. |
3390 |
^ self |
|
10028 | 3391 |
]. |
3392 |
||
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3393 |
self changeMenuSelectIn: changeList suchThat: [:change|conditionBlock value: change change]. |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3394 |
|
10448 | 3395 |
"Created: / 04-08-2011 / 17:42:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3396 |
"Modified: / 21-01-2013 / 17:13:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3397 |
! |
3398 |
||
13674
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3399 |
changeMenuSelectVersionMethods: changeList |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3400 |
|
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3401 |
self changeMenuSelectIn: changeList suchThat:[:changeEntry| |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3402 |
| change | |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3403 |
|
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3404 |
change := changeEntry change. |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3405 |
change isMethodCodeChange |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3406 |
and:[((AbstractSourceCodeManager isVersionMethodSelector: change selector) or:[AbstractSourceCodeManager isExtensionsVersionMethodSelector:change selector]) |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3407 |
and:[change isForMeta]] |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3408 |
] |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3409 |
|
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3410 |
"Created: / 12-11-2013 / 17:22:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3411 |
! |
7cf98b160823
Small fixes for working with changesets
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13612
diff
changeset
|
3412 |
|
10448 | 3413 |
changeMenuUndeleteSelection: changeList |
10028 | 3414 |
|
3415 |
self selectionDo:[:chg|chg removed: false] |
|
3416 |
||
3417 |
"Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10448 | 3418 |
"Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11651 | 3419 |
! |
3420 |
||
3421 |
selectedChangesIn: changeList |
|
3422 |
|changes| |
|
3423 |
||
12292 | 3424 |
changes := (changeList == list1 |
3425 |
ifTrue:[ selection1Holder ] |
|
3426 |
ifFalse:[ selection2Holder ]) value. |
|
11651 | 3427 |
^ changes collect:[:eachListEntry | eachListEntry change]. |
3428 |
||
3429 |
"Created: / 23-07-2012 / 13:13:11 / cg" |
|
10448 | 3430 |
! ! |
3431 |
||
3432 |
!ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'! |
|
3433 |
||
3434 |
changeMenuApplyChange: aChange |
|
3435 |
||
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3436 |
"/ aChange isClassDefinitionChange ifTrue: |
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3437 |
"/ [(Smalltalk at: aChange superClassName asSymbol) |
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3438 |
"/ ifNil:[^self error: 'Nil superclass']]. |
10682 | 3439 |
|
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3440 |
| nsQueries packageQueries hasMC apply targetNameSpace | |
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3441 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3442 |
aChange removed ifTrue:[ ^ self ]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3443 |
|
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3444 |
|
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3445 |
nsQueries := Class nameSpaceQuerySignal. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3446 |
packageQueries := Class packageQuerySignal. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3447 |
hasMC := ConfigurableFeatures includesFeature:#MonticelloSupport. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3448 |
hasMC ifTrue:[ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3449 |
nsQueries := nsQueries , MCStXNamespaceQuery. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3450 |
packageQueries := packageQueries , MCStXPackageQuery. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3451 |
]. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3452 |
apply := [ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3453 |
updateChangeFileHolder value ifTrue:[ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3454 |
aChange apply |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3455 |
] ifFalse:[ |
13612
1acb01525f56
Fix in Tools::ChangeSetBrowser2 - do not update change file but update internal changeset...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13178
diff
changeset
|
3456 |
Class updateChangeFileQuerySignal answer: false do:[ |
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3457 |
aChange apply |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3458 |
] |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3459 |
]. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3460 |
]. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3461 |
|
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3462 |
targetNameSpaceName notNil ifTrue:[ |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3463 |
targetNameSpace := NameSpace name: targetNameSpaceName. |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3464 |
apply := [ |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3465 |
nsQueries answer: targetNameSpace do:apply. |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3466 |
] |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3467 |
]. |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3468 |
|
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3469 |
hasMC ifTrue:[ |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3470 |
apply := [ |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3471 |
MCInteractiveLoadingQuery answer: true do: apply |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3472 |
]. |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3473 |
]. |
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3474 |
|
12292 | 3475 |
self withWaitCursorDo:[ |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3476 |
packageQueries answer: self targetPackage do: apply |
10682 | 3477 |
]. |
10448 | 3478 |
|
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3479 |
"Modified: / 07-09-2011 / 22:24:57 / cg" |
13675
36933883999a
Fixes/improvements in changeset tools.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13674
diff
changeset
|
3480 |
"Modified: / 13-11-2013 / 12:09:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10448 | 3481 |
! |
3482 |
||
3483 |
changeMenuApplyChanges: changesToApply |
|
3484 |
||
3485 |
| changesThatFailToApply | |
|
3486 |
||
3487 |
changesThatFailToApply := ChangeSet new. |
|
3488 |
ProgressIndicator |
|
11196 | 3489 |
displayProgress:'Applying changes...' |
12088
5ae808a3d675
class: Tools::ChangeSetBrowser2
Stefan Vogel <sv@exept.de>
parents:
11797
diff
changeset
|
3490 |
at:(Screen default centerOfMonitorHavingPointer) |
11196 | 3491 |
from:200 to:400 |
3492 |
during:[:val | |
|
3493 |
1 to: changesToApply size do: |
|
3494 |
[:i| |
|
3495 |
val value:((100 / changesToApply size) * i) rounded. |
|
3496 |
[self changeMenuApplyChange: (changesToApply at: i)] |
|
3497 |
on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]] |
|
10448 | 3498 |
|
3499 |
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3500 |
! |
|
3501 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3502 |
changeMenuDeleteChange: change |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3503 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3504 |
change removed: true |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3505 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3506 |
"Created: / 30-03-2012 / 12:22:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3507 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3508 |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3509 |
changeMenuSelectIn: changeList suchThat:conditionBlock |
10448 | 3510 |
|
3511 |
| sel | |
|
3512 |
sel := OrderedCollection new. |
|
3513 |
changeList listHolder value do: [:chg|(conditionBlock value: chg) ifTrue:[sel add: chg]]. |
|
3514 |
changeList selectionHolder value: sel. |
|
3515 |
||
3516 |
"Created: / 04-08-2011 / 17:29:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3517 |
"Modified: / 21-01-2013 / 17:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3518 |
! ! |
3519 |
||
3520 |
!ChangeSetBrowser2 methodsFor:'private'! |
|
3521 |
||
10655 | 3522 |
changesDo:aBlock |
3523 |
self changeset do:aBlock. |
|
3524 |
||
3525 |
"Created: / 30-08-2011 / 14:30:58 / cg" |
|
3526 |
! |
|
3527 |
||
10028 | 3528 |
getNavigatorChangeSet |
3529 |
||
3530 |
| changeset | |
|
12271 | 3531 |
changeset := changesetHolder value. "/deepCopy. |
10028 | 3532 |
(changeset isKindOf: ChangeSet) ifFalse: |
12292 | 3533 |
[changeset := ChangeSet withAll: changeset]. |
10028 | 3534 |
|
12144 | 3535 |
^ (self navigatorSpecHolder value ~~ #oneColumnNavigatorSpec) ifTrue:[ |
12292 | 3536 |
changeset groupByClass |
12144 | 3537 |
] ifFalse:[ |
12292 | 3538 |
changeset flatten |
12144 | 3539 |
] |
10028 | 3540 |
|
3541 |
"Created: / 24-10-2009 / 19:31:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12272 | 3542 |
"Modified: / 27-07-2012 / 17:02:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3543 |
! |
3544 |
||
12667
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3545 |
iconSelectorForChange:aChange |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3546 |
|currentMethod| |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3547 |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3548 |
targetPackage notNil ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3549 |
aChange isMethodChange ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3550 |
(currentMethod := aChange changeMethod) notNil ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3551 |
currentMethod package ~= targetPackage ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3552 |
^ #iconExcla |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3553 |
] |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3554 |
] |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3555 |
]. |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3556 |
]. |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3557 |
^ nil. |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3558 |
! |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3559 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3560 |
list |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3561 |
"Returns list to operate on" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3562 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3563 |
^self isTwoColumn ifTrue:[list2] ifFalse:[list1] |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3564 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3565 |
"Created: / 30-03-2012 / 12:02:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3566 |
! |
3567 |
||
3568 |
redrawChangeListViews |
|
3569 |
||
10448 | 3570 |
list1 notNil ifTrue:[ |
12292 | 3571 |
list1 builder window allSubViewsDo: [:v|v redraw] |
10448 | 3572 |
]. |
3573 |
list2 notNil ifTrue:[ |
|
12292 | 3574 |
list2 builder window allSubViewsDo: [:v|v redraw] |
10448 | 3575 |
]. |
10028 | 3576 |
|
3577 |
"Created: / 16-03-2011 / 22:41:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3578 |
! |
|
3579 |
||
10453 | 3580 |
selectionDo: aBlock |
3581 |
||
11447 | 3582 |
| applyBlock | |
3583 |
||
3584 |
applyBlock := [:e|aBlock value: e change]. |
|
3585 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3586 |
"/ selectionHolder value isEmptyOrNil ifTrue:[ |
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3587 |
"/ (self navigatorChangesetHolder value ? #()) do: aBlock |
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3588 |
"/ ] ifFalse:[ |
11447 | 3589 |
selection2Holder value isEmptyOrNil not |
12405
76f9a872362b
Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
3590 |
ifTrue:[selection2Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]] |
76f9a872362b
Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
3591 |
ifFalse:[selection1Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]]. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3592 |
"/ ]. |
11447 | 3593 |
self redrawChangeListViews |
10453 | 3594 |
|
3595 |
"Created: / 29-10-2010 / 13:47:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11447 | 3596 |
"Modified: / 20-03-2012 / 17:16:40 / cg" |
12249 | 3597 |
"Modified: / 18-05-2012 / 09:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10453 | 3598 |
! |
3599 |
||
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3600 |
showProgress: label while: block |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3601 |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3602 |
self infoPanel progress: label while: [ |
12292 | 3603 |
[ |
3604 |
self isWorkingHolder value: true. |
|
3605 |
block value |
|
3606 |
] ensure:[ |
|
3607 |
self isWorkingHolder value: false. |
|
3608 |
] |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3609 |
] |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3610 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3611 |
"Created: / 10-02-2012 / 10:35:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10453 | 3612 |
! |
3613 |
||
10309 | 3614 |
showSource: aBoolean |
3615 |
| panel | |
|
3616 |
||
3617 |
"Not yet implemented" |
|
3618 |
||
3619 |
^self. |
|
3620 |
||
11663 | 3621 |
"/ cg: but what is it supposed to do??? |
3622 |
"/ sourceView ifNil:[^self]. |
|
3623 |
"/ panel := builder componentAt: #VerticalPanel. |
|
3624 |
"/ aBoolean ifTrue:[ |
|
3625 |
"/ (panel subViews includes: sourceView) ifTrue:[^self]. |
|
3626 |
"/ panel addSubView: sourceView. |
|
3627 |
"/ ] ifFalse:[ |
|
3628 |
"/ (panel subViews includes: sourceView) ifFalse:[^self]. |
|
3629 |
"/ panel removeSubView: sourceView. |
|
3630 |
"/ sourceView setId: nil. |
|
3631 |
"/ ] |
|
10309 | 3632 |
|
3633 |
"Created: / 11-07-2011 / 16:06:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11663 | 3634 |
"Modified: / 25-07-2012 / 17:44:01 / cg" |
10682 | 3635 |
! |
10028 | 3636 |
|
10682 | 3637 |
targetPackage |
3638 |
^ targetPackage ? PackageId noProjectID |
|
10028 | 3639 |
|
10682 | 3640 |
"Created: / 07-09-2011 / 20:12:04 / cg" |
10028 | 3641 |
! ! |
3642 |
||
3643 |
!ChangeSetBrowser2 methodsFor:'queries'! |
|
3644 |
||
3645 |
canApplyChanges |
|
3646 |
||
3647 |
^true |
|
3648 |
||
3649 |
"Created: / 29-10-2010 / 13:07:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3650 |
! |
|
3651 |
||
3652 |
canDrop: somethign |
|
3653 |
||
10682 | 3654 |
self breakPoint:#jv. |
10028 | 3655 |
|
3656 |
"Created: / 20-03-2011 / 21:34:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10682 | 3657 |
"Modified: / 07-09-2011 / 20:21:15 / cg" |
10028 | 3658 |
! |
3659 |
||
10448 | 3660 |
hasChangeSelectedAndNotRemoved: changeList |
10028 | 3661 |
|
10448 | 3662 |
| sel | |
3663 |
sel := changeList selection. |
|
3664 |
sel isEmptyOrNil ifTrue:[^false]. |
|
3665 |
^(sel anySatisfy:[:each|each removed]) not |
|
10028 | 3666 |
|
10380
f2a255ec6fc9
not ifTrue -> ifFalse (trying the rewrite tool ;-)
Claus Gittinger <cg@exept.de>
parents:
10370
diff
changeset
|
3667 |
"Modified: / 24-07-2011 / 06:52:28 / cg" |
10448 | 3668 |
"Created: / 04-08-2011 / 18:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3669 |
! |
3670 |
||
10448 | 3671 |
hasSingleChangeSelectedAndCanBrowse: changeList |
10028 | 3672 |
|
10448 | 3673 |
| sel | |
3674 |
sel := changeList selection. |
|
3675 |
sel isEmptyOrNil ifTrue:[^false]. |
|
3676 |
^true |
|
10028 | 3677 |
|
10448 | 3678 |
"Created: / 04-08-2011 / 18:25:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3679 |
! ! |
3680 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3681 |
!ChangeSetBrowser2 methodsFor:'testing'! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3682 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3683 |
isHierarchical |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3684 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3685 |
^self navigatorSpecHolder == #hierarchicalNavigatorSpec |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3686 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3687 |
"Modified: / 14-10-2010 / 15:52:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3688 |
"Created: / 30-03-2012 / 11:59:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3689 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3690 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3691 |
isOneColumn |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3692 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3693 |
^self navigatorSpecHolder value == #oneColumnNavigatorSpec |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3694 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3695 |
"Modified: / 14-10-2010 / 15:52:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3696 |
"Created: / 30-03-2012 / 11:59:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3697 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3698 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3699 |
isTwoColumn |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3700 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3701 |
^self navigatorSpecHolder == #twoColumnNavigatorSpec |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3702 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3703 |
"Modified: / 14-10-2010 / 15:51:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3704 |
"Created: / 30-03-2012 / 11:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3705 |
! ! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3706 |
|
10914 | 3707 |
!ChangeSetBrowser2::ChangeEditor class methodsFor:'documentation'! |
3708 |
||
3709 |
documentation |
|
3710 |
" |
|
3711 |
A simple, embeddable window to show a single change. |
|
3712 |
If readonlyHolder's value is false, then user is |
|
3713 |
allowed to edit the change (i.e., modify the source code) |
|
3714 |
||
3715 |
[author:] |
|
12292 | 3716 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
10914 | 3717 |
|
3718 |
[instance variables:] |
|
3719 |
||
3720 |
[class variables:] |
|
3721 |
||
3722 |
[see also:] |
|
3723 |
||
3724 |
" |
|
3725 |
! |
|
3726 |
||
3727 |
examples |
|
3728 |
" |
|
3729 |
Starting the application: |
|
12292 | 3730 |
[exBegin] |
10914 | 3731 |
Tools::ChangeEditor open |
3732 |
||
12292 | 3733 |
[exEnd] |
10914 | 3734 |
|
3735 |
more examples to be added: |
|
12292 | 3736 |
[exBegin] |
3737 |
... add code fragment for |
|
10914 | 3738 |
... executable example here ... |
12292 | 3739 |
[exEnd] |
10914 | 3740 |
" |
3741 |
! ! |
|
3742 |
||
3743 |
!ChangeSetBrowser2::ChangeEditor class methodsFor:'interface specs'! |
|
3744 |
||
3745 |
windowSpec |
|
3746 |
"This resource specification was automatically generated |
|
3747 |
by the UIPainter of ST/X." |
|
3748 |
||
3749 |
"Do not manually edit this!! If it is corrupted, |
|
3750 |
the UIPainter may not be able to read the specification." |
|
3751 |
||
3752 |
" |
|
3753 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2::ChangeEditor andSelector:#windowSpec |
|
3754 |
Tools::ChangeSetBrowser2::ChangeEditor new openInterface:#windowSpec |
|
3755 |
Tools::ChangeSetBrowser2::ChangeEditor open |
|
3756 |
" |
|
3757 |
||
3758 |
<resource: #canvas> |
|
3759 |
||
12292 | 3760 |
^ |
10914 | 3761 |
#(FullSpec |
12292 | 3762 |
name: windowSpec |
3763 |
window: |
|
10914 | 3764 |
(WindowSpec |
12292 | 3765 |
label: 'Change Editor' |
3766 |
name: 'Change Editor' |
|
3767 |
min: (Point 10 10) |
|
3768 |
bounds: (Rectangle 0 0 579 341) |
|
3769 |
) |
|
3770 |
component: |
|
10914 | 3771 |
(SpecCollection |
12292 | 3772 |
collection: ( |
3773 |
(SubCanvasSpec |
|
3774 |
name: 'TextDiffTool' |
|
3775 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
3776 |
hasHorizontalScrollBar: false |
|
3777 |
hasVerticalScrollBar: false |
|
3778 |
majorKey: #'Tools::TextDiff2Tool' |
|
3779 |
minorKey: windowSpecForEmbedding |
|
3780 |
subAspectHolders: |
|
3781 |
(Array |
|
3782 |
||
3783 |
(SubChannelInfoSpec |
|
3784 |
subAspect: classHolder |
|
3785 |
aspect: classAspect |
|
3786 |
) |
|
3787 |
(SubChannelInfoSpec |
|
3788 |
subAspect: codeAspectHolder |
|
3789 |
aspect: codeAspect |
|
3790 |
) |
|
3791 |
||
3792 |
(SubChannelInfoSpec |
|
3793 |
subAspect: labelAHolder |
|
3794 |
aspect: labelAHolder |
|
3795 |
) |
|
3796 |
(SubChannelInfoSpec |
|
3797 |
subAspect: labelBHolder |
|
3798 |
aspect: labelBHolder |
|
3799 |
) |
|
3800 |
||
3801 |
(SubChannelInfoSpec |
|
3802 |
subAspect: showDiffHolder |
|
3803 |
aspect: showdiffHolder |
|
3804 |
) |
|
3805 |
(SubChannelInfoSpec |
|
3806 |
subAspect: textAHolder |
|
3807 |
aspect: sourceChangeHolder |
|
3808 |
) |
|
3809 |
||
3810 |
(SubChannelInfoSpec |
|
3811 |
subAspect: textBHolder |
|
3812 |
aspect: sourceImageHolder |
|
3813 |
) |
|
3814 |
) |
|
3815 |
createNewApplication: true |
|
3816 |
createNewBuilder: true |
|
3817 |
) |
|
3818 |
) |
|
3819 |
||
3820 |
) |
|
10914 | 3821 |
) |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12154
diff
changeset
|
3822 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12154
diff
changeset
|
3823 |
"Modified: / 16-03-2012 / 13:08:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10914 | 3824 |
! ! |
3825 |
||
3826 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'accessing'! |
|
3827 |
||
3828 |
sourceChangeHolder |
|
3829 |
^ sourceChangeHolder |
|
3830 |
! |
|
3831 |
||
3832 |
sourceChangeHolder:something |
|
3833 |
sourceChangeHolder := something. |
|
3834 |
! |
|
3835 |
||
3836 |
sourceImageHolder |
|
3837 |
^ sourceImageHolder |
|
3838 |
! |
|
3839 |
||
3840 |
sourceImageHolder:something |
|
3841 |
sourceImageHolder := something. |
|
3842 |
! ! |
|
3843 |
||
3844 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'aspects'! |
|
3845 |
||
3846 |
changeHolder |
|
3847 |
"return/create the 'changeHolder' value holder (automatically generated)" |
|
3848 |
||
3849 |
changeHolder isNil ifTrue:[ |
|
12292 | 3850 |
changeHolder := ValueHolder new. |
3851 |
changeHolder addDependent:self. |
|
10914 | 3852 |
]. |
3853 |
^ changeHolder |
|
3854 |
! |
|
3855 |
||
3856 |
changeHolder:something |
|
3857 |
"set the 'changeHolder' value holder (automatically generated)" |
|
3858 |
||
3859 |
|oldValue newValue| |
|
3860 |
||
3861 |
changeHolder notNil ifTrue:[ |
|
12292 | 3862 |
oldValue := changeHolder value. |
3863 |
changeHolder removeDependent:self. |
|
10914 | 3864 |
]. |
3865 |
changeHolder := something. |
|
3866 |
changeHolder notNil ifTrue:[ |
|
12292 | 3867 |
changeHolder addDependent:self. |
10914 | 3868 |
]. |
3869 |
newValue := changeHolder value. |
|
3870 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 3871 |
self update:#value with:newValue from:changeHolder. |
10914 | 3872 |
]. |
3873 |
! |
|
3874 |
||
3875 |
classAspect |
|
3876 |
||
12292 | 3877 |
^(AspectAdaptor forAspect: #changeClass) |
3878 |
subjectChannel: self changeHolder |
|
10914 | 3879 |
|
3880 |
"Created: / 29-11-2011 / 11:21:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3881 |
! |
|
3882 |
||
3883 |
codeAspect |
|
3884 |
||
3885 |
^BlockValue |
|
12292 | 3886 |
with: [:change| |
3887 |
change isMethodCodeChange |
|
3888 |
ifTrue:[ SyntaxHighlighter codeAspectMethod ] |
|
3889 |
ifFalse:[ SyntaxHighlighter codeAspectExpression ] |
|
3890 |
] argument: self changeHolder |
|
10914 | 3891 |
|
3892 |
"Created: / 29-11-2011 / 11:21:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 3893 |
"Modified: / 27-07-2012 / 22:03:31 / cg" |
10914 | 3894 |
! |
3895 |
||
3896 |
labelAText |
|
3897 |
||
3898 |
^'Change' |
|
3899 |
||
3900 |
"Created: / 27-11-2011 / 14:59:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3901 |
! |
|
3902 |
||
3903 |
labelBText |
|
3904 |
||
3905 |
^'Current (in image)' |
|
3906 |
||
3907 |
"Created: / 27-11-2011 / 14:59:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3908 |
! |
|
3909 |
||
3910 |
readonlyHolder |
|
3911 |
"return/create the 'readonlyHolder' value holder (automatically generated)" |
|
3912 |
||
3913 |
readonlyHolder isNil ifTrue:[ |
|
12292 | 3914 |
readonlyHolder := ValueHolder new. |
3915 |
readonlyHolder addDependent:self. |
|
10914 | 3916 |
]. |
3917 |
^ readonlyHolder |
|
3918 |
! |
|
3919 |
||
3920 |
readonlyHolder:something |
|
3921 |
"set the 'readonlyHolder' value holder (automatically generated)" |
|
3922 |
||
3923 |
|oldValue newValue| |
|
3924 |
||
3925 |
readonlyHolder notNil ifTrue:[ |
|
12292 | 3926 |
oldValue := readonlyHolder value. |
3927 |
readonlyHolder removeDependent:self. |
|
10914 | 3928 |
]. |
3929 |
readonlyHolder := something. |
|
3930 |
readonlyHolder notNil ifTrue:[ |
|
12292 | 3931 |
readonlyHolder addDependent:self. |
10914 | 3932 |
]. |
3933 |
newValue := readonlyHolder value. |
|
3934 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 3935 |
self update:#value with:newValue from:readonlyHolder. |
10914 | 3936 |
]. |
3937 |
! |
|
3938 |
||
3939 |
showdiffHolder |
|
3940 |
"return/create the 'showdiffHolder' value holder (automatically generated)" |
|
3941 |
||
3942 |
showdiffHolder isNil ifTrue:[ |
|
12292 | 3943 |
showdiffHolder := ValueHolder new. |
10914 | 3944 |
]. |
3945 |
^ showdiffHolder |
|
3946 |
! |
|
3947 |
||
3948 |
showdiffHolder:something |
|
3949 |
"set the 'showdiffHolder' value holder (automatically generated)" |
|
3950 |
||
3951 |
showdiffHolder := something. |
|
3952 |
! ! |
|
3953 |
||
3954 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'change & update'! |
|
3955 |
||
3956 |
changeChanged |
|
3957 |
"changeHolder has changed, update sources etc..." |
|
3958 |
||
3959 |
| change | |
|
11663 | 3960 |
|
10914 | 3961 |
change := changeHolder value. |
3962 |
||
3963 |
sourceChangeHolder value: change changeSource. |
|
3964 |
sourceImageHolder value: change imageSource. |
|
3965 |
||
3966 |
"Created: / 29-11-2011 / 11:15:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11663 | 3967 |
"Modified (format): / 25-07-2012 / 17:39:48 / cg" |
10914 | 3968 |
! |
3969 |
||
3970 |
update:something with:aParameter from:changedObject |
|
3971 |
"Invoked when an object that I depend upon sends a change notification." |
|
3972 |
||
3973 |
||
3974 |
changedObject == changeHolder ifTrue:[ |
|
12292 | 3975 |
self changeChanged. |
3976 |
^ self. |
|
10914 | 3977 |
]. |
3978 |
super update:something with:aParameter from:changedObject |
|
3979 |
||
3980 |
"Modified: / 29-11-2011 / 11:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3981 |
! ! |
|
3982 |
||
10028 | 3983 |
!ChangeSetBrowser2 class methodsFor:'documentation'! |
3984 |
||
10450 | 3985 |
version |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3986 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $' |
10450 | 3987 |
! |
3988 |
||
10028 | 3989 |
version_CVS |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3990 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $' |
10028 | 3991 |
! |
3992 |
||
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3993 |
version_HG |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3994 |
|
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3995 |
^ '$Changeset: <not expanded> $' |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3996 |
! |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3997 |
|
10028 | 3998 |
version_SVN |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3999 |
^ '$Id: Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $' |
10028 | 4000 |
! ! |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
4001 |