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