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