author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Sat, 17 Mar 2012 10:21:50 +0000 | |
branch | jv |
changeset 12192 | 15f47901fb64 |
parent 12179 | 47f98e7d6de1 |
child 12198 | 414e7b69ecda |
permissions | -rw-r--r-- |
10194 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany |
|
3 |
Copyright (c) 2009-2010 eXept Software AG |
|
4 |
||
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. |
|
25 |
" |
|
12125 | 26 |
"{ Package: 'stx:libtool' }" |
10194 | 27 |
|
28 |
"{ NameSpace: Tools }" |
|
29 |
||
30 |
ApplicationModel subclass:#ChangeSetDiffTool |
|
31 |
instanceVariableNames:'listHolder singleSelectionHolder diffsetHolder titleHolder |
|
32 |
firstColSelectionHolder navigatorPanelSpecHolder diffMenuHolder |
|
33 |
diffsetHolderPrivate selectionHolder versionATextHolder |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
34 |
versionBTextHolder versionBaseTextHolder textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
35 |
textDiffToolWindowSpecHolder' |
10194 | 36 |
classVariableNames:'' |
37 |
poolDictionaries:'' |
|
38 |
category:'Interface-Diff' |
|
39 |
! |
|
40 |
||
41 |
SimpleDialog subclass:#OpenDialog |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
42 |
instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
43 |
changesetSpecBaseHolder' |
10194 | 44 |
classVariableNames:'LastDirectory' |
45 |
poolDictionaries:'' |
|
46 |
privateIn:ChangeSetDiffTool |
|
47 |
! |
|
48 |
||
49 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
50 |
||
51 |
copyright |
|
52 |
" |
|
53 |
Copyright (c) 2007-2010 Jan Vrany |
|
54 |
Copyright (c) 2009-2010 eXept Software AG |
|
55 |
||
56 |
Permission is hereby granted, free of charge, to any person |
|
57 |
obtaining a copy of this software and associated documentation |
|
58 |
files (the 'Software'), to deal in the Software without |
|
59 |
restriction, including without limitation the rights to use, |
|
60 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
61 |
copies of the Software, and to permit persons to whom the |
|
62 |
Software is furnished to do so, subject to the following |
|
63 |
conditions: |
|
64 |
||
65 |
The above copyright notice and this permission notice shall be |
|
66 |
included in all copies or substantial portions of the Software. |
|
67 |
||
68 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
69 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
70 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
71 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
72 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
73 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
74 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
75 |
OTHER DEALINGS IN THE SOFTWARE. |
|
76 |
||
77 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
78 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
79 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
80 |
documentation |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
81 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
82 |
Tool for viewing/merging differences between two change sets |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
83 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
84 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
85 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
86 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
87 |
[instance variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
88 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
89 |
[class variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
90 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
91 |
[see also:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
92 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
93 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
94 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
95 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
96 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
97 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
98 |
Starting the application: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
99 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
100 |
Tools::ChangeSetDiffTool open |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
101 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
102 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
103 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
104 |
Show differences between CVS HEAD and SVN jv-branch |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
105 |
NewSystemBrowser: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
106 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
107 |
| cvsCs svnCs | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
108 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
109 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
110 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
111 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
112 |
Tools::ChangeSetDiffTool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
113 |
open; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
114 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
115 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
116 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
117 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
118 |
Show differences between CVS HEAD and SVN jv-branch and |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
119 |
base version of NewSystemBrowser: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
120 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
121 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
122 |
| cvsBaseCs cvsCs svnCs | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
123 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
124 |
cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
125 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
126 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
127 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
128 |
Tools::ChangeSetDiffTool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
129 |
open; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
130 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
131 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
132 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
133 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
134 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
135 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
136 |
" |
10194 | 137 |
! ! |
138 |
||
139 |
!ChangeSetDiffTool class methodsFor:'accessing - defaults'! |
|
140 |
||
141 |
versionAColor |
|
142 |
||
143 |
^Color green lightened lightened |
|
144 |
||
145 |
"Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
146 |
! |
|
147 |
||
148 |
versionBColor |
|
149 |
||
150 |
^Color blue lightened lightened |
|
151 |
||
152 |
"Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
153 |
! |
|
154 |
||
155 |
versionBaseColor |
|
156 |
||
157 |
^Color yellow lightened lightened |
|
158 |
||
159 |
"Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
160 |
! |
|
161 |
||
162 |
versionNotPresentText |
|
163 |
^ 'Not present' asText allItalic colorizeAllWith:Color gray lighter |
|
164 |
! ! |
|
165 |
||
166 |
!ChangeSetDiffTool class methodsFor:'image specs'! |
|
167 |
||
168 |
versionA24x24 |
|
169 |
||
170 |
^ToolbarIconLibrary versionA24x24 |
|
171 |
||
172 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
173 |
! |
|
174 |
||
175 |
versionB24x24 |
|
176 |
||
177 |
^ToolbarIconLibrary versionB24x24 |
|
178 |
||
179 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
180 |
! ! |
|
181 |
||
182 |
!ChangeSetDiffTool class methodsFor:'interface specs'! |
|
183 |
||
184 |
labelSpec |
|
185 |
"This resource specification was automatically generated |
|
186 |
by the UIPainter of ST/X." |
|
187 |
||
188 |
"Do not manually edit this!! If it is corrupted, |
|
189 |
the UIPainter may not be able to read the specification." |
|
190 |
||
191 |
" |
|
192 |
UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec |
|
193 |
SVN::DiffBrowser new openInterface:#labelSpec |
|
194 |
" |
|
195 |
||
196 |
<resource: #canvas> |
|
197 |
||
198 |
^ |
|
199 |
#(FullSpec |
|
200 |
name: labelSpec |
|
201 |
window: |
|
202 |
(WindowSpec |
|
203 |
label: 'Label' |
|
204 |
name: 'Label' |
|
205 |
min: (Point 10 10) |
|
206 |
bounds: (Rectangle 0 0 600 48) |
|
207 |
) |
|
208 |
component: |
|
209 |
(SpecCollection |
|
210 |
collection: ( |
|
211 |
(UISubSpecification |
|
212 |
name: 'LabelA' |
|
213 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
214 |
minorKey: versionALabelSpec |
|
215 |
) |
|
216 |
(UISubSpecification |
|
217 |
name: 'LabelB' |
|
218 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
219 |
minorKey: versionBLabelSpec |
|
220 |
) |
|
221 |
) |
|
222 |
||
223 |
) |
|
224 |
) |
|
225 |
! |
|
226 |
||
227 |
oneColumnNavigatorSpec |
|
228 |
"This resource specification was automatically generated |
|
229 |
by the UIPainter of ST/X." |
|
230 |
||
231 |
"Do not manually edit this!! If it is corrupted, |
|
232 |
the UIPainter may not be able to read the specification." |
|
233 |
||
234 |
" |
|
235 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#oneColumnNavigatorSpec |
|
236 |
Tools::ChangeSetDiffBrowser new openInterface:#oneColumnNavigatorSpec |
|
237 |
" |
|
238 |
||
239 |
<resource: #canvas> |
|
240 |
||
241 |
^ |
|
242 |
#(FullSpec |
|
243 |
name: oneColumnNavigatorSpec |
|
244 |
window: |
|
245 |
(WindowSpec |
|
246 |
label: 'One Column Navigator' |
|
247 |
name: 'One Column Navigator' |
|
248 |
min: (Point 10 10) |
|
249 |
bounds: (Rectangle 0 0 300 300) |
|
250 |
) |
|
251 |
component: |
|
252 |
(SpecCollection |
|
253 |
collection: ( |
|
254 |
(SubCanvasSpec |
|
255 |
name: 'DiffList' |
|
256 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
257 |
hasHorizontalScrollBar: false |
|
258 |
hasVerticalScrollBar: false |
|
259 |
majorKey: #'Tools::ChangeSetDiffList' |
|
260 |
subAspectHolders: |
|
261 |
(Array |
|
262 |
||
263 |
(SubChannelInfoSpec |
|
264 |
subAspect: inGeneratorHolder |
|
265 |
aspect: diffsetHolderPrivate |
|
266 |
) |
|
267 |
(SubChannelInfoSpec |
|
268 |
subAspect: listEntryLabelGenerator |
|
269 |
aspect: diffListEntryLabelGeneratorAspect |
|
270 |
) |
|
271 |
||
272 |
(SubChannelInfoSpec |
|
273 |
subAspect: menuHolder |
|
274 |
aspect: listMenuHolder |
|
275 |
) |
|
276 |
(SubChannelInfoSpec |
|
277 |
subAspect: outGeneratorHolder |
|
278 |
aspect: selectionHolder |
|
279 |
) |
|
280 |
) |
|
281 |
createNewApplication: true |
|
282 |
createNewBuilder: false |
|
283 |
) |
|
284 |
) |
|
285 |
||
286 |
) |
|
287 |
) |
|
288 |
! |
|
289 |
||
290 |
twoColumnNavigatorSpec |
|
291 |
"This resource specification was automatically generated |
|
292 |
by the UIPainter of ST/X." |
|
293 |
||
294 |
"Do not manually edit this!! If it is corrupted, |
|
295 |
the UIPainter may not be able to read the specification." |
|
296 |
||
297 |
" |
|
298 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#twoColumnNavigatorSpec |
|
299 |
Tools::ChangeSetDiffBrowser new openInterface:#twoColumnNavigatorSpec |
|
300 |
" |
|
301 |
||
302 |
<resource: #canvas> |
|
303 |
||
304 |
^ |
|
305 |
#(FullSpec |
|
306 |
name: twoColumnNavigatorSpec |
|
307 |
window: |
|
308 |
(WindowSpec |
|
309 |
label: 'Two Column Navigator' |
|
310 |
name: 'Two Column Navigator' |
|
311 |
min: (Point 10 10) |
|
312 |
bounds: (Rectangle 0 0 300 300) |
|
313 |
) |
|
314 |
component: |
|
315 |
(SpecCollection |
|
316 |
collection: ( |
|
317 |
(VariableHorizontalPanelSpec |
|
318 |
name: 'Columns' |
|
319 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
320 |
component: |
|
321 |
(SpecCollection |
|
322 |
collection: ( |
|
323 |
(SubCanvasSpec |
|
324 |
name: 'FirstColumn' |
|
325 |
hasHorizontalScrollBar: false |
|
326 |
hasVerticalScrollBar: false |
|
327 |
majorKey: #'Tools::ChangeSetDiffList' |
|
328 |
subAspectHolders: |
|
329 |
(Array |
|
330 |
||
331 |
(SubChannelInfoSpec |
|
332 |
subAspect: inGeneratorHolder |
|
333 |
aspect: diffsetHolderPrivate |
|
334 |
) |
|
335 |
(SubChannelInfoSpec |
|
336 |
subAspect: listEntryLabelGenerator |
|
337 |
aspect: diffListEntryLabelGeneratorAspect |
|
338 |
) |
|
339 |
||
340 |
(SubChannelInfoSpec |
|
341 |
subAspect: menuHolder |
|
342 |
aspect: listMenuHolder |
|
343 |
) |
|
344 |
(SubChannelInfoSpec |
|
345 |
subAspect: outGeneratorHolder |
|
346 |
aspect: firstColSelectionHolder |
|
347 |
) |
|
348 |
) |
|
349 |
createNewApplication: true |
|
350 |
createNewBuilder: true |
|
351 |
) |
|
352 |
(SubCanvasSpec |
|
353 |
name: 'SecondColumn' |
|
354 |
hasHorizontalScrollBar: false |
|
355 |
hasVerticalScrollBar: false |
|
356 |
majorKey: #'Tools::ChangeSetDiffList' |
|
357 |
subAspectHolders: |
|
358 |
(Array |
|
359 |
||
360 |
(SubChannelInfoSpec |
|
361 |
subAspect: inGeneratorHolder |
|
362 |
aspect: firstColSelectionHolder |
|
363 |
) |
|
364 |
(SubChannelInfoSpec |
|
365 |
subAspect: listEntryLabelGenerator |
|
366 |
aspect: diffListEntryLabelGeneratorAspect |
|
367 |
) |
|
368 |
||
369 |
(SubChannelInfoSpec |
|
370 |
subAspect: menuHolder |
|
371 |
aspect: listMenuHolder |
|
372 |
) |
|
373 |
(SubChannelInfoSpec |
|
374 |
subAspect: outGeneratorHolder |
|
375 |
aspect: selectionHolder |
|
376 |
) |
|
377 |
) |
|
378 |
createNewApplication: true |
|
379 |
createNewBuilder: true |
|
380 |
) |
|
381 |
) |
|
382 |
||
383 |
) |
|
384 |
handles: (Any 0.5 1.0) |
|
385 |
) |
|
386 |
) |
|
387 |
||
388 |
) |
|
389 |
) |
|
390 |
! |
|
391 |
||
392 |
windowSpec |
|
393 |
"This resource specification was automatically generated |
|
394 |
by the UIPainter of ST/X." |
|
395 |
||
396 |
"Do not manually edit this!! If it is corrupted, |
|
397 |
the UIPainter may not be able to read the specification." |
|
398 |
||
399 |
" |
|
400 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec |
|
401 |
Tools::ChangeSetDiffTool new openInterface:#windowSpec |
|
402 |
Tools::ChangeSetDiffTool open |
|
403 |
" |
|
404 |
||
405 |
<resource: #canvas> |
|
406 |
||
407 |
^ |
|
408 |
#(FullSpec |
|
409 |
name: windowSpec |
|
410 |
window: |
|
411 |
(WindowSpec |
|
412 |
label: 'Diff Browser' |
|
413 |
name: 'Diff Browser' |
|
414 |
min: (Point 10 10) |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
415 |
bounds: (Rectangle 0 0 1024 768) |
10194 | 416 |
menu: mainMenu |
417 |
) |
|
418 |
component: |
|
419 |
(SpecCollection |
|
420 |
collection: ( |
|
421 |
(UISubSpecification |
|
422 |
name: 'Label' |
|
423 |
layout: (LayoutFrame 0 0 0 0 0 1 56 0) |
|
424 |
minorKey: labelSpec |
|
425 |
) |
|
426 |
(VariableVerticalPanelSpec |
|
427 |
name: 'Panel' |
|
428 |
layout: (LayoutFrame 0 0 56 0 0 1 0 1) |
|
429 |
showHandle: true |
|
430 |
component: |
|
431 |
(SpecCollection |
|
432 |
collection: ( |
|
433 |
(SubCanvasSpec |
|
434 |
name: 'NavigatorPanel' |
|
435 |
hasHorizontalScrollBar: false |
|
436 |
hasVerticalScrollBar: false |
|
437 |
specHolder: navigatorPanelSpecHolder |
|
438 |
createNewBuilder: false |
|
439 |
) |
|
440 |
(SubCanvasSpec |
|
441 |
name: 'TextDiff' |
|
442 |
majorKey: #'Tools::TextDiffTool' |
|
443 |
minorKey: windowSpecForEmbedding |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
444 |
specHolder: textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
445 |
clientHolder: textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
446 |
createNewBuilder: false |
10194 | 447 |
) |
448 |
) |
|
449 |
||
450 |
) |
|
451 |
handles: (Any 0.5 1.0) |
|
452 |
) |
|
453 |
) |
|
454 |
||
455 |
) |
|
456 |
) |
|
457 |
! ! |
|
458 |
||
459 |
!ChangeSetDiffTool class methodsFor:'interface specs - labels'! |
|
460 |
||
461 |
versionALabelSpec |
|
462 |
"This resource specification was automatically generated |
|
463 |
by the UIPainter of ST/X." |
|
464 |
||
465 |
"Do not manually edit this!! If it is corrupted, |
|
466 |
the UIPainter may not be able to read the specification." |
|
467 |
||
468 |
" |
|
469 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec |
|
470 |
Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec |
|
471 |
" |
|
472 |
||
473 |
<resource: #canvas> |
|
474 |
||
475 |
^ |
|
476 |
#(FullSpec |
|
477 |
name: versionALabelSpec |
|
478 |
window: |
|
479 |
(WindowSpec |
|
480 |
label: 'Version A' |
|
481 |
name: 'Version A' |
|
482 |
min: (Point 10 10) |
|
483 |
bounds: (Rectangle 0 0 300 30) |
|
484 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
485 |
forceRecursiveBackground: true |
|
486 |
) |
|
487 |
component: |
|
488 |
(SpecCollection |
|
489 |
collection: ( |
|
490 |
(LabelSpec |
|
491 |
label: 'versionA24x24' |
|
492 |
name: 'VersionAIcon' |
|
493 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
494 |
hasCharacterOrientedLabel: false |
|
495 |
translateLabel: true |
|
496 |
) |
|
497 |
(LabelSpec |
|
498 |
label: 'Version A' |
|
499 |
name: 'VersionALabel' |
|
500 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
501 |
translateLabel: true |
|
502 |
labelChannel: versionALabelHolder |
|
503 |
resizeForLabel: true |
|
504 |
adjust: left |
|
505 |
) |
|
12125 | 506 |
(LabelSpec |
507 |
label: '(A)' |
|
508 |
name: 'ALabel' |
|
509 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
510 |
translateLabel: true |
|
511 |
) |
|
10194 | 512 |
) |
513 |
||
514 |
) |
|
515 |
) |
|
516 |
! |
|
517 |
||
518 |
versionBLabelSpec |
|
519 |
"This resource specification was automatically generated |
|
520 |
by the UIPainter of ST/X." |
|
521 |
||
522 |
"Do not manually edit this!! If it is corrupted, |
|
523 |
the UIPainter may not be able to read the specification." |
|
524 |
||
525 |
" |
|
526 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
527 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
528 |
" |
|
529 |
||
530 |
<resource: #canvas> |
|
531 |
||
532 |
^ |
|
533 |
#(FullSpec |
|
534 |
name: versionBLabelSpec |
|
535 |
window: |
|
536 |
(WindowSpec |
|
537 |
label: 'Version B' |
|
538 |
name: 'Version B' |
|
539 |
min: (Point 10 10) |
|
540 |
bounds: (Rectangle 0 0 300 30) |
|
541 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
542 |
forceRecursiveBackground: true |
|
543 |
) |
|
544 |
component: |
|
545 |
(SpecCollection |
|
546 |
collection: ( |
|
547 |
(LabelSpec |
|
548 |
label: 'versionB24x24' |
|
549 |
name: 'VersionBIcon' |
|
550 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
551 |
hasCharacterOrientedLabel: false |
|
552 |
translateLabel: true |
|
553 |
) |
|
554 |
(LabelSpec |
|
555 |
label: 'Version B' |
|
556 |
name: 'VersionBLabel' |
|
557 |
layout: (LayoutFrame 30 0 0 0 167 0 0 1) |
|
558 |
translateLabel: true |
|
559 |
labelChannel: versionBLabelHolder |
|
560 |
resizeForLabel: true |
|
561 |
adjust: left |
|
562 |
useDynamicPreferredWidth: true |
|
563 |
usePreferredWidth: true |
|
564 |
) |
|
12125 | 565 |
(LabelSpec |
566 |
label: '(B)' |
|
567 |
name: 'BLabel' |
|
568 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
569 |
translateLabel: true |
|
570 |
) |
|
10194 | 571 |
) |
572 |
||
573 |
) |
|
574 |
) |
|
12125 | 575 |
|
576 |
"Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 577 |
! ! |
578 |
||
579 |
!ChangeSetDiffTool class methodsFor:'menu specs'! |
|
580 |
||
581 |
listMenu |
|
582 |
"This resource specification was automatically generated |
|
583 |
by the MenuEditor of ST/X." |
|
584 |
||
585 |
"Do not manually edit this!! If it is corrupted, |
|
586 |
the MenuEditor may not be able to read the specification." |
|
587 |
||
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
588 |
|
10194 | 589 |
" |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
590 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenu |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
591 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenu)) startUp |
10194 | 592 |
" |
593 |
||
594 |
<resource: #menu> |
|
595 |
||
596 |
^ |
|
597 |
#(Menu |
|
598 |
( |
|
599 |
(MenuItem |
|
600 |
label: 'Browse' |
|
601 |
itemValue: listMenuBrowse |
|
602 |
translateLabel: true |
|
603 |
) |
|
604 |
(MenuItem |
|
605 |
label: '-' |
|
606 |
) |
|
607 |
(MenuItem |
|
608 |
label: 'Load version A' |
|
609 |
itemValue: listMenuLoadVersionA |
|
610 |
nameKey: LoadVersionA |
|
611 |
translateLabel: true |
|
612 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
613 |
) |
|
614 |
(MenuItem |
|
615 |
label: 'Load version B' |
|
616 |
itemValue: listMenuLoadVersionB |
|
617 |
nameKey: LoadVersionB |
|
618 |
translateLabel: true |
|
619 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
620 |
) |
|
621 |
(MenuItem |
|
622 |
label: '-' |
|
623 |
) |
|
624 |
(MenuItem |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
625 |
label: 'Open in...' |
10194 | 626 |
translateLabel: true |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
627 |
submenu: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
628 |
(Menu |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
629 |
( |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
630 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
631 |
enabled: hasSelection |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
632 |
label: 'Inspector' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
633 |
itemValue: listMenuInspect |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
634 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
635 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
636 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
637 |
label: 'kdiff3' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
638 |
itemValue: listMenuOpenInExternal: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
639 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
640 |
argument: 'kdiff3' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
641 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
642 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
643 |
label: 'meld' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
644 |
itemValue: listMenuOpenInExternal: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
645 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
646 |
argument: 'meld' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
647 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
648 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
649 |
nil |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
650 |
nil |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
651 |
) |
10194 | 652 |
) |
653 |
) |
|
654 |
nil |
|
655 |
nil |
|
656 |
) |
|
657 |
! |
|
658 |
||
659 |
mainMenu |
|
660 |
"This resource specification was automatically generated |
|
661 |
by the MenuEditor of ST/X." |
|
662 |
||
663 |
"Do not manually edit this!! If it is corrupted, |
|
664 |
the MenuEditor may not be able to read the specification." |
|
665 |
||
12125 | 666 |
|
10194 | 667 |
" |
12125 | 668 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu |
669 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp |
|
10194 | 670 |
" |
671 |
||
672 |
<resource: #menu> |
|
673 |
||
674 |
^ |
|
675 |
#(Menu |
|
676 |
( |
|
677 |
(MenuItem |
|
678 |
label: 'File' |
|
679 |
translateLabel: true |
|
680 |
submenu: |
|
681 |
(Menu |
|
682 |
( |
|
683 |
(MenuItem |
|
684 |
label: 'Open' |
|
685 |
itemValue: fileMenuOpen |
|
686 |
translateLabel: true |
|
687 |
shortcutKey: Ctrlo |
|
688 |
) |
|
689 |
(MenuItem |
|
690 |
enabled: false |
|
691 |
label: 'Save as patch ' |
|
692 |
itemValue: fileMenuSaveAsPatch |
|
693 |
translateLabel: true |
|
694 |
) |
|
695 |
(MenuItem |
|
696 |
label: '-' |
|
697 |
) |
|
698 |
(MenuItem |
|
699 |
label: 'Exit' |
|
700 |
itemValue: closeRequest |
|
701 |
translateLabel: true |
|
702 |
) |
|
703 |
) |
|
704 |
nil |
|
705 |
nil |
|
706 |
) |
|
707 |
) |
|
708 |
(MenuItem |
|
12125 | 709 |
label: 'Changeset' |
710 |
translateLabel: true |
|
711 |
submenu: |
|
712 |
(Menu |
|
713 |
( |
|
714 |
(MenuItem |
|
715 |
label: 'Browse changes (A)' |
|
716 |
itemValue: changesetMenuBrowseA |
|
717 |
translateLabel: true |
|
718 |
) |
|
719 |
(MenuItem |
|
720 |
label: 'Browse changes (B)' |
|
721 |
itemValue: changesetMenuBrowseB |
|
722 |
translateLabel: true |
|
723 |
) |
|
724 |
||
725 |
) |
|
726 |
nil |
|
727 |
nil |
|
728 |
) |
|
729 |
) |
|
730 |
(MenuItem |
|
10194 | 731 |
label: 'Diff' |
732 |
translateLabel: true |
|
733 |
submenuChannel: listMenu |
|
734 |
) |
|
735 |
) |
|
736 |
nil |
|
737 |
nil |
|
738 |
) |
|
12125 | 739 |
|
740 |
"Modified: / 16-12-2011 / 14:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 741 |
! ! |
742 |
||
743 |
!ChangeSetDiffTool class methodsFor:'plugIn spec'! |
|
744 |
||
745 |
aspectSelectors |
|
746 |
"This resource specification was automatically generated |
|
747 |
by the UIPainter of ST/X." |
|
748 |
||
749 |
"Do not manually edit this. If it is corrupted, |
|
750 |
the UIPainter may not be able to read the specification." |
|
751 |
||
752 |
"Return a description of exported aspects; |
|
753 |
these can be connected to aspects of an embedding application |
|
754 |
(if this app is embedded in a subCanvas)." |
|
755 |
||
756 |
^ #( |
|
757 |
#diffsetHolder |
|
758 |
). |
|
759 |
||
760 |
! ! |
|
761 |
||
762 |
!ChangeSetDiffTool methodsFor:'accessing'! |
|
763 |
||
764 |
beSingleColumn |
|
765 |
||
766 |
self navigatorPanelSpecHolder value: #oneColumnNavigatorSpec |
|
767 |
||
768 |
"Created: / 20-11-2009 / 20:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
769 |
! |
|
770 |
||
771 |
beTwoColumn |
|
772 |
||
773 |
self navigatorPanelSpecHolder value: #twoColumnNavigatorSpec |
|
774 |
||
775 |
"Created: / 20-11-2009 / 20:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
776 |
! |
|
777 |
||
778 |
beTwoColumn: aBoolean |
|
779 |
||
780 |
aBoolean |
|
781 |
ifTrue:[self beTwoColumn] |
|
782 |
ifFalse:[self beSingleColumn] |
|
783 |
||
784 |
"Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
785 |
! |
|
786 |
||
787 |
diffset |
|
788 |
||
789 |
^self diffsetHolder value |
|
790 |
||
791 |
"Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
792 |
! |
|
793 |
||
794 |
diffset: aDiff3Set |
|
795 |
||
796 |
self diffsetHolder value: aDiff3Set |
|
797 |
||
798 |
"Created: / 01-11-2009 / 09:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
799 |
! |
|
800 |
||
801 |
patchset |
|
802 |
||
803 |
| patchset | |
|
804 |
patchset := ChangeSet new. |
|
805 |
self diffset do: |
|
806 |
[:diff|patchset add:diff versionA]. |
|
807 |
^patchset |
|
808 |
||
809 |
"Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
810 |
! |
|
811 |
||
812 |
selection |
|
813 |
||
814 |
^self selectionHolder value |
|
815 |
||
816 |
"Created: / 22-10-2008 / 11:30:03 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
817 |
! |
|
818 |
||
819 |
selection: selection |
|
820 |
||
821 |
^self selectionHolder value: selection |
|
822 |
||
823 |
"Created: / 22-10-2008 / 11:30:11 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
824 |
! |
|
825 |
||
826 |
title: aString |
|
827 |
||
828 |
self titleHolder value: aString |
|
829 |
||
830 |
"Created: / 19-11-2009 / 15:44:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
831 |
! ! |
|
832 |
||
833 |
!ChangeSetDiffTool methodsFor:'accessing - selection'! |
|
834 |
||
835 |
theSingleSelectedObject |
|
836 |
||
837 |
| sel selSize obj | |
|
838 |
sel := self selection. |
|
839 |
||
840 |
(sel isCollection and:[self isString not]) |
|
841 |
ifFalse:[^sel]. |
|
842 |
||
843 |
selSize := 0. |
|
844 |
obj := nil. |
|
845 |
sel do: |
|
846 |
[:each| |
|
847 |
selSize := selSize + 1. |
|
848 |
selSize > 1 ifTrue:[^nil]. |
|
849 |
obj := each]. |
|
850 |
^obj |
|
851 |
||
852 |
"Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
853 |
"Modified: / 20-11-2009 / 19:54:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
854 |
! ! |
|
855 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
856 |
!ChangeSetDiffTool methodsFor:'accessing - subapps'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
857 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
858 |
textDiff2Tool |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
859 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
860 |
^TextDiff2Tool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
861 |
labelAHolder: self versionALabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
862 |
textAHolder: self versionATextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
863 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
864 |
labelBHolder: self versionBLabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
865 |
textBHolder: self versionBTextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
866 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
867 |
yourself |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
868 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
869 |
"Created: / 16-03-2012 / 13:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
870 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
871 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
872 |
textDiff3Tool |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
873 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
874 |
^TextDiff3Tool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
875 |
labelCHolder: self versionBaseLabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
876 |
textCHolder: self versionBaseTextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
877 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
878 |
labelBHolder: self versionBLabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
879 |
textBHolder: self versionBTextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
880 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
881 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
882 |
labelAHolder: self versionALabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
883 |
textAHolder: self versionATextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
884 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
885 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
886 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
887 |
yourself |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
888 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
889 |
"Created: / 16-03-2012 / 15:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
890 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
891 |
|
10194 | 892 |
!ChangeSetDiffTool methodsFor:'aspects'! |
893 |
||
894 |
diffListEntryLabelGeneratorAspect |
|
895 |
||
896 |
^nil |
|
897 |
||
898 |
"Created: / 24-11-2009 / 10:01:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
899 |
! |
|
900 |
||
901 |
diffsetHolder |
|
902 |
"return/create the 'diffsetHolder' value holder (automatically generated)" |
|
903 |
||
904 |
diffsetHolder isNil ifTrue:[ |
|
905 |
diffsetHolder := ValueHolder new. |
|
906 |
diffsetHolder addDependent:self. |
|
907 |
]. |
|
908 |
^ diffsetHolder |
|
909 |
! |
|
910 |
||
911 |
diffsetHolder:aValueHolder |
|
912 |
"set the 'diffsetHolder' value holder (automatically generated)" |
|
913 |
||
914 |
|oldValue newValue| |
|
915 |
||
916 |
diffsetHolder notNil ifTrue:[ |
|
917 |
oldValue := diffsetHolder value. |
|
918 |
diffsetHolder removeDependent:self. |
|
919 |
]. |
|
920 |
diffsetHolder := aValueHolder. |
|
921 |
diffsetHolder notNil ifTrue:[ |
|
922 |
diffsetHolder addDependent:self. |
|
923 |
]. |
|
924 |
newValue := diffsetHolder value. |
|
925 |
oldValue ~~ newValue ifTrue:[ |
|
926 |
self update:#value with:newValue from:diffsetHolder. |
|
927 |
]. |
|
928 |
! |
|
929 |
||
930 |
diffsetHolderPrivate |
|
931 |
"return/create the 'diffSetHolderPrivate' value holder (automatically generated)" |
|
932 |
||
933 |
diffsetHolderPrivate isNil ifTrue:[ |
|
934 |
diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value). |
|
935 |
]. |
|
936 |
^ diffsetHolderPrivate |
|
937 |
||
938 |
"Created: / 05-12-2009 / 11:03:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
939 |
! |
|
940 |
||
941 |
firstColSelectionHolder |
|
942 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
943 |
||
944 |
firstColSelectionHolder isNil ifTrue:[ |
|
945 |
firstColSelectionHolder := ValueHolder with:nil "defaultValue here". |
|
946 |
]. |
|
947 |
^ firstColSelectionHolder |
|
948 |
! |
|
949 |
||
950 |
hasSelectionHolder |
|
951 |
||
952 |
|holder| |
|
953 |
||
954 |
(holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[ |
|
955 |
holder := (AspectAdaptor forAspect: #notEmptyOrNil) |
|
956 |
subjectChannel: self selectionHolder. |
|
957 |
builder aspectAt:#hasSelectionHolder put: holder |
|
958 |
]. |
|
959 |
^ holder. |
|
960 |
||
961 |
"Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
962 |
"Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
963 |
! |
|
964 |
||
965 |
listHolder |
|
966 |
"return/create the 'listHolder' value holder (automatically generated)" |
|
967 |
||
968 |
listHolder isNil ifTrue:[ |
|
969 |
listHolder := ValueHolder new. |
|
970 |
]. |
|
971 |
^ listHolder |
|
972 |
||
973 |
"Modified: / 01-11-2009 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
974 |
! |
|
975 |
||
976 |
listMenuHolder |
|
12125 | 977 |
diffMenuHolder isNil ifTrue:[ |
978 |
diffMenuHolder := ValueHolder with:(Menu decodeFromLiteralArray: self class listMenu) |
|
979 |
]. |
|
10194 | 980 |
^ diffMenuHolder |
981 |
||
982 |
"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
983 |
"Modified: / 09-12-2009 / 23:34:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 984 |
"Modified: / 18-11-2011 / 14:57:47 / cg" |
10194 | 985 |
! |
986 |
||
987 |
nameAspect |
|
988 |
||
989 |
^(AspectAdaptor forAspect: #name) |
|
990 |
subjectChannel: self diffsetHolder |
|
991 |
||
992 |
"Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
993 |
! |
|
994 |
||
995 |
navigatorPanelSpecHolder |
|
996 |
<resource: #uiAspect> |
|
997 |
||
998 |
navigatorPanelSpecHolder isNil ifTrue:[ |
|
999 |
navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec. |
|
1000 |
]. |
|
1001 |
^ navigatorPanelSpecHolder. |
|
1002 |
||
1003 |
"Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1004 |
! |
|
1005 |
||
1006 |
selectionHolder |
|
1007 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
|
1008 |
||
1009 |
selectionHolder isNil ifTrue:[ |
|
1010 |
||
1011 |
selectionHolder := ValueHolder new. |
|
1012 |
selectionHolder addDependent:self. |
|
1013 |
]. |
|
1014 |
^ selectionHolder |
|
1015 |
||
1016 |
"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1017 |
! |
|
1018 |
||
1019 |
singleSelectionHolder |
|
1020 |
"return/create the 'singleSelectionHolder' value holder (automatically generated)" |
|
1021 |
||
1022 |
singleSelectionHolder isNil ifTrue:[ |
|
1023 |
singleSelectionHolder := ValueHolder new. |
|
1024 |
]. |
|
1025 |
^ singleSelectionHolder |
|
1026 |
||
1027 |
"Modified: / 10-11-2009 / 11:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1028 |
! |
|
1029 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1030 |
textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1031 |
"return/create the 'textDiffToolHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1032 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1033 |
textDiffToolHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1034 |
textDiffToolHolder := ValueHolder with: self textDiff2Tool. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1035 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1036 |
^ textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1037 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1038 |
"Modified: / 16-03-2012 / 13:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1039 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1040 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1041 |
textDiffToolHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1042 |
"set the 'textDiffToolHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1043 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1044 |
textDiffToolHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1045 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1046 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1047 |
textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1048 |
"return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1049 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1050 |
textDiffToolWindowSpecHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1051 |
textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1052 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1053 |
^ textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1054 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1055 |
"Modified: / 16-03-2012 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1056 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1057 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1058 |
textDiffToolWindowSpecHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1059 |
"set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1060 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1061 |
textDiffToolWindowSpecHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1062 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1063 |
|
10194 | 1064 |
titleHolder |
1065 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
1066 |
||
1067 |
titleHolder isNil ifTrue:[ |
|
1068 |
titleHolder := ValueHolder with: 'Diff Browser'. |
|
1069 |
]. |
|
1070 |
^ titleHolder |
|
1071 |
||
1072 |
"Modified: / 01-11-2009 / 14:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1073 |
! |
|
1074 |
||
1075 |
versionALabelHolder |
|
1076 |
||
1077 |
^(AspectAdaptor forAspect: #versionALabel) |
|
1078 |
subjectChannel: self diffsetHolder |
|
1079 |
||
1080 |
"Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1081 |
! |
|
1082 |
||
1083 |
versionATextHolder |
|
1084 |
||
12125 | 1085 |
versionATextHolder isNil ifTrue:[ |
10194 | 1086 |
versionATextHolder := ValueHolder new |
1087 |
]. |
|
1088 |
^versionATextHolder |
|
1089 |
||
1090 |
"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1091 |
"Modified: / 18-11-2011 / 14:57:56 / cg" |
10194 | 1092 |
! |
1093 |
||
1094 |
versionBLabelHolder |
|
1095 |
||
1096 |
^(AspectAdaptor forAspect: #versionBLabel) |
|
1097 |
subjectChannel: self diffsetHolder |
|
1098 |
||
1099 |
"Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1100 |
! |
|
1101 |
||
1102 |
versionBTextHolder |
|
1103 |
||
12125 | 1104 |
versionBTextHolder isNil ifTrue:[ |
10194 | 1105 |
versionBTextHolder := ValueHolder new |
1106 |
]. |
|
1107 |
^versionBTextHolder |
|
1108 |
||
1109 |
"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1110 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1111 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1112 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1113 |
versionBaseLabelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1114 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1115 |
^(AspectAdaptor forAspect: #versionBaseLabel) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1116 |
subjectChannel: self diffsetHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1117 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1118 |
"Created: / 16-03-2012 / 15:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1119 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1120 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1121 |
versionBaseTextHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1122 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1123 |
versionBaseTextHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1124 |
versionBaseTextHolder := ValueHolder new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1125 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1126 |
^versionBaseTextHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1127 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1128 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1129 |
"Created: / 16-03-2012 / 15:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1130 |
! ! |
1131 |
||
1132 |
!ChangeSetDiffTool methodsFor:'change & update'! |
|
1133 |
||
1134 |
diffsetChanged |
|
1135 |
||
1136 |
| ds | |
|
1137 |
||
1138 |
ds := self diffsetHolder value. |
|
1139 |
||
1140 |
self diffsetHolderPrivate value: |
|
1141 |
(self isOneColumnBrowser |
|
1142 |
ifTrue:[ds flattened] |
|
1143 |
ifFalse:[ds value]). |
|
1144 |
||
1145 |
self versionALabelHolder value: ds versionALabel. |
|
1146 |
self versionBLabelHolder value: ds versionBLabel. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1147 |
self versionBaseLabelHolder value: ds versionBaseLabel. |
10194 | 1148 |
|
1149 |
"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1150 |
"Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1151 |
"Modified: / 16-03-2012 / 15:42:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1152 |
! |
1153 |
||
1154 |
selectionChanged |
|
1155 |
||
1156 |
| diffItem | |
|
1157 |
||
1158 |
diffItem := self theSingleSelectedObject. |
|
1159 |
self singleSelectionHolder value: diffItem. |
|
1160 |
diffItem isNil ifTrue:[^self]. |
|
1161 |
||
1162 |
self versionATextHolder setValue: diffItem versionAText. |
|
1163 |
self versionBTextHolder setValue: diffItem versionBText. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1164 |
self versionBaseTextHolder setValue: diffItem versionBaseText. |
10194 | 1165 |
|
1166 |
self versionATextHolder changed: #value. |
|
1167 |
self versionBTextHolder changed: #value. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1168 |
self versionBaseTextHolder changed: #value |
10194 | 1169 |
|
1170 |
"Created: / 22-10-2008 / 11:29:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1171 |
"Modified: / 16-03-2012 / 15:19:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1172 |
! |
1173 |
||
1174 |
update: aspect with: param from: sender |
|
1175 |
||
1176 |
sender == selectionHolder ifTrue:[ |
|
1177 |
self selectionChanged. |
|
1178 |
^self. |
|
1179 |
]. |
|
1180 |
||
1181 |
sender == diffsetHolder ifTrue:[ |
|
1182 |
self diffsetChanged. |
|
1183 |
^self. |
|
1184 |
]. |
|
1185 |
||
1186 |
^super update: aspect with: param from: sender |
|
1187 |
||
1188 |
"Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1189 |
! |
|
1190 |
||
1191 |
updateListMenu |
|
1192 |
|menu diffs loadA loadB| |
|
1193 |
||
1194 |
menu := self listMenuHolder value. |
|
1195 |
diffs := self selection ? #(). |
|
1196 |
loadA := menu atNameKey:#LoadVersionA. |
|
1197 |
loadA disable. |
|
1198 |
loadB := menu atNameKey:#LoadVersionB. |
|
1199 |
loadB disable. |
|
1200 |
(diffs select:[:e | true ]) do:[:diff | |
|
1201 |
diff versionA |
|
1202 |
ifNotNil:[ |
|
1203 |
loadA enable. |
|
1204 |
loadA label:'Load version ' , diff versionALabel |
|
1205 |
]. |
|
1206 |
diff versionB |
|
1207 |
ifNotNil:[ |
|
1208 |
loadB |
|
1209 |
label:'Load version ' , diff versionBLabel; |
|
1210 |
enable |
|
1211 |
]. |
|
1212 |
]. |
|
1213 |
! ! |
|
1214 |
||
1215 |
!ChangeSetDiffTool methodsFor:'initialization'! |
|
1216 |
||
1217 |
initialize |
|
1218 |
||
1219 |
super initialize. |
|
1220 |
self createBuilder |
|
1221 |
||
1222 |
"Created: / 22-10-2008 / 12:37:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1223 |
! ! |
|
1224 |
||
1225 |
!ChangeSetDiffTool methodsFor:'menu actions'! |
|
1226 |
||
12125 | 1227 |
changesetMenuBrowse: changeset |
1228 |
||
1229 |
Tools::ChangeSetBrowser2 openOn: changeset |
|
1230 |
||
1231 |
"Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1232 |
! |
|
1233 |
||
1234 |
changesetMenuBrowseA |
|
1235 |
||
1236 |
self changesetMenuBrowse: self diffsetHolder value changesetA |
|
1237 |
||
1238 |
"Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1239 |
! |
|
1240 |
||
1241 |
changesetMenuBrowseB |
|
1242 |
||
1243 |
self changesetMenuBrowse: self diffsetHolder value changesetB |
|
1244 |
||
1245 |
"Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1246 |
! |
|
1247 |
||
10194 | 1248 |
fileMenuOpen |
1249 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1250 |
| dlg a b base| |
10194 | 1251 |
dlg := OpenDialog new. |
1252 |
dlg open ifFalse:[^self]. |
|
1253 |
a := dlg changeSetA. |
|
1254 |
b := dlg changeSetB. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1255 |
base := dlg changeSetBase. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1256 |
^self fileMenuOpenOnDiffBetween: a and: b base: base. |
10194 | 1257 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1258 |
"Modified: / 16-03-2012 / 13:51:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1259 |
! |
1260 |
||
1261 |
fileMenuOpenOnDiffBetween: a and: b |
|
1262 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1263 |
^self fileMenuOpenOnDiffBetween: a and: b base: nil. |
10194 | 1264 |
|
1265 |
"Modified: / 29-06-2011 / 08:10:17 / Jan Vrany <enter your email here>" |
|
1266 |
"Modified: / 06-07-2011 / 12:56:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1267 |
"Created: / 16-03-2012 / 14:07:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1268 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1269 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1270 |
fileMenuOpenOnDiffBetween: a and: b base: base |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1271 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1272 |
self diffset: (ChangeSetDiff versionA: a versionB: b versionBase: base). |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1273 |
base notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1274 |
textDiffToolHolder value isDiff3 ifFalse:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1275 |
textDiffToolHolder value: self textDiff3Tool. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1276 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1277 |
] ifFalse:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1278 |
textDiffToolHolder value isDiff2 ifFalse:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1279 |
textDiffToolHolder value: self textDiff2Tool. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1280 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1281 |
] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1282 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1283 |
"Modified: / 29-06-2011 / 08:10:17 / Jan Vrany <enter your email here>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1284 |
"Created: / 16-03-2012 / 13:49:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1285 |
! |
1286 |
||
1287 |
fileMenuSaveAsPatch |
|
1288 |
||
1289 |
| filename | |
|
1290 |
filename := Smalltalk::Dialog requestFileName: 'Enter filename' default:'patch.chg' ifFail:[^self]. |
|
1291 |
self patchset fileOutAs: filename. |
|
1292 |
||
1293 |
"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1294 |
! |
|
1295 |
||
12125 | 1296 |
listMenuBrowse |
1297 |
||
1298 |
| items | |
|
1299 |
items := self selection collect:[:e|e]. "/must do collect as selection is an iterator..." |
|
1300 |
items size == 1 ifTrue:[ |
|
1301 |
| item cls sel | |
|
1302 |
item:= items anElement. |
|
1303 |
cls := item changeClass. |
|
1304 |
sel := item changeSelector. |
|
1305 |
cls notNil ifTrue:[ |
|
1306 |
sel notNil ifTrue:[ |
|
1307 |
UserPreferences current systemBrowserClass |
|
1308 |
openInClass:cls selector:sel |
|
1309 |
||
1310 |
] ifFalse:[ |
|
1311 |
UserPreferences current systemBrowserClass |
|
1312 |
browseClass: cls |
|
1313 |
] |
|
1314 |
] ifFalse:[ |
|
1315 |
Dialog warn: (self class resources at: 'Oops, class is gone') |
|
1316 |
] |
|
1317 |
] ifFalse:[ |
|
1318 |
Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'. |
|
1319 |
] |
|
1320 |
||
1321 |
"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1322 |
! |
|
1323 |
||
10194 | 1324 |
listMenuInspect |
1325 |
||
1326 |
(self selection collect:[:e|e]) inspect |
|
1327 |
||
1328 |
"Modified: / 24-11-2009 / 12:51:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1329 |
! |
|
1330 |
||
1331 |
listMenuLoadVersionA |
|
1332 |
||
1333 |
self selection do: |
|
1334 |
[:diff|diff versionA apply] |
|
1335 |
||
1336 |
"Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1337 |
! |
|
1338 |
||
1339 |
listMenuLoadVersionB |
|
1340 |
||
1341 |
self selection do: |
|
1342 |
[:diff|diff versionB apply] |
|
1343 |
||
1344 |
"Modified: / 09-12-2009 / 23:10:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1345 |
! |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1346 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1347 |
listMenuOpenInExternal: command |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1348 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1349 |
(OperatingSystem canExecuteCommand: command) ifFalse:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1350 |
Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1351 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1352 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1353 |
self selection do:[:item| |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1354 |
| base a b cmd | |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1355 |
item versionBase notNil ifTrue:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1356 |
base := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1357 |
base writingFileDo:[:s|s nextPutAll: item versionBase source]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1358 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1359 |
a := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1360 |
a writingFileDo:[:s|s nextPutAll: item versionA source]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1361 |
b := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1362 |
b writingFileDo:[:s|s nextPutAll: item versionB source]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1363 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1364 |
base isNil ifTrue:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1365 |
cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1366 |
] ifFalse:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1367 |
cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1368 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1369 |
[ OperatingSystem executeCommand: cmd. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1370 |
a remove. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1371 |
b remove. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1372 |
base notNil ifTrue:[base remove]. ] fork |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1373 |
] |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1374 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1375 |
"Modified: / 17-03-2012 / 08:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1376 |
! ! |
1377 |
||
1378 |
!ChangeSetDiffTool methodsFor:'queries'! |
|
1379 |
||
1380 |
canBrowse |
|
1381 |
||
1382 |
^true |
|
1383 |
||
1384 |
"^[self selection notNil |
|
1385 |
and:[self selection versionA notNil]]" |
|
1386 |
||
1387 |
"Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1388 |
"Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1389 |
! |
|
1390 |
||
1391 |
hasSelection |
|
1392 |
||
1393 |
^[self selection notNil] |
|
1394 |
||
1395 |
"Created: / 03-11-2009 / 10:48:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1396 |
! |
|
1397 |
||
1398 |
isOneColumnBrowser |
|
1399 |
||
1400 |
^self navigatorPanelSpecHolder value = #oneColumnNavigatorSpec |
|
1401 |
||
1402 |
"Created: / 05-12-2009 / 11:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1403 |
! ! |
|
1404 |
||
1405 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'image specs'! |
|
1406 |
||
1407 |
versionA24x24 |
|
1408 |
||
1409 |
^ToolbarIconLibrary versionA24x24 |
|
1410 |
||
1411 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1412 |
! |
|
1413 |
||
1414 |
versionB24x24 |
|
1415 |
||
1416 |
^ToolbarIconLibrary versionB24x24 |
|
1417 |
||
1418 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1419 |
! ! |
|
1420 |
||
1421 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs'! |
|
1422 |
||
1423 |
windowSpec |
|
1424 |
"This resource specification was automatically generated |
|
1425 |
by the UIPainter of ST/X." |
|
1426 |
||
1427 |
"Do not manually edit this!! If it is corrupted, |
|
1428 |
the UIPainter may not be able to read the specification." |
|
1429 |
||
1430 |
" |
|
1431 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#windowSpec |
|
1432 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#windowSpec |
|
1433 |
Tools::ChangeSetDiffBrowser::OpenDialog open |
|
1434 |
" |
|
1435 |
||
1436 |
<resource: #canvas> |
|
1437 |
||
1438 |
^ |
|
1439 |
#(FullSpec |
|
1440 |
name: windowSpec |
|
1441 |
window: |
|
1442 |
(WindowSpec |
|
1443 |
label: 'Open...' |
|
1444 |
name: 'Open...' |
|
1445 |
min: (Point 10 10) |
|
1446 |
bounds: (Rectangle 0 0 640 130) |
|
1447 |
) |
|
1448 |
component: |
|
1449 |
(SpecCollection |
|
1450 |
collection: ( |
|
1451 |
(VariableHorizontalPanelSpec |
|
1452 |
name: 'ChangeSetsSpecPanel' |
|
1453 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
1454 |
barWidth: 3 |
|
1455 |
showHandle: true |
|
1456 |
component: |
|
1457 |
(SpecCollection |
|
1458 |
collection: ( |
|
1459 |
(ViewSpec |
|
1460 |
name: 'A' |
|
1461 |
component: |
|
1462 |
(SpecCollection |
|
1463 |
collection: ( |
|
1464 |
(UISubSpecification |
|
1465 |
name: 'SubSpecification1' |
|
1466 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
1467 |
minorKey: versionALabelSpec |
|
1468 |
) |
|
1469 |
(SubCanvasSpec |
|
1470 |
name: 'ChangesetASpec' |
|
1471 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
1472 |
hasHorizontalScrollBar: false |
|
1473 |
hasVerticalScrollBar: false |
|
1474 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
1475 |
minorKey: windowSpecForEmbedding |
|
1476 |
subAspectHolders: |
|
1477 |
(Array |
|
1478 |
||
1479 |
(SubChannelInfoSpec |
|
1480 |
subAspect: specHolder |
|
1481 |
aspect: changesetSpecAHolder |
|
1482 |
) |
|
1483 |
) |
|
1484 |
createNewApplication: true |
|
1485 |
createNewBuilder: true |
|
1486 |
) |
|
1487 |
) |
|
1488 |
||
1489 |
) |
|
1490 |
) |
|
1491 |
(ViewSpec |
|
1492 |
name: 'B' |
|
1493 |
component: |
|
1494 |
(SpecCollection |
|
1495 |
collection: ( |
|
1496 |
(UISubSpecification |
|
1497 |
name: 'SubSpecification2' |
|
1498 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
1499 |
minorKey: versionBLabelSpec |
|
1500 |
) |
|
1501 |
(SubCanvasSpec |
|
1502 |
name: 'SubCanvas1' |
|
1503 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
1504 |
hasHorizontalScrollBar: false |
|
1505 |
hasVerticalScrollBar: false |
|
1506 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
1507 |
minorKey: windowSpecForEmbedding |
|
1508 |
subAspectHolders: |
|
1509 |
(Array |
|
1510 |
||
1511 |
(SubChannelInfoSpec |
|
1512 |
subAspect: specHolder |
|
1513 |
aspect: changesetSpecBHolder |
|
1514 |
) |
|
1515 |
) |
|
1516 |
createNewApplication: true |
|
1517 |
createNewBuilder: true |
|
1518 |
) |
|
1519 |
) |
|
1520 |
||
1521 |
) |
|
1522 |
) |
|
1523 |
) |
|
1524 |
||
1525 |
) |
|
1526 |
handles: (Any 0.5 1.0) |
|
1527 |
) |
|
1528 |
(HorizontalPanelViewSpec |
|
1529 |
name: 'ButtonPanel' |
|
1530 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
1531 |
horizontalLayout: right |
|
1532 |
verticalLayout: center |
|
1533 |
horizontalSpace: 3 |
|
1534 |
verticalSpace: 3 |
|
1535 |
reverseOrderIfOKAtLeft: true |
|
1536 |
component: |
|
1537 |
(SpecCollection |
|
1538 |
collection: ( |
|
1539 |
(ActionButtonSpec |
|
1540 |
label: 'OK' |
|
1541 |
name: 'Button1' |
|
1542 |
translateLabel: true |
|
1543 |
model: doAccept |
|
1544 |
enableChannel: doAcceptEnabled |
|
1545 |
extent: (Point 125 22) |
|
1546 |
) |
|
1547 |
(ActionButtonSpec |
|
1548 |
label: 'Cancel' |
|
1549 |
name: 'Button2' |
|
1550 |
translateLabel: true |
|
1551 |
model: doCancel |
|
1552 |
extent: (Point 125 22) |
|
1553 |
) |
|
1554 |
) |
|
1555 |
||
1556 |
) |
|
1557 |
) |
|
1558 |
) |
|
1559 |
||
1560 |
) |
|
1561 |
) |
|
1562 |
||
1563 |
"Modified: / 06-07-2011 / 11:32:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1564 |
! ! |
|
1565 |
||
1566 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs - labels'! |
|
1567 |
||
1568 |
versionALabelSpec |
|
1569 |
"This resource specification was automatically generated |
|
1570 |
by the UIPainter of ST/X." |
|
1571 |
||
1572 |
"Do not manually edit this!! If it is corrupted, |
|
1573 |
the UIPainter may not be able to read the specification." |
|
1574 |
||
1575 |
" |
|
1576 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionALabelSpec |
|
1577 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionALabelSpec |
|
1578 |
" |
|
1579 |
||
1580 |
<resource: #canvas> |
|
1581 |
||
1582 |
^ |
|
1583 |
#(FullSpec |
|
1584 |
name: versionALabelSpec |
|
1585 |
window: |
|
1586 |
(WindowSpec |
|
1587 |
label: 'Version A' |
|
1588 |
name: 'Changeset A' |
|
1589 |
min: (Point 10 10) |
|
1590 |
bounds: (Rectangle 0 0 300 30) |
|
1591 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
1592 |
forceRecursiveBackground: true |
|
1593 |
) |
|
1594 |
component: |
|
1595 |
(SpecCollection |
|
1596 |
collection: ( |
|
1597 |
(LabelSpec |
|
1598 |
label: 'versionA24x24' |
|
1599 |
name: 'VersionAIcon' |
|
1600 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
1601 |
hasCharacterOrientedLabel: false |
|
1602 |
translateLabel: true |
|
1603 |
) |
|
1604 |
(LabelSpec |
|
1605 |
label: 'Version A' |
|
1606 |
name: 'VersionALabel' |
|
1607 |
layout: (LayoutFrame 30 0 5 0 0 1 0 1) |
|
1608 |
translateLabel: true |
|
1609 |
resizeForLabel: true |
|
1610 |
adjust: left |
|
1611 |
) |
|
1612 |
) |
|
1613 |
||
1614 |
) |
|
1615 |
) |
|
1616 |
||
1617 |
"Modified: / 06-07-2011 / 11:24:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1618 |
! |
|
1619 |
||
1620 |
versionBLabelSpec |
|
1621 |
"This resource specification was automatically generated |
|
1622 |
by the UIPainter of ST/X." |
|
1623 |
||
1624 |
"Do not manually edit this!! If it is corrupted, |
|
1625 |
the UIPainter may not be able to read the specification." |
|
1626 |
||
1627 |
" |
|
1628 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionBLabelSpec |
|
1629 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionBLabelSpec |
|
1630 |
" |
|
1631 |
||
1632 |
<resource: #canvas> |
|
1633 |
||
1634 |
^ |
|
1635 |
#(FullSpec |
|
1636 |
name: versionBLabelSpec |
|
1637 |
window: |
|
1638 |
(WindowSpec |
|
1639 |
label: 'Version B' |
|
1640 |
name: 'Changeset B' |
|
1641 |
min: (Point 10 10) |
|
1642 |
bounds: (Rectangle 0 0 300 30) |
|
1643 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
1644 |
forceRecursiveBackground: true |
|
1645 |
) |
|
1646 |
component: |
|
1647 |
(SpecCollection |
|
1648 |
collection: ( |
|
1649 |
(LabelSpec |
|
1650 |
label: 'versionB24x24' |
|
1651 |
name: 'VersionBIcon' |
|
1652 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
1653 |
hasCharacterOrientedLabel: false |
|
1654 |
translateLabel: true |
|
1655 |
) |
|
1656 |
(LabelSpec |
|
1657 |
label: 'Version B' |
|
1658 |
name: 'VersionBLabel' |
|
1659 |
layout: (LayoutFrame 30 0 5 0 97 0 0 1) |
|
1660 |
translateLabel: true |
|
1661 |
resizeForLabel: true |
|
1662 |
adjust: left |
|
1663 |
useDynamicPreferredWidth: true |
|
1664 |
usePreferredWidth: true |
|
1665 |
) |
|
1666 |
) |
|
1667 |
||
1668 |
) |
|
1669 |
) |
|
1670 |
||
1671 |
"Modified: / 06-07-2011 / 11:24:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1672 |
! ! |
|
1673 |
||
1674 |
!ChangeSetDiffTool::OpenDialog methodsFor:'accessing'! |
|
1675 |
||
1676 |
changeSetA |
|
1677 |
||
1678 |
| specA | |
|
1679 |
||
1680 |
specA := self changesetSpecAHolder value. |
|
1681 |
^specA ifNil:[nil] ifNotNil:[specA changeSet] |
|
1682 |
||
1683 |
"Created: / 06-07-2011 / 11:36:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1684 |
! |
|
1685 |
||
1686 |
changeSetB |
|
1687 |
||
1688 |
| specB | |
|
1689 |
||
1690 |
specB := self changesetSpecBHolder value. |
|
1691 |
^specB ifNil:[nil] ifNotNil:[specB changeSet] |
|
1692 |
||
1693 |
"Created: / 06-07-2011 / 11:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1694 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1695 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1696 |
changeSetBase |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1697 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1698 |
| specBase | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1699 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1700 |
specBase := self changesetSpecBaseHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1701 |
^specBase ifNil:[nil] ifNotNil:[specBase changeSet] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1702 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1703 |
"Created: / 16-03-2012 / 13:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1704 |
! ! |
1705 |
||
1706 |
!ChangeSetDiffTool::OpenDialog methodsFor:'aspects'! |
|
1707 |
||
1708 |
changesetSpecAHolder |
|
1709 |
"return/create the 'changesetSpecAHolder' value holder (automatically generated)" |
|
1710 |
||
1711 |
changesetSpecAHolder isNil ifTrue:[ |
|
1712 |
changesetSpecAHolder := ValueHolder new. |
|
1713 |
]. |
|
1714 |
^ changesetSpecAHolder |
|
1715 |
! |
|
1716 |
||
1717 |
changesetSpecAHolder:something |
|
1718 |
"set the 'changesetSpecAHolder' value holder (automatically generated)" |
|
1719 |
||
1720 |
changesetSpecAHolder := something. |
|
1721 |
! |
|
1722 |
||
1723 |
changesetSpecBHolder |
|
1724 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
1725 |
||
1726 |
changesetSpecBHolder isNil ifTrue:[ |
|
1727 |
changesetSpecBHolder := ValueHolder new. |
|
1728 |
]. |
|
1729 |
^ changesetSpecBHolder |
|
1730 |
! |
|
1731 |
||
1732 |
changesetSpecBHolder:something |
|
1733 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
1734 |
||
1735 |
changesetSpecBHolder := something. |
|
1736 |
! |
|
1737 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1738 |
changesetSpecBaseHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1739 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1740 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1741 |
changesetSpecBaseHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1742 |
changesetSpecBaseHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1743 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1744 |
^ changesetSpecBaseHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1745 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1746 |
"Created: / 16-03-2012 / 13:48:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1747 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1748 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1749 |
changesetSpecBaseHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1750 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1751 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1752 |
changesetSpecBaseHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1753 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1754 |
"Created: / 16-03-2012 / 13:49:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1755 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1756 |
|
10194 | 1757 |
doAcceptEnabled |
1758 |
<resource: #uiAspect> |
|
1759 |
||
1760 |
^BlockValue |
|
1761 |
with:[:a :b|a value notNil and:[b value notNil]] |
|
1762 |
argument:self changesetSpecAHolder |
|
1763 |
argument:self changesetSpecAHolder. |
|
1764 |
||
1765 |
"Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1766 |
! ! |
|
1767 |
||
1768 |
!ChangeSetDiffTool::OpenDialog methodsFor:'events'! |
|
1769 |
||
1770 |
closeAccept |
|
1771 |
||
1772 |
^super closeAccept |
|
1773 |
||
1774 |
"Created: / 06-07-2011 / 12:09:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1775 |
! ! |
|
1776 |
||
1777 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
1778 |
||
1779 |
version_CVS |
|
12125 | 1780 |
^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
10194 | 1781 |
! |
1782 |
||
1783 |
version_SVN |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1784 |
^ '$Id: Tools__ChangeSetDiffTool.st 7938 2012-03-17 10:21:50Z vranyj1 $' |
12125 | 1785 |
! ! |