author | Claus Gittinger <cg@exept.de> |
Tue, 03 Sep 2013 14:19:28 +0200 | |
changeset 13479 | 269e9b9afdc2 |
parent 12574 | 4b07dbee292f |
child 12626 | 7ae48abfedac |
child 13861 | 85705b58dba5 |
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 |
|
10654 | 17 |
instanceVariableNames:'titleHolder labelAHolder textAHolder labelBHolder textBHolder |
18 |
classHolder languageHolder codeAspectHolder showDiffHolder |
|
19 |
diffSpecHolder diffView textAChanged textBChanged codeView' |
|
10196 | 20 |
classVariableNames:'' |
21 |
poolDictionaries:'' |
|
22 |
category:'Interface-Diff' |
|
23 |
! |
|
24 |
||
25 |
!TextDiffTool class methodsFor:'documentation'! |
|
26 |
||
27 |
copyright |
|
28 |
" |
|
29 |
COPYRIGHT (c) 2006 by eXept Software AG |
|
30 |
All Rights Reserved |
|
31 |
||
32 |
This software is furnished under a license and may be used |
|
33 |
only in accordance with the terms of that license and with the |
|
34 |
inclusion of the above copyright notice. This software may not |
|
35 |
be provided or otherwise made available to, or used by, any |
|
36 |
other person. No title to or ownership of the software is |
|
37 |
hereby transferred. |
|
38 |
" |
|
39 |
! ! |
|
40 |
||
41 |
!TextDiffTool class methodsFor:'image specs'! |
|
42 |
||
43 |
versionA24x24 |
|
44 |
||
45 |
^ToolbarIconLibrary versionA24x24 |
|
46 |
||
47 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
48 |
! |
|
49 |
||
50 |
versionB24x24 |
|
51 |
||
52 |
^ToolbarIconLibrary versionB24x24 |
|
53 |
||
54 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
55 |
! |
|
56 |
||
57 |
versionBase24x24 |
|
58 |
||
59 |
^ToolbarIconLibrary versionBase24x24 |
|
60 |
||
61 |
"Created: / 24-03-2010 / 20:50:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
62 |
! ! |
|
63 |
||
64 |
!TextDiffTool class methodsFor:'interface specs'! |
|
65 |
||
66 |
diffSpec |
|
67 |
"This resource specification was automatically generated |
|
68 |
by the UIPainter of ST/X." |
|
69 |
||
70 |
"Do not manually edit this!! If it is corrupted, |
|
71 |
the UIPainter may not be able to read the specification." |
|
72 |
||
73 |
" |
|
74 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#diffSpec |
|
75 |
Tools::TextDiffTool new openInterface:#diffSpec |
|
76 |
" |
|
77 |
||
78 |
<resource: #canvas> |
|
79 |
||
80 |
^ |
|
81 |
#(FullSpec |
|
82 |
name: diffSpec |
|
83 |
window: |
|
84 |
(WindowSpec |
|
85 |
label: 'Text Diff Tool (for embedding)' |
|
86 |
name: 'Text Diff Tool (for embedding)' |
|
87 |
min: (Point 10 10) |
|
88 |
bounds: (Rectangle 0 0 782 506) |
|
89 |
) |
|
90 |
component: |
|
91 |
(SpecCollection |
|
92 |
collection: ( |
|
93 |
(ViewSpec |
|
94 |
name: '2Labels' |
|
95 |
layout: (LayoutFrame 0 0 0 0 -16 1 30 0) |
|
96 |
component: |
|
97 |
(SpecCollection |
|
98 |
collection: ( |
|
99 |
(UISubSpecification |
|
100 |
name: 'VersionA' |
|
101 |
layout: (LayoutFrame 0 0 0 0 0 0.5 30 0) |
|
102 |
minorKey: versionALabelSpec |
|
103 |
) |
|
104 |
(UISubSpecification |
|
105 |
name: 'VersionB' |
|
106 |
layout: (LayoutFrame 5 0.5 0 0 0 1 30 0) |
|
107 |
minorKey: versionBLabelSpec |
|
108 |
) |
|
109 |
) |
|
110 |
||
111 |
) |
|
112 |
) |
|
113 |
(ArbitraryComponentSpec |
|
114 |
name: 'Diff2TextView' |
|
115 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
116 |
hasHorizontalScrollBar: false |
|
117 |
hasVerticalScrollBar: false |
|
118 |
autoHideScrollBars: false |
|
119 |
hasBorder: false |
|
120 |
component: #'Tools::DiffCodeView2' |
|
121 |
postBuildCallback: postBuildDiffView: |
|
122 |
) |
|
123 |
) |
|
124 |
||
125 |
) |
|
126 |
) |
|
127 |
! |
|
128 |
||
10344 | 129 |
nothingSpec |
130 |
"This resource specification was automatically generated |
|
131 |
by the UIPainter of ST/X." |
|
132 |
||
133 |
"Do not manually edit this!! If it is corrupted, |
|
134 |
the UIPainter may not be able to read the specification." |
|
135 |
||
136 |
" |
|
137 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#nothingSpec |
|
138 |
Tools::TextDiffTool new openInterface:#nothingSpec |
|
139 |
" |
|
140 |
||
141 |
<resource: #canvas> |
|
142 |
||
143 |
^ |
|
144 |
#(FullSpec |
|
145 |
name: nothingSpec |
|
146 |
window: |
|
147 |
(WindowSpec |
|
148 |
label: 'NewApplication' |
|
149 |
name: 'NewApplication' |
|
150 |
bounds: (Rectangle 0 0 300 300) |
|
151 |
) |
|
152 |
component: |
|
153 |
(SpecCollection |
|
154 |
collection: ( |
|
155 |
(LabelSpec |
|
156 |
label: 'Nothing selected...' |
|
157 |
name: 'Label1' |
|
158 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
159 |
translateLabel: true |
|
160 |
) |
|
161 |
) |
|
162 |
||
163 |
) |
|
164 |
) |
|
165 |
! |
|
166 |
||
10332 | 167 |
textViewSpec |
168 |
"This resource specification was automatically generated |
|
169 |
by the UIPainter of ST/X." |
|
170 |
||
171 |
"Do not manually edit this!! If it is corrupted, |
|
172 |
the UIPainter may not be able to read the specification." |
|
173 |
||
174 |
" |
|
175 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#textViewSpec |
|
176 |
Tools::TextDiffTool new openInterface:#textViewSpec |
|
177 |
" |
|
178 |
||
179 |
<resource: #canvas> |
|
180 |
||
181 |
^ |
|
182 |
#(FullSpec |
|
183 |
name: 'textViewSpec' |
|
184 |
window: |
|
185 |
(WindowSpec |
|
186 |
label: 'Text Only' |
|
187 |
name: 'Text Only' |
|
188 |
min: (Point 10 10) |
|
189 |
bounds: (Rectangle 0 0 782 506) |
|
190 |
) |
|
191 |
component: |
|
192 |
(SpecCollection |
|
193 |
collection: ( |
|
194 |
(ArbitraryComponentSpec |
|
195 |
name: 'CodeView' |
|
196 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
197 |
model: textAHolder |
|
198 |
hasHorizontalScrollBar: false |
|
199 |
hasVerticalScrollBar: false |
|
200 |
autoHideScrollBars: false |
|
201 |
hasBorder: false |
|
202 |
component: #'Tools::CodeView2' |
|
203 |
postBuildCallback: postBuildCodeView: |
|
204 |
) |
|
205 |
) |
|
206 |
||
207 |
) |
|
208 |
) |
|
209 |
! |
|
210 |
||
211 |
versionAOnlySpec |
|
212 |
"This resource specification was automatically generated |
|
213 |
by the UIPainter of ST/X." |
|
214 |
||
215 |
"Do not manually edit this!! If it is corrupted, |
|
216 |
the UIPainter may not be able to read the specification." |
|
217 |
||
218 |
" |
|
219 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#versionAOnlySpec |
|
220 |
Tools::TextDiffTool new openInterface:#versionAOnlySpec |
|
221 |
" |
|
222 |
||
223 |
<resource: #canvas> |
|
224 |
||
225 |
^ |
|
226 |
#(FullSpec |
|
227 |
name: versionAOnlySpec |
|
228 |
window: |
|
229 |
(WindowSpec |
|
230 |
label: 'Version A Only' |
|
231 |
name: 'Version A Only' |
|
232 |
min: (Point 10 10) |
|
233 |
bounds: (Rectangle 0 0 782 506) |
|
234 |
) |
|
235 |
component: |
|
236 |
(SpecCollection |
|
237 |
collection: ( |
|
238 |
(UISubSpecification |
|
239 |
name: 'VersionA' |
|
240 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
241 |
minorKey: versionALabelSpec |
|
242 |
) |
|
243 |
(UISubSpecification |
|
244 |
name: 'Text' |
|
245 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
246 |
minorKey: textViewSpec |
|
247 |
) |
|
248 |
) |
|
249 |
||
250 |
) |
|
251 |
) |
|
252 |
! |
|
253 |
||
254 |
versionBOnlySpec |
|
255 |
"This resource specification was automatically generated |
|
256 |
by the UIPainter of ST/X." |
|
257 |
||
258 |
"Do not manually edit this!! If it is corrupted, |
|
259 |
the UIPainter may not be able to read the specification." |
|
260 |
||
261 |
" |
|
262 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#versionBOnlySpec |
|
263 |
Tools::TextDiffTool new openInterface:#versionBOnlySpec |
|
264 |
" |
|
265 |
||
266 |
<resource: #canvas> |
|
267 |
||
268 |
^ |
|
269 |
#(FullSpec |
|
270 |
name: 'versionBOnlySpec' |
|
271 |
window: |
|
272 |
(WindowSpec |
|
273 |
label: 'Version B Only' |
|
274 |
name: 'Version B Only' |
|
275 |
min: (Point 10 10) |
|
276 |
bounds: (Rectangle 0 0 782 506) |
|
277 |
) |
|
278 |
component: |
|
279 |
(SpecCollection |
|
280 |
collection: ( |
|
281 |
(UISubSpecification |
|
282 |
name: 'VersionB' |
|
283 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
284 |
minorKey: versionBLabelSpec |
|
285 |
) |
|
286 |
(UISubSpecification |
|
287 |
name: 'Text' |
|
288 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
289 |
minorKey: textViewSpec |
|
290 |
) |
|
291 |
) |
|
292 |
||
293 |
) |
|
294 |
) |
|
295 |
||
296 |
"Created: / 19-07-2011 / 10:06:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
297 |
! |
|
298 |
||
10196 | 299 |
windowSpec |
300 |
"This resource specification was automatically generated |
|
301 |
by the UIPainter of ST/X." |
|
302 |
||
303 |
"Do not manually edit this!! If it is corrupted, |
|
304 |
the UIPainter may not be able to read the specification." |
|
305 |
||
306 |
" |
|
307 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#windowSpec |
|
308 |
Tools::TextDiffTool new openInterface:#windowSpec |
|
309 |
Tools::TextDiffTool open |
|
310 |
" |
|
311 |
||
312 |
<resource: #canvas> |
|
313 |
||
314 |
^ |
|
315 |
#(FullSpec |
|
316 |
name: windowSpec |
|
317 |
window: |
|
318 |
(WindowSpec |
|
319 |
label: 'Text Diff Tool' |
|
320 |
name: 'Text Diff Tool' |
|
10654 | 321 |
labelChannel: titleHolder |
10196 | 322 |
min: (Point 10 10) |
323 |
bounds: (Rectangle 0 0 640 480) |
|
324 |
) |
|
325 |
component: |
|
326 |
(SpecCollection |
|
327 |
collection: ( |
|
328 |
(UISubSpecification |
|
329 |
name: 'Contents' |
|
330 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
331 |
minorKey: windowSpecForEmbedding |
|
332 |
) |
|
333 |
) |
|
334 |
||
335 |
) |
|
336 |
) |
|
337 |
! |
|
338 |
||
339 |
windowSpecForEmbedding |
|
340 |
"This resource specification was automatically generated |
|
341 |
by the UIPainter of ST/X." |
|
342 |
||
343 |
"Do not manually edit this!! If it is corrupted, |
|
344 |
the UIPainter may not be able to read the specification." |
|
345 |
||
346 |
" |
|
347 |
UIPainter new openOnClass:Tools::TextDiffTool andSelector:#windowSpecForEmbedding |
|
348 |
Tools::TextDiffTool new openInterface:#windowSpecForEmbedding |
|
349 |
" |
|
350 |
||
351 |
<resource: #canvas> |
|
352 |
||
353 |
^ |
|
354 |
#(FullSpec |
|
355 |
name: windowSpecForEmbedding |
|
356 |
window: |
|
357 |
(WindowSpec |
|
358 |
label: 'Text Diff Tool (for embedding)' |
|
359 |
name: 'Text Diff Tool (for embedding)' |
|
360 |
min: (Point 10 10) |
|
361 |
bounds: (Rectangle 0 0 782 506) |
|
362 |
) |
|
363 |
component: |
|
364 |
(SpecCollection |
|
365 |
collection: ( |
|
366 |
(SubCanvasSpec |
|
367 |
name: 'Contents' |
|
368 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
369 |
hasHorizontalScrollBar: false |
|
370 |
hasVerticalScrollBar: false |
|
371 |
specHolder: diffSpecHolder |
|
372 |
createNewBuilder: false |
|
373 |
) |
|
374 |
) |
|
375 |
||
376 |
) |
|
377 |
) |
|
378 |
! ! |
|
379 |
||
380 |
!TextDiffTool class methodsFor:'interface specs - labels'! |
|
381 |
||
382 |
versionALabelSpec |
|
383 |
"This resource specification was automatically generated |
|
384 |
by the UIPainter of ST/X." |
|
385 |
||
386 |
"Do not manually edit this!! If it is corrupted, |
|
387 |
the UIPainter may not be able to read the specification." |
|
388 |
||
389 |
" |
|
390 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionALabelSpec |
|
391 |
SVN::DiffViewApp new openInterface:#versionALabelSpec |
|
392 |
" |
|
393 |
||
394 |
<resource: #canvas> |
|
395 |
||
396 |
^ |
|
397 |
#(FullSpec |
|
398 |
name: versionALabelSpec |
|
399 |
window: |
|
400 |
(WindowSpec |
|
401 |
label: 'Version A' |
|
402 |
name: 'Version A' |
|
403 |
min: (Point 10 10) |
|
404 |
bounds: (Rectangle 0 0 300 30) |
|
405 |
) |
|
406 |
component: |
|
407 |
(SpecCollection |
|
408 |
collection: ( |
|
409 |
(LabelSpec |
|
410 |
label: 'versionA24x24' |
|
411 |
name: 'VersionAIcon' |
|
412 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
413 |
hasCharacterOrientedLabel: false |
|
414 |
translateLabel: true |
|
415 |
) |
|
416 |
(LabelSpec |
|
417 |
label: 'Version A' |
|
418 |
name: 'VersionALabel' |
|
419 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
420 |
translateLabel: true |
|
421 |
labelChannel: labelAHolder |
|
422 |
resizeForLabel: true |
|
423 |
adjust: left |
|
424 |
) |
|
425 |
) |
|
426 |
||
427 |
) |
|
428 |
) |
|
429 |
||
430 |
"Modified: / 30-06-2011 / 20:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
431 |
! |
|
432 |
||
433 |
versionBLabelSpec |
|
434 |
"This resource specification was automatically generated |
|
435 |
by the UIPainter of ST/X." |
|
436 |
||
437 |
"Do not manually edit this!! If it is corrupted, |
|
438 |
the UIPainter may not be able to read the specification." |
|
439 |
||
440 |
" |
|
441 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBLabelSpec |
|
442 |
SVN::DiffViewApp new openInterface:#versionBLabelSpec |
|
443 |
" |
|
444 |
||
445 |
<resource: #canvas> |
|
446 |
||
447 |
^ |
|
448 |
#(FullSpec |
|
449 |
name: versionBLabelSpec |
|
450 |
window: |
|
451 |
(WindowSpec |
|
452 |
label: 'Version B' |
|
453 |
name: 'Version B' |
|
454 |
min: (Point 10 10) |
|
455 |
bounds: (Rectangle 0 0 300 30) |
|
456 |
) |
|
457 |
component: |
|
458 |
(SpecCollection |
|
459 |
collection: ( |
|
460 |
(LabelSpec |
|
461 |
label: 'versionB24x24' |
|
462 |
name: 'VersionBIcon' |
|
463 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
464 |
hasCharacterOrientedLabel: false |
|
465 |
translateLabel: true |
|
466 |
) |
|
467 |
(LabelSpec |
|
468 |
label: 'Version B' |
|
469 |
name: 'VersionBLabel' |
|
470 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
471 |
translateLabel: true |
|
472 |
labelChannel: labelBHolder |
|
473 |
resizeForLabel: true |
|
474 |
adjust: left |
|
475 |
useDynamicPreferredWidth: true |
|
476 |
usePreferredWidth: true |
|
477 |
) |
|
478 |
) |
|
479 |
||
480 |
) |
|
481 |
) |
|
482 |
||
483 |
"Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
484 |
! |
|
485 |
||
486 |
versionBaseLabelSpec |
|
487 |
"This resource specification was automatically generated |
|
488 |
by the UIPainter of ST/X." |
|
489 |
||
490 |
"Do not manually edit this!! If it is corrupted, |
|
491 |
the UIPainter may not be able to read the specification." |
|
492 |
||
493 |
" |
|
494 |
UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBaseLabelSpec |
|
495 |
SVN::DiffViewApp new openInterface:#versionBaseLabelSpec |
|
496 |
" |
|
497 |
||
498 |
<resource: #canvas> |
|
499 |
||
500 |
^ |
|
501 |
#(FullSpec |
|
502 |
name: versionBaseLabelSpec |
|
503 |
window: |
|
504 |
(WindowSpec |
|
505 |
label: 'Version Base' |
|
506 |
name: 'Version Base' |
|
507 |
min: (Point 10 10) |
|
508 |
bounds: (Rectangle 0 0 300 30) |
|
509 |
) |
|
510 |
component: |
|
511 |
(SpecCollection |
|
512 |
collection: ( |
|
513 |
(LabelSpec |
|
514 |
label: 'versionBase24x24' |
|
515 |
name: 'VersionBaseIcon' |
|
516 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
517 |
hasCharacterOrientedLabel: false |
|
518 |
translateLabel: true |
|
519 |
) |
|
520 |
(LabelSpec |
|
521 |
label: 'Version Base' |
|
522 |
name: 'VersionBaseLabel' |
|
523 |
layout: (LayoutFrame 30 0 5 0 191 0 0 1) |
|
524 |
translateLabel: true |
|
525 |
labelChannel: versionBaseLabelAspect |
|
526 |
resizeForLabel: true |
|
527 |
adjust: left |
|
528 |
useDynamicPreferredWidth: true |
|
529 |
usePreferredWidth: true |
|
530 |
) |
|
531 |
) |
|
532 |
||
533 |
) |
|
534 |
) |
|
535 |
||
536 |
"Modified: / 24-03-2010 / 20:51:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
537 |
! ! |
|
538 |
||
539 |
!TextDiffTool class methodsFor:'plugIn spec'! |
|
540 |
||
541 |
aspectSelectors |
|
542 |
"This resource specification was automatically generated |
|
543 |
by the UIPainter of ST/X." |
|
544 |
||
545 |
"Do not manually edit this. If it is corrupted, |
|
546 |
the UIPainter may not be able to read the specification." |
|
547 |
||
548 |
"Return a description of exported aspects; |
|
549 |
these can be connected to aspects of an embedding application |
|
550 |
(if this app is embedded in a subCanvas)." |
|
551 |
||
552 |
^ #( |
|
10654 | 553 |
#classHolder |
554 |
#codeAspectHolder |
|
10196 | 555 |
#labelAHolder |
556 |
#labelBHolder |
|
10654 | 557 |
#languageHolder |
558 |
#showDiffHolder |
|
10196 | 559 |
#textAHolder |
560 |
#textBHolder |
|
561 |
). |
|
562 |
||
10654 | 563 |
! ! |
564 |
||
565 |
!TextDiffTool methodsFor:'accessing'! |
|
566 |
||
567 |
labelA: aString |
|
568 |
^self labelAHolder value: aString |
|
569 |
||
570 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
571 |
"Created: / 30-08-2011 / 09:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 572 |
"Modified (format): / 27-07-2012 / 21:57:10 / cg" |
10654 | 573 |
! |
574 |
||
575 |
labelB: aString |
|
576 |
^self labelBHolder value: aString |
|
577 |
||
578 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
579 |
"Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 580 |
"Modified (format): / 27-07-2012 / 21:57:15 / cg" |
10654 | 581 |
! |
582 |
||
583 |
textA: aString |
|
584 |
^self textAHolder value: aString |
|
585 |
||
586 |
"Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 587 |
"Modified (format): / 27-07-2012 / 21:57:37 / cg" |
10654 | 588 |
! |
589 |
||
590 |
textB: aString |
|
591 |
^self textBHolder value: aString |
|
592 |
||
593 |
"Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 594 |
"Modified (format): / 27-07-2012 / 21:57:41 / cg" |
10654 | 595 |
! |
596 |
||
597 |
title: aString |
|
598 |
||
599 |
^self titleHolder value: aString |
|
600 |
||
601 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
602 |
"Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 603 |
! ! |
604 |
||
605 |
!TextDiffTool methodsFor:'aspects'! |
|
606 |
||
10332 | 607 |
classHolder |
608 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
609 |
||
610 |
classHolder isNil ifTrue:[ |
|
611 |
classHolder := ValueHolder new. |
|
612 |
]. |
|
613 |
^ classHolder |
|
614 |
! |
|
615 |
||
616 |
classHolder: aValueHolder |
|
617 |
classHolder := aValueHolder. |
|
618 |
codeView notNil ifTrue:[codeView classHolder: aValueHolder]. |
|
619 |
diffView notNil ifTrue:[diffView classHolder: aValueHolder]. |
|
620 |
||
621 |
"Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 622 |
"Modified (format): / 27-07-2012 / 21:57:00 / cg" |
10332 | 623 |
! |
624 |
||
10344 | 625 |
codeAspectHolder |
626 |
"return/create the 'codeAspectHolder' value holder (automatically generated)" |
|
627 |
||
628 |
codeAspectHolder isNil ifTrue:[ |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
629 |
codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression). |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
630 |
codeAspectHolder addDependent:self |
10344 | 631 |
]. |
632 |
^ codeAspectHolder |
|
633 |
||
634 |
"Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
635 |
"Modified: / 27-07-2012 / 23:46:11 / cg" |
10344 | 636 |
! |
637 |
||
638 |
codeAspectHolder:something |
|
639 |
"set the 'codeAspectHolder' value holder (automatically generated)" |
|
640 |
||
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
641 |
codeAspectHolder notNil ifTrue:[ |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
642 |
codeAspectHolder removeDependent:self |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
643 |
]. |
10344 | 644 |
codeAspectHolder := something. |
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
645 |
codeAspectHolder notNil ifTrue:[ |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
646 |
codeAspectHolder addDependent:self |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
647 |
]. |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
648 |
|
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
649 |
"Modified: / 27-07-2012 / 22:55:42 / cg" |
10344 | 650 |
! |
651 |
||
10196 | 652 |
diffSpecHolder |
653 |
"return/create the 'diffSpecHolder' value holder (automatically generated)" |
|
654 |
||
655 |
diffSpecHolder isNil ifTrue:[ |
|
656 |
diffSpecHolder := ValueHolder with: #diffSpec. |
|
657 |
diffSpecHolder addDependent:self. |
|
658 |
]. |
|
659 |
^ diffSpecHolder |
|
660 |
||
661 |
"Modified: / 06-07-2011 / 11:57:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
662 |
! |
|
663 |
||
664 |
diffSpecHolder:something |
|
665 |
"set the 'diffSpecHolder' value holder (automatically generated)" |
|
666 |
||
667 |
|oldValue newValue| |
|
668 |
||
669 |
diffSpecHolder notNil ifTrue:[ |
|
670 |
oldValue := diffSpecHolder value. |
|
671 |
diffSpecHolder removeDependent:self. |
|
672 |
]. |
|
673 |
diffSpecHolder := something. |
|
674 |
diffSpecHolder notNil ifTrue:[ |
|
675 |
diffSpecHolder addDependent:self. |
|
676 |
]. |
|
677 |
newValue := diffSpecHolder value. |
|
678 |
oldValue ~~ newValue ifTrue:[ |
|
679 |
self update:#value with:newValue from:diffSpecHolder. |
|
680 |
]. |
|
681 |
! |
|
682 |
||
683 |
labelAHolder |
|
684 |
"return/create the 'labelAHolder' value holder (automatically generated)" |
|
685 |
||
686 |
labelAHolder isNil ifTrue:[ |
|
10332 | 687 |
labelAHolder := ValueHolder with:'Version A'. |
10196 | 688 |
labelAHolder addDependent:self. |
689 |
]. |
|
690 |
^ labelAHolder |
|
10332 | 691 |
|
692 |
"Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 693 |
! |
694 |
||
695 |
labelAHolder:something |
|
696 |
"set the 'labelAHolder' value holder (automatically generated)" |
|
697 |
||
698 |
|oldValue newValue| |
|
699 |
||
700 |
labelAHolder notNil ifTrue:[ |
|
701 |
oldValue := labelAHolder value. |
|
702 |
labelAHolder removeDependent:self. |
|
703 |
]. |
|
704 |
labelAHolder := something. |
|
705 |
labelAHolder notNil ifTrue:[ |
|
706 |
labelAHolder addDependent:self. |
|
707 |
]. |
|
708 |
newValue := labelAHolder value. |
|
709 |
oldValue ~~ newValue ifTrue:[ |
|
710 |
self update:#value with:newValue from:labelAHolder. |
|
711 |
]. |
|
712 |
! |
|
713 |
||
714 |
labelBHolder |
|
715 |
"return/create the 'labelBHolder' value holder (automatically generated)" |
|
716 |
||
717 |
labelBHolder isNil ifTrue:[ |
|
10332 | 718 |
labelBHolder := ValueHolder with:'Version B'. |
10196 | 719 |
labelBHolder addDependent:self. |
720 |
]. |
|
721 |
^ labelBHolder |
|
10332 | 722 |
|
723 |
"Modified: / 19-07-2011 / 11:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 724 |
! |
725 |
||
726 |
labelBHolder:something |
|
727 |
"set the 'labelBHolder' value holder (automatically generated)" |
|
728 |
||
729 |
|oldValue newValue| |
|
730 |
||
731 |
labelBHolder notNil ifTrue:[ |
|
732 |
oldValue := labelBHolder value. |
|
733 |
labelBHolder removeDependent:self. |
|
734 |
]. |
|
735 |
labelBHolder := something. |
|
736 |
labelBHolder notNil ifTrue:[ |
|
737 |
labelBHolder addDependent:self. |
|
738 |
]. |
|
739 |
newValue := labelBHolder value. |
|
740 |
oldValue ~~ newValue ifTrue:[ |
|
741 |
self update:#value with:newValue from:labelBHolder. |
|
742 |
]. |
|
743 |
! |
|
744 |
||
10332 | 745 |
languageHolder |
746 |
"return/create the 'languageHolder' value holder (automatically generated)" |
|
747 |
||
748 |
languageHolder isNil ifTrue:[ |
|
749 |
languageHolder := ValueHolder new. |
|
750 |
]. |
|
751 |
^ languageHolder |
|
752 |
! |
|
753 |
||
754 |
languageHolder:aValueHolder |
|
755 |
||
756 |
languageHolder := aValueHolder. |
|
757 |
codeView notNil ifTrue:[codeView languageHolder: aValueHolder]. |
|
758 |
diffView notNil ifTrue:[diffView languageHolder: aValueHolder]. |
|
759 |
||
760 |
"Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
761 |
! |
|
762 |
||
10196 | 763 |
showDiffHolder |
12574 | 764 |
"this holder controls if one or two code-text views are show in the lower area" |
10196 | 765 |
|
766 |
showDiffHolder isNil ifTrue:[ |
|
767 |
showDiffHolder := ValueHolder with: true. |
|
768 |
showDiffHolder addDependent:self. |
|
769 |
]. |
|
770 |
^ showDiffHolder |
|
771 |
||
772 |
"Modified: / 30-06-2011 / 20:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
773 |
! |
|
774 |
||
775 |
showDiffHolder:something |
|
12574 | 776 |
"set the 'showDiffHolder' value holder (automatically generated). |
777 |
this holder controls if one or two code-text views are show in the lower area" |
|
10196 | 778 |
|
779 |
|oldValue newValue| |
|
780 |
||
781 |
showDiffHolder notNil ifTrue:[ |
|
782 |
oldValue := showDiffHolder value. |
|
783 |
showDiffHolder removeDependent:self. |
|
784 |
]. |
|
785 |
showDiffHolder := something. |
|
786 |
showDiffHolder notNil ifTrue:[ |
|
787 |
showDiffHolder addDependent:self. |
|
788 |
]. |
|
789 |
newValue := showDiffHolder value. |
|
790 |
oldValue ~~ newValue ifTrue:[ |
|
791 |
self update:#value with:newValue from:showDiffHolder. |
|
792 |
]. |
|
793 |
! |
|
794 |
||
795 |
textAHolder |
|
796 |
"return/create the 'textAHolder' value holder (automatically generated)" |
|
797 |
||
798 |
textAHolder isNil ifTrue:[ |
|
799 |
textAHolder := ValueHolder new. |
|
800 |
textAHolder addDependent:self. |
|
801 |
]. |
|
802 |
^ textAHolder |
|
803 |
! |
|
804 |
||
805 |
textAHolder:something |
|
806 |
"set the 'textAHolder' value holder (automatically generated)" |
|
807 |
||
808 |
|oldValue newValue| |
|
809 |
||
810 |
textAHolder notNil ifTrue:[ |
|
811 |
oldValue := textAHolder value. |
|
812 |
textAHolder removeDependent:self. |
|
813 |
]. |
|
814 |
textAHolder := something. |
|
815 |
textAHolder notNil ifTrue:[ |
|
816 |
textAHolder addDependent:self. |
|
817 |
]. |
|
818 |
newValue := textAHolder value. |
|
819 |
oldValue ~~ newValue ifTrue:[ |
|
820 |
self update:#value with:newValue from:textAHolder. |
|
821 |
]. |
|
822 |
! |
|
823 |
||
824 |
textBHolder |
|
825 |
"return/create the 'textBHolder' value holder (automatically generated)" |
|
826 |
||
827 |
textBHolder isNil ifTrue:[ |
|
828 |
textBHolder := ValueHolder new. |
|
829 |
textBHolder addDependent:self. |
|
830 |
]. |
|
831 |
^ textBHolder |
|
832 |
! |
|
833 |
||
834 |
textBHolder:something |
|
835 |
"set the 'textBHolder' value holder (automatically generated)" |
|
836 |
||
837 |
|oldValue newValue| |
|
838 |
||
839 |
textBHolder notNil ifTrue:[ |
|
840 |
oldValue := textBHolder value. |
|
841 |
textBHolder removeDependent:self. |
|
842 |
]. |
|
843 |
textBHolder := something. |
|
844 |
textBHolder notNil ifTrue:[ |
|
845 |
textBHolder addDependent:self. |
|
846 |
]. |
|
847 |
newValue := textBHolder value. |
|
848 |
oldValue ~~ newValue ifTrue:[ |
|
849 |
self update:#value with:newValue from:textBHolder. |
|
850 |
]. |
|
10654 | 851 |
! |
852 |
||
853 |
titleHolder |
|
854 |
"return/create the 'labelAHolder' value holder (automatically generated)" |
|
855 |
||
856 |
titleHolder isNil ifTrue:[ |
|
857 |
titleHolder := ValueHolder with:'Text diff'. |
|
858 |
"/titleHolder addDependent:self. |
|
859 |
]. |
|
860 |
^ titleHolder |
|
861 |
||
862 |
"Created: / 30-08-2011 / 09:45:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10196 | 863 |
! ! |
864 |
||
865 |
!TextDiffTool methodsFor:'change & update'! |
|
866 |
||
10344 | 867 |
codeAspect |
868 |
^self codeAspectHolder value |
|
869 |
||
870 |
"Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 871 |
"Modified (format): / 27-07-2012 / 21:56:52 / cg" |
872 |
! |
|
873 |
||
874 |
codeAspect:aSymbol |
|
875 |
self codeAspectHolder value:aSymbol |
|
876 |
||
877 |
"Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
878 |
"Created: / 27-07-2012 / 21:56:48 / cg" |
|
10344 | 879 |
! |
880 |
||
10196 | 881 |
update:something with:aParameter from:changedObject |
882 |
"Invoked when an object that I depend upon sends a change notification." |
|
883 |
||
10344 | 884 |
changedObject == textAHolder ifTrue:[ |
885 |
textAChanged := true. |
|
10332 | 886 |
self updateAfterAorBChanged. |
887 |
^ self. |
|
888 |
]. |
|
10344 | 889 |
changedObject == textBHolder ifTrue:[ |
890 |
textBChanged := true. |
|
891 |
self updateAfterAorBChanged. |
|
892 |
^ self. |
|
893 |
]. |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
894 |
changedObject == codeAspectHolder ifTrue:[ |
12574 | 895 |
|v| |
896 |
||
897 |
(codeView notNil and:[(v := codeView scrolledView) notNil ]) ifTrue:[v codeAspect: codeAspectHolder value]. |
|
898 |
(diffView notNil and:[(v := diffView scrolledView) notNil ]) ifTrue:[v codeAspect: codeAspectHolder value]. |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
899 |
self updateViews. |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
900 |
^ self. |
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
901 |
]. |
10332 | 902 |
(changedObject == showDiffHolder) ifTrue:[ |
903 |
self updateViews. |
|
904 |
^self. |
|
905 |
]. |
|
10196 | 906 |
super update:something with:aParameter from:changedObject |
907 |
||
10344 | 908 |
"Modified: / 19-07-2011 / 19:44:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
909 |
"Modified: / 27-07-2012 / 23:44:32 / cg" |
10196 | 910 |
! |
911 |
||
912 |
updateAfterAorBChanged |
|
10344 | 913 |
(textAChanged & textBChanged) ifTrue:[ |
914 |
textAChanged := textBChanged := false. |
|
915 |
self updateViews |
|
916 |
]. |
|
10196 | 917 |
|
918 |
"Created: / 06-07-2011 / 12:12:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
919 |
"Modified (format): / 27-07-2012 / 23:00:28 / cg" |
10332 | 920 |
! |
921 |
||
922 |
updateViews |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
923 |
| a b | |
10332 | 924 |
|
925 |
a := self textAHolder value. |
|
926 |
b := self textBHolder value. |
|
927 |
||
928 |
self showDiffHolder value ifFalse:[ |
|
929 |
self showTextOnly. |
|
930 |
^ self |
|
931 |
]. |
|
932 |
||
933 |
(a notNil and:[b notNil]) ifTrue:[ |
|
934 |
self showDiff. |
|
935 |
^self |
|
936 |
]. |
|
937 |
a notNil ifTrue:[ |
|
938 |
self showVersionA. |
|
939 |
^self |
|
940 |
]. |
|
941 |
b notNil ifTrue:[ |
|
942 |
self showVersionB. |
|
943 |
^self |
|
944 |
]. |
|
945 |
||
10344 | 946 |
self showNothing. |
10332 | 947 |
|
948 |
"Created: / 19-07-2011 / 11:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
949 |
"Modified (format): / 27-07-2012 / 23:00:32 / cg" |
10196 | 950 |
! ! |
951 |
||
952 |
!TextDiffTool methodsFor:'hooks'! |
|
953 |
||
10332 | 954 |
postBuildCodeView:aScrollableView |
10344 | 955 |
codeView := aScrollableView. |
956 |
codeView notNil ifTrue:[codeView languageHolder: self languageHolder]. |
|
957 |
codeView notNil ifTrue:[codeView classHolder: self classHolder]. |
|
10332 | 958 |
|
959 |
"Created: / 19-07-2011 / 10:17:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 960 |
"Modified (format): / 27-07-2012 / 21:57:23 / cg" |
10332 | 961 |
! |
962 |
||
10196 | 963 |
postBuildDiffView:aScrollableView |
10344 | 964 |
diffView := aScrollableView. |
10654 | 965 |
diffView notNil ifTrue:[ |
966 |
diffView languageHolder: self languageHolder. |
|
967 |
diffView classHolder: self classHolder. |
|
968 |
||
969 |
(self textAHolder value notNil and:[self textBHolder value notNil]) ifTrue:[ |
|
970 |
diffView scrolledView |
|
971 |
text1: self textAHolder value |
|
972 |
text2: self textBHolder value |
|
973 |
] |
|
974 |
]. |
|
10196 | 975 |
|
976 |
"Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 977 |
"Modified (format): / 27-07-2012 / 21:57:21 / cg" |
10196 | 978 |
! ! |
979 |
||
980 |
!TextDiffTool methodsFor:'initialization'! |
|
981 |
||
982 |
initialize |
|
983 |
super initialize. |
|
10344 | 984 |
textAChanged := textBChanged := false. |
10196 | 985 |
|
10344 | 986 |
"Modified: / 19-07-2011 / 19:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11700 | 987 |
"Modified (format): / 27-07-2012 / 21:57:08 / cg" |
10196 | 988 |
! ! |
989 |
||
10332 | 990 |
!TextDiffTool methodsFor:'private'! |
991 |
||
992 |
showDiff |
|
10868 | 993 |
|scrolledView| |
10332 | 994 |
|
995 |
self diffSpecHolder value: #diffSpec. |
|
996 |
||
10868 | 997 |
diffView isNil ifTrue:[^self]. |
998 |
(scrolledView := diffView scrolledView) isNil ifTrue:[^self]. |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
999 |
scrolledView codeAspect: codeAspectHolder value. |
10868 | 1000 |
scrolledView |
10332 | 1001 |
text1: self textAHolder value |
1002 |
text2: self textBHolder value |
|
1003 |
||
1004 |
"Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11703
100f3c5ed545
fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents:
11700
diff
changeset
|
1005 |
"Modified: / 27-07-2012 / 23:31:04 / cg" |
10332 | 1006 |
! |
1007 |
||
10344 | 1008 |
showNothing |
1009 |
self diffSpecHolder value: #nothingSpec |
|
1010 |
||
1011 |
"Created: / 19-07-2011 / 19:34:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 1012 |
"Modified (format): / 27-07-2012 / 21:57:28 / cg" |
10344 | 1013 |
! |
1014 |
||
10332 | 1015 |
showTextOnly |
1016 |
self diffSpecHolder value: #textViewSpec |
|
1017 |
||
1018 |
"Created: / 19-07-2011 / 11:39:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 1019 |
"Modified (format): / 27-07-2012 / 21:57:30 / cg" |
10332 | 1020 |
! |
1021 |
||
1022 |
showVersionA |
|
1023 |
self diffSpecHolder value: #versionAOnlySpec |
|
1024 |
||
1025 |
"Created: / 19-07-2011 / 10:22:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 1026 |
"Modified (format): / 27-07-2012 / 21:57:33 / cg" |
10332 | 1027 |
! |
1028 |
||
1029 |
showVersionB |
|
1030 |
self diffSpecHolder value: #versionBOnlySpec |
|
1031 |
||
1032 |
"Created: / 19-07-2011 / 10:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11700 | 1033 |
"Modified (format): / 27-07-2012 / 21:57:35 / cg" |
10332 | 1034 |
! ! |
1035 |
||
10196 | 1036 |
!TextDiffTool class methodsFor:'documentation'! |
1037 |
||
10870 | 1038 |
version |
12574 | 1039 |
^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.9 2013-03-29 07:27:32 cg Exp $' |
10870 | 1040 |
! |
1041 |
||
10196 | 1042 |
version_CVS |
12574 | 1043 |
^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.9 2013-03-29 07:27:32 cg Exp $' |
10196 | 1044 |
! |
1045 |
||
1046 |
version_SVN |
|
1047 |
^ '§Id§' |
|
1048 |
! ! |
|
12574 | 1049 |