author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Tue, 15 Jan 2013 12:03:21 +0000 | |
branch | jv |
changeset 12317 | aac0f12a3327 |
parent 12307 | d7a3df44366a |
child 12318 | 1dda95be3d40 |
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 |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
17 |
instanceVariableNames:'labelMergedHolder textMergedHolder mergeHolder mergeDataHolder |
12307 | 18 |
mergeIntervalHolder mergeView mergeService' |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
19 |
classVariableNames:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
poolDictionaries:'' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
category:'Interface-Diff' |
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 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
24 |
CodeViewService subclass:#MergeService |
12307 | 25 |
instanceVariableNames:'dataHolder data sectionIntervalHolder' |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
26 |
classVariableNames:'' |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
27 |
poolDictionaries:'' |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
28 |
privateIn:TextDiff3Tool |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
29 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
30 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
!TextDiff3Tool class methodsFor:'documentation'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
copyright |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
34 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
COPYRIGHT (c) 2006 by eXept Software AG |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
All Rights Reserved |
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 |
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
|
39 |
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
|
40 |
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
|
41 |
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
|
42 |
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
|
43 |
hereby transferred. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
" |
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 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
47 |
documentation |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
48 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
49 |
documentation to be added. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
52 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
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 |
[instance variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
55 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
[class variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
58 |
[see also:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
|
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 |
! |
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 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
Starting the application: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
Tools::TextDiff3Tool open |
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 |
[exEnd] |
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 |
more examples to be added: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
... add code fragment for |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
... executable example here ... |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
[exEnd] |
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 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
79 |
!TextDiff3Tool class methodsFor:'defaults - colors'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
80 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
81 |
colorA |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
82 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
83 |
^(Color red:54.1176470588235 green:75.2941176470588 blue:28.6274509803922) lighter |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
84 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
85 |
"Created: / 19-03-2012 / 13:11:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
86 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
87 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
88 |
colorB |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
89 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
90 |
^(Color red:96.078431372549 green:73.7254901960784 blue:0.0) lighter |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
91 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
92 |
"Created: / 19-03-2012 / 13:11:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
93 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
94 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
95 |
colorBase |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
96 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
97 |
^(Color red:5.88235294117647 green:58.8235294117647 blue:80.3921568627451) lighter |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
98 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
99 |
"Created: / 19-03-2012 / 13:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
100 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
101 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
102 |
colorConflict |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
103 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
104 |
^Color red |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
105 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
106 |
"Created: / 19-03-2012 / 13:12:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
107 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
108 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
109 |
colorMerged |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
110 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
111 |
^(Color red:83.921568627451 green:17.2549019607843 blue:85.0980392156863) lighter |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
112 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
113 |
"Created: / 19-03-2012 / 13:11:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
114 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
115 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
116 |
!TextDiff3Tool class methodsFor:'interface specs'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
117 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
"This resource specification was automatically generated |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
by the UIPainter of ST/X." |
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 |
"Do not manually edit this!! If it is corrupted, |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
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
|
124 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
Tools::TextDiff3Tool new openInterface:#diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
<resource: #canvas> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
^ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
#(FullSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
name: diff3Spec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
135 |
window: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
(WindowSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
label: 'Text Diff Tool (for embedding)' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
name: 'Text Diff Tool (for embedding)' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
min: (Point 10 10) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
140 |
bounds: (Rectangle 0 0 782 506) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
141 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
142 |
component: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
143 |
(SpecCollection |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
144 |
collection: ( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
(ViewSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
name: '3Labels' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
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
|
148 |
component: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
149 |
(SpecCollection |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
collection: ( |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
151 |
(UISubSpecification |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
152 |
name: 'VersionC' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
153 |
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
|
154 |
minorKey: versionCLabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
155 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
156 |
(UISubSpecification |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
157 |
name: 'VersionA' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
158 |
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
|
159 |
minorKey: versionALabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
160 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
161 |
(UISubSpecification |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
162 |
name: 'VersionB' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
163 |
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
|
164 |
minorKey: versionBLabelSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
165 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
166 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
167 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
168 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
169 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
170 |
(ArbitraryComponentSpec |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
171 |
name: 'Diff3TextView' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
172 |
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
|
173 |
hasHorizontalScrollBar: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
174 |
hasVerticalScrollBar: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
175 |
autoHideScrollBars: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
176 |
hasBorder: false |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
177 |
component: #'Tools::Diff3CodeView2' |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
178 |
postBuildCallback: postBuildDiffView: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
179 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
180 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
181 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
182 |
) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
183 |
) |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
184 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
185 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
186 |
mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
187 |
"This resource specification was automatically generated |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
188 |
by the UIPainter of ST/X." |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
189 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
190 |
"Do not manually edit this!! If it is corrupted, |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
191 |
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
|
192 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
193 |
" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
194 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
195 |
Tools::TextDiff3Tool new openInterface:#mergeSpec |
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 |
<resource: #canvas> |
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 |
#(FullSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
202 |
name: mergeSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
203 |
window: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
204 |
(WindowSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
205 |
label: 'Merge view' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
206 |
name: 'Merge view' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
207 |
min: (Point 10 10) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
208 |
bounds: (Rectangle 0 0 782 506) |
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 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
211 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
212 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
213 |
(VariableVerticalPanelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
214 |
name: 'DiffAndMergePanel' |
12307 | 215 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
216 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
217 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
218 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
219 |
(UISubSpecification |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
220 |
name: 'DiffView' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
221 |
minorKey: diff3Spec |
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 |
(TransparentBoxSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
224 |
name: 'MergeView' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
225 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
226 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
227 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
228 |
(UISubSpecification |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
229 |
name: 'MergeLabel' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
230 |
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
|
231 |
minorKey: versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
232 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
233 |
(TextEditorSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
234 |
name: 'MergeCode' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
235 |
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
|
236 |
model: textMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
237 |
hasHorizontalScrollBar: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
238 |
hasVerticalScrollBar: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
239 |
hasKeyboardFocusInitially: false |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
240 |
viewClassName: 'Tools::CodeView2' |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
241 |
postBuildCallback: postBuildMergeView: |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
242 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
243 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
244 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
245 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
246 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
247 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
248 |
|
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 |
handles: (Any 0.5 1.0) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
251 |
) |
12307 | 252 |
(MenuPanelSpec |
253 |
name: 'ToolBar' |
|
254 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
255 |
menu: toolbarMenuMerge |
|
256 |
textDefault: true |
|
257 |
) |
|
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
258 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
259 |
|
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 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
262 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
263 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
264 |
!TextDiff3Tool class methodsFor:'interface specs - labels'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
265 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
266 |
versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
267 |
"This resource specification was automatically generated |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
268 |
by the UIPainter of ST/X." |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
269 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
270 |
"Do not manually edit this!! If it is corrupted, |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
271 |
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
|
272 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
273 |
" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
274 |
UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
275 |
Tools::TextDiff3Tool new openInterface:#versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
276 |
" |
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 |
<resource: #canvas> |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
279 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
280 |
^ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
281 |
#(FullSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
282 |
name: versionMergedLabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
283 |
window: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
284 |
(WindowSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
285 |
label: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
286 |
name: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
287 |
min: (Point 10 10) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
288 |
bounds: (Rectangle 0 0 774 30) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
289 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
290 |
component: |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
291 |
(SpecCollection |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
292 |
collection: ( |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
293 |
(LabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
294 |
label: 'versionMerged24x24' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
295 |
name: 'VersionMergedIcon' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
296 |
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
|
297 |
hasCharacterOrientedLabel: false |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
298 |
translateLabel: true |
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 |
(LabelSpec |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
301 |
label: 'Merge' |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
302 |
name: 'VersionMergeLabel' |
12307 | 303 |
layout: (LayoutFrame 30 0 5 0 157 0 0 1) |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
304 |
translateLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
305 |
labelChannel: labelMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
306 |
resizeForLabel: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
307 |
adjust: left |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
308 |
useDynamicPreferredWidth: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
309 |
usePreferredWidth: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
310 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
311 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
312 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
313 |
) |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
314 |
) |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
315 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
316 |
|
12307 | 317 |
!TextDiff3Tool class methodsFor:'menu specs'! |
318 |
||
319 |
toolbarMenuMerge |
|
320 |
"This resource specification was automatically generated |
|
321 |
by the MenuEditor of ST/X." |
|
322 |
||
323 |
"Do not manually edit this!! If it is corrupted, |
|
324 |
the MenuEditor may not be able to read the specification." |
|
325 |
||
326 |
||
327 |
" |
|
328 |
MenuEditor new openOnClass:Tools::TextDiff3Tool andSelector:#toolbarMenuMerge |
|
329 |
(Menu new fromLiteralArrayEncoding:(Tools::TextDiff3Tool toolbarMenuMerge)) startUp |
|
330 |
" |
|
331 |
||
332 |
<resource: #menu> |
|
333 |
||
334 |
^ |
|
335 |
#(Menu |
|
336 |
( |
|
337 |
(MenuItem |
|
338 |
enabled: canMergeCurrentHolder |
|
339 |
label: 'Base' |
|
340 |
itemValue: doMergeGurrentUsingBase |
|
341 |
) |
|
342 |
(MenuItem |
|
343 |
enabled: canMergeCurrentHolder |
|
344 |
label: 'A' |
|
345 |
itemValue: doMergeGurrentUsingA |
|
346 |
) |
|
347 |
(MenuItem |
|
348 |
enabled: canMergeCurrentHolder |
|
349 |
label: 'B' |
|
350 |
itemValue: doMergeGurrentUsingB |
|
351 |
) |
|
352 |
(MenuItem |
|
353 |
label: '-' |
|
354 |
) |
|
355 |
(MenuItem |
|
356 |
label: 'All Base' |
|
357 |
itemValue: doMergeAllUsingBase |
|
358 |
) |
|
359 |
(MenuItem |
|
360 |
label: 'All A' |
|
361 |
itemValue: doMergeAllUsingA |
|
362 |
) |
|
363 |
(MenuItem |
|
364 |
label: 'All B' |
|
365 |
itemValue: doMergeAllUsingB |
|
366 |
) |
|
367 |
(MenuItem |
|
368 |
label: '-' |
|
369 |
) |
|
370 |
(MenuItem |
|
371 |
label: 'Auto Merge' |
|
372 |
itemValue: doMergeAllAuto |
|
373 |
) |
|
374 |
(MenuItem |
|
375 |
label: 'External Merge' |
|
376 |
itemValue: doMergeAllExternal |
|
377 |
) |
|
378 |
) |
|
379 |
nil |
|
380 |
nil |
|
381 |
) |
|
382 |
||
383 |
"Modified: / 30-11-2012 / 13:53:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
384 |
! ! |
|
385 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
386 |
!TextDiff3Tool class methodsFor:'plugIn spec'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
aspectSelectors |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
"This resource specification was automatically generated |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
390 |
by the UIPainter of ST/X." |
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 |
"Do not manually edit this. If it is corrupted, |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
393 |
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
|
394 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
395 |
"Return a description of exported aspects; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
396 |
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
|
397 |
(if this app is embedded in a subCanvas)." |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
398 |
|
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 |
#codeAspectHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
401 |
#labelAHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
402 |
#labelBHolde |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
403 |
#labelCHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
404 |
#labelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
405 |
#languageHolder |
12307 | 406 |
#mergeDataHolder |
407 |
#mergeHolder |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
408 |
#textAHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
409 |
#textBHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
410 |
#textCHolder |
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 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
414 |
|
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
415 |
!TextDiff3Tool methodsFor:'accessing'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
416 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
417 |
beDiff3Tool |
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 |
self mergeHolder value: false |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
420 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
421 |
"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
|
422 |
! |
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 |
beMergeTool |
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 |
self mergeHolder value: true |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
427 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
428 |
"Created: / 17-03-2012 / 12:23:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
429 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
430 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
431 |
mergeData |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
432 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
433 |
^self mergeDataHolder value |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
434 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
435 |
"Created: / 20-03-2012 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
436 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
437 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
438 |
!TextDiff3Tool methodsFor:'aspects'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
439 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
440 |
mergeDataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
441 |
"return/create the 'mergeDataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
442 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
443 |
mergeDataHolder isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
444 |
mergeDataHolder := ValueHolder new. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
445 |
mergeDataHolder addDependent:self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
446 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
447 |
^ mergeDataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
448 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
449 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
450 |
mergeDataHolder:something |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
451 |
"set the 'mergeDataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
452 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
453 |
|oldValue newValue| |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
454 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
455 |
mergeDataHolder notNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
456 |
oldValue := mergeDataHolder value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
457 |
mergeDataHolder removeDependent:self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
458 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
459 |
mergeDataHolder := something. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
460 |
mergeDataHolder notNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
461 |
mergeDataHolder addDependent:self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
462 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
463 |
newValue := mergeDataHolder value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
464 |
oldValue ~~ newValue ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
465 |
self update:#value with:newValue from:mergeDataHolder. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
466 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
467 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
468 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
469 |
mergeHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
470 |
"return/create the 'mergeHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
471 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
472 |
mergeHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
473 |
mergeHolder := ValueHolder with: false. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
474 |
mergeHolder addDependent:self. |
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 |
^ mergeHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
477 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
478 |
"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
|
479 |
! |
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 |
mergeHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
482 |
"set the 'mergeHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
483 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
484 |
|oldValue newValue| |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
485 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
486 |
mergeHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
487 |
oldValue := mergeHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
488 |
mergeHolder removeDependent:self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
489 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
490 |
mergeHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
491 |
mergeHolder notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
492 |
mergeHolder addDependent:self. |
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 |
newValue := mergeHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
495 |
oldValue ~~ newValue ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
496 |
self update:#value with:newValue from:mergeHolder. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
497 |
]. |
12307 | 498 |
! |
499 |
||
500 |
mergeIntervalHolder |
|
501 |
"return/create the 'mergeIntervalHolder' value holder (automatically generated)" |
|
502 |
||
503 |
mergeIntervalHolder isNil ifTrue:[ |
|
504 |
mergeIntervalHolder := ValueHolder new. |
|
505 |
mergeIntervalHolder addDependent:self. |
|
506 |
]. |
|
507 |
^ mergeIntervalHolder |
|
508 |
! |
|
509 |
||
510 |
mergeIntervalHolder:something |
|
511 |
"set the 'mergeIntervalHolder' value holder (automatically generated)" |
|
512 |
||
513 |
|oldValue newValue| |
|
514 |
||
515 |
mergeIntervalHolder notNil ifTrue:[ |
|
516 |
oldValue := mergeIntervalHolder value. |
|
517 |
mergeIntervalHolder removeDependent:self. |
|
518 |
]. |
|
519 |
mergeIntervalHolder := something. |
|
520 |
mergeIntervalHolder notNil ifTrue:[ |
|
521 |
mergeIntervalHolder addDependent:self. |
|
522 |
]. |
|
523 |
newValue := mergeIntervalHolder value. |
|
524 |
oldValue ~~ newValue ifTrue:[ |
|
525 |
self update:#value with:newValue from:mergeIntervalHolder. |
|
526 |
]. |
|
527 |
! ! |
|
528 |
||
529 |
!TextDiff3Tool methodsFor:'aspects - queries'! |
|
530 |
||
531 |
canMergeCurrentHolder |
|
532 |
^self builder bindings at:#canMergeCurrentHolder ifAbsentPut:[ |
|
533 |
BlockValue |
|
534 |
with:[:model|model value notNil] |
|
535 |
argument: self mergeIntervalHolder |
|
536 |
] |
|
537 |
||
538 |
"Created: / 30-11-2012 / 13:49:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
539 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
540 |
|
12193
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
541 |
!TextDiff3Tool methodsFor:'aspects-versions'! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
542 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
543 |
labelMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
544 |
"return/create the 'labelMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
545 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
546 |
labelMergedHolder isNil ifTrue:[ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
547 |
labelMergedHolder := ValueHolder with:'Merge'. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
548 |
]. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
549 |
^ labelMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
550 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
551 |
"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
|
552 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
553 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
554 |
labelMergedHolder:something |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
555 |
"set the 'labelMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
556 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
557 |
labelMergedHolder := something. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
558 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
559 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
560 |
textMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
561 |
"return/create the 'textMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
562 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
563 |
textMergedHolder isNil ifTrue:[ |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
564 |
textMergedHolder := ValueHolder new. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
565 |
]. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
566 |
^ textMergedHolder |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
567 |
! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
568 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
569 |
textMergedHolder:something |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
570 |
"set the 'textMergedHolder' value holder (automatically generated)" |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
571 |
|
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
572 |
textMergedHolder := something. |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
573 |
! ! |
c0bdf75cfde5
Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12190
diff
changeset
|
574 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
575 |
!TextDiff3Tool methodsFor:'change & update'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
576 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
577 |
update:something with:aParameter from:changedObject |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
578 |
"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
|
579 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
580 |
"stub code automatically generated - please change as required" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
581 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
582 |
changedObject == mergeHolder ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
583 |
self updateViews. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
584 |
self updateMergeData. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
585 |
self updateCodeViewSynchronization. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
586 |
^ self. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
587 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
588 |
super update:something with:aParameter from:changedObject |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
589 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
590 |
"Modified: / 19-03-2012 / 14:29:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
591 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
592 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
593 |
updateAfterAorBorCChanged |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
594 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
595 |
(textAChanged & textBChanged & textCChanged) ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
596 |
textAChanged := textBChanged := textCChanged := false. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
597 |
self updateViews. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
598 |
self isMerge ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
599 |
self updateMergeData. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
600 |
]. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
601 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
602 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
603 |
"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
|
604 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
605 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
606 |
updateCodeViewSynchronization |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
607 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
608 |
diffView isNil ifTrue:[ ^ self ]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
609 |
mergeView isNil ifTrue:[ ^ self ]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
610 |
self isMerge ifTrue:[ |
12264
75581322c03b
Fixes in scroll position synchronization
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12218
diff
changeset
|
611 |
"/ diffView synchronizeWith: mergeView. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
612 |
diffView textViews do:[:e| |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
613 |
mergeView synchronizeWith: e. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
614 |
] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
615 |
] ifFalse:[ |
12264
75581322c03b
Fixes in scroll position synchronization
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12218
diff
changeset
|
616 |
"/ diffView unsynchronizeWith: mergeView. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
617 |
diffView textViews do:[:e| |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
618 |
mergeView unsynchronizeWith: e. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
619 |
] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
620 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
621 |
] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
622 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
623 |
"Created: / 19-03-2012 / 14:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
624 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
625 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
626 |
updateMergeData |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
627 |
| data | |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
628 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
629 |
(data := self mergeDataHolder value) isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
630 |
data := TextMergeInfo new. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
631 |
data text1: self textC text2: self textA text3: self textB. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
632 |
self mergeDataHolder value: data. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
633 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
634 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
635 |
"Created: / 19-03-2012 / 11:52:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
636 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
637 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
638 |
updateViews |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
639 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
640 |
self mergeHolder value ifTrue:[ |
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
641 |
self contentSpecHolder value: #mergeSpec |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
642 |
] ifFalse:[ |
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
643 |
self contentSpecHolder value: #diff3Spec |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
644 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
645 |
|
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
646 |
diffView notNil ifTrue:[ |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
647 |
diffView |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
648 |
text1: self textCHolder value |
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
649 |
text2: self textAHolder value |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
650 |
text3: self textBHolder value. |
12190
2a77dea2eceb
Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
651 |
] |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
652 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
653 |
"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
|
654 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
655 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
656 |
!TextDiff3Tool methodsFor:'hooks'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
657 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
658 |
commonPostBuild |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
659 |
self updateViews |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
660 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
661 |
"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
|
662 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
663 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
664 |
postBuildDiffView:aScrollableView |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
665 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
666 |
super postBuildDiffView:aScrollableView. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
667 |
diffView notNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
668 |
(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
|
669 |
diffView scrolledView |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
670 |
text1: self textCHolder value |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
671 |
text2: self textAHolder value |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
672 |
text3: self textBHolder value |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
673 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
674 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
675 |
self updateCodeViewSynchronization. |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
676 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
677 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
678 |
"Created: / 16-03-2012 / 13:31:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
679 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
680 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
681 |
postBuildMergeView:aCodeView2 |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
682 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
683 |
mergeView := aCodeView2. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12264
diff
changeset
|
684 |
self setupCodeView: aCodeView2. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
685 |
mergeView registerService: |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
686 |
((mergeService := MergeService new) |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
687 |
dataHolder: self mergeDataHolder; |
12307 | 688 |
sectionIntervalHolder: self mergeIntervalHolder; |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
689 |
yourself). |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
690 |
self updateCodeViewSynchronization. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
691 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
692 |
"Created: / 19-03-2012 / 11:47:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12307 | 693 |
"Modified: / 30-11-2012 / 13:47:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
694 |
! ! |
|
695 |
||
696 |
!TextDiff3Tool methodsFor:'menu actions'! |
|
697 |
||
698 |
doMergeAllAuto |
|
699 |
self mergeDataHolder value |
|
700 |
text1:self textC |
|
701 |
text2:self textA |
|
702 |
text3:self textB. |
|
703 |
||
704 |
"Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
705 |
! |
|
706 |
||
707 |
doMergeAllExternal |
|
708 |
| left wc right merge | |
|
709 |
||
710 |
left := Filename newTemporary. |
|
711 |
left writingFileDo:[:s|s nextPutAll: self textC]. |
|
712 |
||
713 |
wc := Filename newTemporary. |
|
714 |
wc writingFileDo:[:s|s nextPutAll: self textA]. |
|
715 |
||
716 |
right := Filename newTemporary. |
|
717 |
right writingFileDo:[:s|s nextPutAll: self textB]. |
|
718 |
||
719 |
merge := Filename newTemporary. |
|
720 |
||
721 |
[ |
|
722 |
(OperatingSystem executeCommand: |
|
723 |
('%1 %2 %3 %4 -o %5' |
|
724 |
bindWith: 'kdiff3' |
|
725 |
with: left pathName |
|
726 |
with: wc pathName |
|
727 |
with: right pathName |
|
728 |
with: merge pathName)) ifTrue:[ |
|
729 |
merge exists ifTrue:[ |
|
730 |
self mergeData mergeUsing: merge contents asString |
|
731 |
]. |
|
732 |
] |
|
733 |
] ensure:[ |
|
734 |
left remove. |
|
735 |
wc remove. |
|
736 |
right remove. |
|
737 |
merge exists ifTrue:[merge remove]. |
|
738 |
] |
|
739 |
||
740 |
"Modified: / 30-11-2012 / 14:13:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
741 |
! |
|
742 |
||
743 |
doMergeAllUsingA |
|
744 |
self mergeData mergeUsingA: self textA |
|
745 |
||
746 |
"Created: / 30-11-2012 / 13:33:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
747 |
! |
|
748 |
||
749 |
doMergeAllUsingB |
|
750 |
||
751 |
self mergeData mergeUsingB: self textB |
|
752 |
||
753 |
"Created: / 30-11-2012 / 13:33:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
754 |
! |
|
755 |
||
756 |
doMergeAllUsingBase |
|
757 |
self mergeData mergeUsingBase: self textC |
|
758 |
||
759 |
"Created: / 30-11-2012 / 13:33:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
760 |
! |
|
761 |
||
762 |
doMergeCurrentUsingA |
|
763 |
||
764 |
| interval | |
|
765 |
interval := mergeService sectionInterval. |
|
766 |
interval notNil ifTrue:[ |
|
767 |
self mergeData mergeUsingA: self textA interval: interval |
|
768 |
] |
|
769 |
||
770 |
"Created: / 30-11-2012 / 13:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
771 |
! |
|
772 |
||
773 |
doMergeCurrentUsingB |
|
774 |
||
775 |
| interval | |
|
776 |
interval := mergeService sectionInterval. |
|
777 |
interval notNil ifTrue:[ |
|
778 |
self mergeData mergeUsingB: self textB interval: interval |
|
779 |
] |
|
780 |
||
781 |
"Created: / 30-11-2012 / 13:33:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
782 |
! |
|
783 |
||
784 |
doMergeCurrentUsingBase |
|
785 |
||
786 |
| interval | |
|
787 |
interval := mergeService sectionInterval. |
|
788 |
interval notNil ifTrue:[ |
|
789 |
self mergeData mergeUsingBase: self textC interval: interval |
|
790 |
] |
|
791 |
||
792 |
"Created: / 30-11-2012 / 13:34:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
793 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
794 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
795 |
!TextDiff3Tool methodsFor:'testing'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
796 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
797 |
isDiff3 |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
798 |
^true |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
799 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
800 |
"Created: / 16-03-2012 / 15:21:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
801 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
802 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
803 |
isMerge |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
804 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
805 |
^self mergeHolder value |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
806 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
807 |
"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
808 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
809 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
810 |
!TextDiff3Tool::MergeService class methodsFor:'accessing'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
811 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
812 |
label |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
813 |
"Answers short label - for UI" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
814 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
815 |
^'Merge Support Service' |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
816 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
817 |
"Created: / 19-03-2012 / 11:48:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
818 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
819 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
820 |
!TextDiff3Tool::MergeService class methodsFor:'testing'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
821 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
822 |
isAvailable |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
823 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
824 |
^false "/Should be installed explicitly" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
825 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
826 |
"Created: / 19-03-2012 / 11:45:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
827 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
828 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
829 |
!TextDiff3Tool::MergeService methodsFor:'accessing'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
830 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
831 |
infoAtLine: lineNr |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
832 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
833 |
^(lineNr between: 1 and: data listInfos size) ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
834 |
data listInfos at: lineNr |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
835 |
] ifFalse:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
836 |
nil |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
837 |
] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
838 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
839 |
"Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
840 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
841 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
842 |
sectionInterval |
12307 | 843 |
^ sectionIntervalHolder value |
844 |
||
845 |
"Modified: / 30-11-2012 / 13:45:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
846 |
! |
|
847 |
||
848 |
sectionInterval: anObject |
|
12317 | 849 |
^ self sectionIntervalHolder value: anObject |
12307 | 850 |
|
851 |
"Created: / 30-11-2012 / 13:45:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12317 | 852 |
"Modified: / 15-01-2013 / 11:50:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
853 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
854 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
855 |
!TextDiff3Tool::MergeService methodsFor:'aspects'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
856 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
857 |
dataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
858 |
"return/create the 'dataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
859 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
860 |
dataHolder isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
861 |
dataHolder := ValueHolder new. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
862 |
dataHolder addDependent:self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
863 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
864 |
^ dataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
865 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
866 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
867 |
dataHolder:something |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
868 |
"set the 'dataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
869 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
870 |
|oldValue newValue| |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
871 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
872 |
dataHolder notNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
873 |
oldValue := dataHolder value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
874 |
dataHolder removeDependent:self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
875 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
876 |
dataHolder := something. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
877 |
dataHolder notNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
878 |
dataHolder addDependent:self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
879 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
880 |
newValue := dataHolder value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
881 |
oldValue ~~ newValue ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
882 |
self update:#value with:newValue from:dataHolder. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
883 |
]. |
12307 | 884 |
! |
885 |
||
886 |
sectionIntervalHolder |
|
887 |
"return/create the 'sectionIntervalHolder' value holder (automatically generated)" |
|
888 |
||
889 |
sectionIntervalHolder isNil ifTrue:[ |
|
890 |
sectionIntervalHolder := ValueHolder new. |
|
891 |
sectionIntervalHolder addDependent:self. |
|
892 |
]. |
|
893 |
^ sectionIntervalHolder |
|
894 |
! |
|
895 |
||
896 |
sectionIntervalHolder:something |
|
897 |
"set the 'sectionIntervalHolder' value holder (automatically generated)" |
|
898 |
||
899 |
|oldValue newValue| |
|
900 |
||
901 |
sectionIntervalHolder notNil ifTrue:[ |
|
902 |
oldValue := sectionIntervalHolder value. |
|
903 |
sectionIntervalHolder removeDependent:self. |
|
904 |
]. |
|
905 |
sectionIntervalHolder := something. |
|
906 |
sectionIntervalHolder notNil ifTrue:[ |
|
907 |
sectionIntervalHolder addDependent:self. |
|
908 |
]. |
|
909 |
newValue := sectionIntervalHolder value. |
|
910 |
oldValue ~~ newValue ifTrue:[ |
|
911 |
self update:#value with:newValue from:sectionIntervalHolder. |
|
912 |
]. |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
913 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
914 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
915 |
!TextDiff3Tool::MergeService methodsFor:'change & update'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
916 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
917 |
dataChanged |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
918 |
"Merge data has changes, update text view" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
919 |
| changed | |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
920 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
921 |
textView isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
922 |
^ self "/not yet registered |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
923 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
924 |
data isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
925 |
textView list: #(). |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
926 |
^self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
927 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
928 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
929 |
"/Collect conflicted lines" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
930 |
changed := data listInfos |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
931 |
select:[:info|info isConflict] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
932 |
thenCollect:[:info|info line]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
933 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
934 |
textView changedLines: changed. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
935 |
textView diffMode: true. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
936 |
textView list: data list. |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
937 |
textView invalidate. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
938 |
gutterView invalidate. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
939 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
940 |
"Created: / 19-03-2012 / 12:41:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
941 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
942 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
943 |
dataHolderChanged |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
944 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
945 |
data notNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
946 |
data removeDependent: self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
947 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
948 |
data := dataHolder value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
949 |
data notNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
950 |
data addDependent: self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
951 |
]. |
12307 | 952 |
self sectionInterval: nil. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
953 |
self dataChanged |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
954 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
955 |
"Created: / 19-03-2012 / 11:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12307 | 956 |
"Modified: / 30-11-2012 / 13:46:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
957 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
958 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
959 |
update:something with:aParameter from:changedObject |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
960 |
"Invoked when an object that I depend upon sends a change notification." |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
961 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
962 |
"stub code automatically generated - please change as required" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
963 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
964 |
changedObject == dataHolder ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
965 |
self dataHolderChanged. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
966 |
^ self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
967 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
968 |
changedObject == data ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
969 |
self dataChanged. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
970 |
^ self. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
971 |
]. |
12307 | 972 |
|
973 |
changedObject == sectionIntervalHolder ifTrue:[ |
|
974 |
gutterView invalidate. |
|
975 |
^self |
|
976 |
]. |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
977 |
super update:something with:aParameter from:changedObject |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
978 |
|
12307 | 979 |
"Modified: / 30-11-2012 / 13:45:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
980 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
981 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
982 |
updateSelection: lineNr |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
983 |
"For given number, update sectionInterval" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
984 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
985 |
| conflict | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
986 |
lineNr notNil ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
987 |
conflict := (self infoAtLine: lineNr) conflict. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
988 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
989 |
lineNr isNil"conflict isNil" ifTrue:[ |
12307 | 990 |
self sectionInterval: nil |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
991 |
] ifFalse:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
992 |
| start stop i | |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
993 |
i := lineNr - 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
994 |
[ i > 0 and:[ (self infoAtLine: i) conflict == conflict ]] |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
995 |
whileTrue:[ i := i - 1 ]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
996 |
start := i + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
997 |
i := lineNr + 1. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
998 |
[ i < (data listInfos size) and:[ (self infoAtLine: i) conflict == conflict ]] |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
999 |
whileTrue:[ i := i + 1 ]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1000 |
stop := i - 1. |
12307 | 1001 |
self sectionInterval: (start to: stop). |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1002 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1003 |
gutterView invalidate. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1004 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1005 |
"Created: / 03-04-2012 / 19:29:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12307 | 1006 |
"Modified: / 30-11-2012 / 13:45:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1007 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1008 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1009 |
!TextDiff3Tool::MergeService methodsFor:'drawing'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1010 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1011 |
drawLine:lineNo in:view atX:x y:y width:w height:h from:startCol to:endColOrNil with:fg and:bg |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1012 |
"Called by both gutterView and textView (well, not yet) to |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1013 |
allow services to draw custom things on text view. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1014 |
Ask JV what the args means if unsure (I'm lazy to document |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1015 |
them, now it is just an experiment...)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1016 |
|
12307 | 1017 |
| info color sectionInterval | |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1018 |
|
12307 | 1019 |
sectionInterval := self sectionInterval. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1020 |
view == gutterView ifFalse:[ ^ self ]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1021 |
info := self infoAtLine: lineNo. |
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1022 |
info notNil ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1023 |
color := info color. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1024 |
color notNil ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1025 |
view fillRectangleX: x y:y - h |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1026 |
width: 8 |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1027 |
height:h + textView lineSpacing + 5"Magic constant to make it look nicer" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1028 |
color: color. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1029 |
]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1030 |
]. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1031 |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1032 |
(sectionInterval notNil and:[sectionInterval includes: lineNo]) ifTrue:[ |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1033 |
"Drawing outside annotation area is not nice, but..." |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1034 |
view fillRectangleX:view width - 7 y:y - h |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1035 |
width:4 |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1036 |
height:h + textView lineSpacing + 5"Magic constant to make it look nicer" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1037 |
color: Color gray. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1038 |
] |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1039 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1040 |
"Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12307 | 1041 |
"Modified: / 30-11-2012 / 13:46:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1042 |
! ! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1043 |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1044 |
!TextDiff3Tool::MergeService methodsFor:'event handling'! |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1045 |
|
12218
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1046 |
buttonPress: button x:x y:y in: view |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1047 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1048 |
"Handles an event in given view (a subview of codeView). |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1049 |
If the method returns true, it has eaten the event and it will not be processed |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1050 |
by the view." |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1051 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1052 |
|lineNr| |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1053 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1054 |
view == gutterView ifFalse:[ ^ false ]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1055 |
button == 1 ifFalse:[ ^ false ]. |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1056 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1057 |
self updateSelection: (textView yVisibleToLineNr:y). |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1058 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1059 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1060 |
^false |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1061 |
|
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1062 |
"Created: / 03-04-2012 / 19:23:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1063 |
! |
8b88c30fb1e7
Improvements in text merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12203
diff
changeset
|
1064 |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1065 |
linesModifiedFrom: start to: end |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1066 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1067 |
start to: end do:[:i| |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1068 |
(data listInfos at:i) resolution: #Merged. |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1069 |
]. |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1070 |
gutterView invalidate. |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1071 |
|
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1072 |
"Created: / 06-07-2011 / 17:14:36 / jv" |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1073 |
"Created: / 20-03-2012 / 22:57:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1074 |
! ! |
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1075 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1076 |
!TextDiff3Tool::MergeService methodsFor:'registering'! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1077 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1078 |
registerIn: aCodeView |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1079 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1080 |
"Installs myself in aCodeView" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1081 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1082 |
super registerIn: aCodeView. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1083 |
self dataChanged. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1084 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1085 |
"Modified: / 17-06-2011 / 13:07:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12193
diff
changeset
|
1086 |
"Created: / 19-03-2012 / 12:52:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1087 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1088 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1089 |
!TextDiff3Tool class methodsFor:'documentation'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1090 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1091 |
version_SVN |
12317 | 1092 |
^ '$Id: Tools__TextDiff3Tool.st 8086 2013-01-15 12:03:21Z vranyj1 $' |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1093 |
! ! |