author | Claus Gittinger <cg@exept.de> |
Mon, 14 Feb 2011 18:16:36 +0100 | |
branch | initialV |
changeset 9777 | 82d9e1236f1f |
parent 9602 | 46d76851e419 |
child 10691 | 3a00938248ac |
permissions | -rw-r--r-- |
2626 | 1 |
" |
2 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
3 |
All Rights Reserved |
|
4 |
||
5 |
This software is furnished under a license and may be used |
|
6 |
only in accordance with the terms of that license and with the |
|
7 |
inclusion of the above copyright notice. This software may not |
|
8 |
be provided or otherwise made available to, or used by, any |
|
9 |
other person. No title to or ownership of the software is |
|
10 |
hereby transferred. |
|
11 |
" |
|
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
12 |
"{ Package: 'stx:libtool' }" |
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
13 |
|
2221 | 14 |
ApplicationModel subclass:#VersionDiffBrowser |
2856 | 15 |
instanceVariableNames:'classChangeSet diffTextView boxAVisible boxBVisible boxMVisible |
16 |
classIfSingleClassDiff versionAIfSingleClassDiff |
|
3147 | 17 |
versionBIfSingleClassDiff changedLabelHolder diffTextLabelA |
18 |
diffTextLabelB methodText methodsChanged methodsChangedSelection |
|
19 |
methodsOnlyInA methodsOnlyInASelection methodsOnlyInB |
|
5182 | 20 |
methodsOnlyInBSelection onlyInALabelHolder onlyInBLabelHolder |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
21 |
classHolder versionAHolder versionBHolder infoHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
22 |
includeExtensionsHolder canIncludeExtensionsHolder' |
2221 | 23 |
classVariableNames:'' |
24 |
poolDictionaries:'' |
|
25 |
category:'Interface-Browsers' |
|
26 |
! |
|
27 |
||
2497 | 28 |
HierarchicalItem subclass:#ClassChangeSet |
8891 | 29 |
instanceVariableNames:'classBeingCompared labelA labelB diffSet versionA versionB' |
2497 | 30 |
classVariableNames:'' |
31 |
poolDictionaries:'' |
|
32 |
privateIn:VersionDiffBrowser |
|
33 |
! |
|
34 |
||
2626 | 35 |
!VersionDiffBrowser class methodsFor:'documentation'! |
36 |
||
37 |
copyright |
|
38 |
" |
|
39 |
COPYRIGHT (c) 2000 by eXept Software AG |
|
40 |
All Rights Reserved |
|
41 |
||
42 |
This software is furnished under a license and may be used |
|
43 |
only in accordance with the terms of that license and with the |
|
44 |
inclusion of the above copyright notice. This software may not |
|
45 |
be provided or otherwise made available to, or used by, any |
|
46 |
other person. No title to or ownership of the software is |
|
47 |
hereby transferred. |
|
48 |
" |
|
49 |
||
50 |
! |
|
51 |
||
52 |
documentation |
|
53 |
" |
|
54 |
This is not yet finished (work in progress). |
|
55 |
||
56 |
A browser to show differences between class versions, |
|
57 |
allowing easy comparison; will also eventually add capabilities |
|
58 |
to checkIn / load classes into / from the repository. |
|
59 |
||
60 |
[see also:] |
|
61 |
||
62 |
[instance variables:] |
|
63 |
||
64 |
[class variables:] |
|
65 |
" |
|
66 |
||
67 |
||
68 |
! ! |
|
2221 | 69 |
|
70 |
!VersionDiffBrowser class methodsFor:'interface specs'! |
|
71 |
||
72 |
windowSpec |
|
73 |
"This resource specification was automatically generated |
|
74 |
by the UIPainter of ST/X." |
|
75 |
||
76 |
"Do not manually edit this!! If it is corrupted, |
|
77 |
the UIPainter may not be able to read the specification." |
|
78 |
||
79 |
" |
|
80 |
UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpec |
|
81 |
VersionDiffBrowser new openInterface:#windowSpec |
|
82 |
VersionDiffBrowser open |
|
83 |
" |
|
84 |
||
85 |
<resource: #canvas> |
|
86 |
||
87 |
^ |
|
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
88 |
#(FullSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
89 |
name: windowSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
90 |
window: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
91 |
(WindowSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
92 |
label: 'Version DiffBrowser' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
93 |
name: 'Version DiffBrowser' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
94 |
min: (Point 10 10) |
7396 | 95 |
bounds: (Rectangle 0 0 865 504) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
96 |
menu: mainMenu |
2221 | 97 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
98 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
99 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
100 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
101 |
(VariableVerticalPanelSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
102 |
name: 'VariableVerticalPanel1' |
8602 | 103 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
104 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
105 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
106 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
107 |
(HorizontalPanelViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
108 |
name: 'TopHorizontalPanel' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
109 |
horizontalLayout: fit |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
110 |
verticalLayout: fit |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
111 |
horizontalSpace: 3 |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
112 |
verticalSpace: 3 |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
113 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
114 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
115 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
116 |
(ViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
117 |
name: 'BoxA' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
118 |
level: 0 |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
119 |
visibilityChannel: boxAVisible |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
120 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
121 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
122 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
123 |
(LabelSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
124 |
label: 'Only in A' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
125 |
name: 'OnlyInALabel' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
126 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
127 |
translateLabel: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
128 |
labelChannel: onlyInALabelHolder |
2221 | 129 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
130 |
(SequenceViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
131 |
name: 'ListA' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
132 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
133 |
model: methodsOnlyInASelection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
134 |
menu: menuA |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
135 |
hasHorizontalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
136 |
hasVerticalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
137 |
miniScrollerHorizontal: true |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
138 |
doubleClickSelector: methodInADoubleClicked: |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
139 |
valueChangeSelector: methodsOnlyInASelectionChanged |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
140 |
useIndex: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
141 |
sequenceList: methodsOnlyInA |
2221 | 142 |
) |
143 |
) |
|
144 |
||
145 |
) |
|
8602 | 146 |
extent: (Point 286 199) |
2221 | 147 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
148 |
(ViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
149 |
name: 'BoxM' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
150 |
visibilityChannel: boxMVisible |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
151 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
152 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
153 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
154 |
(LabelSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
155 |
label: 'Changed' |
7396 | 156 |
name: 'ChangedLabel' |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
157 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
158 |
translateLabel: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
159 |
labelChannel: changedLabelHolder |
2221 | 160 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
161 |
(SequenceViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
162 |
name: 'ListM' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
163 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
164 |
model: methodsChangedSelection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
165 |
menu: menuM |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
166 |
hasHorizontalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
167 |
hasVerticalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
168 |
miniScrollerHorizontal: true |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
169 |
doubleClickSelector: methodInChangedDoubleClicked: |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
170 |
valueChangeSelector: methodsChangedSelectionChanged |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
171 |
useIndex: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
172 |
sequenceList: methodsChanged |
2221 | 173 |
) |
174 |
) |
|
175 |
||
176 |
) |
|
8602 | 177 |
extent: (Point 286 199) |
2221 | 178 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
179 |
(ViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
180 |
name: 'BoxB' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
181 |
visibilityChannel: boxBVisible |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
182 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
183 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
184 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
185 |
(LabelSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
186 |
label: 'Only in B' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
187 |
name: 'OnlyInBLabel' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
188 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
189 |
translateLabel: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
190 |
labelChannel: onlyInBLabelHolder |
2221 | 191 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
192 |
(SequenceViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
193 |
name: 'ListB' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
194 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
195 |
model: methodsOnlyInBSelection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
196 |
menu: menuB |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
197 |
hasHorizontalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
198 |
hasVerticalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
199 |
miniScrollerHorizontal: true |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
200 |
doubleClickSelector: methodInBDoubleClicked: |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
201 |
valueChangeSelector: methodsOnlyInBSelectionChanged |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
202 |
useIndex: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
203 |
sequenceList: methodsOnlyInB |
2221 | 204 |
) |
205 |
) |
|
206 |
||
207 |
) |
|
8602 | 208 |
extent: (Point 287 199) |
2221 | 209 |
) |
210 |
) |
|
211 |
||
212 |
) |
|
213 |
) |
|
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
214 |
(ViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
215 |
name: 'Box4' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
216 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
217 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
218 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
219 |
(ViewSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
220 |
name: 'diffTextViewBox' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
221 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
222 |
initiallyInvisible: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
223 |
component: |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
224 |
(SpecCollection |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
225 |
collection: ( |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
226 |
(LabelSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
227 |
label: 'A' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
228 |
name: 'DiffTextLabelA' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
229 |
layout: (LayoutFrame 0 0 0 0 0 0.5 20 0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
230 |
translateLabel: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
231 |
labelChannel: diffTextLabelA |
2221 | 232 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
233 |
(LabelSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
234 |
label: 'B' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
235 |
name: 'DiffTextLabelB' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
236 |
layout: (LayoutFrame 0 0.5 0 0 0 1 20 0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
237 |
translateLabel: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
238 |
labelChannel: diffTextLabelB |
2221 | 239 |
) |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
240 |
(ArbitraryComponentSpec |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
241 |
name: 'diffTextView' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
242 |
layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
243 |
hasBorder: false |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
244 |
component: diffTextView |
2221 | 245 |
) |
246 |
) |
|
247 |
||
248 |
) |
|
249 |
) |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
250 |
(CodeViewSpec |
5150
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
251 |
name: 'singleTextView' |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
252 |
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0) |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
253 |
model: methodText |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
254 |
hasHorizontalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
255 |
hasVerticalScrollBar: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
256 |
miniScrollerHorizontal: true |
4a469455c4b4
Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents:
4653
diff
changeset
|
257 |
isReadOnly: true |
8602 | 258 |
hasKeyboardFocusInitially: false |
2221 | 259 |
) |
260 |
) |
|
261 |
||
262 |
) |
|
263 |
) |
|
264 |
) |
|
265 |
||
266 |
) |
|
8602 | 267 |
handles: (Any 0.42379958246347 1.0) |
268 |
) |
|
269 |
(LabelSpec |
|
270 |
name: 'InfoLabel' |
|
271 |
layout: (LayoutFrame 0 0 -25 1 0 1 0 1) |
|
272 |
level: -1 |
|
273 |
translateLabel: true |
|
274 |
labelChannel: infoHolder |
|
275 |
adjust: left |
|
2221 | 276 |
) |
277 |
) |
|
278 |
||
279 |
) |
|
280 |
) |
|
281 |
! ! |
|
282 |
||
283 |
!VersionDiffBrowser class methodsFor:'menu specs'! |
|
284 |
||
285 |
mainMenu |
|
286 |
"This resource specification was automatically generated |
|
287 |
by the MenuEditor of ST/X." |
|
288 |
||
289 |
"Do not manually edit this!! If it is corrupted, |
|
290 |
the MenuEditor may not be able to read the specification." |
|
291 |
||
292 |
" |
|
293 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu |
|
294 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp |
|
295 |
" |
|
296 |
||
297 |
<resource: #menu> |
|
298 |
||
299 |
^ |
|
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
300 |
#(Menu |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
301 |
( |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
302 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
303 |
label: 'File' |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
304 |
translateLabel: true |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
305 |
submenu: |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
306 |
(Menu |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
307 |
( |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
308 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
309 |
label: 'Create PatchFile...' |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
310 |
itemValue: createPatchFile |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
311 |
translateLabel: true |
2469 | 312 |
) |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
313 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
314 |
label: '-' |
2469 | 315 |
) |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
316 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
317 |
label: 'Exit' |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
318 |
itemValue: closeRequest |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
319 |
translateLabel: true |
2221 | 320 |
) |
321 |
) |
|
322 |
nil |
|
323 |
nil |
|
324 |
) |
|
325 |
) |
|
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
326 |
(MenuItem |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
327 |
label: 'View' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
328 |
translateLabel: true |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
329 |
submenu: |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
330 |
(Menu |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
331 |
( |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
332 |
(MenuItem |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
333 |
label: 'Include Extensions' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
334 |
translateLabel: true |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
335 |
indication: includeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
336 |
enabled: canIncludeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
337 |
) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
338 |
) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
339 |
nil |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
340 |
nil |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
341 |
) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
342 |
) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
343 |
(MenuItem |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
344 |
label: 'Help' |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
345 |
translateLabel: true |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
346 |
startGroup: conditionalRight |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
347 |
submenu: |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
348 |
(Menu |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
349 |
( |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
350 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
351 |
label: 'Documentation' |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
352 |
itemValue: openDocumentation |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
353 |
translateLabel: true |
2221 | 354 |
) |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
355 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
356 |
label: '-' |
2221 | 357 |
) |
7419
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
358 |
(MenuItem |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
359 |
label: 'About this Application...' |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
360 |
itemValue: openAboutThisApplication |
e4e108674fe6
conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents:
7396
diff
changeset
|
361 |
translateLabel: true |
2221 | 362 |
) |
363 |
) |
|
364 |
nil |
|
365 |
nil |
|
366 |
) |
|
367 |
) |
|
368 |
) |
|
369 |
nil |
|
370 |
nil |
|
371 |
) |
|
372 |
! |
|
373 |
||
374 |
menuA |
|
375 |
"This resource specification was automatically generated |
|
376 |
by the MenuEditor of ST/X." |
|
377 |
||
378 |
"Do not manually edit this!! If it is corrupted, |
|
379 |
the MenuEditor may not be able to read the specification." |
|
380 |
||
381 |
" |
|
382 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
383 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
384 |
" |
|
385 |
||
386 |
<resource: #menu> |
|
387 |
||
388 |
^ |
|
389 |
#(#Menu |
|
390 |
#( |
|
391 |
#(#MenuItem |
|
3322 | 392 |
#label: 'Apply' |
2221 | 393 |
#translateLabel: true |
3322 | 394 |
#value: #applySelectedChangeInA |
3753 | 395 |
#enabled: #hasChangeSelectedInA |
3322 | 396 |
) |
397 |
#(#MenuItem |
|
398 |
#label: 'Browse' |
|
399 |
#translateLabel: true |
|
400 |
#value: #browseClassInA |
|
3753 | 401 |
#enabled: #hasChangeSelectedInA |
2221 | 402 |
) |
2465 | 403 |
#(#MenuItem |
404 |
#label: '-' |
|
405 |
) |
|
406 |
#(#MenuItem |
|
3322 | 407 |
#label: 'Inspect' |
2465 | 408 |
#translateLabel: true |
3322 | 409 |
#value: #inspectSelectedChangeInA |
410 |
#choiceValue: 'nil "UndefinedObject" ' |
|
3753 | 411 |
#enabled: #hasChangeSelectedInA |
2465 | 412 |
) |
2221 | 413 |
) |
414 |
nil |
|
415 |
nil |
|
416 |
) |
|
417 |
! |
|
418 |
||
419 |
menuB |
|
420 |
"This resource specification was automatically generated |
|
421 |
by the MenuEditor of ST/X." |
|
422 |
||
423 |
"Do not manually edit this!! If it is corrupted, |
|
424 |
the MenuEditor may not be able to read the specification." |
|
425 |
||
426 |
" |
|
427 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menuB |
|
428 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menuB)) startUp |
|
429 |
" |
|
430 |
||
431 |
<resource: #menu> |
|
432 |
||
433 |
^ |
|
434 |
#(#Menu |
|
435 |
#( |
|
436 |
#(#MenuItem |
|
3322 | 437 |
#label: 'Apply' |
2221 | 438 |
#translateLabel: true |
3322 | 439 |
#value: #applySelectedChangeInB |
3753 | 440 |
#enabled: #hasChangeSelectedInB |
3322 | 441 |
) |
442 |
#(#MenuItem |
|
443 |
#label: 'Browse' |
|
444 |
#translateLabel: true |
|
445 |
#value: #browseClassInB |
|
3753 | 446 |
#enabled: #hasChangeSelectedInB |
2221 | 447 |
) |
2465 | 448 |
#(#MenuItem |
449 |
#label: '-' |
|
450 |
) |
|
451 |
#(#MenuItem |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
452 |
#label: 'Remove in Image' |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
453 |
#translateLabel: true |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
454 |
#value: #removeSelectedChangeInBFromImage |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
455 |
#enabled: #hasChangeSelectedInB |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
456 |
) |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
457 |
#(#MenuItem |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
458 |
#label: '-' |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
459 |
) |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
460 |
#(#MenuItem |
3322 | 461 |
#label: 'Inspect' |
2465 | 462 |
#translateLabel: true |
3322 | 463 |
#value: #inspectSelectedChangeInB |
464 |
#choiceValue: 'nil "UndefinedObject" ' |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
465 |
#enabled: #hasChangeSelectedInB |
2465 | 466 |
) |
2221 | 467 |
) |
468 |
nil |
|
469 |
nil |
|
470 |
) |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
471 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
472 |
"Modified: / 15-08-2010 / 21:24:49 / cg" |
2221 | 473 |
! |
474 |
||
475 |
menuM |
|
476 |
"This resource specification was automatically generated |
|
477 |
by the MenuEditor of ST/X." |
|
478 |
||
479 |
"Do not manually edit this!! If it is corrupted, |
|
480 |
the MenuEditor may not be able to read the specification." |
|
481 |
||
482 |
" |
|
483 |
MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1 |
|
484 |
(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp |
|
485 |
" |
|
486 |
||
487 |
<resource: #menu> |
|
488 |
||
489 |
^ |
|
490 |
#(#Menu |
|
491 |
#( |
|
492 |
#(#MenuItem |
|
3322 | 493 |
#label: 'Browse' |
2221 | 494 |
#translateLabel: true |
3322 | 495 |
#value: #browseClassInM |
3753 | 496 |
#enabled: #hasChangeSelectedInM |
2221 | 497 |
) |
2465 | 498 |
#(#MenuItem |
499 |
#label: '-' |
|
500 |
) |
|
501 |
#(#MenuItem |
|
7833 | 502 |
#label: 'Apply Left Version' |
503 |
#translateLabel: true |
|
504 |
#value: #acceptInLeftView |
|
505 |
#enabled: #hasChangeSelectedInM |
|
506 |
) |
|
507 |
#(#MenuItem |
|
508 |
#label: 'Apply Right Version' |
|
509 |
#translateLabel: true |
|
510 |
#value: #acceptInRightView |
|
511 |
#enabled: #hasChangeSelectedInM |
|
512 |
) |
|
513 |
#(#MenuItem |
|
514 |
#label: '-' |
|
515 |
) |
|
516 |
#(#MenuItem |
|
3322 | 517 |
#label: 'Inspect both' |
2465 | 518 |
#translateLabel: true |
3322 | 519 |
#value: #inspectSelectedChangeInM |
520 |
#choiceValue: 'nil "UndefinedObject" ' |
|
3753 | 521 |
#enabled: #hasChangeSelectedInM |
2465 | 522 |
) |
2221 | 523 |
) |
524 |
nil |
|
525 |
nil |
|
526 |
) |
|
7833 | 527 |
|
528 |
"Modified: / 31-08-2007 / 14:16:39 / cg" |
|
2221 | 529 |
! ! |
530 |
||
2695 | 531 |
!VersionDiffBrowser class methodsFor:'plugIn spec'! |
532 |
||
533 |
aspectSelectors |
|
534 |
"This resource specification was automatically generated |
|
535 |
by the UIPainter of ST/X." |
|
536 |
||
537 |
"Do not manually edit this. If it is corrupted, |
|
538 |
the UIPainter may not be able to read the specification." |
|
539 |
||
540 |
"Return a description of exported aspects; |
|
541 |
these can be connected to aspects of an embedding application |
|
542 |
(if this app is embedded in a subCanvas)." |
|
543 |
||
544 |
^ #( |
|
545 |
#changedLabelHolder |
|
546 |
#onlyInALabelHolder |
|
547 |
#onlyInBLabelHolder |
|
548 |
). |
|
549 |
||
550 |
! ! |
|
551 |
||
2221 | 552 |
!VersionDiffBrowser class methodsFor:'startup'! |
553 |
||
2695 | 554 |
openOnClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
555 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
556 |
browser. The class diff set is generated from aClasses current against some version |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
557 |
via the source code manager." |
2507 | 558 |
|
2497 | 559 |
|theBrowser| |
2224 | 560 |
|
2497 | 561 |
theBrowser := self new. |
562 |
theBrowser allButOpen. |
|
2695 | 563 |
theBrowser setupForClass:aClass againstVersion:aVersionA. |
2497 | 564 |
theBrowser openWindow. |
565 |
^ theBrowser. |
|
2224 | 566 |
|
2695 | 567 |
" |
568 |
self openOnClass:Array againstVersion:'1.116' |
|
569 |
self openOnClass:Array againstVersion:nil - against the version on which Array is based upon |
|
570 |
self openOnClass:Array againstVersion:#newest - against the newest repository version |
|
571 |
||
572 |
self openOnClass:VersionDiffBrowser againstVersion:nil |
|
573 |
self openOnClass:VersionDiffBrowser againstVersion:#newest |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
574 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
575 |
(self openOnClass:ByteArray againstVersion:'1.116') includeExtensionsHolder value:true |
2695 | 576 |
" |
577 |
! |
|
578 |
||
2949 | 579 |
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
580 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
581 |
browser. The class diff set is generated from two classes." |
2949 | 582 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
583 |
^ self |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
584 |
openOnClass:classA labelA:aLabelA |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
585 |
andClass:classB labelB:aLabelB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
586 |
title:ignoredTitle ifSame:nil |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
587 |
|
3147 | 588 |
" |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
589 |
self |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
590 |
openOnClass:Array labelA:'Array' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
591 |
andClass:Collection labelB:'Collection' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
592 |
title:'Array vs. Collection' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
593 |
" |
2949 | 594 |
! |
595 |
||
596 |
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle ifSame:sameAction |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
597 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
598 |
browser. The class diff set is generated from two classes." |
2949 | 599 |
|
8891 | 600 |
|classChangeSet| |
2949 | 601 |
|
8891 | 602 |
classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB. |
603 |
classChangeSet removeAllVersionMethods. |
|
2949 | 604 |
sameAction notNil ifTrue:[ |
605 |
"/ check if same ... |
|
8891 | 606 |
(classChangeSet methodsOnlyInA isEmpty |
607 |
and:[classChangeSet methodsOnlyInB isEmpty |
|
608 |
and:[classChangeSet diffSet isEmpty]]) ifTrue:[ |
|
2949 | 609 |
sameAction value. |
610 |
^ self "/ do not open |
|
611 |
] |
|
612 |
]. |
|
8891 | 613 |
|
614 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
2949 | 615 |
! |
616 |
||
2695 | 617 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
618 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
619 |
browser. The class diff set is generated from two source files." |
2695 | 620 |
|
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
621 |
^ self |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
622 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
623 |
title:nil |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
624 |
! |
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
625 |
|
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
626 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
627 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
628 |
browser. The class diff set is generated from two source files." |
2716
8451e7057f00
some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents:
2714
diff
changeset
|
629 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
630 |
^ self |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
631 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
632 |
labelB:aLabelB sourceB:aSourceB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
633 |
title:ignoredTitle ifSame:nil |
2849 | 634 |
! |
635 |
||
636 |
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle ifSame:sameAction |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
637 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
638 |
browser. The class diff set is generated from two source files." |
8891 | 639 |
|
640 |
|diffs hasChangedMethods classChangeSet versionMethodChanges| |
|
2695 | 641 |
|
8891 | 642 |
classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB. |
643 |
classChangeSet removeAllVersionMethods. |
|
2849 | 644 |
sameAction notNil ifTrue:[ |
2853 | 645 |
"/ check if same ... |
7396 | 646 |
(classChangeSet methodsOnlyInA isEmpty |
647 |
and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[ |
|
648 |
diffs := classChangeSet diffSet. |
|
3853
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
649 |
|
7396 | 650 |
hasChangedMethods := diffs changed notEmpty. |
651 |
hasChangedMethods ifTrue:[ |
|
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
652 |
versionMethodChanges := diffs changed select:[:eachDifference | |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
653 |
|eachChange| |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
654 |
eachChange := eachDifference first. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
655 |
(eachChange isMethodChange |
8891 | 656 |
and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector) |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
657 |
and:[ eachChange changeClass isMeta ]]). |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
658 |
]. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
659 |
diffs changed size == versionMethodChanges size ifTrue: [ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
660 |
hasChangedMethods := false. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
661 |
]. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
662 |
"/ diffs changed size == 1 ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
663 |
"/ theOnlyDifference := diffs changed first. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
664 |
"/ theOnlyChange := theOnlyDifference first. |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
665 |
"/ (theOnlyChange isMethodChange |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
666 |
"/ and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_']) |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
667 |
"/ and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[ |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
668 |
"/ hasChangedMethods := false |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
669 |
"/ ] |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
670 |
"/ ] |
3853
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
671 |
]. |
f3ce00da9b68
ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents:
3843
diff
changeset
|
672 |
|
7396 | 673 |
(hasChangedMethods not |
3756 | 674 |
and:[diffs onlyInArg isEmpty |
675 |
and:[diffs onlyInReceiver isEmpty]]) ifTrue:[ |
|
676 |
sameAction value. |
|
677 |
^ self "/ do not open |
|
3682
a17c1e10caa5
fixed versions-are-the-same check
Claus Gittinger <cg@exept.de>
parents:
3678
diff
changeset
|
678 |
]. |
2853 | 679 |
] |
2849 | 680 |
]. |
8891 | 681 |
|
682 |
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle |
|
7396 | 683 |
|
684 |
"Modified: / 13-10-2006 / 01:01:05 / cg" |
|
2224 | 685 |
! |
686 |
||
2497 | 687 |
openOnClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
688 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
689 |
browser. The class diff set is generated from two versions of aClass via |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
690 |
the source code manager." |
2507 | 691 |
|
2497 | 692 |
|theBrowser| |
2221 | 693 |
|
2497 | 694 |
theBrowser := self new. |
695 |
theBrowser allButOpen. |
|
2695 | 696 |
theBrowser setupForClass:aClass versionA:aVersionA versionB:aVersionB. |
2497 | 697 |
theBrowser openWindow. |
698 |
^ theBrowser. |
|
2221 | 699 |
|
700 |
" |
|
701 |
self openOnClass:Array versionA:'1.116' versionB:'1.113' |
|
702 |
" |
|
3678 | 703 |
! |
704 |
||
8891 | 705 |
openOnClassChangeSet:classChangeSet title:ignoredTitle |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
706 |
"create a VersionDiffBrowser instance and set the class change set of the |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
707 |
browser. The class diff set is generated from two classes." |
8891 | 708 |
|
709 |
|theBrowser| |
|
710 |
||
711 |
theBrowser := self new. |
|
712 |
theBrowser allButOpen. |
|
713 |
theBrowser classChangeSet:classChangeSet. |
|
714 |
theBrowser openWindow. |
|
715 |
^ theBrowser. |
|
716 |
! |
|
717 |
||
3678 | 718 |
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle |
719 |
|theBrowser| |
|
720 |
||
721 |
theBrowser := self new. |
|
722 |
theBrowser allButOpen. |
|
723 |
theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB. |
|
724 |
theBrowser window label:ignoredTitle. |
|
725 |
theBrowser openWindow. |
|
726 |
^ theBrowser. |
|
5520 | 727 |
! |
728 |
||
729 |
openOnDiffsBetweenFile:file1 and:file2 |
|
730 |
|set1 set2 diffset theBrowser| |
|
731 |
||
732 |
set1 := ChangeSet fromFile:file1. |
|
733 |
set2 := ChangeSet fromFile:file2. |
|
734 |
diffset := set1 diffSetsAgainst:set2. |
|
735 |
||
736 |
theBrowser := self new. |
|
737 |
theBrowser allButOpen. |
|
738 |
theBrowser setupForDiffSet:diffset labelA:file1 asFilename baseName labelB:file2 asFilename baseName. |
|
739 |
theBrowser window label:('%1 vs. %2' bindWith:file1 asFilename baseName with:file2 asFilename baseName). |
|
740 |
theBrowser openWindow. |
|
741 |
^ theBrowser. |
|
742 |
||
743 |
" |
|
744 |
VersionDiffBrowser |
|
745 |
openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st' |
|
746 |
and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st' |
|
747 |
" |
|
2221 | 748 |
! ! |
749 |
||
750 |
!VersionDiffBrowser methodsFor:'accessing'! |
|
751 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
752 |
canIncludeExtensions:something |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
753 |
self canIncludeExtensionsHolder value:something. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
754 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
755 |
|
2497 | 756 |
changeSetA |
3147 | 757 |
" |
758 |
gets the change set which contains only the new methods |
|
759 |
in versionA of the class |
|
2221 | 760 |
|
3147 | 761 |
<return: ChangeSet> |
762 |
" |
|
2221 | 763 |
|
2497 | 764 |
^ self classChangeSet methodsOnlyInA |
2221 | 765 |
! |
766 |
||
2497 | 767 |
changeSetB |
3147 | 768 |
" |
769 |
gets the change set which contains only the new methods |
|
770 |
in versionB of the class |
|
2497 | 771 |
|
3147 | 772 |
<return: ChangeSet> |
773 |
" |
|
2497 | 774 |
|
775 |
^ self classChangeSet methodsOnlyInB |
|
776 |
! |
|
777 |
||
2856 | 778 |
class:aClass versionA:revA versionB:revB |
779 |
classIfSingleClassDiff := aClass. |
|
780 |
versionAIfSingleClassDiff := revA. |
|
781 |
versionBIfSingleClassDiff := revB. |
|
782 |
! |
|
783 |
||
2497 | 784 |
classBeingCompared |
3147 | 785 |
" |
786 |
gets the class from the change set which is compared. |
|
2224 | 787 |
|
3147 | 788 |
<return: Class> |
789 |
" |
|
2497 | 790 |
^ self classChangeSet classBeingCompared |
791 |
! |
|
792 |
||
793 |
classChangeSet |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
794 |
"returns the class change set which is the model of the version diff browser." |
2224 | 795 |
|
2507 | 796 |
^ classChangeSet |
797 |
! |
|
2497 | 798 |
|
2507 | 799 |
classChangeSet:aClassChangeSet |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
800 |
"sets the class change set which is the model of the version diff browser. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
801 |
The labels, the lists, the visibility and the selection of the lists must be reseted |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
802 |
when a new change set is given." |
2497 | 803 |
|
2507 | 804 |
classChangeSet := aClassChangeSet. |
2501 | 805 |
self updateLabels. |
806 |
self updateLists. |
|
807 |
self resetSelectionHolders. |
|
808 |
! |
|
2224 | 809 |
|
2507 | 810 |
selectedChangeInA |
3147 | 811 |
" |
812 |
gets the selected method change for the 'method only in version A'. |
|
2507 | 813 |
|
3147 | 814 |
<return: MethodChange | nil> |
815 |
" |
|
2507 | 816 |
|sel change| |
817 |
||
818 |
sel := self methodsOnlyInASelection value. |
|
819 |
sel notNil ifTrue:[ |
|
3753 | 820 |
change := self changeSetA at:sel. |
2507 | 821 |
]. |
3753 | 822 |
^ change |
2507 | 823 |
! |
824 |
||
825 |
selectedChangeInB |
|
3147 | 826 |
" |
827 |
gets the selected method change for the 'method only in version B'. |
|
2507 | 828 |
|
3147 | 829 |
<return: MethodChange | nil> |
830 |
" |
|
2507 | 831 |
|sel change| |
832 |
||
833 |
sel := self methodsOnlyInBSelection value. |
|
834 |
sel notNil ifTrue:[ |
|
835 |
change := (self changeSetB at:sel). |
|
836 |
]. |
|
3753 | 837 |
^ change |
2507 | 838 |
! |
839 |
||
840 |
selectedChangesInM |
|
3147 | 841 |
" |
842 |
get the two method changes for the selected 'changed method'. |
|
2507 | 843 |
|
3147 | 844 |
<return: <Array with:MethodChange with:MethodChange | nil>> |
845 |
" |
|
2745 | 846 |
|sel changeA changeB theTwoChanges| |
2507 | 847 |
|
848 |
sel := self methodsChangedSelection value. |
|
849 |
sel notNil ifTrue:[ |
|
2745 | 850 |
theTwoChanges := self classChangeSet methodsChanged at:sel. |
3753 | 851 |
"/ changeA := theTwoChanges first. |
852 |
"/ changeB := theTwoChanges second. |
|
853 |
"/ ^ Array with:changeA with:changeB. |
|
854 |
^ theTwoChanges. |
|
2507 | 855 |
]. |
3753 | 856 |
^ #(nil nil) |
2507 | 857 |
! |
858 |
||
2221 | 859 |
versionA |
3147 | 860 |
" |
861 |
gets the first class version to be compared |
|
2221 | 862 |
|
3147 | 863 |
<return: String> |
864 |
" |
|
2731 | 865 |
classChangeSet isNil ifTrue:[^ 'A']. |
866 |
^ classChangeSet labelA |
|
2221 | 867 |
! |
868 |
||
869 |
versionB |
|
3147 | 870 |
" |
871 |
gets the second class version to be compared |
|
2221 | 872 |
|
3147 | 873 |
<return: String> |
874 |
" |
|
2731 | 875 |
classChangeSet isNil ifTrue:[^ 'B']. |
876 |
^ classChangeSet labelB |
|
2221 | 877 |
! ! |
878 |
||
879 |
!VersionDiffBrowser methodsFor:'actions'! |
|
880 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
881 |
acceptInLeftView |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
882 |
|change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
883 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
884 |
change := self selectedChangesInM first. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
885 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
886 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
887 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
888 |
acceptInRightView |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
889 |
|change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
890 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
891 |
change := self selectedChangesInM second. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
892 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
893 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
894 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
895 |
acceptInSingleView |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
896 |
|change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
897 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
898 |
change := self selectedChangeInA. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
899 |
change isNil ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
900 |
change := self selectedChangeInB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
901 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
902 |
self applyChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
903 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
904 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
905 |
applySelectedChangeInA |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
906 |
self applyChange:(self selectedChangeInA) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
907 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
908 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
909 |
applySelectedChangeInB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
910 |
self applyChange:(self selectedChangeInB) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
911 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
912 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
913 |
methodInADoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
914 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
915 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
916 |
"/ change := self changeSetA at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
917 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
918 |
self browseClassInA |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
919 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
920 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
921 |
methodInBDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
922 |
"/ |change| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
923 |
"/ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
924 |
"/ change := self changeSetB at:index. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
925 |
"/ self browseChange:change |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
926 |
self browseClassInB |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
927 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
928 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
929 |
methodInChangedDoubleClicked:index |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
930 |
self browseClassInM. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
931 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
932 |
|
2221 | 933 |
methodsChangedSelectionChanged |
3147 | 934 |
" |
935 |
the selection in the list of the 'changed methods' changed. |
|
936 |
Reset the selection of the two other lists and calc the method change. |
|
2507 | 937 |
|
3147 | 938 |
<return: self> |
939 |
" |
|
8602 | 940 |
|sel changeA changeB methodsChanged parseError treeA treeB| |
941 |
||
942 |
self infoHolder value:''. |
|
2221 | 943 |
|
944 |
sel := self methodsChangedSelection value. |
|
945 |
sel notNil ifTrue:[ |
|
946 |
self methodsOnlyInASelection value:nil. |
|
947 |
self methodsOnlyInBSelection value:nil. |
|
2695 | 948 |
methodsChanged := self classChangeSet methodsChanged. |
949 |
changeA := (methodsChanged at:sel) first. |
|
950 |
changeB := (methodsChanged at:sel) second. |
|
2501 | 951 |
self withReadCursorDo:[ |
8602 | 952 |
"/ see if the semantics have changed (or only prettyPrinted) |
953 |
RBParser notNil ifTrue:[ |
|
954 |
(classChangeSet notNil |
|
955 |
and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[ |
|
956 |
parseError := false. |
|
957 |
treeA := RBParser parseMethod:changeA source onError: [:str :pos | parseError := true]. |
|
958 |
treeB := RBParser parseMethod:changeB source onError: [:str :pos | parseError := true]. |
|
8629 | 959 |
parseError ifFalse:[ |
960 |
(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
|
961 |
self infoHolder value:'Methods only differ in formatting / comments.'. |
|
962 |
] |
|
8602 | 963 |
] |
964 |
]. |
|
965 |
]. |
|
966 |
self diffTextView |
|
967 |
text1:(changeA prettyPrintedSource) text2:(changeB prettyPrintedSource); |
|
968 |
moveToNextChanged |
|
2377 | 969 |
]. |
2221 | 970 |
self showDiffTextView. |
971 |
] |
|
2377 | 972 |
|
973 |
"Modified: / 3.9.1999 / 15:01:30 / ps" |
|
2221 | 974 |
! |
975 |
||
976 |
methodsOnlyInASelectionChanged |
|
3147 | 977 |
" |
978 |
the selection in the list of the 'method only in version A' changed. |
|
979 |
Reset the selection of the two other lists and show the method in |
|
980 |
the text view. |
|
2507 | 981 |
|
3147 | 982 |
<return: self> |
983 |
" |
|
2221 | 984 |
|change sel| |
985 |
||
8602 | 986 |
self infoHolder value:''. |
987 |
||
2221 | 988 |
sel := self methodsOnlyInASelection value. |
989 |
sel notNil ifTrue:[ |
|
990 |
self methodsOnlyInBSelection value:nil. |
|
991 |
self methodsChangedSelection value:nil. |
|
2497 | 992 |
change := self changeSetA at:sel. |
3051 | 993 |
self methodText value:(change prettyPrintedSource). |
2221 | 994 |
self showSingleTextView. |
995 |
] |
|
996 |
! |
|
997 |
||
998 |
methodsOnlyInBSelectionChanged |
|
3147 | 999 |
" |
1000 |
the selection in the list of the 'method only in version B' changed. |
|
1001 |
Reset the selection of the two other lists and show the method in |
|
1002 |
the text view. |
|
2507 | 1003 |
|
3147 | 1004 |
<return: self> |
1005 |
" |
|
2221 | 1006 |
|change sel| |
1007 |
||
8602 | 1008 |
self infoHolder value:''. |
1009 |
||
2221 | 1010 |
sel := self methodsOnlyInBSelection value. |
1011 |
sel notNil ifTrue:[ |
|
1012 |
self methodsOnlyInASelection value:nil. |
|
1013 |
self methodsChangedSelection value:nil. |
|
2497 | 1014 |
change := self changeSetB at:sel. |
3051 | 1015 |
self methodText value:(change prettyPrintedSource). |
2221 | 1016 |
self showSingleTextView. |
1017 |
] |
|
9550
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1018 |
! |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1019 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1020 |
removeSelectedChangeInBFromImage |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1021 |
|change cls sel op| |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1022 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1023 |
change := self selectedChangeInB. |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1024 |
change isMethodChange ifTrue:[ |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1025 |
(cls := change changeClass) notNil ifTrue:[ |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1026 |
(sel := change selector) notNil ifTrue:[ |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1027 |
RefactoryChangeManager notNil ifTrue:[ |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1028 |
op := RemoveMethodChange remove:sel from:cls. |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1029 |
RefactoryChangeManager performChange: op. |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1030 |
] ifFalse:[ |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1031 |
cls removeSelector:sel |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1032 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1033 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1034 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1035 |
] |
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1036 |
|
531c77d5d3e3
added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents:
9383
diff
changeset
|
1037 |
"Modified: / 15-08-2010 / 21:35:00 / cg" |
2221 | 1038 |
! ! |
1039 |
||
1040 |
!VersionDiffBrowser methodsFor:'aspects'! |
|
1041 |
||
2585 | 1042 |
boxAVisible |
2745 | 1043 |
boxAVisible isNil ifTrue:[ |
1044 |
boxAVisible := true asValue. |
|
2585 | 1045 |
]. |
2745 | 1046 |
^ boxAVisible. |
2585 | 1047 |
! |
1048 |
||
1049 |
boxBVisible |
|
2745 | 1050 |
boxBVisible isNil ifTrue:[ |
1051 |
boxBVisible := true asValue. |
|
2585 | 1052 |
]. |
2745 | 1053 |
^ boxBVisible. |
2585 | 1054 |
! |
1055 |
||
1056 |
boxMVisible |
|
2745 | 1057 |
boxMVisible isNil ifTrue:[ |
1058 |
boxMVisible := true asValue. |
|
2585 | 1059 |
]. |
2745 | 1060 |
^ boxMVisible. |
2585 | 1061 |
! |
1062 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1063 |
canIncludeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1064 |
"can include extensions ? (menu item enabler)" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1065 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1066 |
canIncludeExtensionsHolder isNil ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1067 |
canIncludeExtensionsHolder := true asValue. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1068 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1069 |
^ canIncludeExtensionsHolder. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1070 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1071 |
|
2221 | 1072 |
changedLabelHolder |
3147 | 1073 |
" |
1074 |
aspect for the label of the changed method box. |
|
2221 | 1075 |
|
3147 | 1076 |
<return: ValueHolder on: nil> |
1077 |
" |
|
2221 | 1078 |
|
3147 | 1079 |
changedLabelHolder isNil ifTrue:[ |
1080 |
changedLabelHolder := ValueHolder new. |
|
2221 | 1081 |
]. |
3147 | 1082 |
^ changedLabelHolder. |
2221 | 1083 |
! |
1084 |
||
1085 |
diffTextLabelA |
|
3147 | 1086 |
" |
1087 |
aspect for the label for version A. |
|
2221 | 1088 |
|
3147 | 1089 |
<return: ValueHolder on: nil> |
1090 |
" |
|
2221 | 1091 |
|
3147 | 1092 |
diffTextLabelA isNil ifTrue:[ |
1093 |
diffTextLabelA := ValueHolder new. |
|
2221 | 1094 |
]. |
3147 | 1095 |
^ diffTextLabelA. |
2221 | 1096 |
! |
1097 |
||
1098 |
diffTextLabelB |
|
3147 | 1099 |
" |
1100 |
aspect for the label for version B. |
|
2221 | 1101 |
|
3147 | 1102 |
<return: ValueHolder on: nil> |
1103 |
" |
|
2221 | 1104 |
|
3147 | 1105 |
diffTextLabelB isNil ifTrue:[ |
1106 |
diffTextLabelB := ValueHolder new. |
|
2221 | 1107 |
]. |
3147 | 1108 |
^ diffTextLabelB. |
2221 | 1109 |
! |
1110 |
||
2497 | 1111 |
diffTextView |
3147 | 1112 |
" |
1113 |
return the component for the diff text view. |
|
2497 | 1114 |
|
3147 | 1115 |
<return: HVScrollableView> |
1116 |
" |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1117 |
|v| |
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1118 |
|
2497 | 1119 |
diffTextView isNil ifTrue:[ |
8103 | 1120 |
v := DiffCodeView basicNew. |
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1121 |
v textViewClass:CodeView. |
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1122 |
v initialize. |
2497 | 1123 |
diffTextView := HVScrollableView |
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1124 |
forView:v |
2497 | 1125 |
miniScrollerH:true miniScrollerV:false. |
1126 |
diffTextView addNextPreviousButtons. |
|
1127 |
]. |
|
1128 |
^ diffTextView |
|
7364
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1129 |
|
e7613aec8035
use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents:
7108
diff
changeset
|
1130 |
"Modified: / 06-10-2006 / 14:30:42 / cg" |
2497 | 1131 |
! |
1132 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1133 |
includeExtensionsHolder |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1134 |
"only compare base-methods or include extensions ?" |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1135 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1136 |
includeExtensionsHolder isNil ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1137 |
includeExtensionsHolder := false asValue. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1138 |
includeExtensionsHolder onChangeSend:#updateLists to:self. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1139 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1140 |
^ includeExtensionsHolder. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1141 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1142 |
|
8602 | 1143 |
infoHolder |
1144 |
infoHolder isNil ifTrue:[ |
|
1145 |
infoHolder := ValueHolder new. |
|
1146 |
]. |
|
1147 |
^ infoHolder. |
|
1148 |
! |
|
1149 |
||
2221 | 1150 |
methodText |
3147 | 1151 |
" |
1152 |
aspect for the text in the method text view. |
|
2221 | 1153 |
|
3147 | 1154 |
<return: ValueHolder on: nil> |
1155 |
" |
|
2221 | 1156 |
|
3147 | 1157 |
methodText isNil ifTrue:[ |
1158 |
methodText := ValueHolder new. |
|
2221 | 1159 |
]. |
3147 | 1160 |
^ methodText. |
2221 | 1161 |
! |
1162 |
||
1163 |
methodsChanged |
|
3147 | 1164 |
" |
1165 |
aspect for the 'changed method' list. |
|
2221 | 1166 |
|
3147 | 1167 |
<return: List> |
1168 |
" |
|
2221 | 1169 |
|
3147 | 1170 |
methodsChanged isNil ifTrue:[ |
1171 |
methodsChanged := List new. |
|
2221 | 1172 |
]. |
3147 | 1173 |
^ methodsChanged. |
2221 | 1174 |
! |
1175 |
||
1176 |
methodsChangedSelection |
|
3147 | 1177 |
" |
1178 |
aspect for the selection holder of 'changed method'-list. |
|
2221 | 1179 |
|
3147 | 1180 |
<return: ValueHolder on: nil> |
1181 |
" |
|
2221 | 1182 |
|
3147 | 1183 |
methodsChangedSelection isNil ifTrue:[ |
1184 |
methodsChangedSelection := ValueHolder new. |
|
2221 | 1185 |
]. |
3147 | 1186 |
^ methodsChangedSelection. |
2221 | 1187 |
! |
1188 |
||
1189 |
methodsOnlyInA |
|
6828 | 1190 |
"aspect for the 'method only in version A' list." |
2221 | 1191 |
|
3147 | 1192 |
methodsOnlyInA isNil ifTrue:[ |
1193 |
methodsOnlyInA := List new. |
|
2221 | 1194 |
]. |
3147 | 1195 |
^ methodsOnlyInA. |
6828 | 1196 |
|
1197 |
"Modified: / 25-07-2006 / 11:14:43 / cg" |
|
2221 | 1198 |
! |
1199 |
||
1200 |
methodsOnlyInASelection |
|
6828 | 1201 |
"aspect for the selection holder of 'method only in version A'-list." |
2221 | 1202 |
|
3147 | 1203 |
methodsOnlyInASelection isNil ifTrue:[ |
1204 |
methodsOnlyInASelection := ValueHolder new. |
|
2221 | 1205 |
]. |
3147 | 1206 |
^ methodsOnlyInASelection. |
6828 | 1207 |
|
1208 |
"Modified: / 25-07-2006 / 11:14:53 / cg" |
|
2221 | 1209 |
! |
1210 |
||
1211 |
methodsOnlyInB |
|
6828 | 1212 |
"aspect for the 'method only in version B' list" |
2221 | 1213 |
|
3147 | 1214 |
methodsOnlyInB isNil ifTrue:[ |
1215 |
methodsOnlyInB := List new. |
|
2221 | 1216 |
]. |
3147 | 1217 |
^ methodsOnlyInB. |
6828 | 1218 |
|
1219 |
"Modified: / 25-07-2006 / 11:14:48 / cg" |
|
2221 | 1220 |
! |
1221 |
||
1222 |
methodsOnlyInBSelection |
|
6828 | 1223 |
"aspect for the selection holder of 'method only in version B'-list." |
2221 | 1224 |
|
3147 | 1225 |
methodsOnlyInBSelection isNil ifTrue:[ |
1226 |
methodsOnlyInBSelection := ValueHolder new. |
|
2221 | 1227 |
]. |
3147 | 1228 |
^ methodsOnlyInBSelection. |
6828 | 1229 |
|
1230 |
"Modified: / 25-07-2006 / 11:15:00 / cg" |
|
2221 | 1231 |
! |
1232 |
||
1233 |
onlyInALabelHolder |
|
6828 | 1234 |
"aspect for the label for 'method only in version A'." |
2221 | 1235 |
|
3147 | 1236 |
onlyInALabelHolder isNil ifTrue:[ |
1237 |
onlyInALabelHolder := ValueHolder new. |
|
2221 | 1238 |
]. |
3147 | 1239 |
^ onlyInALabelHolder. |
6828 | 1240 |
|
1241 |
"Modified: / 25-07-2006 / 11:15:12 / cg" |
|
2221 | 1242 |
! |
1243 |
||
1244 |
onlyInBLabelHolder |
|
6828 | 1245 |
"aspect for the label for 'method only in version B'." |
2221 | 1246 |
|
3147 | 1247 |
onlyInBLabelHolder isNil ifTrue:[ |
1248 |
onlyInBLabelHolder := ValueHolder new. |
|
2221 | 1249 |
]. |
3147 | 1250 |
^ onlyInBLabelHolder. |
6828 | 1251 |
|
1252 |
"Modified: / 25-07-2006 / 11:15:07 / cg" |
|
2221 | 1253 |
! ! |
1254 |
||
2725 | 1255 |
!VersionDiffBrowser methodsFor:'aspects-exported'! |
2695 | 1256 |
|
1257 |
changedLabelHolder:aValueHolder |
|
1258 |
builder aspectAt:#changedLabelHolder put:aValueHolder. |
|
1259 |
||
1260 |
! |
|
1261 |
||
1262 |
classHolder:aValueHolder |
|
5182 | 1263 |
classHolder notNil ifTrue:[ |
1264 |
classHolder removeDependent:self |
|
2695 | 1265 |
]. |
5182 | 1266 |
classHolder := aValueHolder. |
1267 |
classHolder notNil ifTrue:[ |
|
1268 |
classHolder addDependent:self |
|
2695 | 1269 |
] |
1270 |
! |
|
1271 |
||
1272 |
onlyInALabelHolder:aValueHolder |
|
1273 |
builder aspectAt:#onlyInALabelHolder put:aValueHolder. |
|
1274 |
! |
|
1275 |
||
1276 |
onlyInBLabelHolder:aValueHolder |
|
1277 |
builder aspectAt:#onlyInBLabelHolder put:aValueHolder. |
|
1278 |
! |
|
1279 |
||
1280 |
versionAHolder:aValueHolder |
|
5182 | 1281 |
versionAHolder notNil ifTrue:[ |
1282 |
versionAHolder removeDependent:self |
|
2695 | 1283 |
]. |
5182 | 1284 |
versionAHolder := aValueHolder. |
1285 |
versionAHolder notNil ifTrue:[ |
|
1286 |
versionAHolder addDependent:self |
|
2695 | 1287 |
] |
1288 |
! |
|
1289 |
||
1290 |
versionBHolder:aValueHolder |
|
5182 | 1291 |
versionBHolder notNil ifTrue:[ |
1292 |
versionBHolder removeDependent:self |
|
2695 | 1293 |
]. |
5182 | 1294 |
versionBHolder := aValueHolder. |
1295 |
versionBHolder notNil ifTrue:[ |
|
1296 |
versionBHolder addDependent:self |
|
2695 | 1297 |
] |
1298 |
! ! |
|
1299 |
||
4359 | 1300 |
!VersionDiffBrowser methodsFor:'aspects-menu'! |
1301 |
||
1302 |
canAcceptInCodeView |
|
1303 |
^ self hasChangeSelectedInA |
|
1304 |
or:[self hasChangeSelectedInB |
|
1305 |
or:[self hasChangeSelectedInM]] |
|
1306 |
! |
|
1307 |
||
1308 |
hasChangeSelectedInA |
|
1309 |
^ self selectedChangeInA notNil |
|
1310 |
! |
|
1311 |
||
1312 |
hasChangeSelectedInB |
|
1313 |
^ self selectedChangeInB notNil |
|
1314 |
! |
|
1315 |
||
1316 |
hasChangeSelectedInM |
|
1317 |
^ self methodsChangedSelection value notNil |
|
1318 |
! ! |
|
1319 |
||
2695 | 1320 |
!VersionDiffBrowser methodsFor:'change & update'! |
1321 |
||
1322 |
update:something with:parameter from:changedObject |
|
1323 |
(changedObject == classHolder |
|
1324 |
or:[changedObject == versionAHolder |
|
1325 |
or:[changedObject == versionBHolder]]) ifTrue:[ |
|
1326 |
self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value) |
|
1327 |
. ^ self |
|
1328 |
]. |
|
1329 |
super update:something with:parameter from:changedObject |
|
1330 |
! ! |
|
1331 |
||
2221 | 1332 |
!VersionDiffBrowser methodsFor:'initialization & release'! |
1333 |
||
1334 |
postBuildWith:aBuilder |
|
3147 | 1335 |
" |
1336 |
components which are invisible should be ignored by the panel. |
|
1337 |
Cannot be set via the interface builder. |
|
2221 | 1338 |
|
3147 | 1339 |
<return: self> |
1340 |
" |
|
1341 |
||
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1342 |
(self componentAt:#TopHorizontalPanel) ignoreInvisibleComponents:true. |
6642 | 1343 |
super postBuildWith:aBuilder |
2221 | 1344 |
! ! |
1345 |
||
1346 |
!VersionDiffBrowser methodsFor:'menu action'! |
|
1347 |
||
2465 | 1348 |
browseChange:aChange |
6828 | 1349 |
"browse the change in aChange" |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1350 |
|
7396 | 1351 |
|cls sel m browserClass| |
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
1352 |
|
2578
29264fb3847e
avoid debugger in browse-menu
Claus Gittinger <cg@exept.de>
parents:
2536
diff
changeset
|
1353 |
aChange isNil ifTrue:[^ self]. |
7396 | 1354 |
browserClass := UserPreferences systemBrowserClass. |
1355 |
||
2650
447c99ac6f76
oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents:
2626
diff
changeset
|
1356 |
cls := aChange changeClass. |
7396 | 1357 |
aChange isMethodChange ifTrue:[ |
1358 |
sel := aChange changeSelector. |
|
1359 |
"/ (cls compiledMethodAt:sel) isNil ifTrue:[ |
|
1360 |
"/ (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[ |
|
1361 |
"/ browserClass openInClass:cls |
|
1362 |
"/ ]. |
|
1363 |
"/ sel := nil. |
|
1364 |
"/ ] |
|
1365 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1366 |
self withWaitCursorDo:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1367 |
browserClass openInClass:cls selector:sel. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1368 |
] |
6828 | 1369 |
|
7396 | 1370 |
"Modified: / 12-10-2006 / 23:58:40 / cg" |
2465 | 1371 |
! |
1372 |
||
1373 |
browseClassInA |
|
6828 | 1374 |
"browse the selected method." |
1375 |
self browseChange:(self selectedChangeInA). |
|
2507 | 1376 |
|
6828 | 1377 |
"Modified: / 25-07-2006 / 11:14:02 / cg" |
2465 | 1378 |
! |
2221 | 1379 |
|
2465 | 1380 |
browseClassInB |
6828 | 1381 |
"browse the selected method." |
1382 |
self browseChange:(self selectedChangeInB). |
|
2507 | 1383 |
|
6828 | 1384 |
"Modified: / 25-07-2006 / 11:13:58 / cg" |
2465 | 1385 |
! |
1386 |
||
1387 |
browseClassInM |
|
6828 | 1388 |
"browse the selected method." |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1389 |
|
6828 | 1390 |
self browseChange:(self selectedChangesInM first). |
2507 | 1391 |
|
6828 | 1392 |
"Modified: / 25-07-2006 / 11:13:54 / cg" |
2465 | 1393 |
! |
1394 |
||
2469 | 1395 |
createPatchFile |
2856 | 1396 |
"create a patchFile, to patch the old version (versionB) into the new version (versionA). |
1397 |
I.e. a little changeFile to transport those changes." |
|
1398 |
||
6828 | 1399 |
|defaultName f oldVersion newVersion vsnMthdA vsnMthdB vsnA vsnB info classBeingCompared| |
2856 | 1400 |
|
1401 |
defaultName := 'patchFile.chg'. |
|
2469 | 1402 |
|
6828 | 1403 |
classBeingCompared := classChangeSet classBeingCompared. |
1404 |
classBeingCompared notNil ifTrue:[ |
|
1405 |
defaultName := classBeingCompared nameWithoutPrefix. |
|
2856 | 1406 |
classChangeSet versionA notNil ifTrue:[ |
1407 |
defaultName := defaultName , '-'. |
|
1408 |
defaultName := defaultName , classChangeSet versionA. |
|
1409 |
classChangeSet versionB notNil ifTrue:[ |
|
1410 |
defaultName := defaultName , '-'. |
|
1411 |
defaultName := defaultName , classChangeSet versionB. |
|
1412 |
]. |
|
1413 |
]. |
|
1414 |
defaultName := defaultName , '.chg'. |
|
1415 |
]. |
|
1416 |
f := Dialog |
|
9602 | 1417 |
requestFileNameForSave:'Name of patchFile:' |
2856 | 1418 |
default:defaultName. |
1419 |
self warn:'Sorry: This function is not yet implemented'. |
|
2730 | 1420 |
^ self. |
1421 |
||
3103 | 1422 |
"/ vsnMthdA := self changeSetA |
1423 |
"/ detect:[:ch | ch isMethodChange |
|
1424 |
"/ and:[ch changeClass isMeta |
|
1425 |
"/ and:[ch changeSelector = #version]]] |
|
1426 |
"/ ifNone:nil. |
|
1427 |
"/ vsnMthdB := self changeSetA |
|
1428 |
"/ detect:[:ch | ch isMethodChange |
|
1429 |
"/ and:[ch changeClass isMeta |
|
1430 |
"/ and:[ch changeSelector = #version]]] |
|
1431 |
"/ ifNone:nil. |
|
1432 |
"/ |
|
1433 |
"/ vsnMthdA notNil ifTrue:[ |
|
1434 |
"/ "/ extract the version |
|
1435 |
"/ vsnA := Class revisionStringFromSource:vsnMthdA source. |
|
1436 |
"/ vsnA notNil ifTrue:[ |
|
1437 |
"/ info := Class revisionInfoFromString:vsnA. |
|
1438 |
"/ info notNil ifTrue:[ |
|
1439 |
"/ vsnA := info at:#revision ifAbsent:nil. |
|
1440 |
"/ ] ifFalse:[ |
|
1441 |
"/ vsnA := nil. |
|
1442 |
"/ ]. |
|
1443 |
"/ ]. |
|
1444 |
"/ ]. |
|
1445 |
"/ vsnMthdB notNil ifTrue:[ |
|
1446 |
"/ "/ extract the version |
|
1447 |
"/ vsnB := Class revisionStringFromSource:vsnMthdB source. |
|
1448 |
"/ vsnB notNil ifTrue:[ |
|
1449 |
"/ info := Class revisionInfoFromString:vsnB. |
|
1450 |
"/ info notNil ifTrue:[ |
|
1451 |
"/ vsnB := info at:#revision ifAbsent:nil. |
|
1452 |
"/ ] ifFalse:[ |
|
1453 |
"/ vsnB := nil. |
|
1454 |
"/ ]. |
|
1455 |
"/ ]. |
|
1456 |
"/ ]. |
|
1457 |
"/ |
|
1458 |
"/ (vsnA isNil or:[vsnB isNil or:[vsnA = vsnB]]) ifTrue:[ |
|
1459 |
"/ self warn:'The generated patch file will not be able to validate/update the class version'. |
|
1460 |
"/ ]. |
|
1461 |
"/ |
|
1462 |
"/self halt:'not yet finished'. |
|
6828 | 1463 |
|
9602 | 1464 |
"Modified: / 27-10-2010 / 11:34:58 / cg" |
2469 | 1465 |
! |
1466 |
||
2465 | 1467 |
inspectSelectedChangeInA |
6828 | 1468 |
"inspect the selected method change for the 'method only in version A'." |
2507 | 1469 |
|
2465 | 1470 |
self selectedChangeInA inspect. |
6828 | 1471 |
|
1472 |
"Modified: / 25-07-2006 / 11:13:30 / cg" |
|
2221 | 1473 |
! |
1474 |
||
1475 |
inspectSelectedChangeInB |
|
6828 | 1476 |
"inspect the selected method change for the 'method only in version B'." |
2507 | 1477 |
|
2465 | 1478 |
self selectedChangeInB inspect. |
6828 | 1479 |
|
1480 |
"Modified: / 25-07-2006 / 11:13:22 / cg" |
|
2465 | 1481 |
! |
1482 |
||
1483 |
inspectSelectedChangeInM |
|
6828 | 1484 |
"inspect the two method changes for the selected 'changed method'." |
2507 | 1485 |
|
2465 | 1486 |
|changes| |
1487 |
||
1488 |
changes := self selectedChangesInM. |
|
1489 |
changes do:[:change | |
|
1490 |
change inspect |
|
1491 |
]. |
|
6828 | 1492 |
|
1493 |
"Modified: / 25-07-2006 / 11:13:13 / cg" |
|
2465 | 1494 |
! |
1495 |
||
2501 | 1496 |
mainMenu |
6828 | 1497 |
"if this application runs as an subapplication, |
1498 |
the menu bar should not be used." |
|
2507 | 1499 |
|
2501 | 1500 |
self masterApplication isNil ifTrue:[ |
1501 |
^ self class mainMenu |
|
1502 |
]. |
|
1503 |
^ nil |
|
6828 | 1504 |
|
1505 |
"Modified: / 25-07-2006 / 11:13:44 / cg" |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1506 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1507 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1508 |
openDocumentation |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1509 |
HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF' |
2221 | 1510 |
! ! |
1511 |
||
1512 |
!VersionDiffBrowser methodsFor:'private'! |
|
1513 |
||
2745 | 1514 |
addAcceptToTextViewMenus |
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1515 |
"add to the standard diff text view or single text views menu an accept entry. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1516 |
The acceptAction will fetch the corresponding change and apply it |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1517 |
(not the shown text) |
2745 | 1518 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1519 |
<return: self> |
3147 | 1520 |
" |
2745 | 1521 |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1522 |
|diffTextView leftView rightView singleView| |
2745 | 1523 |
|
1524 |
diffTextView := self diffTextView. |
|
1525 |
leftView := diffTextView leftTextView. |
|
1526 |
rightView := diffTextView rightTextView. |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1527 |
singleView := self componentAt:#singleTextView. |
2745 | 1528 |
|
1529 |
(Array |
|
1530 |
with:leftView |
|
1531 |
with:rightView |
|
1532 |
with:singleView) |
|
1533 |
do:[:v | |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1534 |
|mGen| |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1535 |
|
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1536 |
mGen := [ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1537 |
|m| |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1538 |
|
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1539 |
m := v editMenu. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1540 |
|
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1541 |
(m selectorAt:#accept) isNil ifTrue:[ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1542 |
m addLabels:(resources array:#('-' 'Accept')) |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1543 |
selectors:(Array with:nil with:#accept) |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1544 |
after:#copySelection. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1545 |
]. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1546 |
m |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1547 |
actionAt:#accept |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1548 |
put:[ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1549 |
v == singleView ifTrue:[ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1550 |
self acceptInSingleView |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1551 |
] ifFalse:[ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1552 |
v == leftView ifTrue:[ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1553 |
self acceptInLeftView |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1554 |
] ifFalse:[ |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1555 |
self acceptInRightView |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1556 |
]. |
2745 | 1557 |
]. |
1558 |
]. |
|
8657
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1559 |
m selectorAt:#accept put:nil. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1560 |
m enable:#copySelection. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1561 |
m setEnable:#accept to:[self canAcceptInCodeView]. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1562 |
m |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1563 |
]. |
4a54180313b5
enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents:
8629
diff
changeset
|
1564 |
v menuHolder:mGen. |
2745 | 1565 |
v menuMessage:#value. |
1566 |
] |
|
1567 |
! |
|
1568 |
||
3753 | 1569 |
applyChange:change |
1570 |
change notNil ifTrue:[ |
|
1571 |
change apply |
|
1572 |
] |
|
1573 |
! |
|
1574 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1575 |
printStringForChange:aChange |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1576 |
"generate a print string for a change." |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1577 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1578 |
|m changeClassName useChangesString selectorString |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1579 |
singleComparedClass singleComparedClassesName singleComparedMetaclassesName| |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1580 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1581 |
(singleComparedClass := self classBeingCompared) notNil ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1582 |
singleComparedClassesName := singleComparedClass name. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1583 |
singleComparedMetaclassesName := singleComparedClass theMetaclass name. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1584 |
]. |
2497 | 1585 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1586 |
aChange isClassDefinitionChange ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1587 |
^ aChange printStringWithoutClassName |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1588 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1589 |
aChange isDoIt ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1590 |
^ aChange source , ' (doIt)' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1591 |
]. |
3678 | 1592 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1593 |
useChangesString := false. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1594 |
changeClassName := aChange className. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1595 |
(changeClassName = singleComparedClassesName) ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1596 |
changeClassName := ''. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1597 |
useChangesString := true. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1598 |
] ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1599 |
(changeClassName = singleComparedMetaclassesName) ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1600 |
changeClassName := 'class '. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1601 |
useChangesString := true. |
2497 | 1602 |
] ifFalse:[ |
9302 | 1603 |
((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[ |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1604 |
changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1605 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1606 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1607 |
]. |
6272 | 1608 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1609 |
selectorString := ''. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1610 |
(aChange isMethodChange |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1611 |
and:[ aChange changeClass notNil ]) ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1612 |
selectorString := aChange selector. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1613 |
m := aChange changeMethod. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1614 |
m notNil ifTrue:[ |
9587
9f33d5c62efa
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
9550
diff
changeset
|
1615 |
m := m originalMethodIfWrapped. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1616 |
selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass. |
2497 | 1617 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1618 |
selectorString := ' ',selectorString |
2497 | 1619 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1620 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1621 |
aChange isMethodCategoryChange ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1622 |
^ changeClassName,selectorString, ' (category)' |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1623 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1624 |
^ changeClassName,selectorString |
9587
9f33d5c62efa
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
9550
diff
changeset
|
1625 |
|
9f33d5c62efa
changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents:
9550
diff
changeset
|
1626 |
"Modified: / 22-10-2010 / 12:36:34 / cg" |
2497 | 1627 |
! |
1628 |
||
2501 | 1629 |
resetSelectionHolders |
3147 | 1630 |
" |
1631 |
reset all selection holders when a new change set is given. |
|
1632 |
First set the selection to nil. |
|
2507 | 1633 |
|
3147 | 1634 |
<return: self> |
1635 |
" |
|
2501 | 1636 |
|
1637 |
self methodsChangedSelection value:nil. |
|
1638 |
self methodsOnlyInASelection value:nil. |
|
1639 |
self methodsOnlyInBSelection value:nil. |
|
2507 | 1640 |
self diffTextView text1:'' text2:''. |
1641 |
self methodText value:''. |
|
1642 |
||
1643 |
"/ self methodsChangedSelectionChanged. |
|
1644 |
"/ self methodsOnlyInASelectionChanged. |
|
1645 |
"/ self methodsOnlyInBSelectionChanged. |
|
2501 | 1646 |
! |
1647 |
||
2221 | 1648 |
showDiffTextView |
3147 | 1649 |
" |
1650 |
if a method change is selected, then show the diff text view. |
|
1651 |
Add an accept entry to the popup menu. |
|
2507 | 1652 |
|
3147 | 1653 |
<return: self> |
1654 |
" |
|
2694 | 1655 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1656 |
(self componentAt:#diffTextViewBox) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1657 |
(self componentAt:#singleTextView) beInvisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1658 |
(self componentAt:#diffTextView) realizeAllSubViews. |
2694 | 1659 |
|
2465 | 1660 |
self addAcceptToTextViewMenus. |
2221 | 1661 |
! |
1662 |
||
1663 |
showSingleTextView |
|
3147 | 1664 |
" |
1665 |
if a method is selected which is only in version A or B of the class, |
|
1666 |
then show the text view. |
|
1667 |
Add an accept entry to the popup menu. |
|
2507 | 1668 |
|
3147 | 1669 |
<return: self> |
1670 |
" |
|
2507 | 1671 |
|
3843
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1672 |
(self componentAt:#singleTextView) raise; beVisible. |
673fbeb191c9
builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents:
3839
diff
changeset
|
1673 |
(self componentAt:#diffTextViewBox) beInvisible. |
2501 | 1674 |
self addAcceptToTextViewMenus. |
2221 | 1675 |
! |
1676 |
||
2497 | 1677 |
updateLabels |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1678 |
"update the labels of the diff text view. Show the version numbers |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1679 |
of the class." |
2221 | 1680 |
|
2694 | 1681 |
|theVersionA theVersionB builder| |
2224 | 1682 |
|
2694 | 1683 |
builder := self builder. |
2497 | 1684 |
(theVersionA := self versionA) notNil ifTrue:[ |
1685 |
self diffTextLabelA value:theVersionA. |
|
2726 | 1686 |
self onlyInALabelHolder value:('Only in ' , theVersionA). |
7396 | 1687 |
(self componentAt:#OnlyInALabel) |
1688 |
foregroundColor:Color white; |
|
1689 |
backgroundColor:Color green darkened. |
|
2224 | 1690 |
]. |
2497 | 1691 |
(theVersionB :=self versionB) notNil ifTrue:[ |
1692 |
self diffTextLabelB value:theVersionB. |
|
2726 | 1693 |
self onlyInBLabelHolder value:('Only in ' , theVersionB). |
7396 | 1694 |
(self componentAt:#OnlyInBLabel) |
1695 |
foregroundColor:Color white; |
|
1696 |
backgroundColor:Color red darkened. |
|
2224 | 1697 |
]. |
7396 | 1698 |
|
1699 |
self changedLabelHolder value:('Different'). |
|
1700 |
||
1701 |
"Modified: / 13-10-2006 / 01:07:08 / cg" |
|
2224 | 1702 |
! |
1703 |
||
1704 |
updateLists |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1705 |
|classChangeSet listOnlyInA listOnlyInB listChanged |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1706 |
printStringGenerator sortBlockForChangeLists filteredList |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1707 |
isExtensionChange numIgnoredExtensions| |
2230
5e10eebb1de2
move change-compare code to where it belongs (Change-hierarchy)
Claus Gittinger <cg@exept.de>
parents:
2229
diff
changeset
|
1708 |
|
2585 | 1709 |
classChangeSet := self classChangeSet. |
1710 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1711 |
printStringGenerator := [:aChange | self printStringForChange:aChange]. |
3839 | 1712 |
sortBlockForChangeLists := [:a :b | (printStringGenerator value:a) < (printStringGenerator value:b)]. |
1713 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1714 |
numIgnoredExtensions := 0. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1715 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1716 |
isExtensionChange := |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1717 |
[:change | |
9242 | 1718 |
|packageOfMethodInChange packageOfMethodInImage changeMethod ignored| |
1719 |
||
1720 |
ignored := false. |
|
9259 | 1721 |
change isMethodCodeChange ifTrue:[ |
1722 |
packageOfMethodInChange := change package. |
|
1723 |
(packageOfMethodInChange notNil |
|
1724 |
and:[ packageOfMethodInChange ~= PackageId noProjectID |
|
1725 |
and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[ |
|
1726 |
ignored := true |
|
1727 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1728 |
|
9259 | 1729 |
changeMethod := change changeMethod. |
1730 |
changeMethod notNil ifTrue:[ |
|
1731 |
packageOfMethodInImage := changeMethod package. |
|
1732 |
(packageOfMethodInImage notNil |
|
1733 |
and:[ packageOfMethodInImage ~= PackageId noProjectID |
|
1734 |
and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[ |
|
1735 |
ignored := true |
|
1736 |
]. |
|
9242 | 1737 |
]. |
9259 | 1738 |
numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]). |
9242 | 1739 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1740 |
ignored. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1741 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1742 |
|
2731 | 1743 |
listOnlyInA := self methodsOnlyInA. |
1744 |
listOnlyInA removeAll. |
|
1745 |
classChangeSet notNil ifTrue:[ |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1746 |
"/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1747 |
filteredList := classChangeSet methodsOnlyInA. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1748 |
includeExtensionsHolder value ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1749 |
filteredList := filteredList reject:isExtensionChange. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1750 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1751 |
listOnlyInA addAll: (filteredList collect:printStringGenerator). |
2731 | 1752 |
]. |
2585 | 1753 |
|
2731 | 1754 |
listOnlyInB := self methodsOnlyInB. |
1755 |
listOnlyInB removeAll. |
|
1756 |
classChangeSet notNil ifTrue:[ |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1757 |
"/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1758 |
filteredList := classChangeSet methodsOnlyInB. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1759 |
includeExtensionsHolder value ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1760 |
filteredList := filteredList reject:isExtensionChange. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1761 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1762 |
listOnlyInB addAll: (filteredList collect:printStringGenerator). |
2731 | 1763 |
]. |
2221 | 1764 |
|
2731 | 1765 |
listChanged := self methodsChanged. |
1766 |
listChanged removeAll. |
|
1767 |
classChangeSet notNil ifTrue:[ |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1768 |
"/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1769 |
filteredList := classChangeSet methodsChanged. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1770 |
includeExtensionsHolder value ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1771 |
filteredList := filteredList reject:[:entry | isExtensionChange value:entry first]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1772 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1773 |
listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]). |
2731 | 1774 |
]. |
2221 | 1775 |
|
2731 | 1776 |
self boxAVisible value:(listOnlyInA notEmpty). |
1777 |
self boxBVisible value:(listOnlyInB notEmpty). |
|
2221 | 1778 |
|
2731 | 1779 |
self boxMVisible value:(listChanged isEmpty |
1780 |
and: [(listOnlyInA notEmpty |
|
1781 |
or:[listOnlyInB notEmpty])]) not. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1782 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1783 |
numIgnoredExtensions ~~ 0 ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1784 |
infoHolder value:('%1 extension methods ignored.' bindWith:numIgnoredExtensions) |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1785 |
] ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1786 |
infoHolder value:nil |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1787 |
]. |
2221 | 1788 |
! ! |
1789 |
||
2501 | 1790 |
!VersionDiffBrowser methodsFor:'setup'! |
1791 |
||
2695 | 1792 |
setupForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1793 |
"compute the class change set for the class aClass of its current version against the repository version A. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1794 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1795 |
are updated." |
2695 | 1796 |
|
2731 | 1797 |
|changeSet| |
1798 |
||
2745 | 1799 |
aClass isNil ifTrue:[ |
1800 |
changeSet := nil |
|
1801 |
] ifFalse:[ |
|
1802 |
aClass isNameSpace ifFalse:[ |
|
1803 |
aClass isLoaded ifTrue:[ |
|
1804 |
changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA). |
|
1805 |
] |
|
1806 |
]. |
|
2731 | 1807 |
]. |
2856 | 1808 |
self classChangeSet:changeSet. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
1809 |
aVersionA isNil ifTrue:[ |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1810 |
self class:aClass versionA:'Repository' versionB:'Current'. |
2857
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
1811 |
] ifFalse:[ |
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
1812 |
self class:aClass versionA:aVersionA versionB:(aVersionA , 'm'). |
0c467f6b1741
handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents:
2856
diff
changeset
|
1813 |
] |
2695 | 1814 |
! |
1815 |
||
2949 | 1816 |
setupForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1817 |
"generate the class change set from the two classes A and B. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1818 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1819 |
are updated." |
2949 | 1820 |
|
1821 |
|changeSet| |
|
1822 |
||
1823 |
changeSet := (ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB). |
|
1824 |
self classChangeSet:changeSet |
|
1825 |
! |
|
1826 |
||
2510 | 1827 |
setupForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1828 |
"generate the class change set from the two source files A and B. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1829 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1830 |
are updated." |
2510 | 1831 |
|
2731 | 1832 |
|changeSet| |
1833 |
||
9383 | 1834 |
aClass isRealNameSpace ifFalse:[ |
2731 | 1835 |
aClass isLoaded ifTrue:[ |
1836 |
changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB). |
|
1837 |
] |
|
1838 |
]. |
|
1839 |
self classChangeSet:changeSet |
|
7499 | 1840 |
|
1841 |
"Modified: / 10-11-2006 / 17:15:26 / cg" |
|
2510 | 1842 |
! |
1843 |
||
2501 | 1844 |
setupForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1845 |
"compute the class change set for the class aClass and the versions A and B. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1846 |
When setting the class change set, the labels, list etc. of the receiver |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1847 |
are updated." |
2501 | 1848 |
|
2731 | 1849 |
|changeSet| |
1850 |
||
1851 |
aClass isNameSpace ifFalse:[ |
|
1852 |
aClass isLoaded ifTrue:[ |
|
1853 |
changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB). |
|
1854 |
] |
|
1855 |
]. |
|
2856 | 1856 |
self classChangeSet:changeSet. |
1857 |
self class:aClass versionA:aVersionA versionB:aVersionB. |
|
3678 | 1858 |
! |
1859 |
||
1860 |
setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB |
|
1861 |
|changeSet| |
|
1862 |
||
1863 |
changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB). |
|
1864 |
self classChangeSet:changeSet |
|
2501 | 1865 |
! ! |
1866 |
||
2497 | 1867 |
!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'! |
1868 |
||
2695 | 1869 |
changeSetForClass:aClass |
3756 | 1870 |
"return a ChangeSet for the class aClass and its current source. |
1871 |
The source is generated into a stream and then the change set is generated |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1872 |
from the source stream." |
2695 | 1873 |
|
3756 | 1874 |
^ ChangeSet forExistingClass:aClass. |
2695 | 1875 |
! |
1876 |
||
2497 | 1877 |
changeSetForClass:aClass andRevision:aVersion |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1878 |
"return a ChangeSet for the class aClass and version aVersion. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1879 |
The version from the class source stream is checked out from the repositiory |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1880 |
into a source stream. Then the change set is generated from the source stream." |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1881 |
|
2497 | 1882 |
|theSourceCodeManager theSourceStream theChangeSet| |
1883 |
||
7108 | 1884 |
theSourceCodeManager := SourceCodeManagerUtilities sourceCodeManagerFor:aClass. |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1885 |
[ |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1886 |
theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion. |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1887 |
theSourceStream notNil |
3763 | 1888 |
ifTrue:[theChangeSet := ChangeSet fromStream:theSourceStream] |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1889 |
] ensure:[ |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1890 |
theSourceStream notNil ifTrue:[theSourceStream close] |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1891 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1892 |
self sortChangeSet:theChangeSet. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1893 |
^ theChangeSet |
7108 | 1894 |
|
1895 |
"Modified: / 12-09-2006 / 14:24:51 / cg" |
|
2497 | 1896 |
! |
1897 |
||
1898 |
changeSetForClass:aClass andSource:aSource |
|
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1899 |
"return a ChangeSet for the class aClass and source aSource. |
4638
79734f7bdfc4
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4359
diff
changeset
|
1900 |
The source is converted to a stream and then the change set is generated |
79734f7bdfc4
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4359
diff
changeset
|
1901 |
from the source stream. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1902 |
Raise an error if the source stream cannot be opened." |
4638
79734f7bdfc4
Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents:
4359
diff
changeset
|
1903 |
|
2497 | 1904 |
|theChangeSet theSourceStream| |
1905 |
||
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1906 |
[ |
4653
0a97ce41f5bd
More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents:
4638
diff
changeset
|
1907 |
theSourceStream := aSource readStream. |
0a97ce41f5bd
More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents:
4638
diff
changeset
|
1908 |
theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream) |
3594
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1909 |
] ensure:[ |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1910 |
theSourceStream notNil ifTrue:[ |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1911 |
theSourceStream close |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1912 |
] |
12071dccbbe4
#valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents:
3344
diff
changeset
|
1913 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1914 |
self sortChangeSet:theChangeSet. |
4653
0a97ce41f5bd
More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents:
4638
diff
changeset
|
1915 |
^ theChangeSet |
2497 | 1916 |
! |
1917 |
||
2695 | 1918 |
newForClass:aClass againstVersion:aVersionA |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1919 |
"return a ClassChangeSet for the class aClass against some verson in the repository. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1920 |
A new instance of ClassChangeSet is generated containing |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1921 |
the correspondenting changes." |
2695 | 1922 |
|
8891 | 1923 |
|theClassChangeSet| |
2695 | 1924 |
|
1925 |
theClassChangeSet := self new. |
|
8891 | 1926 |
theClassChangeSet setupForClass:aClass againstVersion:aVersionA. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1927 |
^ theClassChangeSet |
2695 | 1928 |
! |
1929 |
||
2949 | 1930 |
newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1931 |
"return a ClassChangeSet for two classes. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1932 |
A new instance of ClassChangeSet is generated containing the correspondenting changes." |
2949 | 1933 |
|
1934 |
|aStream sourceA sourceB theChangeSetA theChangeSetB theClassChangeSet| |
|
1935 |
||
1936 |
theClassChangeSet := self new. |
|
1937 |
theClassChangeSet classBeingCompared:classA. |
|
1938 |
theClassChangeSet labelA:aLabelA. |
|
1939 |
theClassChangeSet labelB:aLabelB. |
|
1940 |
||
1941 |
aStream := '' writeStream. |
|
1942 |
Method flushSourceStreamCache. |
|
1943 |
classA fileOutOn:aStream withTimeStamp:false. |
|
1944 |
sourceA := aStream contents asString. |
|
1945 |
||
1946 |
aStream := '' writeStream. |
|
1947 |
Method flushSourceStreamCache. |
|
1948 |
classB fileOutOn:aStream withTimeStamp:false. |
|
1949 |
sourceB := aStream contents asString. |
|
1950 |
||
1951 |
theChangeSetA:=self changeSetForClass:classA andSource:sourceA. |
|
1952 |
theChangeSetB:=self changeSetForClass:classB andSource:sourceB. |
|
1953 |
theChangeSetA isNil |
|
1954 |
ifTrue: [theChangeSetA := ChangeSet new]. |
|
1955 |
theChangeSetB isNil |
|
1956 |
ifTrue: [theChangeSetB := ChangeSet new]. |
|
1957 |
||
1958 |
"/ just in case (if comparing a class against another), |
|
1959 |
"/ unify the classes of the changes (to avoid that all changes are detected as different) |
|
1960 |
||
1961 |
theChangeSetB do:[:eachChange | |
|
1962 |
eachChange isMethodChange ifTrue:[ |
|
1963 |
eachChange changeClass isMeta ifTrue:[ |
|
1964 |
eachChange changeClass ~~ classA theMetaclass ifTrue:[ |
|
1965 |
eachChange changeClass:classA theMetaclass. |
|
1966 |
] |
|
1967 |
] ifFalse:[ |
|
1968 |
eachChange changeClass ~~ classA theNonMetaclass ifTrue:[ |
|
1969 |
eachChange changeClass:classA theNonMetaclass. |
|
1970 |
] |
|
1971 |
]. |
|
1972 |
]. |
|
1973 |
]. |
|
1974 |
"/ remove all #initialize doIts |
|
1975 |
theChangeSetA := theChangeSetA select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]]. |
|
1976 |
theChangeSetB := theChangeSetB select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]]. |
|
1977 |
||
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1978 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1979 |
^ theClassChangeSet |
2949 | 1980 |
! |
1981 |
||
2497 | 1982 |
newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
1983 |
"return a ClassChangeSet for the class aClass and the two sources. |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
1984 |
The two classes are compared via the source files. A new instance of |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
1985 |
ClassChangeSet is generated containing the correspondenting changes." |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
1986 |
|
4128 | 1987 |
|theChangeSetA theChangeSetB theClassChangeSet className metaClassName| |
2497 | 1988 |
|
1989 |
theClassChangeSet := self new. |
|
1990 |
theClassChangeSet classBeingCompared:aClass. |
|
1991 |
theClassChangeSet labelA:aLabelA. |
|
1992 |
theClassChangeSet labelB:aLabelB. |
|
1993 |
theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA. |
|
1994 |
theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB. |
|
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
1995 |
|
4128 | 1996 |
className := aClass name. |
1997 |
metaClassName := aClass class name. |
|
1998 |
||
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
1999 |
aClass isPrivate ifTrue:[ |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2000 |
theChangeSetA := theChangeSetA select:[:change | change isMethodChange not |
4128 | 2001 |
or:[change className = className or:[change className = metaClassName]]]. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2002 |
theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not |
4128 | 2003 |
or:[change className = className or:[change className = metaClassName]]]. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2004 |
theChangeSetA := theChangeSetA select:[:change | change isDoIt not |
4128 | 2005 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2006 |
theChangeSetB := theChangeSetB select:[:change | change isMethodChange not |
4128 | 2007 |
or:[change className = className or:[change className = metaClassName]]]. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2008 |
theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not |
4128 | 2009 |
or:[change className = className or:[change className = metaClassName]]]. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2010 |
theChangeSetB := theChangeSetB select:[:change | change isDoIt not |
4128 | 2011 |
or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]]. |
3730
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2012 |
"/ there might be more needed... |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2013 |
]. |
717e425e843e
allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents:
3687
diff
changeset
|
2014 |
|
2497 | 2015 |
theChangeSetA isNil |
2016 |
ifTrue: [theChangeSetA := ChangeSet new]. |
|
2017 |
theChangeSetB isNil |
|
2018 |
ifTrue: [theChangeSetB := ChangeSet new]. |
|
2947 | 2019 |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2020 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2021 |
^ theClassChangeSet |
2465 | 2022 |
! |
2023 |
||
2497 | 2024 |
newForClass:aClass versionA:aVersionA versionB:aVersionB |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2025 |
"return a ClassChangeSet for the class aClass and the two versions. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2026 |
The two class version are checked out from the repository and then being |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2027 |
compared. A new instance of ClassChangeSet is generated containing |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2028 |
the correspondenting changes." |
2497 | 2029 |
|
2030 |
|theChangeSetA theChangeSetB theClassChangeSet| |
|
2031 |
||
2032 |
theClassChangeSet := self new. |
|
2033 |
theClassChangeSet classBeingCompared:aClass. |
|
2856 | 2034 |
theClassChangeSet versionA:aVersionA. |
2035 |
theClassChangeSet versionB:aVersionB. |
|
2497 | 2036 |
theClassChangeSet labelA:aVersionA. |
2037 |
theClassChangeSet labelB:aVersionB. |
|
2038 |
theChangeSetA := self changeSetForClass: aClass andRevision: aVersionA. |
|
2039 |
theChangeSetB := self changeSetForClass: aClass andRevision: aVersionB. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2040 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2041 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2042 |
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2043 |
^ theClassChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2044 |
! |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2045 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2046 |
sortChangeSet:aChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2047 |
"/ sort by meta and selector |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2048 |
|
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2049 |
aChangeSet |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2050 |
sort:[:a :b | |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2051 |
a == b ifTrue:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2052 |
false |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2053 |
] ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2054 |
a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[ |
9241 | 2055 |
a isClassChange == b isClassChange ifTrue:[ |
2056 |
a isClassChange ifTrue:[ |
|
2057 |
a isForMeta == b isForMeta ifTrue:[ |
|
2058 |
a isMethodChange == b isMethodChange ifTrue:[ |
|
2059 |
a className < b className |
|
2060 |
or:[ a className = b className |
|
9325
1ea6a7a8e4dc
Fix handling of primitive*Changes
Stefan Vogel <sv@exept.de>
parents:
9302
diff
changeset
|
2061 |
and:[ a isPrimitiveChange not |
1ea6a7a8e4dc
Fix handling of primitive*Changes
Stefan Vogel <sv@exept.de>
parents:
9302
diff
changeset
|
2062 |
and:[ b isPrimitiveChange not |
9286 | 2063 |
and:[ a selector < b selector ]]]] |
9241 | 2064 |
] ifFalse:[ |
2065 |
a isMethodChange not |
|
2066 |
]. |
|
2067 |
] ifFalse:[ |
|
2068 |
a isForMeta |
|
2069 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2070 |
] ifFalse:[ |
9241 | 2071 |
a printString < b printString |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2072 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2073 |
] ifFalse:[ |
9241 | 2074 |
a isClassChange |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2075 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2076 |
] ifFalse:[ |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2077 |
a isClassDefinitionChange |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2078 |
]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2079 |
] |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2080 |
]. |
2497 | 2081 |
! ! |
2082 |
||
2083 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'! |
|
2084 |
||
2085 |
classBeingCompared |
|
3756 | 2086 |
"returns the value of the class which is compared" |
2497 | 2087 |
|
2088 |
^ classBeingCompared |
|
2089 |
! |
|
2221 | 2090 |
|
2497 | 2091 |
classBeingCompared:something |
3756 | 2092 |
"set the value of the class which is compared" |
2497 | 2093 |
|
2094 |
classBeingCompared := something. |
|
2095 |
! |
|
2096 |
||
2695 | 2097 |
diffSet |
3756 | 2098 |
"returns a diffSet containing the different changes. |
2099 |
it responds to: |
|
2695 | 2100 |
|
3756 | 2101 |
changed OrderedCollection of arrays containing ChangeSets for methods |
2102 |
which are changed and exists in the class versionA and versionB |
|
2103 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
|
2104 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
2105 |
" |
|
2106 |
||
2695 | 2107 |
^ diffSet |
2108 |
! |
|
2109 |
||
2110 |
diffSet:something |
|
3756 | 2111 |
"sets the diffSet containing the different changes. |
2112 |
it responds to: |
|
2695 | 2113 |
|
3756 | 2114 |
changed OrderedCollection of arrays containing ChangeSets for methods |
2115 |
which are changed and exists in the class versionA and versionB |
|
2116 |
onlyInArg ChangeSet for the methods which exists only in the class versionB |
|
2117 |
onlyInReceiver ChangeSet for the methods which exists only in the class versionA |
|
2118 |
" |
|
2695 | 2119 |
|
2120 |
diffSet := something. |
|
2121 |
! |
|
2122 |
||
2497 | 2123 |
labelA |
3756 | 2124 |
"returns the label for the class versionA" |
2497 | 2125 |
|
2126 |
^ labelA |
|
2127 |
! |
|
2128 |
||
2129 |
labelA:something |
|
3756 | 2130 |
"sets the label for the class versionA" |
2497 | 2131 |
|
2132 |
labelA := something. |
|
2133 |
! |
|
2134 |
||
2135 |
labelB |
|
3756 | 2136 |
"returns the label for the class versionB" |
2497 | 2137 |
|
2138 |
^ labelB |
|
2139 |
! |
|
2465 | 2140 |
|
2497 | 2141 |
labelB:something |
3756 | 2142 |
"sets the label for the class versionB" |
2497 | 2143 |
|
2144 |
labelB := something. |
|
2145 |
! |
|
2146 |
||
2147 |
methodsChanged |
|
3756 | 2148 |
"returns an OrderedCollection of arrays containing ChangeSets for methods |
2149 |
which are changed and exists in the class versionA and versionB |
|
2497 | 2150 |
|
3756 | 2151 |
<return: OrderedCollection of Array(2)> |
2152 |
" |
|
2153 |
||
2154 |
^ self diffSet changed |
|
2497 | 2155 |
! |
2156 |
||
2157 |
methodsOnlyInA |
|
3756 | 2158 |
"returns a ChangeSet for the methods which exists only in the class versionA" |
2497 | 2159 |
|
3756 | 2160 |
^ self diffSet onlyInReceiver |
2497 | 2161 |
! |
2162 |
||
2163 |
methodsOnlyInB |
|
3756 | 2164 |
"returns a ChangeSet for the methods which exists only in the class versionB" |
2497 | 2165 |
|
3756 | 2166 |
^ self diffSet onlyInArg |
2856 | 2167 |
! |
2168 |
||
2169 |
versionA |
|
2170 |
^ versionA |
|
2171 |
! |
|
2172 |
||
2173 |
versionA:something |
|
2174 |
versionA := something. |
|
2175 |
! |
|
2176 |
||
2177 |
versionB |
|
2178 |
^ versionB |
|
2179 |
! |
|
2180 |
||
2181 |
versionB:something |
|
2182 |
versionB := something. |
|
2221 | 2183 |
! ! |
2184 |
||
8891 | 2185 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'misc'! |
2186 |
||
2187 |
removeAllVersionMethods |
|
2188 |
diffSet removeAllVersionMethods. |
|
2189 |
! ! |
|
2190 |
||
2191 |
!VersionDiffBrowser::ClassChangeSet methodsFor:'setup'! |
|
2192 |
||
2193 |
setupForClass:aClass againstVersion:aVersionA |
|
2194 |
"return a ClassChangeSet for the class aClass against some verison in the repository. |
|
2195 |
A new instance of ClassChangeSet is generated containing |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2196 |
the correspondenting changes." |
8891 | 2197 |
|
2198 |
|theChangeSetA theChangeSetB versionCompared| |
|
2199 |
||
2200 |
self classBeingCompared:aClass. |
|
2201 |
versionCompared := aVersionA. |
|
2202 |
aVersionA isNil ifTrue:[ |
|
2203 |
self labelA:(versionCompared := aClass revision). |
|
2204 |
self versionA:versionCompared. |
|
2205 |
] ifFalse:[ |
|
2206 |
aVersionA == #newest ifTrue:[ |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2207 |
self labelA:(VersionDiffBrowser resources string:'Newest'). |
8891 | 2208 |
] ifFalse:[ |
2209 |
self labelA:versionCompared. |
|
2210 |
self versionA:versionCompared. |
|
2211 |
] |
|
2212 |
]. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2213 |
self labelB:(VersionDiffBrowser resources string:'Current'). |
8891 | 2214 |
theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared. |
2215 |
theChangeSetB := self class changeSetForClass: aClass. |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2216 |
theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2217 |
theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2218 |
|
8891 | 2219 |
"/ if we are comparing a private class, prune out other changes |
2220 |
aClass isPrivate ifTrue:[ |
|
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2221 |
theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2222 |
theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ]. |
8891 | 2223 |
]. |
9239
1cfdf9dae50b
double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents:
8891
diff
changeset
|
2224 |
self activityNotification:'Generating diff-set...'. |
8891 | 2225 |
self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB). |
2226 |
self activityNotification:nil. |
|
2227 |
^ diffSet |
|
2228 |
! ! |
|
2229 |
||
2221 | 2230 |
!VersionDiffBrowser class methodsFor:'documentation'! |
2231 |
||
2232 |
version |
|
9602 | 2233 |
^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.96 2010-10-27 09:37:20 cg Exp $' |
8811
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2234 |
! |
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2235 |
|
65e08571a2f3
changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents:
8657
diff
changeset
|
2236 |
version_CVS |
9602 | 2237 |
^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.96 2010-10-27 09:37:20 cg Exp $' |
2221 | 2238 |
! ! |