author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 21 Mar 2012 01:52:35 +0000 | |
branch | jv |
changeset 12202 | eaa1f6cb6ce8 |
parent 12201 | 283826cb8bcc |
child 12216 | 5698c277f043 |
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 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
31 |
instanceVariableNames:'diffInfoHolder listHolder singleSelectionHolder diffsetHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
32 |
titleHolder firstColSelectionHolder navigatorPanelSpecHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
33 |
diffMenuHolder diffsetHolderPrivate selectionHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
34 |
versionATextHolder versionBTextHolder versionBaseTextHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
35 |
textDiffToolHolder textDiffToolWindowSpecHolder mergeHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
36 |
mergeDataHolder' |
10194 | 37 |
classVariableNames:'' |
38 |
poolDictionaries:'' |
|
39 |
category:'Interface-Diff' |
|
40 |
! |
|
41 |
||
42 |
SimpleDialog subclass:#OpenDialog |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
43 |
instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
44 |
changesetSpecBaseHolder changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
45 |
changesetSpecMergedHolder changesetSpecMergedEnabledHolder' |
10194 | 46 |
classVariableNames:'LastDirectory' |
47 |
poolDictionaries:'' |
|
48 |
privateIn:ChangeSetDiffTool |
|
49 |
! |
|
50 |
||
51 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
52 |
||
53 |
copyright |
|
54 |
" |
|
55 |
Copyright (c) 2007-2010 Jan Vrany |
|
56 |
Copyright (c) 2009-2010 eXept Software AG |
|
57 |
||
58 |
Permission is hereby granted, free of charge, to any person |
|
59 |
obtaining a copy of this software and associated documentation |
|
60 |
files (the 'Software'), to deal in the Software without |
|
61 |
restriction, including without limitation the rights to use, |
|
62 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
63 |
copies of the Software, and to permit persons to whom the |
|
64 |
Software is furnished to do so, subject to the following |
|
65 |
conditions: |
|
66 |
||
67 |
The above copyright notice and this permission notice shall be |
|
68 |
included in all copies or substantial portions of the Software. |
|
69 |
||
70 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
71 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
72 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
73 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
74 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
75 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
76 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
77 |
OTHER DEALINGS IN THE SOFTWARE. |
|
78 |
||
79 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
80 |
! |
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 |
documentation |
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 |
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
|
85 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
86 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
87 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
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 |
[instance 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 |
[class variables:] |
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 |
[see also:] |
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 |
! |
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 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
99 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
100 |
Starting the application: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
101 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
102 |
Tools::ChangeSetDiffTool open |
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 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
105 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
106 |
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
|
107 |
NewSystemBrowser: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
108 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
109 |
| cvsCs svnCs | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
110 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
111 |
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
|
112 |
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
|
113 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
114 |
Tools::ChangeSetDiffTool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
115 |
open; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
116 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs. |
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 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
119 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
120 |
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
|
121 |
base version of NewSystemBrowser: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
122 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
123 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
124 |
| cvsBaseCs cvsCs svnCs | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
125 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
126 |
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
|
127 |
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
|
128 |
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
|
129 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
130 |
Tools::ChangeSetDiffTool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
131 |
open; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
132 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs |
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 |
[exEnd] |
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 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
137 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
138 |
" |
10194 | 139 |
! ! |
140 |
||
141 |
!ChangeSetDiffTool class methodsFor:'accessing - defaults'! |
|
142 |
||
143 |
versionAColor |
|
144 |
||
145 |
^Color green lightened lightened |
|
146 |
||
147 |
"Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
148 |
! |
|
149 |
||
150 |
versionBColor |
|
151 |
||
152 |
^Color blue lightened lightened |
|
153 |
||
154 |
"Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
155 |
! |
|
156 |
||
157 |
versionBaseColor |
|
158 |
||
159 |
^Color yellow lightened lightened |
|
160 |
||
161 |
"Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
162 |
! |
|
163 |
||
164 |
versionNotPresentText |
|
165 |
^ 'Not present' asText allItalic colorizeAllWith:Color gray lighter |
|
166 |
! ! |
|
167 |
||
168 |
!ChangeSetDiffTool class methodsFor:'image specs'! |
|
169 |
||
170 |
versionA24x24 |
|
171 |
||
172 |
^ToolbarIconLibrary versionA24x24 |
|
173 |
||
174 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
175 |
! |
|
176 |
||
177 |
versionB24x24 |
|
178 |
||
179 |
^ToolbarIconLibrary versionB24x24 |
|
180 |
||
181 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
182 |
! ! |
|
183 |
||
184 |
!ChangeSetDiffTool class methodsFor:'interface specs'! |
|
185 |
||
186 |
labelSpec |
|
187 |
"This resource specification was automatically generated |
|
188 |
by the UIPainter of ST/X." |
|
189 |
||
190 |
"Do not manually edit this!! If it is corrupted, |
|
191 |
the UIPainter may not be able to read the specification." |
|
192 |
||
193 |
" |
|
194 |
UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec |
|
195 |
SVN::DiffBrowser new openInterface:#labelSpec |
|
196 |
" |
|
197 |
||
198 |
<resource: #canvas> |
|
199 |
||
200 |
^ |
|
201 |
#(FullSpec |
|
202 |
name: labelSpec |
|
203 |
window: |
|
204 |
(WindowSpec |
|
205 |
label: 'Label' |
|
206 |
name: 'Label' |
|
207 |
min: (Point 10 10) |
|
208 |
bounds: (Rectangle 0 0 600 48) |
|
209 |
) |
|
210 |
component: |
|
211 |
(SpecCollection |
|
212 |
collection: ( |
|
213 |
(UISubSpecification |
|
214 |
name: 'LabelA' |
|
215 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
216 |
minorKey: versionALabelSpec |
|
217 |
) |
|
218 |
(UISubSpecification |
|
219 |
name: 'LabelB' |
|
220 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
221 |
minorKey: versionBLabelSpec |
|
222 |
) |
|
223 |
) |
|
224 |
||
225 |
) |
|
226 |
) |
|
227 |
! |
|
228 |
||
229 |
oneColumnNavigatorSpec |
|
230 |
"This resource specification was automatically generated |
|
231 |
by the UIPainter of ST/X." |
|
232 |
||
233 |
"Do not manually edit this!! If it is corrupted, |
|
234 |
the UIPainter may not be able to read the specification." |
|
235 |
||
236 |
" |
|
237 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#oneColumnNavigatorSpec |
|
238 |
Tools::ChangeSetDiffBrowser new openInterface:#oneColumnNavigatorSpec |
|
239 |
" |
|
240 |
||
241 |
<resource: #canvas> |
|
242 |
||
243 |
^ |
|
244 |
#(FullSpec |
|
245 |
name: oneColumnNavigatorSpec |
|
246 |
window: |
|
247 |
(WindowSpec |
|
248 |
label: 'One Column Navigator' |
|
249 |
name: 'One Column Navigator' |
|
250 |
min: (Point 10 10) |
|
251 |
bounds: (Rectangle 0 0 300 300) |
|
252 |
) |
|
253 |
component: |
|
254 |
(SpecCollection |
|
255 |
collection: ( |
|
256 |
(SubCanvasSpec |
|
257 |
name: 'DiffList' |
|
258 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
259 |
hasHorizontalScrollBar: false |
|
260 |
hasVerticalScrollBar: false |
|
261 |
majorKey: #'Tools::ChangeSetDiffList' |
|
262 |
subAspectHolders: |
|
263 |
(Array |
|
264 |
||
265 |
(SubChannelInfoSpec |
|
266 |
subAspect: inGeneratorHolder |
|
267 |
aspect: diffsetHolderPrivate |
|
268 |
) |
|
269 |
(SubChannelInfoSpec |
|
270 |
subAspect: listEntryLabelGenerator |
|
271 |
aspect: diffListEntryLabelGeneratorAspect |
|
272 |
) |
|
273 |
||
274 |
(SubChannelInfoSpec |
|
275 |
subAspect: menuHolder |
|
276 |
aspect: listMenuHolder |
|
277 |
) |
|
278 |
(SubChannelInfoSpec |
|
279 |
subAspect: outGeneratorHolder |
|
280 |
aspect: selectionHolder |
|
281 |
) |
|
282 |
) |
|
283 |
createNewApplication: true |
|
284 |
createNewBuilder: false |
|
285 |
) |
|
286 |
) |
|
287 |
||
288 |
) |
|
289 |
) |
|
290 |
! |
|
291 |
||
292 |
twoColumnNavigatorSpec |
|
293 |
"This resource specification was automatically generated |
|
294 |
by the UIPainter of ST/X." |
|
295 |
||
296 |
"Do not manually edit this!! If it is corrupted, |
|
297 |
the UIPainter may not be able to read the specification." |
|
298 |
||
299 |
" |
|
300 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#twoColumnNavigatorSpec |
|
301 |
Tools::ChangeSetDiffBrowser new openInterface:#twoColumnNavigatorSpec |
|
302 |
" |
|
303 |
||
304 |
<resource: #canvas> |
|
305 |
||
306 |
^ |
|
307 |
#(FullSpec |
|
308 |
name: twoColumnNavigatorSpec |
|
309 |
window: |
|
310 |
(WindowSpec |
|
311 |
label: 'Two Column Navigator' |
|
312 |
name: 'Two Column Navigator' |
|
313 |
min: (Point 10 10) |
|
314 |
bounds: (Rectangle 0 0 300 300) |
|
315 |
) |
|
316 |
component: |
|
317 |
(SpecCollection |
|
318 |
collection: ( |
|
319 |
(VariableHorizontalPanelSpec |
|
320 |
name: 'Columns' |
|
321 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
322 |
component: |
|
323 |
(SpecCollection |
|
324 |
collection: ( |
|
325 |
(SubCanvasSpec |
|
326 |
name: 'FirstColumn' |
|
327 |
hasHorizontalScrollBar: false |
|
328 |
hasVerticalScrollBar: false |
|
329 |
majorKey: #'Tools::ChangeSetDiffList' |
|
330 |
subAspectHolders: |
|
331 |
(Array |
|
332 |
||
333 |
(SubChannelInfoSpec |
|
334 |
subAspect: inGeneratorHolder |
|
335 |
aspect: diffsetHolderPrivate |
|
336 |
) |
|
337 |
(SubChannelInfoSpec |
|
338 |
subAspect: listEntryLabelGenerator |
|
339 |
aspect: diffListEntryLabelGeneratorAspect |
|
340 |
) |
|
341 |
||
342 |
(SubChannelInfoSpec |
|
343 |
subAspect: menuHolder |
|
344 |
aspect: listMenuHolder |
|
345 |
) |
|
346 |
(SubChannelInfoSpec |
|
347 |
subAspect: outGeneratorHolder |
|
348 |
aspect: firstColSelectionHolder |
|
349 |
) |
|
350 |
) |
|
351 |
createNewApplication: true |
|
352 |
createNewBuilder: true |
|
353 |
) |
|
354 |
(SubCanvasSpec |
|
355 |
name: 'SecondColumn' |
|
356 |
hasHorizontalScrollBar: false |
|
357 |
hasVerticalScrollBar: false |
|
358 |
majorKey: #'Tools::ChangeSetDiffList' |
|
359 |
subAspectHolders: |
|
360 |
(Array |
|
361 |
||
362 |
(SubChannelInfoSpec |
|
363 |
subAspect: inGeneratorHolder |
|
364 |
aspect: firstColSelectionHolder |
|
365 |
) |
|
366 |
(SubChannelInfoSpec |
|
367 |
subAspect: listEntryLabelGenerator |
|
368 |
aspect: diffListEntryLabelGeneratorAspect |
|
369 |
) |
|
370 |
||
371 |
(SubChannelInfoSpec |
|
372 |
subAspect: menuHolder |
|
373 |
aspect: listMenuHolder |
|
374 |
) |
|
375 |
(SubChannelInfoSpec |
|
376 |
subAspect: outGeneratorHolder |
|
377 |
aspect: selectionHolder |
|
378 |
) |
|
379 |
) |
|
380 |
createNewApplication: true |
|
381 |
createNewBuilder: true |
|
382 |
) |
|
383 |
) |
|
384 |
||
385 |
) |
|
386 |
handles: (Any 0.5 1.0) |
|
387 |
) |
|
388 |
) |
|
389 |
||
390 |
) |
|
391 |
) |
|
392 |
! |
|
393 |
||
394 |
windowSpec |
|
395 |
"This resource specification was automatically generated |
|
396 |
by the UIPainter of ST/X." |
|
397 |
||
398 |
"Do not manually edit this!! If it is corrupted, |
|
399 |
the UIPainter may not be able to read the specification." |
|
400 |
||
401 |
" |
|
402 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec |
|
403 |
Tools::ChangeSetDiffTool new openInterface:#windowSpec |
|
404 |
Tools::ChangeSetDiffTool open |
|
405 |
" |
|
406 |
||
407 |
<resource: #canvas> |
|
408 |
||
409 |
^ |
|
410 |
#(FullSpec |
|
411 |
name: windowSpec |
|
412 |
window: |
|
413 |
(WindowSpec |
|
414 |
label: 'Diff Browser' |
|
415 |
name: 'Diff Browser' |
|
416 |
min: (Point 10 10) |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
417 |
bounds: (Rectangle 0 0 1024 768) |
10194 | 418 |
menu: mainMenu |
419 |
) |
|
420 |
component: |
|
421 |
(SpecCollection |
|
422 |
collection: ( |
|
423 |
(UISubSpecification |
|
424 |
name: 'Label' |
|
425 |
layout: (LayoutFrame 0 0 0 0 0 1 56 0) |
|
426 |
minorKey: labelSpec |
|
427 |
) |
|
428 |
(VariableVerticalPanelSpec |
|
429 |
name: 'Panel' |
|
430 |
layout: (LayoutFrame 0 0 56 0 0 1 0 1) |
|
431 |
showHandle: true |
|
432 |
component: |
|
433 |
(SpecCollection |
|
434 |
collection: ( |
|
435 |
(SubCanvasSpec |
|
436 |
name: 'NavigatorPanel' |
|
437 |
hasHorizontalScrollBar: false |
|
438 |
hasVerticalScrollBar: false |
|
439 |
specHolder: navigatorPanelSpecHolder |
|
440 |
createNewBuilder: false |
|
441 |
) |
|
442 |
(SubCanvasSpec |
|
443 |
name: 'TextDiff' |
|
444 |
majorKey: #'Tools::TextDiffTool' |
|
445 |
minorKey: windowSpecForEmbedding |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
446 |
specHolder: textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
447 |
clientHolder: textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
448 |
createNewBuilder: false |
10194 | 449 |
) |
450 |
) |
|
451 |
||
452 |
) |
|
453 |
handles: (Any 0.5 1.0) |
|
454 |
) |
|
455 |
) |
|
456 |
||
457 |
) |
|
458 |
) |
|
459 |
! ! |
|
460 |
||
461 |
!ChangeSetDiffTool class methodsFor:'interface specs - labels'! |
|
462 |
||
463 |
versionALabelSpec |
|
464 |
"This resource specification was automatically generated |
|
465 |
by the UIPainter of ST/X." |
|
466 |
||
467 |
"Do not manually edit this!! If it is corrupted, |
|
468 |
the UIPainter may not be able to read the specification." |
|
469 |
||
470 |
" |
|
471 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec |
|
472 |
Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec |
|
473 |
" |
|
474 |
||
475 |
<resource: #canvas> |
|
476 |
||
477 |
^ |
|
478 |
#(FullSpec |
|
479 |
name: versionALabelSpec |
|
480 |
window: |
|
481 |
(WindowSpec |
|
482 |
label: 'Version A' |
|
483 |
name: 'Version A' |
|
484 |
min: (Point 10 10) |
|
485 |
bounds: (Rectangle 0 0 300 30) |
|
486 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
487 |
forceRecursiveBackground: true |
|
488 |
) |
|
489 |
component: |
|
490 |
(SpecCollection |
|
491 |
collection: ( |
|
492 |
(LabelSpec |
|
493 |
label: 'versionA24x24' |
|
494 |
name: 'VersionAIcon' |
|
495 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
496 |
hasCharacterOrientedLabel: false |
|
497 |
translateLabel: true |
|
498 |
) |
|
499 |
(LabelSpec |
|
500 |
label: 'Version A' |
|
501 |
name: 'VersionALabel' |
|
502 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
503 |
translateLabel: true |
|
504 |
labelChannel: versionALabelHolder |
|
505 |
resizeForLabel: true |
|
506 |
adjust: left |
|
507 |
) |
|
12125 | 508 |
(LabelSpec |
509 |
label: '(A)' |
|
510 |
name: 'ALabel' |
|
511 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
512 |
translateLabel: true |
|
513 |
) |
|
10194 | 514 |
) |
515 |
||
516 |
) |
|
517 |
) |
|
518 |
! |
|
519 |
||
520 |
versionBLabelSpec |
|
521 |
"This resource specification was automatically generated |
|
522 |
by the UIPainter of ST/X." |
|
523 |
||
524 |
"Do not manually edit this!! If it is corrupted, |
|
525 |
the UIPainter may not be able to read the specification." |
|
526 |
||
527 |
" |
|
528 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
529 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
530 |
" |
|
531 |
||
532 |
<resource: #canvas> |
|
533 |
||
534 |
^ |
|
535 |
#(FullSpec |
|
536 |
name: versionBLabelSpec |
|
537 |
window: |
|
538 |
(WindowSpec |
|
539 |
label: 'Version B' |
|
540 |
name: 'Version B' |
|
541 |
min: (Point 10 10) |
|
542 |
bounds: (Rectangle 0 0 300 30) |
|
543 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
544 |
forceRecursiveBackground: true |
|
545 |
) |
|
546 |
component: |
|
547 |
(SpecCollection |
|
548 |
collection: ( |
|
549 |
(LabelSpec |
|
550 |
label: 'versionB24x24' |
|
551 |
name: 'VersionBIcon' |
|
552 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
553 |
hasCharacterOrientedLabel: false |
|
554 |
translateLabel: true |
|
555 |
) |
|
556 |
(LabelSpec |
|
557 |
label: 'Version B' |
|
558 |
name: 'VersionBLabel' |
|
559 |
layout: (LayoutFrame 30 0 0 0 167 0 0 1) |
|
560 |
translateLabel: true |
|
561 |
labelChannel: versionBLabelHolder |
|
562 |
resizeForLabel: true |
|
563 |
adjust: left |
|
564 |
useDynamicPreferredWidth: true |
|
565 |
usePreferredWidth: true |
|
566 |
) |
|
12125 | 567 |
(LabelSpec |
568 |
label: '(B)' |
|
569 |
name: 'BLabel' |
|
570 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
571 |
translateLabel: true |
|
572 |
) |
|
10194 | 573 |
) |
574 |
||
575 |
) |
|
576 |
) |
|
12125 | 577 |
|
578 |
"Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 579 |
! ! |
580 |
||
581 |
!ChangeSetDiffTool class methodsFor:'menu specs'! |
|
582 |
||
583 |
listMenu |
|
584 |
"This resource specification was automatically generated |
|
585 |
by the MenuEditor of ST/X." |
|
586 |
||
587 |
"Do not manually edit this!! If it is corrupted, |
|
588 |
the MenuEditor may not be able to read the specification." |
|
589 |
||
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
590 |
|
10194 | 591 |
" |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
592 |
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
|
593 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenu)) startUp |
10194 | 594 |
" |
595 |
||
596 |
<resource: #menu> |
|
597 |
||
598 |
^ |
|
599 |
#(Menu |
|
600 |
( |
|
601 |
(MenuItem |
|
602 |
label: 'Browse' |
|
603 |
itemValue: listMenuBrowse |
|
604 |
translateLabel: true |
|
605 |
) |
|
606 |
(MenuItem |
|
607 |
label: '-' |
|
608 |
) |
|
609 |
(MenuItem |
|
610 |
label: 'Load version A' |
|
611 |
itemValue: listMenuLoadVersionA |
|
612 |
nameKey: LoadVersionA |
|
613 |
translateLabel: true |
|
614 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
615 |
) |
|
616 |
(MenuItem |
|
617 |
label: 'Load version B' |
|
618 |
itemValue: listMenuLoadVersionB |
|
619 |
nameKey: LoadVersionB |
|
620 |
translateLabel: true |
|
621 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
622 |
) |
|
623 |
(MenuItem |
|
624 |
label: '-' |
|
625 |
) |
|
626 |
(MenuItem |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
627 |
label: 'Open in...' |
10194 | 628 |
translateLabel: true |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
629 |
submenu: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
630 |
(Menu |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
631 |
( |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
632 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
633 |
enabled: hasSelection |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
634 |
label: 'Inspector' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
635 |
itemValue: listMenuInspect |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
636 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
637 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
638 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
639 |
label: 'kdiff3' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
640 |
itemValue: listMenuOpenInExternal: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
641 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
642 |
argument: 'kdiff3' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
643 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
644 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
645 |
label: 'meld' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
646 |
itemValue: listMenuOpenInExternal: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
647 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
648 |
argument: 'meld' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
649 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
650 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
651 |
nil |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
652 |
nil |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
653 |
) |
10194 | 654 |
) |
655 |
) |
|
656 |
nil |
|
657 |
nil |
|
658 |
) |
|
659 |
! |
|
660 |
||
661 |
mainMenu |
|
662 |
"This resource specification was automatically generated |
|
663 |
by the MenuEditor of ST/X." |
|
664 |
||
665 |
"Do not manually edit this!! If it is corrupted, |
|
666 |
the MenuEditor may not be able to read the specification." |
|
667 |
||
12125 | 668 |
|
10194 | 669 |
" |
12125 | 670 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu |
671 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp |
|
10194 | 672 |
" |
673 |
||
674 |
<resource: #menu> |
|
675 |
||
676 |
^ |
|
677 |
#(Menu |
|
678 |
( |
|
679 |
(MenuItem |
|
680 |
label: 'File' |
|
681 |
translateLabel: true |
|
682 |
submenu: |
|
683 |
(Menu |
|
684 |
( |
|
685 |
(MenuItem |
|
686 |
label: 'Open' |
|
687 |
itemValue: fileMenuOpen |
|
688 |
translateLabel: true |
|
689 |
shortcutKey: Ctrlo |
|
690 |
) |
|
691 |
(MenuItem |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
692 |
enabled: canSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
693 |
label: 'Save' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
694 |
itemValue: fileMenuSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
695 |
translateLabel: true |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
696 |
shortcutKey: Ctrls |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
697 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
698 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
699 |
enabled: canSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
700 |
label: 'Save As...' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
701 |
itemValue: fileMenuSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
702 |
translateLabel: true |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
703 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
704 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
705 |
enabled: canSaveAsPatch |
10194 | 706 |
label: 'Save as patch ' |
707 |
itemValue: fileMenuSaveAsPatch |
|
708 |
translateLabel: true |
|
709 |
) |
|
710 |
(MenuItem |
|
711 |
label: '-' |
|
712 |
) |
|
713 |
(MenuItem |
|
714 |
label: 'Exit' |
|
715 |
itemValue: closeRequest |
|
716 |
translateLabel: true |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
717 |
shortcutKey: Ctrlq |
10194 | 718 |
) |
719 |
) |
|
720 |
nil |
|
721 |
nil |
|
722 |
) |
|
723 |
) |
|
724 |
(MenuItem |
|
12125 | 725 |
label: 'Changeset' |
726 |
translateLabel: true |
|
727 |
submenu: |
|
728 |
(Menu |
|
729 |
( |
|
730 |
(MenuItem |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
731 |
enabled: isDiff2Or3 |
12125 | 732 |
label: 'Browse changes (A)' |
733 |
itemValue: changesetMenuBrowseA |
|
734 |
translateLabel: true |
|
735 |
) |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
736 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
737 |
enabled: isDiff2Or3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
738 |
label: 'Browse changes (B)' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
739 |
itemValue: changesetMenuBrowseB |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
740 |
translateLabel: true |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
741 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
742 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
743 |
enabled: isDiff3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
744 |
label: 'Browse changes (Base)' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
745 |
itemValue: changesetMenuBrowseBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
746 |
translateLabel: true |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
747 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
748 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
749 |
enabled: isMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
750 |
label: 'Browse changes (Merge)' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
751 |
itemValue: changesetMenuBrowseMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
752 |
translateLabel: true |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
753 |
) |
12125 | 754 |
) |
755 |
nil |
|
756 |
nil |
|
757 |
) |
|
758 |
) |
|
759 |
(MenuItem |
|
10194 | 760 |
label: 'Diff' |
761 |
translateLabel: true |
|
762 |
submenuChannel: listMenu |
|
763 |
) |
|
764 |
) |
|
765 |
nil |
|
766 |
nil |
|
767 |
) |
|
768 |
! ! |
|
769 |
||
770 |
!ChangeSetDiffTool class methodsFor:'plugIn spec'! |
|
771 |
||
772 |
aspectSelectors |
|
773 |
"This resource specification was automatically generated |
|
774 |
by the UIPainter of ST/X." |
|
775 |
||
776 |
"Do not manually edit this. If it is corrupted, |
|
777 |
the UIPainter may not be able to read the specification." |
|
778 |
||
779 |
"Return a description of exported aspects; |
|
780 |
these can be connected to aspects of an embedding application |
|
781 |
(if this app is embedded in a subCanvas)." |
|
782 |
||
783 |
^ #( |
|
784 |
#diffsetHolder |
|
785 |
). |
|
786 |
||
787 |
! ! |
|
788 |
||
789 |
!ChangeSetDiffTool methodsFor:'accessing'! |
|
790 |
||
791 |
beSingleColumn |
|
792 |
||
793 |
self navigatorPanelSpecHolder value: #oneColumnNavigatorSpec |
|
794 |
||
795 |
"Created: / 20-11-2009 / 20:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
796 |
! |
|
797 |
||
798 |
beTwoColumn |
|
799 |
||
800 |
self navigatorPanelSpecHolder value: #twoColumnNavigatorSpec |
|
801 |
||
802 |
"Created: / 20-11-2009 / 20:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
803 |
! |
|
804 |
||
805 |
beTwoColumn: aBoolean |
|
806 |
||
807 |
aBoolean |
|
808 |
ifTrue:[self beTwoColumn] |
|
809 |
ifFalse:[self beSingleColumn] |
|
810 |
||
811 |
"Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
812 |
! |
|
813 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
814 |
diffInfo |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
815 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
816 |
^self diffInfoHolder value |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
817 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
818 |
"Created: / 20-03-2012 / 11:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
819 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
820 |
|
10194 | 821 |
diffset |
822 |
||
823 |
^self diffsetHolder value |
|
824 |
||
825 |
"Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
826 |
! |
|
827 |
||
828 |
diffset: aDiff3Set |
|
829 |
||
830 |
self diffsetHolder value: aDiff3Set |
|
831 |
||
832 |
"Created: / 01-11-2009 / 09:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
833 |
! |
|
834 |
||
835 |
patchset |
|
836 |
||
837 |
| patchset | |
|
838 |
patchset := ChangeSet new. |
|
839 |
self diffset do: |
|
840 |
[:diff|patchset add:diff versionA]. |
|
841 |
^patchset |
|
842 |
||
843 |
"Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
844 |
! |
|
845 |
||
846 |
selection |
|
847 |
||
848 |
^self selectionHolder value |
|
849 |
||
850 |
"Created: / 22-10-2008 / 11:30:03 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
851 |
! |
|
852 |
||
853 |
selection: selection |
|
854 |
||
855 |
^self selectionHolder value: selection |
|
856 |
||
857 |
"Created: / 22-10-2008 / 11:30:11 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
858 |
! |
|
859 |
||
860 |
title: aString |
|
861 |
||
862 |
self titleHolder value: aString |
|
863 |
||
864 |
"Created: / 19-11-2009 / 15:44:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
865 |
! ! |
|
866 |
||
867 |
!ChangeSetDiffTool methodsFor:'accessing - selection'! |
|
868 |
||
869 |
theSingleSelectedObject |
|
870 |
||
871 |
| sel selSize obj | |
|
872 |
sel := self selection. |
|
873 |
||
874 |
(sel isCollection and:[self isString not]) |
|
875 |
ifFalse:[^sel]. |
|
876 |
||
877 |
selSize := 0. |
|
878 |
obj := nil. |
|
879 |
sel do: |
|
880 |
[:each| |
|
881 |
selSize := selSize + 1. |
|
882 |
selSize > 1 ifTrue:[^nil]. |
|
883 |
obj := each]. |
|
884 |
^obj |
|
885 |
||
886 |
"Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
887 |
"Modified: / 20-11-2009 / 19:54:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
888 |
! ! |
|
889 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
890 |
!ChangeSetDiffTool methodsFor:'accessing - subapps'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
891 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
892 |
textDiff2Tool |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
893 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
894 |
^TextDiff2Tool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
895 |
labelAHolder: self versionALabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
896 |
textAHolder: self versionATextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
897 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
898 |
labelBHolder: self versionBLabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
899 |
textBHolder: self versionBTextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
900 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
901 |
yourself |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
902 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
903 |
"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
|
904 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
905 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
906 |
textDiff3Tool |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
907 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
908 |
^TextDiff3Tool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
909 |
labelCHolder: self versionBaseLabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
910 |
textCHolder: self versionBaseTextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
911 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
912 |
labelBHolder: self versionBLabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
913 |
textBHolder: self versionBTextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
914 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
915 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
916 |
labelAHolder: self versionALabelHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
917 |
textAHolder: self versionATextHolder; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
918 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
919 |
mergeHolder: self mergeHolder; |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
920 |
mergeDataHolder: self mergeDataHolder; |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
921 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
922 |
yourself |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
923 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
924 |
"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
|
925 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
926 |
|
10194 | 927 |
!ChangeSetDiffTool methodsFor:'aspects'! |
928 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
929 |
diffInfoHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
930 |
"return/create the 'diffInfoHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
931 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
932 |
diffInfoHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
933 |
diffInfoHolder := ValueHolder new. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
934 |
diffInfoHolder addDependent:self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
935 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
936 |
^ diffInfoHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
937 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
938 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
939 |
diffInfoHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
940 |
"set the 'diffInfoHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
941 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
942 |
|oldValue newValue| |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
943 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
944 |
diffInfoHolder notNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
945 |
oldValue := diffInfoHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
946 |
diffInfoHolder removeDependent:self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
947 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
948 |
diffInfoHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
949 |
diffInfoHolder notNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
950 |
diffInfoHolder addDependent:self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
951 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
952 |
newValue := diffInfoHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
953 |
oldValue ~~ newValue ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
954 |
self update:#value with:newValue from:diffInfoHolder. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
955 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
956 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
957 |
|
10194 | 958 |
diffListEntryLabelGeneratorAspect |
959 |
||
960 |
^nil |
|
961 |
||
962 |
"Created: / 24-11-2009 / 10:01:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
963 |
! |
|
964 |
||
965 |
diffsetHolder |
|
966 |
"return/create the 'diffsetHolder' value holder (automatically generated)" |
|
967 |
||
968 |
diffsetHolder isNil ifTrue:[ |
|
969 |
diffsetHolder := ValueHolder new. |
|
970 |
diffsetHolder addDependent:self. |
|
971 |
]. |
|
972 |
^ diffsetHolder |
|
973 |
! |
|
974 |
||
975 |
diffsetHolder:aValueHolder |
|
976 |
"set the 'diffsetHolder' value holder (automatically generated)" |
|
977 |
||
978 |
|oldValue newValue| |
|
979 |
||
980 |
diffsetHolder notNil ifTrue:[ |
|
981 |
oldValue := diffsetHolder value. |
|
982 |
diffsetHolder removeDependent:self. |
|
983 |
]. |
|
984 |
diffsetHolder := aValueHolder. |
|
985 |
diffsetHolder notNil ifTrue:[ |
|
986 |
diffsetHolder addDependent:self. |
|
987 |
]. |
|
988 |
newValue := diffsetHolder value. |
|
989 |
oldValue ~~ newValue ifTrue:[ |
|
990 |
self update:#value with:newValue from:diffsetHolder. |
|
991 |
]. |
|
992 |
! |
|
993 |
||
994 |
diffsetHolderPrivate |
|
995 |
"return/create the 'diffSetHolderPrivate' value holder (automatically generated)" |
|
996 |
||
997 |
diffsetHolderPrivate isNil ifTrue:[ |
|
998 |
diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value). |
|
999 |
]. |
|
1000 |
^ diffsetHolderPrivate |
|
1001 |
||
1002 |
"Created: / 05-12-2009 / 11:03:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1003 |
! |
|
1004 |
||
1005 |
firstColSelectionHolder |
|
1006 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
1007 |
||
1008 |
firstColSelectionHolder isNil ifTrue:[ |
|
1009 |
firstColSelectionHolder := ValueHolder with:nil "defaultValue here". |
|
1010 |
]. |
|
1011 |
^ firstColSelectionHolder |
|
1012 |
! |
|
1013 |
||
1014 |
hasSelectionHolder |
|
1015 |
||
1016 |
|holder| |
|
1017 |
||
1018 |
(holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[ |
|
1019 |
holder := (AspectAdaptor forAspect: #notEmptyOrNil) |
|
1020 |
subjectChannel: self selectionHolder. |
|
1021 |
builder aspectAt:#hasSelectionHolder put: holder |
|
1022 |
]. |
|
1023 |
^ holder. |
|
1024 |
||
1025 |
"Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1026 |
"Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1027 |
! |
|
1028 |
||
1029 |
listHolder |
|
1030 |
"return/create the 'listHolder' value holder (automatically generated)" |
|
1031 |
||
1032 |
listHolder isNil ifTrue:[ |
|
1033 |
listHolder := ValueHolder new. |
|
1034 |
]. |
|
1035 |
^ listHolder |
|
1036 |
||
1037 |
"Modified: / 01-11-2009 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1038 |
! |
|
1039 |
||
1040 |
listMenuHolder |
|
12125 | 1041 |
diffMenuHolder isNil ifTrue:[ |
1042 |
diffMenuHolder := ValueHolder with:(Menu decodeFromLiteralArray: self class listMenu) |
|
1043 |
]. |
|
10194 | 1044 |
^ diffMenuHolder |
1045 |
||
1046 |
"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1047 |
"Modified: / 09-12-2009 / 23:34:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1048 |
"Modified: / 18-11-2011 / 14:57:47 / cg" |
10194 | 1049 |
! |
1050 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1051 |
mergeDataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1052 |
"return/create the 'mergeDataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1053 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1054 |
mergeDataHolder isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1055 |
mergeDataHolder := ValueHolder new. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1056 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1057 |
^ mergeDataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1058 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1059 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1060 |
mergeDataHolder:something |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1061 |
"set the 'mergeDataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1062 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1063 |
mergeDataHolder := something. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1064 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1065 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1066 |
mergeHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1067 |
"return/create the 'mergeHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1068 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1069 |
mergeHolder isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1070 |
mergeHolder := ValueHolder with: false. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1071 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1072 |
^ mergeHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1073 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1074 |
"Modified: / 19-03-2012 / 14:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1075 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1076 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1077 |
mergeHolder:something |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1078 |
"set the 'mergeHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1079 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1080 |
mergeHolder := something. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1081 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1082 |
|
10194 | 1083 |
nameAspect |
1084 |
||
1085 |
^(AspectAdaptor forAspect: #name) |
|
1086 |
subjectChannel: self diffsetHolder |
|
1087 |
||
1088 |
"Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1089 |
! |
|
1090 |
||
1091 |
navigatorPanelSpecHolder |
|
1092 |
<resource: #uiAspect> |
|
1093 |
||
1094 |
navigatorPanelSpecHolder isNil ifTrue:[ |
|
1095 |
navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec. |
|
1096 |
]. |
|
1097 |
^ navigatorPanelSpecHolder. |
|
1098 |
||
1099 |
"Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1100 |
! |
|
1101 |
||
1102 |
selectionHolder |
|
1103 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
|
1104 |
||
1105 |
selectionHolder isNil ifTrue:[ |
|
1106 |
||
1107 |
selectionHolder := ValueHolder new. |
|
1108 |
selectionHolder addDependent:self. |
|
1109 |
]. |
|
1110 |
^ selectionHolder |
|
1111 |
||
1112 |
"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1113 |
! |
|
1114 |
||
1115 |
singleSelectionHolder |
|
1116 |
"return/create the 'singleSelectionHolder' value holder (automatically generated)" |
|
1117 |
||
1118 |
singleSelectionHolder isNil ifTrue:[ |
|
1119 |
singleSelectionHolder := ValueHolder new. |
|
1120 |
]. |
|
1121 |
^ singleSelectionHolder |
|
1122 |
||
1123 |
"Modified: / 10-11-2009 / 11:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1124 |
! |
|
1125 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1126 |
textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1127 |
"return/create the 'textDiffToolHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1128 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1129 |
textDiffToolHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1130 |
textDiffToolHolder := ValueHolder with: self textDiff2Tool. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1131 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1132 |
^ textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1133 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1134 |
"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
|
1135 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1136 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1137 |
textDiffToolHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1138 |
"set the 'textDiffToolHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1139 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1140 |
textDiffToolHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1141 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1142 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1143 |
textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1144 |
"return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1145 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1146 |
textDiffToolWindowSpecHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1147 |
textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1148 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1149 |
^ textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1150 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1151 |
"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
|
1152 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1153 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1154 |
textDiffToolWindowSpecHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1155 |
"set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1156 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1157 |
textDiffToolWindowSpecHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1158 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1159 |
|
10194 | 1160 |
titleHolder |
1161 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
1162 |
||
1163 |
titleHolder isNil ifTrue:[ |
|
1164 |
titleHolder := ValueHolder with: 'Diff Browser'. |
|
1165 |
]. |
|
1166 |
^ titleHolder |
|
1167 |
||
1168 |
"Modified: / 01-11-2009 / 14:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1169 |
! |
|
1170 |
||
1171 |
versionALabelHolder |
|
1172 |
||
1173 |
^(AspectAdaptor forAspect: #versionALabel) |
|
1174 |
subjectChannel: self diffsetHolder |
|
1175 |
||
1176 |
"Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1177 |
! |
|
1178 |
||
1179 |
versionATextHolder |
|
1180 |
||
12125 | 1181 |
versionATextHolder isNil ifTrue:[ |
10194 | 1182 |
versionATextHolder := ValueHolder new |
1183 |
]. |
|
1184 |
^versionATextHolder |
|
1185 |
||
1186 |
"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1187 |
"Modified: / 18-11-2011 / 14:57:56 / cg" |
10194 | 1188 |
! |
1189 |
||
1190 |
versionBLabelHolder |
|
1191 |
||
1192 |
^(AspectAdaptor forAspect: #versionBLabel) |
|
1193 |
subjectChannel: self diffsetHolder |
|
1194 |
||
1195 |
"Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1196 |
! |
|
1197 |
||
1198 |
versionBTextHolder |
|
1199 |
||
12125 | 1200 |
versionBTextHolder isNil ifTrue:[ |
10194 | 1201 |
versionBTextHolder := ValueHolder new |
1202 |
]. |
|
1203 |
^versionBTextHolder |
|
1204 |
||
1205 |
"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1206 |
"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
|
1207 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1208 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1209 |
versionBaseLabelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1210 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1211 |
^(AspectAdaptor forAspect: #versionBaseLabel) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1212 |
subjectChannel: self diffsetHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1213 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1214 |
"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
|
1215 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1216 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1217 |
versionBaseTextHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1218 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1219 |
versionBaseTextHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1220 |
versionBaseTextHolder := ValueHolder new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1221 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1222 |
^versionBaseTextHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1223 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1224 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1225 |
"Created: / 16-03-2012 / 15:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1226 |
! ! |
1227 |
||
1228 |
!ChangeSetDiffTool methodsFor:'change & update'! |
|
1229 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1230 |
diffInfoChanged |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1231 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1232 |
| info | |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1233 |
info := self diffInfoHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1234 |
info read. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1235 |
self diffset: info diffset. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1236 |
self updateViews |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1237 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1238 |
"Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1239 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1240 |
|
10194 | 1241 |
diffsetChanged |
1242 |
||
1243 |
| ds | |
|
1244 |
||
1245 |
ds := self diffsetHolder value. |
|
1246 |
||
1247 |
self diffsetHolderPrivate value: |
|
1248 |
(self isOneColumnBrowser |
|
1249 |
ifTrue:[ds flattened] |
|
1250 |
ifFalse:[ds value]). |
|
1251 |
||
1252 |
self versionALabelHolder value: ds versionALabel. |
|
1253 |
self versionBLabelHolder value: ds versionBLabel. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1254 |
self versionBaseLabelHolder value: ds versionBaseLabel. |
10194 | 1255 |
|
1256 |
"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1257 |
"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
|
1258 |
"Modified: / 16-03-2012 / 15:42:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1259 |
! |
1260 |
||
1261 |
selectionChanged |
|
1262 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1263 |
| diffItem mergeData | |
10194 | 1264 |
|
1265 |
diffItem := self theSingleSelectedObject. |
|
1266 |
self singleSelectionHolder value: diffItem. |
|
1267 |
diffItem isNil ifTrue:[^self]. |
|
1268 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1269 |
self isMerge ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1270 |
self mergeDataHolder setValue: (mergeData := diffItem mergeInfo). |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1271 |
]. |
10194 | 1272 |
self versionATextHolder setValue: diffItem versionAText. |
1273 |
self versionBTextHolder setValue: diffItem versionBText. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1274 |
self versionBaseTextHolder setValue: diffItem versionBaseText. |
10194 | 1275 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1276 |
|
10194 | 1277 |
self versionATextHolder changed: #value. |
1278 |
self versionBTextHolder changed: #value. |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1279 |
self versionBaseTextHolder changed: #value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1280 |
self isMerge ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1281 |
self mergeDataHolder changed: #value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1282 |
"Maybe, there was no merge data beforehand. In that case, |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1283 |
update" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1284 |
mergeData isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1285 |
diffItem mergeInfo: (self mergeDataHolder value). |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1286 |
] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1287 |
] |
10194 | 1288 |
|
1289 |
"Created: / 22-10-2008 / 11:29:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1290 |
"Modified: / 19-03-2012 / 14:59:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1291 |
! |
1292 |
||
1293 |
update: aspect with: param from: sender |
|
1294 |
||
1295 |
sender == selectionHolder ifTrue:[ |
|
1296 |
self selectionChanged. |
|
1297 |
^self. |
|
1298 |
]. |
|
1299 |
||
1300 |
sender == diffsetHolder ifTrue:[ |
|
1301 |
self diffsetChanged. |
|
1302 |
^self. |
|
1303 |
]. |
|
1304 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1305 |
sender == diffInfoHolder ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1306 |
self diffInfoChanged. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1307 |
^self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1308 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1309 |
|
10194 | 1310 |
^super update: aspect with: param from: sender |
1311 |
||
1312 |
"Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1313 |
! |
|
1314 |
||
1315 |
updateListMenu |
|
1316 |
|menu diffs loadA loadB| |
|
1317 |
||
1318 |
menu := self listMenuHolder value. |
|
1319 |
diffs := self selection ? #(). |
|
1320 |
loadA := menu atNameKey:#LoadVersionA. |
|
1321 |
loadA disable. |
|
1322 |
loadB := menu atNameKey:#LoadVersionB. |
|
1323 |
loadB disable. |
|
1324 |
(diffs select:[:e | true ]) do:[:diff | |
|
1325 |
diff versionA |
|
1326 |
ifNotNil:[ |
|
1327 |
loadA enable. |
|
1328 |
loadA label:'Load version ' , diff versionALabel |
|
1329 |
]. |
|
1330 |
diff versionB |
|
1331 |
ifNotNil:[ |
|
1332 |
loadB |
|
1333 |
label:'Load version ' , diff versionBLabel; |
|
1334 |
enable |
|
1335 |
]. |
|
1336 |
]. |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1337 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1338 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1339 |
updateViews |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1340 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1341 |
self diffInfo isNil ifTrue:[ ^ self ]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1342 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1343 |
self diffInfo isDiff3 ifTrue:[ |
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1344 |
self textDiffToolHolder value isDiff3 ifFalse:[ |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1345 |
textDiffToolHolder value: self textDiff3Tool. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1346 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1347 |
self mergeHolder value: self diffInfo isMerge. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1348 |
] ifFalse:[ |
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1349 |
self textDiffToolHolder value isDiff2 ifFalse:[ |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1350 |
textDiffToolHolder value: self textDiff2Tool. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1351 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1352 |
self mergeHolder value: false. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1353 |
] |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1354 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1355 |
"Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1356 |
! ! |
1357 |
||
1358 |
!ChangeSetDiffTool methodsFor:'initialization'! |
|
1359 |
||
1360 |
initialize |
|
1361 |
||
1362 |
super initialize. |
|
1363 |
self createBuilder |
|
1364 |
||
1365 |
"Created: / 22-10-2008 / 12:37:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1366 |
! ! |
|
1367 |
||
1368 |
!ChangeSetDiffTool methodsFor:'menu actions'! |
|
1369 |
||
12125 | 1370 |
changesetMenuBrowse: changeset |
1371 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1372 |
Tools::ChangeSetBrowser2 openOn: (changeset , self diffInfo same) |
12125 | 1373 |
|
1374 |
"Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1375 |
! |
|
1376 |
||
1377 |
changesetMenuBrowseA |
|
1378 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1379 |
self changesetMenuBrowse: self diffInfo diffset changesetA |
12125 | 1380 |
|
1381 |
"Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1382 |
! |
|
1383 |
||
1384 |
changesetMenuBrowseB |
|
1385 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1386 |
self changesetMenuBrowse: self diffInfo diffset changesetB |
12125 | 1387 |
|
1388 |
"Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1389 |
! |
|
1390 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1391 |
changesetMenuBrowseBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1392 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1393 |
self changesetMenuBrowse: self diffInfo diffset changesetBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1394 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1395 |
"Created: / 20-03-2012 / 13:34:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1396 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1397 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1398 |
changesetMenuBrowseMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1399 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1400 |
self changesetMenuBrowse: self diffInfo diffset changesetMerged |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1401 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1402 |
"Created: / 20-03-2012 / 14:34:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1403 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1404 |
|
10194 | 1405 |
fileMenuOpen |
1406 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1407 |
| dlg info | |
10194 | 1408 |
dlg := OpenDialog new. |
1409 |
dlg open ifFalse:[^self]. |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1410 |
info := ChangeSetDiffInfo new. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1411 |
info specA: dlg changeSetASpec. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1412 |
info specB: dlg changeSetBSpec. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1413 |
info specBase: dlg changeSetBaseSpec. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1414 |
info specMerge: dlg changeSetMergedSpec. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1415 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1416 |
^self fileMenuOpenOnDiffInfo: info |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1417 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1418 |
"Modified: / 20-03-2012 / 11:12:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1419 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1420 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1421 |
fileMenuOpenOnDiffInfo: info |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1422 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1423 |
self diffInfoHolder value: info |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1424 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1425 |
"Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1426 |
! |
1427 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1428 |
fileMenuSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1429 |
self fileMenuSaveAs: self diffInfo specMergeFile. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1430 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1431 |
"Modified: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1432 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1433 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1434 |
fileMenuSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1435 |
| info file suggestion | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1436 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1437 |
info := self diffInfo. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1438 |
suggestion := (info specMerge isFile ifTrue:['merged.chg'] ifFalse:[info specMergeFile]). |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1439 |
file := Dialog requestFileName:'Select File for Save' default: (suggestion) pattern:('*.chg;*.st'). |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1440 |
file isNil ifTrue:[^self]. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1441 |
self fileMenuSaveAs: file. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1442 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1443 |
"Modified: / 20-03-2012 / 15:07:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1444 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1445 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1446 |
fileMenuSaveAs: aFilename |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1447 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1448 |
self fileMenuSaveAs: aFilename format: #classSource |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1449 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1450 |
"Created: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1451 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1452 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1453 |
fileMenuSaveAs: aFilename format: format |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1454 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1455 |
| changesToSave | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1456 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1457 |
changesToSave := (self diffInfo diffset changesetMerged) , (self diffInfo same). |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1458 |
changesToSave := changesToSave reject:[:chg|chg isDoIt]. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1459 |
changesToSave saveToFile: aFilename format: format. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1460 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1461 |
"Created: / 20-03-2012 / 15:09:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1462 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1463 |
|
10194 | 1464 |
fileMenuSaveAsPatch |
1465 |
||
1466 |
| filename | |
|
1467 |
filename := Smalltalk::Dialog requestFileName: 'Enter filename' default:'patch.chg' ifFail:[^self]. |
|
1468 |
self patchset fileOutAs: filename. |
|
1469 |
||
1470 |
"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1471 |
! |
|
1472 |
||
12125 | 1473 |
listMenuBrowse |
1474 |
||
1475 |
| items | |
|
1476 |
items := self selection collect:[:e|e]. "/must do collect as selection is an iterator..." |
|
1477 |
items size == 1 ifTrue:[ |
|
1478 |
| item cls sel | |
|
1479 |
item:= items anElement. |
|
1480 |
cls := item changeClass. |
|
1481 |
sel := item changeSelector. |
|
1482 |
cls notNil ifTrue:[ |
|
1483 |
sel notNil ifTrue:[ |
|
1484 |
UserPreferences current systemBrowserClass |
|
1485 |
openInClass:cls selector:sel |
|
1486 |
||
1487 |
] ifFalse:[ |
|
1488 |
UserPreferences current systemBrowserClass |
|
1489 |
browseClass: cls |
|
1490 |
] |
|
1491 |
] ifFalse:[ |
|
1492 |
Dialog warn: (self class resources at: 'Oops, class is gone') |
|
1493 |
] |
|
1494 |
] ifFalse:[ |
|
1495 |
Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'. |
|
1496 |
] |
|
1497 |
||
1498 |
"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1499 |
! |
|
1500 |
||
10194 | 1501 |
listMenuInspect |
1502 |
||
1503 |
(self selection collect:[:e|e]) inspect |
|
1504 |
||
1505 |
"Modified: / 24-11-2009 / 12:51:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1506 |
! |
|
1507 |
||
1508 |
listMenuLoadVersionA |
|
1509 |
||
1510 |
self selection do: |
|
1511 |
[:diff|diff versionA apply] |
|
1512 |
||
1513 |
"Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1514 |
! |
|
1515 |
||
1516 |
listMenuLoadVersionB |
|
1517 |
||
1518 |
self selection do: |
|
1519 |
[:diff|diff versionB apply] |
|
1520 |
||
1521 |
"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
|
1522 |
! |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1523 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1524 |
listMenuOpenInExternal: command |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1525 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1526 |
(OperatingSystem canExecuteCommand: command) ifFalse:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1527 |
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
|
1528 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1529 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1530 |
self selection do:[:item| |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1531 |
| base a b cmd | |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1532 |
item versionBase notNil ifTrue:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1533 |
base := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1534 |
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
|
1535 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1536 |
a := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1537 |
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
|
1538 |
b := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1539 |
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
|
1540 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1541 |
base isNil ifTrue:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1542 |
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
|
1543 |
] ifFalse:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1544 |
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
|
1545 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1546 |
[ OperatingSystem executeCommand: cmd. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1547 |
a remove. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1548 |
b remove. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1549 |
base notNil ifTrue:[base remove]. ] fork |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1550 |
] |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1551 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
1552 |
"Modified: / 17-03-2012 / 08:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1553 |
! ! |
1554 |
||
1555 |
!ChangeSetDiffTool methodsFor:'queries'! |
|
1556 |
||
1557 |
canBrowse |
|
1558 |
||
1559 |
^true |
|
1560 |
||
1561 |
"^[self selection notNil |
|
1562 |
and:[self selection versionA notNil]]" |
|
1563 |
||
1564 |
"Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1565 |
"Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1566 |
! |
|
1567 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1568 |
canSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1569 |
"Returns true, if a merged file can be saved" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1570 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1571 |
| info | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1572 |
info := self diffInfo. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1573 |
^info isMerge and:[info specMerge isFile and:[info diffset isMerged]] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1574 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1575 |
"Created: / 20-03-2012 / 15:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1576 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1577 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1578 |
canSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1579 |
"Returns true, if a merged file can be saved" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1580 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1581 |
| info | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1582 |
info := self diffInfo. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1583 |
^info isMerge and:[info diffset isMerged] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1584 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1585 |
"Created: / 20-03-2012 / 15:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1586 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1587 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1588 |
canSaveAsPatch |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1589 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1590 |
^false |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1591 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1592 |
"Created: / 20-03-2012 / 14:55:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1593 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1594 |
|
10194 | 1595 |
hasSelection |
1596 |
||
1597 |
^[self selection notNil] |
|
1598 |
||
1599 |
"Created: / 03-11-2009 / 10:48:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1600 |
! ! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1601 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1602 |
!ChangeSetDiffTool methodsFor:'testing'! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1603 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1604 |
isDiff2 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1605 |
^self diffInfo notNil and:[self diffInfo isDiff2] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1606 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1607 |
"Created: / 20-03-2012 / 13:27:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1608 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1609 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1610 |
isDiff2Or3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1611 |
^self diffInfo notNil and:[self diffInfo isDiff2 or:[self diffInfo isDiff3]] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1612 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1613 |
"Created: / 20-03-2012 / 13:29:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1614 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1615 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1616 |
isDiff3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1617 |
^self diffInfo notNil and:[self diffInfo isDiff3] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1618 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1619 |
"Created: / 20-03-2012 / 13:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1620 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1621 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1622 |
isMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1623 |
^self diffInfo notNil and:[self diffInfo isMerge] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1624 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1625 |
"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1626 |
! |
1627 |
||
1628 |
isOneColumnBrowser |
|
1629 |
||
1630 |
^self navigatorPanelSpecHolder value = #oneColumnNavigatorSpec |
|
1631 |
||
1632 |
"Created: / 05-12-2009 / 11:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1633 |
! ! |
|
1634 |
||
1635 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'image specs'! |
|
1636 |
||
1637 |
versionA24x24 |
|
1638 |
||
1639 |
^ToolbarIconLibrary versionA24x24 |
|
1640 |
||
1641 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1642 |
! |
|
1643 |
||
1644 |
versionB24x24 |
|
1645 |
||
1646 |
^ToolbarIconLibrary versionB24x24 |
|
1647 |
||
1648 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1649 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1650 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1651 |
versionBase24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1652 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1653 |
^ToolbarIconLibrary versionBase24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1654 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1655 |
"Created: / 19-03-2012 / 23:11:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1656 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1657 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1658 |
versionMerged24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1659 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1660 |
^ToolbarIconLibrary versionMerged24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1661 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1662 |
"Created: / 19-03-2012 / 23:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1663 |
! ! |
1664 |
||
1665 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs'! |
|
1666 |
||
1667 |
windowSpec |
|
1668 |
"This resource specification was automatically generated |
|
1669 |
by the UIPainter of ST/X." |
|
1670 |
||
1671 |
"Do not manually edit this!! If it is corrupted, |
|
1672 |
the UIPainter may not be able to read the specification." |
|
1673 |
||
1674 |
" |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1675 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#windowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1676 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#windowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1677 |
Tools::ChangeSetDiffTool::OpenDialog open |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1678 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1679 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1680 |
<resource: #canvas> |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1681 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1682 |
^ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1683 |
#(FullSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1684 |
name: windowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1685 |
window: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1686 |
(WindowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1687 |
label: 'Open...' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1688 |
name: 'Open...' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1689 |
min: (Point 10 10) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1690 |
bounds: (Rectangle 0 0 640 457) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1691 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1692 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1693 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1694 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1695 |
(VerticalPanelViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1696 |
name: 'VerticalPanel1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1697 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1698 |
horizontalLayout: fit |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1699 |
verticalLayout: top |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1700 |
horizontalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1701 |
verticalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1702 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1703 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1704 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1705 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1706 |
name: 'B' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1707 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1708 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1709 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1710 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1711 |
name: 'SubSpecification2' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1712 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1713 |
minorKey: versionBLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1714 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1715 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1716 |
name: 'SubCanvas1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1717 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1718 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1719 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1720 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1721 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1722 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1723 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1724 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1725 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1726 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1727 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1728 |
aspect: changesetSpecBHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1729 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1730 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1731 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1732 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1733 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1734 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1735 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1736 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1737 |
extent: (Point 640 99) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1738 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1739 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1740 |
name: 'A' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1741 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1742 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1743 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1744 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1745 |
name: 'SubSpecification1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1746 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1747 |
minorKey: versionALabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1748 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1749 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1750 |
name: 'ChangesetASpec' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1751 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1752 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1753 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1754 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1755 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1756 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1757 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1758 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1759 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1760 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1761 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1762 |
aspect: changesetSpecAHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1763 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1764 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1765 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1766 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1767 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1768 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1769 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1770 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1771 |
extent: (Point 640 99) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1772 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1773 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1774 |
name: 'Base' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1775 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1776 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1777 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1778 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1779 |
name: 'SubSpecification3' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1780 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1781 |
minorKey: versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1782 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1783 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1784 |
name: 'SubCanvas2' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1785 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1786 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1787 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1788 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1789 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1790 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1791 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1792 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1793 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1794 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1795 |
subAspect: enabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1796 |
aspect: changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1797 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1798 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1799 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1800 |
aspect: changesetSpecBaseHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1801 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1802 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1803 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1804 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1805 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1806 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1807 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1808 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1809 |
extent: (Point 640 98) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1810 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1811 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1812 |
name: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1813 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1814 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1815 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1816 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1817 |
name: 'SubSpecification4' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1818 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1819 |
minorKey: versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1820 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1821 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1822 |
name: 'SubCanvas3' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1823 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1824 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1825 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1826 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1827 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1828 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1829 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1830 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1831 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1832 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1833 |
subAspect: enabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1834 |
aspect: changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1835 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1836 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1837 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1838 |
aspect: changesetSpecMergedHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1839 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1840 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1841 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1842 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1843 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1844 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1845 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1846 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1847 |
extent: (Point 640 97) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1848 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1849 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1850 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1851 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1852 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1853 |
(HorizontalPanelViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1854 |
name: 'ButtonPanel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1855 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1856 |
horizontalLayout: right |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1857 |
verticalLayout: center |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1858 |
horizontalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1859 |
verticalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1860 |
reverseOrderIfOKAtLeft: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1861 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1862 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1863 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1864 |
(ActionButtonSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1865 |
label: 'OK' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1866 |
name: 'Button1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1867 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1868 |
model: doAccept |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1869 |
enableChannel: doAcceptEnabled |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1870 |
extent: (Point 125 22) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1871 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1872 |
(ActionButtonSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1873 |
label: 'Cancel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1874 |
name: 'Button2' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1875 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1876 |
model: doCancel |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1877 |
extent: (Point 125 22) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1878 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1879 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1880 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1881 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1882 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1883 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1884 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1885 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1886 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1887 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1888 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1889 |
windowSpec_old |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1890 |
"This resource specification was automatically generated |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1891 |
by the UIPainter of ST/X." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1892 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1893 |
"Do not manually edit this!! If it is corrupted, |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1894 |
the UIPainter may not be able to read the specification." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1895 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1896 |
" |
10194 | 1897 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#windowSpec |
1898 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#windowSpec |
|
1899 |
Tools::ChangeSetDiffBrowser::OpenDialog open |
|
1900 |
" |
|
1901 |
||
1902 |
<resource: #canvas> |
|
1903 |
||
1904 |
^ |
|
1905 |
#(FullSpec |
|
1906 |
name: windowSpec |
|
1907 |
window: |
|
1908 |
(WindowSpec |
|
1909 |
label: 'Open...' |
|
1910 |
name: 'Open...' |
|
1911 |
min: (Point 10 10) |
|
1912 |
bounds: (Rectangle 0 0 640 130) |
|
1913 |
) |
|
1914 |
component: |
|
1915 |
(SpecCollection |
|
1916 |
collection: ( |
|
1917 |
(VariableHorizontalPanelSpec |
|
1918 |
name: 'ChangeSetsSpecPanel' |
|
1919 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
1920 |
barWidth: 3 |
|
1921 |
showHandle: true |
|
1922 |
component: |
|
1923 |
(SpecCollection |
|
1924 |
collection: ( |
|
1925 |
(ViewSpec |
|
1926 |
name: 'A' |
|
1927 |
component: |
|
1928 |
(SpecCollection |
|
1929 |
collection: ( |
|
1930 |
(UISubSpecification |
|
1931 |
name: 'SubSpecification1' |
|
1932 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
1933 |
minorKey: versionALabelSpec |
|
1934 |
) |
|
1935 |
(SubCanvasSpec |
|
1936 |
name: 'ChangesetASpec' |
|
1937 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
1938 |
hasHorizontalScrollBar: false |
|
1939 |
hasVerticalScrollBar: false |
|
1940 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
1941 |
minorKey: windowSpecForEmbedding |
|
1942 |
subAspectHolders: |
|
1943 |
(Array |
|
1944 |
||
1945 |
(SubChannelInfoSpec |
|
1946 |
subAspect: specHolder |
|
1947 |
aspect: changesetSpecAHolder |
|
1948 |
) |
|
1949 |
) |
|
1950 |
createNewApplication: true |
|
1951 |
createNewBuilder: true |
|
1952 |
) |
|
1953 |
) |
|
1954 |
||
1955 |
) |
|
1956 |
) |
|
1957 |
(ViewSpec |
|
1958 |
name: 'B' |
|
1959 |
component: |
|
1960 |
(SpecCollection |
|
1961 |
collection: ( |
|
1962 |
(UISubSpecification |
|
1963 |
name: 'SubSpecification2' |
|
1964 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
1965 |
minorKey: versionBLabelSpec |
|
1966 |
) |
|
1967 |
(SubCanvasSpec |
|
1968 |
name: 'SubCanvas1' |
|
1969 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
1970 |
hasHorizontalScrollBar: false |
|
1971 |
hasVerticalScrollBar: false |
|
1972 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
1973 |
minorKey: windowSpecForEmbedding |
|
1974 |
subAspectHolders: |
|
1975 |
(Array |
|
1976 |
||
1977 |
(SubChannelInfoSpec |
|
1978 |
subAspect: specHolder |
|
1979 |
aspect: changesetSpecBHolder |
|
1980 |
) |
|
1981 |
) |
|
1982 |
createNewApplication: true |
|
1983 |
createNewBuilder: true |
|
1984 |
) |
|
1985 |
) |
|
1986 |
||
1987 |
) |
|
1988 |
) |
|
1989 |
) |
|
1990 |
||
1991 |
) |
|
1992 |
handles: (Any 0.5 1.0) |
|
1993 |
) |
|
1994 |
(HorizontalPanelViewSpec |
|
1995 |
name: 'ButtonPanel' |
|
1996 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
1997 |
horizontalLayout: right |
|
1998 |
verticalLayout: center |
|
1999 |
horizontalSpace: 3 |
|
2000 |
verticalSpace: 3 |
|
2001 |
reverseOrderIfOKAtLeft: true |
|
2002 |
component: |
|
2003 |
(SpecCollection |
|
2004 |
collection: ( |
|
2005 |
(ActionButtonSpec |
|
2006 |
label: 'OK' |
|
2007 |
name: 'Button1' |
|
2008 |
translateLabel: true |
|
2009 |
model: doAccept |
|
2010 |
enableChannel: doAcceptEnabled |
|
2011 |
extent: (Point 125 22) |
|
2012 |
) |
|
2013 |
(ActionButtonSpec |
|
2014 |
label: 'Cancel' |
|
2015 |
name: 'Button2' |
|
2016 |
translateLabel: true |
|
2017 |
model: doCancel |
|
2018 |
extent: (Point 125 22) |
|
2019 |
) |
|
2020 |
) |
|
2021 |
||
2022 |
) |
|
2023 |
) |
|
2024 |
) |
|
2025 |
||
2026 |
) |
|
2027 |
) |
|
2028 |
||
2029 |
"Modified: / 06-07-2011 / 11:32:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2030 |
"Created: / 19-03-2012 / 22:21:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2031 |
! ! |
2032 |
||
2033 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs - labels'! |
|
2034 |
||
2035 |
versionALabelSpec |
|
2036 |
"This resource specification was automatically generated |
|
2037 |
by the UIPainter of ST/X." |
|
2038 |
||
2039 |
"Do not manually edit this!! If it is corrupted, |
|
2040 |
the UIPainter may not be able to read the specification." |
|
2041 |
||
2042 |
" |
|
2043 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionALabelSpec |
|
2044 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionALabelSpec |
|
2045 |
" |
|
2046 |
||
2047 |
<resource: #canvas> |
|
2048 |
||
2049 |
^ |
|
2050 |
#(FullSpec |
|
2051 |
name: versionALabelSpec |
|
2052 |
window: |
|
2053 |
(WindowSpec |
|
2054 |
label: 'Version A' |
|
2055 |
name: 'Changeset A' |
|
2056 |
min: (Point 10 10) |
|
2057 |
bounds: (Rectangle 0 0 300 30) |
|
2058 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
2059 |
forceRecursiveBackground: true |
|
2060 |
) |
|
2061 |
component: |
|
2062 |
(SpecCollection |
|
2063 |
collection: ( |
|
2064 |
(LabelSpec |
|
2065 |
label: 'versionA24x24' |
|
2066 |
name: 'VersionAIcon' |
|
2067 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
2068 |
hasCharacterOrientedLabel: false |
|
2069 |
translateLabel: true |
|
2070 |
) |
|
2071 |
(LabelSpec |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2072 |
label: 'Version A (working copy)' |
10194 | 2073 |
name: 'VersionALabel' |
2074 |
layout: (LayoutFrame 30 0 5 0 0 1 0 1) |
|
2075 |
translateLabel: true |
|
2076 |
resizeForLabel: true |
|
2077 |
adjust: left |
|
2078 |
) |
|
2079 |
) |
|
2080 |
||
2081 |
) |
|
2082 |
) |
|
2083 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2084 |
"Modified: / 19-03-2012 / 22:15:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2085 |
! |
2086 |
||
2087 |
versionBLabelSpec |
|
2088 |
"This resource specification was automatically generated |
|
2089 |
by the UIPainter of ST/X." |
|
2090 |
||
2091 |
"Do not manually edit this!! If it is corrupted, |
|
2092 |
the UIPainter may not be able to read the specification." |
|
2093 |
||
2094 |
" |
|
2095 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionBLabelSpec |
|
2096 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionBLabelSpec |
|
2097 |
" |
|
2098 |
||
2099 |
<resource: #canvas> |
|
2100 |
||
2101 |
^ |
|
2102 |
#(FullSpec |
|
2103 |
name: versionBLabelSpec |
|
2104 |
window: |
|
2105 |
(WindowSpec |
|
2106 |
label: 'Version B' |
|
2107 |
name: 'Changeset B' |
|
2108 |
min: (Point 10 10) |
|
2109 |
bounds: (Rectangle 0 0 300 30) |
|
2110 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
2111 |
forceRecursiveBackground: true |
|
2112 |
) |
|
2113 |
component: |
|
2114 |
(SpecCollection |
|
2115 |
collection: ( |
|
2116 |
(LabelSpec |
|
2117 |
label: 'versionB24x24' |
|
2118 |
name: 'VersionBIcon' |
|
2119 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
2120 |
hasCharacterOrientedLabel: false |
|
2121 |
translateLabel: true |
|
2122 |
) |
|
2123 |
(LabelSpec |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2124 |
label: 'Version B (to be merged)' |
10194 | 2125 |
name: 'VersionBLabel' |
2126 |
layout: (LayoutFrame 30 0 5 0 97 0 0 1) |
|
2127 |
translateLabel: true |
|
2128 |
resizeForLabel: true |
|
2129 |
adjust: left |
|
2130 |
useDynamicPreferredWidth: true |
|
2131 |
usePreferredWidth: true |
|
2132 |
) |
|
2133 |
) |
|
2134 |
||
2135 |
) |
|
2136 |
) |
|
2137 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2138 |
"Modified: / 19-03-2012 / 22:15:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2139 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2140 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2141 |
versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2142 |
"This resource specification was automatically generated |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2143 |
by the UIPainter of ST/X." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2144 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2145 |
"Do not manually edit this!! If it is corrupted, |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2146 |
the UIPainter may not be able to read the specification." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2147 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2148 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2149 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2150 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2151 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2152 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2153 |
<resource: #canvas> |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2154 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2155 |
^ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2156 |
#(FullSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2157 |
name: versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2158 |
window: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2159 |
(WindowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2160 |
label: 'Version B' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2161 |
name: 'Version B' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2162 |
min: (Point 10 10) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2163 |
bounds: (Rectangle 0 0 300 30) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2164 |
backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2165 |
forceRecursiveBackground: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2166 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2167 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2168 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2169 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2170 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2171 |
label: 'versionBase24x24' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2172 |
name: 'VersionBaseIcon' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2173 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2174 |
hasCharacterOrientedLabel: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2175 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2176 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2177 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2178 |
label: 'Base' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2179 |
name: 'VersionBLabel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2180 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2181 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2182 |
resizeForLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2183 |
adjust: left |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2184 |
useDynamicPreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2185 |
usePreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2186 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2187 |
(CheckBoxSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2188 |
label: '' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2189 |
name: 'CheckBox1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2190 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2191 |
model: changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2192 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2193 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2194 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2195 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2196 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2197 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2198 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2199 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2200 |
versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2201 |
"This resource specification was automatically generated |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2202 |
by the UIPainter of ST/X." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2203 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2204 |
"Do not manually edit this!! If it is corrupted, |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2205 |
the UIPainter may not be able to read the specification." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2206 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2207 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2208 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2209 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2210 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2211 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2212 |
<resource: #canvas> |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2213 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2214 |
^ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2215 |
#(FullSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2216 |
name: versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2217 |
window: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2218 |
(WindowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2219 |
label: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2220 |
name: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2221 |
min: (Point 10 10) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2222 |
bounds: (Rectangle 0 0 300 30) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2223 |
backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2224 |
forceRecursiveBackground: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2225 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2226 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2227 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2228 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2229 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2230 |
label: 'versionMerged24x24' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2231 |
name: 'VersionMergedIcon' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2232 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2233 |
hasCharacterOrientedLabel: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2234 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2235 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2236 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2237 |
label: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2238 |
name: 'VersionBLabel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2239 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2240 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2241 |
resizeForLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2242 |
adjust: left |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2243 |
useDynamicPreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2244 |
usePreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2245 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2246 |
(CheckBoxSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2247 |
label: '' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2248 |
name: 'CheckBox1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2249 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2250 |
model: changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2251 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2252 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2253 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2254 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2255 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2256 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2257 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2258 |
"Modified: / 19-03-2012 / 23:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2259 |
! ! |
2260 |
||
2261 |
!ChangeSetDiffTool::OpenDialog methodsFor:'accessing'! |
|
2262 |
||
2263 |
changeSetA |
|
2264 |
||
2265 |
| specA | |
|
2266 |
||
2267 |
specA := self changesetSpecAHolder value. |
|
2268 |
^specA ifNil:[nil] ifNotNil:[specA changeSet] |
|
2269 |
||
2270 |
"Created: / 06-07-2011 / 11:36:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2271 |
! |
|
2272 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2273 |
changeSetASpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2274 |
^self changesetSpecAHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2275 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2276 |
"Created: / 20-03-2012 / 00:01:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2277 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2278 |
|
10194 | 2279 |
changeSetB |
2280 |
||
2281 |
| specB | |
|
2282 |
||
2283 |
specB := self changesetSpecBHolder value. |
|
2284 |
^specB ifNil:[nil] ifNotNil:[specB changeSet] |
|
2285 |
||
2286 |
"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
|
2287 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2288 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2289 |
changeSetBSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2290 |
^self changesetSpecBHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2291 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2292 |
"Created: / 20-03-2012 / 00:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2293 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2294 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2295 |
changeSetBase |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2296 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2297 |
| specBase | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2298 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2299 |
specBase := self changesetSpecBaseHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2300 |
^specBase ifNil:[nil] ifNotNil:[specBase changeSet] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2301 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2302 |
"Created: / 16-03-2012 / 13:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2303 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2304 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2305 |
changeSetBaseSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2306 |
^self changesetSpecBaseHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2307 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2308 |
"Created: / 20-03-2012 / 00:01:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2309 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2310 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2311 |
changeSetMerged |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2312 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2313 |
| specMerged | |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2314 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2315 |
specMerged := self changesetSpecMergedHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2316 |
^specMerged ifNil:[nil] ifNotNil:[specMerged changeSet] |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2317 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2318 |
"Created: / 20-03-2012 / 00:01:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2319 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2320 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2321 |
changeSetMergedSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2322 |
^self changesetSpecMergedHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2323 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2324 |
"Created: / 20-03-2012 / 00:01:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2325 |
! ! |
2326 |
||
2327 |
!ChangeSetDiffTool::OpenDialog methodsFor:'aspects'! |
|
2328 |
||
2329 |
changesetSpecAHolder |
|
2330 |
"return/create the 'changesetSpecAHolder' value holder (automatically generated)" |
|
2331 |
||
2332 |
changesetSpecAHolder isNil ifTrue:[ |
|
2333 |
changesetSpecAHolder := ValueHolder new. |
|
2334 |
]. |
|
2335 |
^ changesetSpecAHolder |
|
2336 |
! |
|
2337 |
||
2338 |
changesetSpecAHolder:something |
|
2339 |
"set the 'changesetSpecAHolder' value holder (automatically generated)" |
|
2340 |
||
2341 |
changesetSpecAHolder := something. |
|
2342 |
! |
|
2343 |
||
2344 |
changesetSpecBHolder |
|
2345 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
2346 |
||
2347 |
changesetSpecBHolder isNil ifTrue:[ |
|
2348 |
changesetSpecBHolder := ValueHolder new. |
|
2349 |
]. |
|
2350 |
^ changesetSpecBHolder |
|
2351 |
! |
|
2352 |
||
2353 |
changesetSpecBHolder:something |
|
2354 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
2355 |
||
2356 |
changesetSpecBHolder := something. |
|
2357 |
! |
|
2358 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2359 |
changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2360 |
"return/create the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2361 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2362 |
changesetSpecBaseEnabledHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2363 |
changesetSpecBaseEnabledHolder := false asValue |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2364 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2365 |
^ changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2366 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2367 |
"Modified: / 19-03-2012 / 23:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2368 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2369 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2370 |
changesetSpecBaseEnabledHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2371 |
"set the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2372 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2373 |
changesetSpecBaseEnabledHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2374 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2375 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2376 |
changesetSpecBaseHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2377 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2378 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2379 |
changesetSpecBaseHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2380 |
changesetSpecBaseHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2381 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2382 |
^ changesetSpecBaseHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2383 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2384 |
"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
|
2385 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2386 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2387 |
changesetSpecBaseHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2388 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2389 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2390 |
changesetSpecBaseHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2391 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2392 |
"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
|
2393 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2394 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2395 |
changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2396 |
"return/create the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2397 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2398 |
changesetSpecMergedEnabledHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2399 |
changesetSpecMergedEnabledHolder := false asValue |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2400 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2401 |
^ changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2402 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2403 |
"Modified: / 19-03-2012 / 23:20:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2404 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2405 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2406 |
changesetSpecMergedEnabledHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2407 |
"set the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2408 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2409 |
changesetSpecMergedEnabledHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2410 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2411 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2412 |
changesetSpecMergedHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2413 |
"return/create the 'changesetSpecMergedHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2414 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2415 |
changesetSpecMergedHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2416 |
changesetSpecMergedHolder := ValueHolder new. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2417 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2418 |
^ changesetSpecMergedHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2419 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2420 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2421 |
changesetSpecMergedHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2422 |
"set the 'changesetSpecMergedHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2423 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2424 |
changesetSpecMergedHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2425 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2426 |
|
10194 | 2427 |
doAcceptEnabled |
2428 |
<resource: #uiAspect> |
|
2429 |
||
2430 |
^BlockValue |
|
2431 |
with:[:a :b|a value notNil and:[b value notNil]] |
|
2432 |
argument:self changesetSpecAHolder |
|
2433 |
argument:self changesetSpecAHolder. |
|
2434 |
||
2435 |
"Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2436 |
! ! |
|
2437 |
||
2438 |
!ChangeSetDiffTool::OpenDialog methodsFor:'events'! |
|
2439 |
||
2440 |
closeAccept |
|
2441 |
||
2442 |
^super closeAccept |
|
2443 |
||
2444 |
"Created: / 06-07-2011 / 12:09:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2445 |
! ! |
|
2446 |
||
2447 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
2448 |
||
2449 |
version_CVS |
|
12125 | 2450 |
^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
10194 | 2451 |
! |
2452 |
||
2453 |
version_SVN |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
2454 |
^ '$Id: Tools__ChangeSetDiffTool.st 7948 2012-03-21 01:52:35Z vranyj1 $' |
12125 | 2455 |
! ! |