author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 28 Mar 2013 12:22:48 +0000 | |
branch | jv |
changeset 3158 | f8c56a311307 |
parent 3128 | 87750af738dc |
parent 2880 | 0072cabff85a |
child 3416 | b02354ae5ecf |
permissions | -rw-r--r-- |
2406 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, |
|
3 |
Czech Technical University in Prague |
|
4 |
Copyright (c) 2009-2010 eXept Software AG |
|
5 |
||
6 |
Permission is hereby granted, free of charge, to any person |
|
7 |
obtaining a copy of this software and associated documentation |
|
8 |
files (the 'Software'), to deal in the Software without |
|
9 |
restriction, including without limitation the rights to use, |
|
10 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
11 |
copies of the Software, and to permit persons to whom the |
|
12 |
Software is furnished to do so, subject to the following |
|
13 |
conditions: |
|
14 |
||
15 |
The above copyright notice and this permission notice shall be |
|
16 |
included in all copies or substantial portions of the Software. |
|
17 |
||
18 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
19 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
20 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
21 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
22 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
23 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
24 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
25 |
OTHER DEALINGS IN THE SOFTWARE. |
|
26 |
" |
|
27 |
"{ Package: 'stx:libbasic3' }" |
|
28 |
||
2424
bc7e320cec40
Inherit from object, not Model (to fix dependencies)
vrany
parents:
2406
diff
changeset
|
29 |
Object subclass:#ChangeSetDiffComponent |
2406 | 30 |
instanceVariableNames:'parent' |
31 |
classVariableNames:'' |
|
32 |
poolDictionaries:'' |
|
33 |
category:'System-Changes-Diff' |
|
34 |
! |
|
35 |
||
36 |
!ChangeSetDiffComponent class methodsFor:'documentation'! |
|
37 |
||
38 |
copyright |
|
39 |
" |
|
40 |
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, |
|
41 |
Czech Technical University in Prague |
|
42 |
Copyright (c) 2009-2010 eXept Software AG |
|
43 |
||
44 |
Permission is hereby granted, free of charge, to any person |
|
45 |
obtaining a copy of this software and associated documentation |
|
46 |
files (the 'Software'), to deal in the Software without |
|
47 |
restriction, including without limitation the rights to use, |
|
48 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
49 |
copies of the Software, and to permit persons to whom the |
|
50 |
Software is furnished to do so, subject to the following |
|
51 |
conditions: |
|
52 |
||
53 |
The above copyright notice and this permission notice shall be |
|
54 |
included in all copies or substantial portions of the Software. |
|
55 |
||
56 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
57 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
58 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
59 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
60 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
61 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
62 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
63 |
OTHER DEALINGS IN THE SOFTWARE. |
|
64 |
||
65 |
" |
|
66 |
! ! |
|
67 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
68 |
|
2880 | 69 |
!ChangeSetDiffComponent class methodsFor:'others'! |
70 |
||
71 |
version_CVS |
|
72 |
^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.4 2012-07-31 12:34:40 vrany Exp $' |
|
73 |
! ! |
|
74 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
75 |
|
2406 | 76 |
!ChangeSetDiffComponent methodsFor:'accessing'! |
77 |
||
78 |
changesetA |
|
2643 | 79 |
"Answers a changeset with containing all versionA changes" |
80 |
| cs | |
|
2406 | 81 |
|
2643 | 82 |
cs := ChangeSet new name: self versionALabel. |
83 |
self do:[:item| |
|
3122
91c582043a51
Added support for writing extensions files as sources. Added version_HG to classes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
84 |
(item versionA notNil and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]) ifTrue:[ |
2880 | 85 |
cs add: item versionA |
86 |
] |
|
2643 | 87 |
]. |
88 |
^cs |
|
89 |
||
3122
91c582043a51
Added support for writing extensions files as sources. Added version_HG to classes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
90 |
"Modified: / 29-01-2013 / 18:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2406 | 91 |
! |
92 |
||
93 |
changesetB |
|
2880 | 94 |
"Answers a changeset with containing all versionA changes" |
2643 | 95 |
| cs | |
2406 | 96 |
|
2643 | 97 |
cs := ChangeSet new name: self versionBLabel. |
98 |
self do:[:item| |
|
3122
91c582043a51
Added support for writing extensions files as sources. Added version_HG to classes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
99 |
(item versionB notNil and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]) ifTrue:[ |
2880 | 100 |
cs add: item versionB |
101 |
] |
|
2643 | 102 |
]. |
103 |
^cs |
|
104 |
||
3122
91c582043a51
Added support for writing extensions files as sources. Added version_HG to classes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
105 |
"Modified: / 29-01-2013 / 18:44:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2880 | 106 |
! |
107 |
||
108 |
changesetBase |
|
109 |
"Answers a changeset with containing all versionA changes" |
|
110 |
| cs | |
|
111 |
||
112 |
cs := ChangeSet new name: self versionBaseLabel. |
|
113 |
self do:[:item| |
|
3122
91c582043a51
Added support for writing extensions files as sources. Added version_HG to classes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
114 |
(item versionBase notNil and:[item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]]) ifTrue:[ |
2880 | 115 |
cs add: item versionBase |
116 |
] |
|
117 |
]. |
|
118 |
^cs |
|
119 |
||
120 |
"Created: / 20-03-2012 / 13:31:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3122
91c582043a51
Added support for writing extensions files as sources. Added version_HG to classes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
121 |
"Modified: / 29-01-2013 / 18:44:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2880 | 122 |
! |
123 |
||
124 |
changesetMerged |
|
125 |
"Answers a changeset with containing all versionA changes" |
|
126 |
| cs | |
|
127 |
||
128 |
cs := ChangeSet new name: 'Merged'. |
|
129 |
self do:[:item| |
|
130 |
"/ (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[ |
|
131 |
cs add: item versionMerged |
|
132 |
"/ ] |
|
133 |
]. |
|
134 |
^cs |
|
135 |
||
136 |
"Created: / 20-03-2012 / 13:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2406 | 137 |
! |
138 |
||
3098
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
139 |
depth |
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
140 |
"Return the depth if diff component hierarchy, 0 if there is no nesting at all" |
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
141 |
^0 |
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
142 |
|
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
143 |
"Created: / 15-01-2013 / 11:26:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
144 |
! |
67aaf3fadffb
Added ChangeSetDiffComponent>>depth
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3078
diff
changeset
|
145 |
|
2406 | 146 |
diffs |
147 |
||
148 |
^#() |
|
149 |
||
150 |
"Created: / 10-11-2009 / 11:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
151 |
! |
|
152 |
||
153 |
flattened |
|
154 |
||
155 |
^ChangeSetDiffSet new add: self |
|
156 |
||
157 |
"Created: / 05-12-2009 / 11:07:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
158 |
! |
|
159 |
||
160 |
name |
|
161 |
"raise an error: must be redefined in concrete subclass(es)" |
|
162 |
||
163 |
^ self subclassResponsibility |
|
164 |
! |
|
165 |
||
166 |
parent |
|
167 |
^ parent |
|
168 |
! |
|
169 |
||
170 |
parent:aDiffSet |
|
171 |
parent := aDiffSet. |
|
2643 | 172 |
! |
173 |
||
174 |
versionALabel |
|
175 |
^ parent versionALabel |
|
176 |
||
177 |
"Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
178 |
! |
|
179 |
||
180 |
versionBLabel |
|
181 |
^ parent versionBLabel |
|
182 |
||
183 |
"Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2880 | 184 |
! |
185 |
||
186 |
versionBaseLabel |
|
187 |
^ parent versionBaseLabel |
|
188 |
||
189 |
"Created: / 20-03-2012 / 13:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2406 | 190 |
! ! |
191 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
192 |
|
2406 | 193 |
!ChangeSetDiffComponent methodsFor:'change & update'! |
194 |
||
195 |
changed: aspect with: param |
|
196 |
||
197 |
(aspect = #resolution and:[parent notNil]) |
|
198 |
ifTrue:[parent changed: aspect with: param]. |
|
199 |
super changed: aspect with: param. |
|
200 |
||
201 |
"Created: / 24-11-2009 / 12:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
202 |
! ! |
|
203 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
204 |
|
2406 | 205 |
!ChangeSetDiffComponent methodsFor:'enumerating'! |
206 |
||
207 |
do: aBlock |
|
208 |
||
209 |
self subclassResponsibility |
|
210 |
||
211 |
"Created: / 25-11-2009 / 10:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
212 |
! ! |
|
213 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
214 |
|
2406 | 215 |
!ChangeSetDiffComponent methodsFor:'printing & storing'! |
216 |
||
217 |
printOn:aStream |
|
218 |
"append a printed representation if the receiver to the argument, aStream" |
|
219 |
||
220 |
super printOn:aStream. |
|
221 |
aStream nextPut:$(. |
|
222 |
self name printOn: aStream. |
|
223 |
aStream nextPut:$). |
|
224 |
||
225 |
"Modified: / 26-11-2009 / 16:25:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
226 |
! ! |
|
227 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
228 |
|
2406 | 229 |
!ChangeSetDiffComponent methodsFor:'private'! |
230 |
||
231 |
flattenOn: stream |
|
232 |
||
233 |
^stream nextPut: self |
|
234 |
||
235 |
"Created: / 05-12-2009 / 11:06:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3099
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
236 |
! |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
237 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
238 |
sort |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
239 |
self sort: [:a :b|a printString < b printString ]. |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
240 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
241 |
"Created: / 17-01-2013 / 13:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
242 |
! |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
243 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
244 |
sort: sortBlock |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
245 |
self subclassResponsibility |
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
246 |
|
be6ff432a2ad
Fixes in ChangeSetDiff...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3098
diff
changeset
|
247 |
"Created: / 17-01-2013 / 13:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2406 | 248 |
! ! |
249 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
250 |
|
2406 | 251 |
!ChangeSetDiffComponent methodsFor:'testing'! |
252 |
||
3074
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
253 |
isConflict |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
254 |
"Return true, if there is a conflict." |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
255 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
256 |
^ self subclassResponsibility |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
257 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
258 |
"Modified (comment): / 01-08-2012 / 17:11:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
259 |
! |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
260 |
|
2406 | 261 |
isDiffItem |
262 |
^ false |
|
263 |
! |
|
264 |
||
265 |
isDiffSet |
|
266 |
^ false |
|
267 |
! |
|
268 |
||
269 |
isEmpty |
|
270 |
||
271 |
^false |
|
2880 | 272 |
! |
273 |
||
3074
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
274 |
isForCopyrightMethod |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
275 |
"Returns true, if this is an entry for #copyright method" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
276 |
^self subclassResponsibility |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
277 |
|
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
278 |
"Created: / 01-08-2012 / 16:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
279 |
! |
e38a06f751a5
Some more testing methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3069
diff
changeset
|
280 |
|
2880 | 281 |
isForVersionMethod |
282 |
"Returns true, if this is an entry for version method" |
|
283 |
^self subclassResponsibility |
|
284 |
||
285 |
"Created: / 18-04-2012 / 19:04:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
286 |
! |
|
287 |
||
288 |
isMerged |
|
289 |
"raise an error: must be redefined in concrete subclass(es)" |
|
290 |
||
291 |
^ self subclassResponsibility |
|
2406 | 292 |
! ! |
293 |
||
3158
f8c56a311307
Merged 87750af738dc and 72ca7e81fbbf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
294 |
|
2406 | 295 |
!ChangeSetDiffComponent class methodsFor:'documentation'! |
296 |
||
3069 | 297 |
version |
3121
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
298 |
^ '$Header: ChangeSetDiffComponent.st 1986 2013-01-17 17:02:15Z vranyj1 $' |
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
299 |
! |
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
300 |
|
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
301 |
version_HG |
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
302 |
|
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
303 |
^ '$Changeset: <not expanded> $' |
3012 | 304 |
! |
305 |
||
2880 | 306 |
version_SVN |
307 |
^ '§Id: ChangeSetDiffComponent.st 1920 2012-04-18 20:21:56Z vranyj1 §' |
|
2406 | 308 |
! ! |
3121
19723298dd2c
Bugfix: reading of Java class extensions methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3099
diff
changeset
|
309 |