author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 16 Mar 2012 19:25:49 +0000 | |
branch | jv |
changeset 12180 | 8ff612c17953 |
parent 12179 | 47f98e7d6de1 |
child 12190 | 2a77dea2eceb |
permissions | -rw-r--r-- |
10196 | 1 |
" |
2 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
3 |
All Rights Reserved |
|
4 |
||
5 |
This software is furnished under a license and may be used |
|
6 |
only in accordance with the terms of that license and with the |
|
7 |
inclusion of the above copyright notice. This software may not |
|
8 |
be provided or otherwise made available to, or used by, any |
|
9 |
other person. No title to or ownership of the software is |
|
10 |
hereby transferred. |
|
11 |
" |
|
10332 | 12 |
"{ Package: 'stx:libtool' }" |
10196 | 13 |
|
14 |
"{ NameSpace: Tools }" |
|
15 |
||
16 |
ApplicationModel subclass:#TextDiffTool |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
17 |
instanceVariableNames:'labelHolder labelAHolder textAHolder labelBHolder textBHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
18 |
labelCHolder textCHolder languageHolder codeAspectHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
19 |
textAChanged textBChanged textCChanged contentSpecHolder diffView |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
20 |
classHolder' |
10196 | 21 |
classVariableNames:'' |
22 |
poolDictionaries:'' |
|
23 |
category:'Interface-Diff' |
|
24 |
! |
|
25 |
||
26 |
!TextDiffTool class methodsFor:'documentation'! |
|
27 |
||
28 |
copyright |
|
29 |
" |
|
30 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
31 |
All Rights Reserved |
|
32 |
||
33 |
This software is furnished under a license and may be used |
|
34 |
only in accordance with the terms of that license and with the |
|
35 |
inclusion of the above copyright notice. This software may not |
|
36 |
be provided or otherwise made available to, or used by, any |
|
37 |
other person. No title to or ownership of the software is |
|
38 |
hereby transferred. |
|
39 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
40 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
41 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
42 |
documentation |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
43 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
44 |
documentation to be added. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
45 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
46 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
47 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
48 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
49 |
[instance variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
50 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
51 |
[class variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
52 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
53 |
[see also:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
54 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
55 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
56 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
57 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
58 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
59 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
60 |
See |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
61 |
- TextDiff2Tool examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
62 |
- TextDiff3Tool examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
63 |
" |
10196 | 64 |
! ! |
65 |
||
66 |
!TextDiffTool class methodsFor:'image specs'! |
|
67 |
||
68 |
versionA24x24 |
|
69 |
||
70 |
^ToolbarIconLibrary versionA24x24 |
|
71 |
||
72 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
73 |
! |
|
74 |
||
75 |
versionB24x24 |
|
76 |
||
77 |
^ToolbarIconLibrary versionB24x24 |
|
78 |
||
79 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
80 |
! |
|
81 |
||
82 |
versionBase24x24 |
|
83 |
||
84 |
^ToolbarIconLibrary versionBase24x24 |
|
85 |
||
86 |
"Created: / 24-03-2010 / 20:50:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
87 |
! ! |
|
88 |
||
89 |
!TextDiffTool class methodsFor:'interface specs'! |
|
90 |
||
91 |
windowSpec |
|
92 |
"This resource specification was automatically generated |
|
93 |
by the UIPainter of ST/X." |
|
94 |
||
95 |
"Do not manually edit this!! If it is corrupted, |
|
96 |
the UIPainter may not be able to read the specification." |
|
97 |
||
98 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
99 |
UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
100 |
Tools::TextDiff2Tool new openInterface:#windowSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
101 |
Tools::TextDiff2Tool open |
10196 | 102 |
" |
103 |
||
104 |
<resource: #canvas> |
|
105 |
||
106 |
^ |
|
107 |
#(FullSpec |
|
108 |
name: windowSpec |
|
109 |
window: |
|
110 |
(WindowSpec |
|
111 |
label: 'Text Diff Tool' |
|
112 |
name: 'Text Diff Tool' |
|
12125 | 113 |
labelChannel: titleHolder |
10196 | 114 |
min: (Point 10 10) |
115 |
bounds: (Rectangle 0 0 640 480) |
|
116 |
) |
|
117 |
component: |
|
118 |
(SpecCollection |
|
119 |
collection: ( |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
120 |
(LabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
121 |
label: 'Label' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
122 |
name: 'Label1' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
123 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
124 |
translateLabel: true |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
125 |
labelChannel: labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
126 |
) |
10196 | 127 |
(UISubSpecification |
128 |
name: 'Contents' |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
129 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
10196 | 130 |
minorKey: windowSpecForEmbedding |
131 |
) |
|
132 |
) |
|
133 |
||
134 |
) |
|
135 |
) |
|
136 |
! |
|
137 |
||
138 |
windowSpecForEmbedding |
|
139 |
"This resource specification was automatically generated |
|
140 |
by the UIPainter of ST/X." |
|
141 |
||
142 |
"Do not manually edit this!! If it is corrupted, |
|
143 |
the UIPainter may not be able to read the specification." |
|
144 |
||
145 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
146 |
UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpecForEmbedding |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
147 |
Tools::TextDiff2Tool new openInterface:#windowSpecForEmbedding |
10196 | 148 |
" |
149 |
||
150 |
<resource: #canvas> |
|
151 |
||
152 |
^ |
|
153 |
#(FullSpec |
|
154 |
name: windowSpecForEmbedding |
|
155 |
window: |
|
156 |
(WindowSpec |
|
157 |
label: 'Text Diff Tool (for embedding)' |
|
158 |
name: 'Text Diff Tool (for embedding)' |
|
159 |
min: (Point 10 10) |
|
160 |
bounds: (Rectangle 0 0 782 506) |
|
161 |
) |
|
162 |
component: |
|
163 |
(SpecCollection |
|
164 |
collection: ( |
|
165 |
(SubCanvasSpec |
|
166 |
name: 'Contents' |
|
167 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
168 |
hasHorizontalScrollBar: false |
|
169 |
hasVerticalScrollBar: false |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
170 |
specHolder: contentSpecHolder |
10196 | 171 |
createNewBuilder: false |
172 |
) |
|
173 |
) |
|
174 |
||
175 |
) |
|
176 |
) |
|
177 |
! ! |
|
178 |
||
179 |
!TextDiffTool class methodsFor:'interface specs - labels'! |
|
180 |
||
181 |
versionALabelSpec |
|
182 |
"This resource specification was automatically generated |
|
183 |
by the UIPainter of ST/X." |
|
184 |
||
185 |
"Do not manually edit this!! If it is corrupted, |
|
186 |
the UIPainter may not be able to read the specification." |
|
187 |
||
188 |
" |
|
189 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionALabelSpec |
|
190 |
SVN::DiffViewApp new openInterface:#versionALabelSpec |
|
191 |
" |
|
192 |
||
193 |
<resource: #canvas> |
|
194 |
||
195 |
^ |
|
196 |
#(FullSpec |
|
197 |
name: versionALabelSpec |
|
198 |
window: |
|
199 |
(WindowSpec |
|
200 |
label: 'Version A' |
|
201 |
name: 'Version A' |
|
202 |
min: (Point 10 10) |
|
203 |
bounds: (Rectangle 0 0 300 30) |
|
204 |
) |
|
205 |
component: |
|
206 |
(SpecCollection |
|
207 |
collection: ( |
|
208 |
(LabelSpec |
|
209 |
label: 'versionA24x24' |
|
210 |
name: 'VersionAIcon' |
|
211 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
212 |
hasCharacterOrientedLabel: false |
|
213 |
translateLabel: true |
|
214 |
) |
|
215 |
(LabelSpec |
|
216 |
label: 'Version A' |
|
217 |
name: 'VersionALabel' |
|
218 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
219 |
translateLabel: true |
|
220 |
labelChannel: labelAHolder |
|
221 |
resizeForLabel: true |
|
222 |
adjust: left |
|
223 |
) |
|
224 |
) |
|
225 |
||
226 |
) |
|
227 |
) |
|
228 |
||
229 |
"Modified: / 30-06-2011 / 20:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
230 |
! |
|
231 |
||
232 |
versionBLabelSpec |
|
233 |
"This resource specification was automatically generated |
|
234 |
by the UIPainter of ST/X." |
|
235 |
||
236 |
"Do not manually edit this!! If it is corrupted, |
|
237 |
the UIPainter may not be able to read the specification." |
|
238 |
||
239 |
" |
|
240 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBLabelSpec |
|
241 |
SVN::DiffViewApp new openInterface:#versionBLabelSpec |
|
242 |
" |
|
243 |
||
244 |
<resource: #canvas> |
|
245 |
||
246 |
^ |
|
247 |
#(FullSpec |
|
248 |
name: versionBLabelSpec |
|
249 |
window: |
|
250 |
(WindowSpec |
|
251 |
label: 'Version B' |
|
252 |
name: 'Version B' |
|
253 |
min: (Point 10 10) |
|
254 |
bounds: (Rectangle 0 0 300 30) |
|
255 |
) |
|
256 |
component: |
|
257 |
(SpecCollection |
|
258 |
collection: ( |
|
259 |
(LabelSpec |
|
260 |
label: 'versionB24x24' |
|
261 |
name: 'VersionBIcon' |
|
262 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
263 |
hasCharacterOrientedLabel: false |
|
264 |
translateLabel: true |
|
265 |
) |
|
266 |
(LabelSpec |
|
267 |
label: 'Version B' |
|
268 |
name: 'VersionBLabel' |
|
269 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
270 |
translateLabel: true |
|
271 |
labelChannel: labelBHolder |
|
272 |
resizeForLabel: true |
|
273 |
adjust: left |
|
274 |
useDynamicPreferredWidth: true |
|
275 |
usePreferredWidth: true |
|
276 |
) |
|
277 |
) |
|
278 |
||
279 |
) |
|
280 |
) |
|
281 |
||
282 |
"Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
283 |
! |
|
284 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
285 |
versionCLabelSpec |
10196 | 286 |
"This resource specification was automatically generated |
287 |
by the UIPainter of ST/X." |
|
288 |
||
289 |
"Do not manually edit this!! If it is corrupted, |
|
290 |
the UIPainter may not be able to read the specification." |
|
291 |
||
292 |
" |
|
293 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBaseLabelSpec |
|
294 |
SVN::DiffViewApp new openInterface:#versionBaseLabelSpec |
|
295 |
" |
|
296 |
||
297 |
<resource: #canvas> |
|
298 |
||
299 |
^ |
|
300 |
#(FullSpec |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
301 |
name: versionCLabelSpec |
10196 | 302 |
window: |
303 |
(WindowSpec |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
304 |
label: 'Version C' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
305 |
name: 'Version C' |
10196 | 306 |
min: (Point 10 10) |
307 |
bounds: (Rectangle 0 0 300 30) |
|
308 |
) |
|
309 |
component: |
|
310 |
(SpecCollection |
|
311 |
collection: ( |
|
312 |
(LabelSpec |
|
313 |
label: 'versionBase24x24' |
|
314 |
name: 'VersionBaseIcon' |
|
315 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
316 |
hasCharacterOrientedLabel: false |
|
317 |
translateLabel: true |
|
318 |
) |
|
319 |
(LabelSpec |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
320 |
label: 'Version C' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
321 |
name: 'VersionCLabel' |
10196 | 322 |
layout: (LayoutFrame 30 0 5 0 191 0 0 1) |
323 |
translateLabel: true |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
324 |
labelChannel: versionCLabelAspect |
10196 | 325 |
resizeForLabel: true |
326 |
adjust: left |
|
327 |
useDynamicPreferredWidth: true |
|
328 |
usePreferredWidth: true |
|
329 |
) |
|
330 |
) |
|
331 |
||
332 |
) |
|
333 |
) |
|
334 |
||
335 |
"Modified: / 24-03-2010 / 20:51:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
336 |
"Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 337 |
! ! |
338 |
||
339 |
!TextDiffTool class methodsFor:'plugIn spec'! |
|
340 |
||
341 |
aspectSelectors |
|
342 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
343 |
^#( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
344 |
#labelHolder |
10196 | 345 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
346 |
#labelAHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
347 |
#labelBHolde |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
348 |
#labelCHolder |
10196 | 349 |
|
350 |
#textAHolder |
|
351 |
#textBHolder |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
352 |
#textCHolder |
10196 | 353 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
354 |
#languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
355 |
#codeAspectHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
356 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
357 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
358 |
"Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12125 | 359 |
! ! |
360 |
||
361 |
!TextDiffTool methodsFor:'accessing'! |
|
362 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
363 |
label: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
364 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
365 |
^self labelHolder value: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
366 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
367 |
"Created: / 16-03-2012 / 13:07:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
368 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
369 |
|
12125 | 370 |
labelA: aString |
371 |
||
372 |
^self labelAHolder value: aString |
|
373 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
374 |
"Created: / 16-03-2012 / 13:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12125 | 375 |
! |
376 |
||
377 |
labelB: aString |
|
378 |
||
379 |
^self labelBHolder value: aString |
|
380 |
||
381 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
382 |
"Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
383 |
! |
|
384 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
385 |
labelC: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
386 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
387 |
^self labelCHolder value: aString |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
388 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
389 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
390 |
"Created: / 16-03-2012 / 13:05:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
391 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
392 |
|
12125 | 393 |
textA: aString |
394 |
||
395 |
^self textAHolder value: aString |
|
396 |
||
397 |
"Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
398 |
! |
|
399 |
||
400 |
textB: aString |
|
401 |
||
402 |
^self textBHolder value: aString |
|
403 |
||
404 |
"Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
405 |
! |
|
406 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
407 |
textC: aString |
12125 | 408 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
409 |
^self textCHolder value: aString |
12125 | 410 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
411 |
"Created: / 16-03-2012 / 13:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 412 |
! ! |
413 |
||
414 |
!TextDiffTool methodsFor:'aspects'! |
|
415 |
||
10332 | 416 |
classHolder |
417 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
418 |
||
419 |
classHolder isNil ifTrue:[ |
|
420 |
classHolder := ValueHolder new. |
|
421 |
]. |
|
422 |
^ classHolder |
|
423 |
! |
|
424 |
||
425 |
classHolder: aValueHolder |
|
426 |
||
427 |
classHolder := aValueHolder. |
|
12180 | 428 |
"codeView notNil ifTrue:[codeView classHolder: aValueHolder]." |
10332 | 429 |
diffView notNil ifTrue:[diffView classHolder: aValueHolder]. |
430 |
||
431 |
"Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
432 |
! |
|
433 |
||
10344 | 434 |
codeAspectHolder |
435 |
"return/create the 'codeAspectHolder' value holder (automatically generated)" |
|
436 |
||
437 |
codeAspectHolder isNil ifTrue:[ |
|
438 |
codeAspectHolder := ValueHolder with: #expression. |
|
439 |
]. |
|
440 |
^ codeAspectHolder |
|
441 |
||
442 |
"Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
443 |
! |
|
444 |
||
445 |
codeAspectHolder:something |
|
446 |
"set the 'codeAspectHolder' value holder (automatically generated)" |
|
447 |
||
448 |
codeAspectHolder := something. |
|
449 |
! |
|
450 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
451 |
contentSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
452 |
"return/create the 'contentSpecHolder' value holder (automatically generated)" |
10196 | 453 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
454 |
contentSpecHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
455 |
contentSpecHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
456 |
contentSpecHolder addDependent:self. |
10196 | 457 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
458 |
^ contentSpecHolder |
10196 | 459 |
! |
460 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
461 |
contentSpecHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
462 |
"set the 'contentSpecHolder' value holder (automatically generated)" |
10196 | 463 |
|
464 |
|oldValue newValue| |
|
465 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
466 |
contentSpecHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
467 |
oldValue := contentSpecHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
468 |
contentSpecHolder removeDependent:self. |
10196 | 469 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
470 |
contentSpecHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
471 |
contentSpecHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
472 |
contentSpecHolder addDependent:self. |
10196 | 473 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
474 |
newValue := contentSpecHolder value. |
10196 | 475 |
oldValue ~~ newValue ifTrue:[ |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
476 |
self update:#value with:newValue from:contentSpecHolder. |
10196 | 477 |
]. |
478 |
! |
|
479 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
480 |
labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
481 |
"return/create the 'labelAHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
482 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
483 |
labelHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
484 |
labelHolder := ValueHolder with:'Text diff'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
485 |
"/titleHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
486 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
487 |
^ labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
488 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
489 |
"Created: / 16-03-2012 / 13:06:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
490 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
491 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
492 |
languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
493 |
"return/create the 'languageHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
494 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
495 |
languageHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
496 |
languageHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
497 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
498 |
^ languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
499 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
500 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
501 |
languageHolder:aValueHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
502 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
503 |
languageHolder := aValueHolder. |
12180 | 504 |
"codeView notNil ifTrue:[codeView languageHolder: aValueHolder]." |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
505 |
diffView notNil ifTrue:[diffView languageHolder: aValueHolder]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
506 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
507 |
"Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
508 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
509 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
510 |
!TextDiffTool methodsFor:'aspects-versions'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
511 |
|
10196 | 512 |
labelAHolder |
513 |
"return/create the 'labelAHolder' value holder (automatically generated)" |
|
514 |
||
515 |
labelAHolder isNil ifTrue:[ |
|
10332 | 516 |
labelAHolder := ValueHolder with:'Version A'. |
10196 | 517 |
labelAHolder addDependent:self. |
518 |
]. |
|
519 |
^ labelAHolder |
|
10332 | 520 |
|
521 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 522 |
! |
523 |
||
524 |
labelAHolder:something |
|
525 |
"set the 'labelAHolder' value holder (automatically generated)" |
|
526 |
||
527 |
|oldValue newValue| |
|
528 |
||
529 |
labelAHolder notNil ifTrue:[ |
|
530 |
oldValue := labelAHolder value. |
|
531 |
labelAHolder removeDependent:self. |
|
532 |
]. |
|
533 |
labelAHolder := something. |
|
534 |
labelAHolder notNil ifTrue:[ |
|
535 |
labelAHolder addDependent:self. |
|
536 |
]. |
|
537 |
newValue := labelAHolder value. |
|
538 |
oldValue ~~ newValue ifTrue:[ |
|
539 |
self update:#value with:newValue from:labelAHolder. |
|
540 |
]. |
|
541 |
! |
|
542 |
||
543 |
labelBHolder |
|
544 |
"return/create the 'labelBHolder' value holder (automatically generated)" |
|
545 |
||
546 |
labelBHolder isNil ifTrue:[ |
|
10332 | 547 |
labelBHolder := ValueHolder with:'Version B'. |
10196 | 548 |
labelBHolder addDependent:self. |
549 |
]. |
|
550 |
^ labelBHolder |
|
10332 | 551 |
|
552 |
"Modified: / 19-07-2011 / 11:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 553 |
! |
554 |
||
555 |
labelBHolder:something |
|
556 |
"set the 'labelBHolder' value holder (automatically generated)" |
|
557 |
||
558 |
|oldValue newValue| |
|
559 |
||
560 |
labelBHolder notNil ifTrue:[ |
|
561 |
oldValue := labelBHolder value. |
|
562 |
labelBHolder removeDependent:self. |
|
563 |
]. |
|
564 |
labelBHolder := something. |
|
565 |
labelBHolder notNil ifTrue:[ |
|
566 |
labelBHolder addDependent:self. |
|
567 |
]. |
|
568 |
newValue := labelBHolder value. |
|
569 |
oldValue ~~ newValue ifTrue:[ |
|
570 |
self update:#value with:newValue from:labelBHolder. |
|
571 |
]. |
|
572 |
! |
|
573 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
574 |
labelCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
575 |
"return/create the 'labelBHolder' value holder (automatically generated)" |
10332 | 576 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
577 |
labelCHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
578 |
labelCHolder := ValueHolder with:'Version Base'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
579 |
labelCHolder addDependent:self. |
10332 | 580 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
581 |
^ labelCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
582 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
583 |
"Created: / 16-03-2012 / 12:14:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 584 |
! |
585 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
586 |
labelCHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
587 |
"set the 'labelBHolder' value holder (automatically generated)" |
10196 | 588 |
|
589 |
|oldValue newValue| |
|
590 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
591 |
labelCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
592 |
oldValue := labelCHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
593 |
labelCHolder removeDependent:self. |
10196 | 594 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
595 |
labelCHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
596 |
labelCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
597 |
labelCHolder addDependent:self. |
10196 | 598 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
599 |
newValue := labelCHolder value. |
10196 | 600 |
oldValue ~~ newValue ifTrue:[ |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
601 |
self update:#value with:newValue from:labelCHolder. |
10196 | 602 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
603 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
604 |
"Created: / 16-03-2012 / 12:15:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 605 |
! |
606 |
||
607 |
textAHolder |
|
608 |
"return/create the 'textAHolder' value holder (automatically generated)" |
|
609 |
||
610 |
textAHolder isNil ifTrue:[ |
|
611 |
textAHolder := ValueHolder new. |
|
612 |
textAHolder addDependent:self. |
|
613 |
]. |
|
614 |
^ textAHolder |
|
615 |
! |
|
616 |
||
617 |
textAHolder:something |
|
618 |
"set the 'textAHolder' value holder (automatically generated)" |
|
619 |
||
620 |
|oldValue newValue| |
|
621 |
||
622 |
textAHolder notNil ifTrue:[ |
|
623 |
oldValue := textAHolder value. |
|
624 |
textAHolder removeDependent:self. |
|
625 |
]. |
|
626 |
textAHolder := something. |
|
627 |
textAHolder notNil ifTrue:[ |
|
628 |
textAHolder addDependent:self. |
|
629 |
]. |
|
630 |
newValue := textAHolder value. |
|
631 |
oldValue ~~ newValue ifTrue:[ |
|
632 |
self update:#value with:newValue from:textAHolder. |
|
633 |
]. |
|
634 |
! |
|
635 |
||
636 |
textBHolder |
|
637 |
"return/create the 'textBHolder' value holder (automatically generated)" |
|
638 |
||
639 |
textBHolder isNil ifTrue:[ |
|
640 |
textBHolder := ValueHolder new. |
|
641 |
textBHolder addDependent:self. |
|
642 |
]. |
|
643 |
^ textBHolder |
|
644 |
! |
|
645 |
||
646 |
textBHolder:something |
|
647 |
"set the 'textBHolder' value holder (automatically generated)" |
|
648 |
||
649 |
|oldValue newValue| |
|
650 |
||
651 |
textBHolder notNil ifTrue:[ |
|
652 |
oldValue := textBHolder value. |
|
653 |
textBHolder removeDependent:self. |
|
654 |
]. |
|
655 |
textBHolder := something. |
|
656 |
textBHolder notNil ifTrue:[ |
|
657 |
textBHolder addDependent:self. |
|
658 |
]. |
|
659 |
newValue := textBHolder value. |
|
660 |
oldValue ~~ newValue ifTrue:[ |
|
661 |
self update:#value with:newValue from:textBHolder. |
|
662 |
]. |
|
12125 | 663 |
! |
664 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
665 |
textCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
666 |
"return/create the 'textBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
667 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
668 |
textCHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
669 |
textCHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
670 |
textCHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
671 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
672 |
^ textCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
673 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
674 |
"Created: / 16-03-2012 / 12:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
675 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
676 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
677 |
textCHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
678 |
"set the 'textBHolder' value holder (automatically generated)" |
12125 | 679 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
680 |
|oldValue newValue| |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
681 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
682 |
textCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
683 |
oldValue := textCHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
684 |
textCHolder removeDependent:self. |
12125 | 685 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
686 |
textCHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
687 |
textCHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
688 |
textCHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
689 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
690 |
newValue := textCHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
691 |
oldValue ~~ newValue ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
692 |
self update:#value with:newValue from:textCHolder. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
693 |
]. |
12125 | 694 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
695 |
"Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 696 |
! ! |
697 |
||
698 |
!TextDiffTool methodsFor:'change & update'! |
|
699 |
||
700 |
update:something with:aParameter from:changedObject |
|
701 |
"Invoked when an object that I depend upon sends a change notification." |
|
702 |
||
703 |
||
10344 | 704 |
changedObject == textAHolder ifTrue:[ |
705 |
textAChanged := true. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
706 |
self updateAfterAorBorCChanged. |
10332 | 707 |
^ self. |
708 |
]. |
|
10344 | 709 |
changedObject == textBHolder ifTrue:[ |
710 |
textBChanged := true. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
711 |
self updateAfterAorBorCChanged. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
712 |
^ self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
713 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
714 |
changedObject == textCHolder ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
715 |
textCChanged := true. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
716 |
self updateAfterAorBorCChanged. |
10344 | 717 |
^ self. |
718 |
]. |
|
719 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
720 |
^super update:something with:aParameter from:changedObject |
10196 | 721 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
722 |
"Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 723 |
! |
724 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
725 |
updateAfterAorBorCChanged |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
726 |
"Called whenever one of the texts changes" |
10332 | 727 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
728 |
^ self subclassResponsibility |
10332 | 729 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
730 |
"Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 731 |
! ! |
732 |
||
733 |
!TextDiffTool methodsFor:'hooks'! |
|
734 |
||
735 |
postBuildDiffView:aScrollableView |
|
736 |
||
10344 | 737 |
diffView := aScrollableView. |
12125 | 738 |
diffView notNil ifTrue:[ |
739 |
diffView languageHolder: self languageHolder. |
|
740 |
diffView classHolder: self classHolder. |
|
741 |
||
742 |
]. |
|
10196 | 743 |
|
744 |
"Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
745 |
! ! |
|
746 |
||
747 |
!TextDiffTool methodsFor:'initialization'! |
|
748 |
||
749 |
initialize |
|
750 |
||
751 |
super initialize. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
752 |
textAChanged := textBChanged := textBChanged := false. |
10196 | 753 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
754 |
"Modified: / 16-03-2012 / 12:40:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10196 | 755 |
! ! |
756 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
757 |
!TextDiffTool methodsFor:'testing'! |
10332 | 758 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
759 |
isDiff2 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
760 |
^false |
10332 | 761 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
762 |
"Created: / 16-03-2012 / 15:21:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 763 |
! |
764 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
765 |
isDiff3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
766 |
^false |
10332 | 767 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
768 |
"Created: / 16-03-2012 / 15:21:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10332 | 769 |
! ! |
770 |
||
10196 | 771 |
!TextDiffTool class methodsFor:'documentation'! |
772 |
||
773 |
version_SVN |
|
12180 | 774 |
^ '$Id: Tools__TextDiffTool.st 7926 2012-03-16 19:25:49Z vranyj1 $' |
12125 | 775 |
! ! |