author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Sat, 17 Mar 2012 13:13:35 +0000 | |
branch | jv |
changeset 12193 | c0bdf75cfde5 |
parent 12190 | 2a77dea2eceb |
child 12198 | 414e7b69ecda |
permissions | -rw-r--r-- |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
COPYRIGHT (c) 2006 by eXept Software AG |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
All Rights Reserved |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
5 |
This software is furnished under a license and may be used |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
6 |
only in accordance with the terms of that license and with the |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
inclusion of the above copyright notice. This software may not |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
be provided or otherwise made available to, or used by, any |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
9 |
other person. No title to or ownership of the software is |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
hereby transferred. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
12 |
"{ Package: 'stx:libtool' }" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
13 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
14 |
"{ NameSpace: Tools }" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
15 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
16 |
TextDiffTool subclass:#TextDiff3Tool |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
17 |
instanceVariableNames:'labelMergedHolder textMergedHolder mergeHolder' |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
18 |
classVariableNames:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
19 |
poolDictionaries:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
category:'Interface-Diff' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
23 |
!TextDiff3Tool class methodsFor:'documentation'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
24 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
25 |
copyright |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
26 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
27 |
COPYRIGHT (c) 2006 by eXept Software AG |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
28 |
All Rights Reserved |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
This software is furnished under a license and may be used |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
only in accordance with the terms of that license and with the |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
inclusion of the above copyright notice. This software may not |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
be provided or otherwise made available to, or used by, any |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
34 |
other person. No title to or ownership of the software is |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
hereby transferred. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
documentation |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
40 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
41 |
documentation to be added. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
42 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
43 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
45 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
46 |
[instance variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
47 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
48 |
[class variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
49 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
[see also:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
52 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
53 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
54 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
55 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
Starting the application: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
58 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
Tools::TextDiff3Tool open |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
60 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
more examples to be added: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
... add code fragment for |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
... executable example here ... |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
69 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
70 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
71 |
!TextDiff3Tool class methodsFor:'interface specs'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
"This resource specification was automatically generated |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
by the UIPainter of ST/X." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
77 |
"Do not manually edit this!! If it is corrupted, |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
the UIPainter may not be able to read the specification." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
80 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
82 |
Tools::TextDiff3Tool new openInterface:#diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
83 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
84 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
85 |
<resource: #canvas> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
86 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
^ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
88 |
#(FullSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
89 |
name: diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
90 |
window: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
(WindowSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
92 |
label: 'Text Diff Tool (for embedding)' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
93 |
name: 'Text Diff Tool (for embedding)' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
94 |
min: (Point 10 10) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
bounds: (Rectangle 0 0 782 506) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
96 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
97 |
component: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
98 |
(SpecCollection |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
99 |
collection: ( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
100 |
(ViewSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
name: '3Labels' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
102 |
layout: (LayoutFrame 0 0 0 0 -16 1 30 0) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
103 |
component: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
104 |
(SpecCollection |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
105 |
collection: ( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
106 |
(UISubSpecification |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
107 |
name: 'VersionC' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
108 |
layout: (LayoutFrame 0 0 0 0 0 0.33333 30 0) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
109 |
minorKey: versionCLabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
110 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
111 |
(UISubSpecification |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
112 |
name: 'VersionA' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
113 |
layout: (LayoutFrame 5 0.3333 0 0 0 0.67 30 0) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
114 |
minorKey: versionALabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
115 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
116 |
(UISubSpecification |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
117 |
name: 'VersionB' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
layout: (LayoutFrame 5 0.67 0 0 0 1 30 0) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
minorKey: versionBLabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
121 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
122 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
(ArbitraryComponentSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
name: 'Diff3TextView' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
hasHorizontalScrollBar: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
hasVerticalScrollBar: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
autoHideScrollBars: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
hasBorder: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
component: #'Tools::Diff3CodeView2' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
postBuildCallback: postBuildDiffView: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
135 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
) |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
139 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
140 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
141 |
mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
142 |
"This resource specification was automatically generated |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
143 |
by the UIPainter of ST/X." |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
144 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
145 |
"Do not manually edit this!! If it is corrupted, |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
146 |
the UIPainter may not be able to read the specification." |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
147 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
148 |
" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
149 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
150 |
Tools::TextDiff3Tool new openInterface:#mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
151 |
" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
152 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
153 |
<resource: #canvas> |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
154 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
155 |
^ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
156 |
#(FullSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
157 |
name: mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
158 |
window: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
159 |
(WindowSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
160 |
label: 'Merge view' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
161 |
name: 'Merge view' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
162 |
min: (Point 10 10) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
163 |
bounds: (Rectangle 0 0 782 506) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
164 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
165 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
166 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
167 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
168 |
(VariableVerticalPanelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
169 |
name: 'DiffAndMergePanel' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
170 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
171 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
172 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
173 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
174 |
(UISubSpecification |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
175 |
name: 'DiffView' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
176 |
minorKey: diff3Spec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
177 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
178 |
(TransparentBoxSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
179 |
name: 'MergeView' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
180 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
181 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
182 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
183 |
(UISubSpecification |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
184 |
name: 'MergeLabel' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
185 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
186 |
minorKey: versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
187 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
188 |
(TextEditorSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
189 |
name: 'MergeCode' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
190 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
191 |
model: textMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
192 |
hasHorizontalScrollBar: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
193 |
hasVerticalScrollBar: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
194 |
hasKeyboardFocusInitially: false |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
195 |
viewClassName: 'Tools::CodeView2' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
196 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
197 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
198 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
199 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
200 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
201 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
202 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
203 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
204 |
handles: (Any 0.5 1.0) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
205 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
206 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
207 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
208 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
209 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
210 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
211 |
"Modified: / 17-03-2012 / 12:37:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
212 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
213 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
214 |
!TextDiff3Tool class methodsFor:'interface specs - labels'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
215 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
216 |
versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
217 |
"This resource specification was automatically generated |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
218 |
by the UIPainter of ST/X." |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
219 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
220 |
"Do not manually edit this!! If it is corrupted, |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
221 |
the UIPainter may not be able to read the specification." |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
222 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
223 |
" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
224 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
225 |
Tools::TextDiff3Tool new openInterface:#versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
226 |
" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
227 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
228 |
<resource: #canvas> |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
229 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
230 |
^ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
231 |
#(FullSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
232 |
name: versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
233 |
window: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
234 |
(WindowSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
235 |
label: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
236 |
name: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
237 |
min: (Point 10 10) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
238 |
bounds: (Rectangle 0 0 774 30) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
239 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
240 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
241 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
242 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
243 |
(LabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
244 |
label: 'versionMerged24x24' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
245 |
name: 'VersionMergedIcon' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
246 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
247 |
hasCharacterOrientedLabel: false |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
248 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
249 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
250 |
(LabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
251 |
label: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
252 |
name: 'VersionMergeLabel' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
253 |
layout: (LayoutFrame 30 0 5 0 -350 1 0 1) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
254 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
255 |
labelChannel: labelMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
256 |
resizeForLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
257 |
adjust: left |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
258 |
useDynamicPreferredWidth: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
259 |
usePreferredWidth: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
260 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
261 |
(HorizontalPanelViewSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
262 |
name: 'HorizontalPanel1' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
263 |
layout: (LayoutFrame -350 1 0 0 0 1 0 1) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
264 |
horizontalLayout: center |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
265 |
verticalLayout: center |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
266 |
horizontalSpace: 3 |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
267 |
verticalSpace: 3 |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
268 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
269 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
270 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
271 |
(ActionButtonSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
272 |
label: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
273 |
name: 'MergeAuto' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
274 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
275 |
model: doMergeAuto |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
276 |
extent: (Point 80 22) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
277 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
278 |
(ActionButtonSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
279 |
label: 'Use Base' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
280 |
name: 'MergeBase' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
281 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
282 |
model: doMergeUsingBase |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
283 |
extent: (Point 80 22) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
284 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
285 |
(ActionButtonSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
286 |
label: 'Use A' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
287 |
name: 'MergeUsingA' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
288 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
289 |
model: doMergeUsingA |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
290 |
extent: (Point 80 22) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
291 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
292 |
(ActionButtonSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
293 |
label: 'Use B' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
294 |
name: 'MergeUsingB' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
295 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
296 |
model: doMergeUsingB |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
297 |
extent: (Point 80 22) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
298 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
299 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
300 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
301 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
302 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
303 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
304 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
305 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
306 |
) |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
307 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
308 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
309 |
!TextDiff3Tool class methodsFor:'plugIn spec'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
310 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
311 |
aspectSelectors |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
312 |
"This resource specification was automatically generated |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
313 |
by the UIPainter of ST/X." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
314 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
315 |
"Do not manually edit this. If it is corrupted, |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
316 |
the UIPainter may not be able to read the specification." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
317 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
318 |
"Return a description of exported aspects; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
319 |
these can be connected to aspects of an embedding application |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
320 |
(if this app is embedded in a subCanvas)." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
321 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
322 |
^ #( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
323 |
#codeAspectHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
324 |
#labelAHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
325 |
#labelBHolde |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
326 |
#labelCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
327 |
#labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
328 |
#languageHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
329 |
#textAHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
330 |
#textBHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
331 |
#textCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
332 |
). |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
333 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
334 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
335 |
|
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
336 |
!TextDiff3Tool methodsFor:'accessing'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
337 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
338 |
beDiff3Tool |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
339 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
340 |
self mergeHolder value: false |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
341 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
342 |
"Created: / 17-03-2012 / 12:23:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
343 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
344 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
345 |
beMergeTool |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
346 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
347 |
self mergeHolder value: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
348 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
349 |
"Created: / 17-03-2012 / 12:23:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
350 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
351 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
352 |
!TextDiff3Tool methodsFor:'actions'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
353 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
354 |
doMergeAuto |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
355 |
self halt. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
356 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
357 |
"Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
358 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
359 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
360 |
doMergeUsingA |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
361 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
362 |
self textMergedHolder value: self textAHolder value |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
363 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
364 |
"Created: / 17-03-2012 / 12:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
365 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
366 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
367 |
doMergeUsingB |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
368 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
369 |
self textMergedHolder value: self textBHolder value |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
370 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
371 |
"Created: / 17-03-2012 / 12:55:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
372 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
373 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
374 |
doMergeUsingBase |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
375 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
376 |
self textMergedHolder value: self textCHolder value |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
377 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
378 |
"Created: / 17-03-2012 / 12:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
379 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
380 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
381 |
!TextDiff3Tool methodsFor:'aspects'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
382 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
383 |
mergeHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
384 |
"return/create the 'mergeHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
385 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
386 |
mergeHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
mergeHolder := ValueHolder with: false. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
mergeHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
390 |
^ mergeHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
391 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
392 |
"Modified: / 16-03-2012 / 13:24:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
393 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
394 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
395 |
mergeHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
396 |
"set the 'mergeHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
397 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
398 |
|oldValue newValue| |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
399 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
400 |
mergeHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
401 |
oldValue := mergeHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
402 |
mergeHolder removeDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
403 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
404 |
mergeHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
405 |
mergeHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
406 |
mergeHolder addDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
407 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
408 |
newValue := mergeHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
409 |
oldValue ~~ newValue ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
410 |
self update:#value with:newValue from:mergeHolder. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
411 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
412 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
413 |
|
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
414 |
!TextDiff3Tool methodsFor:'aspects-versions'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
415 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
416 |
labelMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
417 |
"return/create the 'labelMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
418 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
419 |
labelMergedHolder isNil ifTrue:[ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
420 |
labelMergedHolder := ValueHolder with:'Merge'. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
421 |
]. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
422 |
^ labelMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
423 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
424 |
"Modified: / 17-03-2012 / 12:36:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
425 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
426 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
427 |
labelMergedHolder:something |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
428 |
"set the 'labelMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
429 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
430 |
labelMergedHolder := something. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
431 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
432 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
433 |
textMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
434 |
"return/create the 'textMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
435 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
436 |
textMergedHolder isNil ifTrue:[ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
437 |
textMergedHolder := ValueHolder new. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
438 |
]. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
439 |
^ textMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
440 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
441 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
442 |
textMergedHolder:something |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
443 |
"set the 'textMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
444 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
445 |
textMergedHolder := something. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
446 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
447 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
448 |
!TextDiff3Tool methodsFor:'change & update'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
449 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
450 |
update:something with:aParameter from:changedObject |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
451 |
"Invoked when an object that I depend upon sends a change notification." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
452 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
453 |
"stub code automatically generated - please change as required" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
454 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
455 |
changedObject == mergeHolder ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
456 |
self updateViews. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
457 |
^ self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
458 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
459 |
super update:something with:aParameter from:changedObject |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
460 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
461 |
"Modified (format): / 16-03-2012 / 13:24:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
462 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
463 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
464 |
updateAfterAorBorCChanged |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
465 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
466 |
(textAChanged & textBChanged & textCChanged) ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
467 |
textAChanged := textBChanged := textCChanged := false. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
468 |
self updateViews |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
469 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
470 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
471 |
"Created: / 16-03-2012 / 15:26:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
472 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
473 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
474 |
updateViews |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
475 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
476 |
self mergeHolder value ifTrue:[ |
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
477 |
self contentSpecHolder value: #mergeSpec |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
478 |
] ifFalse:[ |
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
479 |
self contentSpecHolder value: #diff3Spec |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
480 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
481 |
|
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
482 |
diffView notNil ifTrue:[ |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
483 |
diffView |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
484 |
text1: self textCHolder value |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
485 |
text2: self textAHolder value |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
486 |
text3: self textBHolder value |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
487 |
] |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
488 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
489 |
"Created: / 16-03-2012 / 13:24:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
490 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
491 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
492 |
!TextDiff3Tool methodsFor:'hooks'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
493 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
494 |
commonPostBuild |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
495 |
self updateViews |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
496 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
497 |
"Created: / 16-03-2012 / 13:25:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
498 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
499 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
500 |
postBuildDiffView:aScrollableView |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
501 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
502 |
super postBuildDiffView:aScrollableView. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
503 |
diffView notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
504 |
(self textAHolder value notNil and:[self textBHolder value notNil and:[self textCHolder value notNil]]) ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
505 |
diffView scrolledView |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
506 |
text1: self textCHolder value |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
507 |
text2: self textAHolder value |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
508 |
text3: self textBHolder value |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
509 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
510 |
] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
511 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
512 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
513 |
"Created: / 16-03-2012 / 13:31:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
514 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
515 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
516 |
!TextDiff3Tool methodsFor:'testing'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
517 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
518 |
isDiff3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
519 |
^true |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
520 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
521 |
"Created: / 16-03-2012 / 15:21:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
522 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
523 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
524 |
!TextDiff3Tool class methodsFor:'documentation'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
525 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
526 |
version_SVN |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
527 |
^ '$Id: Tools__TextDiff3Tool.st 7939 2012-03-17 13:13:35Z vranyj1 $' |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
528 |
! ! |