author | Merge Script |
Sun, 06 Sep 2015 06:46:42 +0200 | |
branch | jv |
changeset 3898 | 33e7f5c6e2bc |
parent 3879 | 9c5661b36fa1 |
parent 3897 | 4bc08912b7b9 |
child 3997 | 99c27816a240 |
permissions | -rw-r--r-- |
3876 | 1 |
"{ Encoding: utf8 }" |
2 |
||
3 | 3 |
" |
4 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
85 | 5 |
All Rights Reserved |
3 | 6 |
|
7 |
This software is furnished under a license and may be used |
|
8 |
only in accordance with the terms of that license and with the |
|
9 |
inclusion of the above copyright notice. This software may not |
|
10 |
be provided or otherwise made available to, or used by, any |
|
11 |
other person. No title to or ownership of the software is |
|
12 |
hereby transferred. |
|
13 |
" |
|
932 | 14 |
"{ Package: 'stx:libbasic3' }" |
15 |
||
3876 | 16 |
"{ NameSpace: Smalltalk }" |
17 |
||
0 | 18 |
Change subclass:#ClassChange |
3464 | 19 |
instanceVariableNames:'className classIsJava package nameSpaceOverride nameSpaceName |
20 |
owningClassName' |
|
235 | 21 |
classVariableNames:'' |
22 |
poolDictionaries:'' |
|
23 |
category:'System-Changes' |
|
0 | 24 |
! |
25 |
||
634 | 26 |
!ClassChange class methodsFor:'documentation'! |
9 | 27 |
|
28 |
copyright |
|
29 |
" |
|
30 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
38 | 31 |
All Rights Reserved |
9 | 32 |
|
33 |
This software is furnished under a license and may be used |
|
34 |
only in accordance with the terms of that license and with the |
|
35 |
inclusion of the above copyright notice. This software may not |
|
36 |
be provided or otherwise made available to, or used by, any |
|
37 |
other person. No title to or ownership of the software is |
|
38 |
hereby transferred. |
|
39 |
" |
|
40 |
! |
|
41 |
||
42 |
documentation |
|
43 |
" |
|
45 | 44 |
Abstract superclass for class related changes |
1162 | 45 |
They are typically held in a ChangeSet. |
235 | 46 |
|
47 |
[author:] |
|
48 |
Claus Gittinger |
|
3464 | 49 |
Jan Vrany |
50 |
||
51 |
[:instvars] incomplete |
|
52 |
className <String> ............ the class name *without* namespace, |
|
53 |
but including all owners (if the class |
|
54 |
is private) |
|
55 |
owningClassName <String|nil> .. class name of the owning class if any |
|
56 |
nameSpaceName <String|nil> .... namespace name of the change or nil, if |
|
57 |
class is in no namespace. |
|
58 |
nameSpaceOverride <NameSpace|nil> enforced namespace in which the class will |
|
59 |
should be installed. |
|
9 | 60 |
" |
100 | 61 |
! ! |
62 |
||
634 | 63 |
!ClassChange class methodsFor:'instance creation'! |
85 | 64 |
|
100 | 65 |
class:aClass |
66 |
^ self new class:aClass |
|
67 |
||
68 |
"Created: 3.12.1995 / 14:01:32 / cg" |
|
1096 | 69 |
! |
70 |
||
71 |
class:aClass source:source |
|
72 |
^ self new class:aClass source:source |
|
73 |
||
74 |
"Created: 3.12.1995 / 14:01:32 / cg" |
|
1903 | 75 |
! |
76 |
||
77 |
className:aClassName |
|
78 |
^ self new className:aClassName |
|
79 |
||
80 |
"Created: / 13-11-2006 / 10:37:39 / cg" |
|
81 |
! |
|
82 |
||
83 |
className:aClassName source:source |
|
84 |
^ self new className:aClassName source:source |
|
85 |
||
86 |
"Created: / 12-11-2006 / 20:11:26 / cg" |
|
9 | 87 |
! ! |
88 |
||
0 | 89 |
!ClassChange methodsFor:'accessing'! |
90 |
||
850 | 91 |
changeClass |
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
92 |
"the class of the change (nil if not present). |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
93 |
Take care for changes from foreign Smalltalks having |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
94 |
a different Namespace definition syntax" |
850 | 95 |
|
1897 | 96 |
"do not autoload an owning class of a private class!!" |
1196 | 97 |
|
3464 | 98 |
|clsNm class owner altName nsName ns meta| |
1855
0c365a83ffc2
care for class name aliases when getting an existing
Claus Gittinger <cg@exept.de>
parents:
1513
diff
changeset
|
99 |
|
3464 | 100 |
clsNm := self className. |
101 |
clsNm isNil ifTrue:[^ nil]. |
|
2245 | 102 |
|
2555
86df1e00019f
comment/format in: #classNameWithoutNamespace
Claus Gittinger <cg@exept.de>
parents:
2525
diff
changeset
|
103 |
"/ ok, try some heuristics (for example Root.something -> Smalltalk::something) |
3464 | 104 |
(clsNm includes:$.) ifTrue:[ |
2094 | 105 |
"/ VW - namespace prefix - convert to colon-notation |
3464 | 106 |
clsNm := clsNm copyReplaceAll:$. withAll:'::'. |
2520 | 107 |
]. |
3464 | 108 |
nsName := self nameSpaceName ? 'Smalltalk'. |
109 |
(nsName includes:$.) ifTrue:[ |
|
110 |
"/ VW - namespace prefix - convert to colon-notation |
|
111 |
nsName := nsName copyReplaceAll:$. withAll:'::'. |
|
112 |
]. |
|
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
113 |
nsName notNil ifTrue:[ |
2525 | 114 |
ns := Smalltalk at:nsName asSymbol. |
115 |
ns isNil ifTrue:[ |
|
3464 | 116 |
ns := NameSpace fullName:nsName |
2525 | 117 |
] |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
118 |
]. |
3464 | 119 |
(meta := (clsNm endsWith:' class')) ifTrue:[ |
120 |
clsNm := clsNm copyButLast:6. |
|
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
121 |
]. |
2094 | 122 |
|
2520 | 123 |
ns := (ns ? Smalltalk). |
124 |
class := ns isNameSpace |
|
3464 | 125 |
ifTrue:[ ns loadedClassNamed:clsNm ] |
126 |
ifFalse:[ Smalltalk loadedClassNamed:clsNm ]. |
|
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
127 |
class isNil ifTrue:[ |
1905
51e766803c45
avoid endless recursion, if change is for a namespace definition.
boris
parents:
1903
diff
changeset
|
128 |
self isPrivateClassDefinitionChange ifTrue:[ |
2612 | 129 |
ns isNameSpace ifTrue:[ |
130 |
owner := ns loadedClassNamed:(self owningClassName). |
|
131 |
] ifFalse:[ |
|
132 |
owner := Smalltalk loadedClassNamed:(self owningClassName). |
|
133 |
]. |
|
1905
51e766803c45
avoid endless recursion, if change is for a namespace definition.
boris
parents:
1903
diff
changeset
|
134 |
owner notNil ifTrue:[ |
3464 | 135 |
class := owner privateClassesAt:clsNm. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
136 |
^ meta ifTrue:[class theMetaclass] ifFalse:[class]. |
1905
51e766803c45
avoid endless recursion, if change is for a namespace definition.
boris
parents:
1903
diff
changeset
|
137 |
]. |
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
138 |
] ifFalse:[ |
2520 | 139 |
class := ns isNameSpace |
3464 | 140 |
ifTrue:[ ns classNamed:clsNm ] |
141 |
ifFalse:[ Smalltalk loadedClassNamed:clsNm ]. |
|
2520 | 142 |
|
2057 | 143 |
"/ class := Parser evaluate:className ifFail:[nil]. |
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
144 |
class isNil ifTrue:[ |
3464 | 145 |
(altName := self classNameForWellKnownVisualWorksNamespaceClass:clsNm) notNil |
2314
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
146 |
ifTrue:[ |
2520 | 147 |
class := ns isNameSpace |
148 |
ifTrue:[ ns classNamed:altName ] |
|
149 |
ifFalse:[ Smalltalk loadedClassNamed:altName ]. |
|
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
150 |
class isNil ifTrue:[ |
2314
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
151 |
class := Parser evaluate:altName ifFail:[nil] |
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
152 |
] |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
153 |
]. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
154 |
]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
155 |
]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
156 |
class isNil ifTrue:[ |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
157 |
ns ~= Smalltalk ifTrue:[ |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
158 |
self isPrivateClassDefinitionChange ifTrue:[ |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
159 |
owner := Smalltalk loadedClassNamed:(self owningClassName). |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
160 |
owner notNil ifTrue:[ |
3464 | 161 |
class := owner privateClassesAt:clsNm. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
162 |
^ meta ifTrue:[class theMetaclass] ifFalse:[class]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
163 |
]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
164 |
] ifFalse:[ |
3464 | 165 |
class := Smalltalk classNamed:clsNm. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
166 |
"/ class := Parser evaluate:className ifFail:[nil]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
167 |
class isNil ifTrue:[ |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
168 |
^ nil. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
169 |
]. |
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
170 |
]. |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
171 |
]. |
2521 | 172 |
class isNil ifTrue:[^ nil]. |
1870
55f67b913779
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1855
diff
changeset
|
173 |
]. |
55f67b913779
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1855
diff
changeset
|
174 |
]. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
175 |
|
1855
0c365a83ffc2
care for class name aliases when getting an existing
Claus Gittinger <cg@exept.de>
parents:
1513
diff
changeset
|
176 |
"/ care for aliases... |
2521 | 177 |
"/ (class nameWithoutPrefix ~= className) ifTrue:[ ^ nil ]. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
178 |
^ meta ifTrue:[class theMetaclass] ifFalse:[class]. |
2314
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
179 |
|
2901
6b85ec626617
fixed namespaceoverride (for changeSetBrowser)
Claus Gittinger <cg@exept.de>
parents:
2815
diff
changeset
|
180 |
"Modified: / 10-08-2012 / 12:07:26 / cg" |
3464 | 181 |
"Modified: / 12-12-2013 / 13:35:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
850 | 182 |
! |
183 |
||
1040 | 184 |
changeClass:aClass |
185 |
"set the class of the change" |
|
186 |
||
187 |
className := aClass name. |
|
188 |
! |
|
189 |
||
100 | 190 |
class:aClass |
378 | 191 |
"set the class of the change" |
192 |
||
1903 | 193 |
self className:aClass name. |
100 | 194 |
|
1903 | 195 |
"Created: / 03-12-1995 / 14:01:45 / cg" |
196 |
"Modified: / 12-11-2006 / 20:10:28 / cg" |
|
100 | 197 |
! |
198 |
||
1096 | 199 |
class:aClass source:newSource |
200 |
"set both class and source of the change" |
|
201 |
||
1286
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
202 |
self className:(aClass name) source:newSource |
1096 | 203 |
! |
204 |
||
1305 | 205 |
classBaseName |
3897 | 206 |
"return the className of the change. |
207 |
This is without *any* prefix (namespace or private-owner)" |
|
378 | 208 |
|
1196 | 209 |
^ self cutNameSpaceOf:className |
378 | 210 |
|
211 |
"Modified: 15.7.1996 / 09:28:35 / cg" |
|
654 | 212 |
! |
213 |
||
3151 | 214 |
className |
3464 | 215 |
"Returns class name of the class *without* namespace, but with |
3897 | 216 |
all owning classes (if the change class is a private class). |
217 |
cg: this comment is wrong!! |
|
218 |
question: what is intended: what the comment says, or what the code does?" |
|
219 |
||
3221
7fa1821ca907
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3216
diff
changeset
|
220 |
^ className |
3464 | 221 |
|
222 |
"Modified (comment): / 12-06-2013 / 11:33:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3151 | 223 |
! |
224 |
||
654 | 225 |
className:aString |
226 |
"set the className of the change" |
|
227 |
||
3183 | 228 |
self assert:aString notNil. |
654 | 229 |
className := aString |
230 |
||
231 |
"Modified: / 15.7.1996 / 09:28:35 / cg" |
|
232 |
"Created: / 16.2.1998 / 13:05:36 / cg" |
|
1233 | 233 |
! |
234 |
||
1286
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
235 |
className:newClassName source:newSource |
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
236 |
"set both className and source of the change" |
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
237 |
|
1469 | 238 |
self assert:(newSource isString). |
239 |
self assert:(newClassName isString). |
|
240 |
||
3464 | 241 |
self className: newClassName. |
1286
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
242 |
source := newSource. |
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
243 |
|
3464 | 244 |
"Created: / 03-12-1995 / 14:01:45 / cg" |
245 |
"Modified: / 15-07-1996 / 09:28:26 / cg" |
|
246 |
"Modified: / 11-06-2013 / 17:44:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1286
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
247 |
! |
621aac0264a7
catch non-string source args
Claus Gittinger <cg@exept.de>
parents:
1233
diff
changeset
|
248 |
|
2314
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
249 |
classNameForWellKnownVisualWorksNamespaceClass:className |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
250 |
(className startsWith:'Root::') ifTrue:[ |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
251 |
^ className copyFrom:7. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
252 |
]. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
253 |
(className startsWith:'Core.') ifTrue:[ |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
254 |
^ className copyFrom:6. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
255 |
]. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
256 |
(className startsWith:'Smalltalk.') ifTrue:[ |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
257 |
^ className copyFrom:11. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
258 |
]. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
259 |
^ nil |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
260 |
|
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
261 |
"Created: / 29-01-2011 / 11:29:59 / cg" |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
262 |
! |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
263 |
|
1305 | 264 |
classNameWithoutNamespace |
265 |
"return the className of the change" |
|
266 |
||
3221
7fa1821ca907
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3216
diff
changeset
|
267 |
^ self cutMyNameSpaceOf: "cutNameSpaceOf:"className |
1305 | 268 |
|
2555
86df1e00019f
comment/format in: #classNameWithoutNamespace
Claus Gittinger <cg@exept.de>
parents:
2525
diff
changeset
|
269 |
"Modified: / 06-10-2011 / 16:58:34 / cg" |
1305 | 270 |
! |
271 |
||
3151 | 272 |
fullClassName |
3464 | 273 |
"Returns fully qualified class name, i.e., including namespace in which the |
274 |
class should be installed (i.e., the override namespace (if any) rather than |
|
275 |
original namespace (of any))" |
|
276 |
||
3151 | 277 |
|ns| |
278 |
||
279 |
"/ used to be ^ className; |
|
280 |
"/ |
|
281 |
"/ now include a translation from vw namespace to stx nameSpace |
|
282 |
||
3876 | 283 |
"/ cg: why is override ignore here??? |
3151 | 284 |
ns := self nameSpaceName. |
3876 | 285 |
"/ ns := self nameSpaceOverride. |
3151 | 286 |
(ns isNil or:[ns = 'Smalltalk']) ifTrue:[^ self className]. |
287 |
||
288 |
^ ns , '::' , self className |
|
3464 | 289 |
|
290 |
"Modified (comment): / 04-02-2014 / 19:29:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3151 | 291 |
! |
292 |
||
3876 | 293 |
fullOwningClassName |
294 |
"Returns fully qualified owner's class name, i.e., including namespace in which the |
|
295 |
class should be found (i.e., the override namespace (if any) rather than |
|
296 |
original namespace (of any))" |
|
297 |
||
298 |
|nm ns| |
|
299 |
||
300 |
nm := self owningClassName. |
|
301 |
nm isNil ifTrue:[^ nil]. |
|
302 |
||
303 |
"/ cg: why is override ignore here??? |
|
304 |
ns := self nameSpaceName. |
|
305 |
"/ ns := self nameSpaceOverride. |
|
306 |
ns notNil ifTrue:[ |
|
307 |
^ ns,'::',nm |
|
308 |
]. |
|
309 |
nameSpaceName notNil ifTrue:[ |
|
310 |
^ nameSpaceName,'::',nm |
|
311 |
]. |
|
312 |
^ nm |
|
313 |
"/ |nm ns| |
|
314 |
"/ |
|
315 |
"/ "/ used to be ^ owningClassName; |
|
316 |
"/ "/ |
|
317 |
"/ "/ now include a translation from vw namespace to stx nameSpace |
|
318 |
"/ nm := self owningClassName. |
|
319 |
"/ ns := self nameSpaceName. |
|
320 |
"/ (ns isNil or:[ns = 'Smalltalk']) ifTrue:[^ nm]. |
|
321 |
"/ |
|
322 |
"/ ^ ns , '::' , nm |
|
323 |
! |
|
324 |
||
3151 | 325 |
localClassName |
326 |
"for private classes, this returns the name relative to its owner; |
|
327 |
for non-private ones, this is the regular name. |
|
3464 | 328 |
Notice that className always returns the full name (incl. any owner prefix) |
329 |
but *without* any namespace prefix" |
|
3151 | 330 |
|
331 |
^self className |
|
3464 | 332 |
|
333 |
"Modified (comment): / 12-06-2013 / 11:34:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3151 | 334 |
! |
335 |
||
336 |
nameSpace |
|
337 |
|nsName nameSpace| |
|
338 |
||
339 |
(nsName := self nameSpaceName) notNil ifTrue:[ |
|
340 |
^ NameSpace name:nsName. |
|
341 |
]. |
|
342 |
^ Smalltalk |
|
343 |
! |
|
344 |
||
3464 | 345 |
nameSpace: aNameSpace |
346 |
self nameSpaceName: aNameSpace name |
|
347 |
||
348 |
"Created: / 11-06-2013 / 15:57:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
349 |
! |
|
350 |
||
3151 | 351 |
nameSpaceName |
3464 | 352 |
"Return the namespace in which the class should be installed. |
353 |
||
354 |
If the user enforces a namespace using nameSpaceOverride or |
|
355 |
using query signal, then the enforced namespace is returned. |
|
356 |
Otherwise, changes's original namespace is returned, if any." |
|
357 |
||
358 |
| ns | |
|
3151 | 359 |
|
360 |
className isNil ifTrue:[^ nil]. |
|
361 |
||
3271 | 362 |
ns := self nameSpaceOverride. |
363 |
ns notNil ifTrue:[ ^ ns ]. |
|
364 |
||
3464 | 365 |
"/ JV: Following code is rubbish because it cannot distiguish |
366 |
"/ between namespace and owning class... |
|
367 |
||
368 |
"/ (idx := className indexOf:$:) ~~ 0 ifTrue:[ |
|
369 |
"/ "/ in a namespace |
|
370 |
"/ ^ className copyTo:(idx - 1). |
|
371 |
"/ ]. |
|
372 |
||
373 |
"/ JV: I commented following It is not clear to how it is supposed to |
|
374 |
"/ work. If anybody wants this back, he/she should first write |
|
375 |
"/ a testcase to demonstrate how it should work. |
|
376 |
||
377 |
"/ (idx := className indexOf:$.) ~~ 0 ifTrue:[ |
|
378 |
"/ "/ in a namespace |
|
379 |
"/ ns := className copyTo:(idx - 1). |
|
380 |
"/ cnm := className copyFrom:(idx + 1). |
|
381 |
"/ "cheat: VW namespaces" |
|
382 |
"/ ^ self nameSpaceForVWNamespace:ns class:cnm ifAbsent:ns |
|
383 |
"/ ]. |
|
384 |
||
385 |
^ nameSpaceName |
|
3151 | 386 |
|
387 |
"Modified: / 03-08-2006 / 02:04:03 / cg" |
|
3464 | 388 |
"Modified: / 11-06-2013 / 15:03:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
389 |
"Modified (comment): / 04-02-2014 / 17:54:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
390 |
! |
|
391 |
||
392 |
nameSpaceName: aString |
|
393 |
nameSpaceName := aString ~= 'Smalltalk' ifTrue:[aString] ifFalse:[nil]. |
|
394 |
||
395 |
"Created: / 11-06-2013 / 15:53:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3151 | 396 |
! |
397 |
||
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
398 |
nameSpaceOverride |
3464 | 399 |
"Return namespace enforced by the caller. |
400 |
||
401 |
NOTE: This code used to use `Class nameSpaceQuerySignal` to |
|
402 |
allow enforcing namespace by query. This made the code more |
|
403 |
complicated and was used only by Tools::ChangeSetBrowser2 so |
|
404 |
it was removed. |
|
405 |
||
406 |
To apply change in particular namespace, use nameSpaceOverride:. |
|
407 |
You may use applyWithNameSpaceOverride: for your convenience. |
|
408 |
" |
|
409 |
||
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
410 |
|ns| |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
411 |
|
3110 | 412 |
ns := nameSpaceOverride. |
3221
7fa1821ca907
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3216
diff
changeset
|
413 |
ns isNil ifTrue:[^ nil]. |
3687 | 414 |
ns isString ifTrue:[ ^ ns ]. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
415 |
^ ns name |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
416 |
|
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
417 |
"Created: / 07-09-2011 / 20:45:43 / cg" |
3464 | 418 |
"Modified (comment): / 04-02-2014 / 18:33:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
419 |
! |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
420 |
|
3135 | 421 |
nameSpaceOverride:aNamespaceOrString |
422 |
aNamespaceOrString isString ifTrue:[ |
|
423 |
nameSpaceOverride := NameSpace name:aNamespaceOrString |
|
424 |
] ifFalse:[ |
|
425 |
nameSpaceOverride := aNamespaceOrString |
|
426 |
] |
|
2815 | 427 |
|
428 |
"Created: / 20-03-2012 / 17:12:08 / cg" |
|
429 |
! |
|
430 |
||
2169 | 431 |
nonMetaClassName |
432 |
^ self isForMeta |
|
433 |
ifTrue:[ self className copyTo:(self className size - 6) ] |
|
434 |
ifFalse:[ self className ] |
|
435 |
||
436 |
"Created: / 06-11-2008 / 17:26:03 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
437 |
! |
|
438 |
||
3464 | 439 |
owningClassName |
440 |
^ owningClassName |
|
441 |
||
442 |
"Modified: / 11-06-2013 / 14:50:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
443 |
! |
|
444 |
||
445 |
owningClassName:aStringOrSymbol |
|
446 |
owningClassName := aStringOrSymbol |
|
447 |
||
448 |
"Created: / 30-08-2010 / 13:55:37 / cg" |
|
449 |
! |
|
450 |
||
1233 | 451 |
package |
452 |
"return the value of the instance variable 'package' (automatically generated)" |
|
453 |
||
454 |
^ package |
|
455 |
! |
|
456 |
||
457 |
package:something |
|
458 |
"set the value of the instance variable 'package' (automatically generated)" |
|
459 |
||
460 |
package := something. |
|
0 | 461 |
! ! |
462 |
||
859 | 463 |
!ClassChange methodsFor:'applying'! |
464 |
||
465 |
apply |
|
466 |
"apply the change" |
|
467 |
||
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
468 |
|class| |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
469 |
|
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
470 |
class := self changeClass. |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
471 |
class isNil ifTrue:[ |
2078 | 472 |
self error:('Cannot apply change for missing class: ' , className) mayProceed:true. |
473 |
^ self |
|
2019
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
474 |
]. |
685031a55645
changed #apply: load class before applying a change
Stefan Vogel <sv@exept.de>
parents:
1905
diff
changeset
|
475 |
class autoload. "Most changes cannot be applied to unloaded classes" |
2315 | 476 |
Class nameSpaceQuerySignal answer:self nameSpace do:[ |
477 |
Parser evaluate:(self source) |
|
478 |
]. |
|
1300
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
479 |
"/ |ns| |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
480 |
"/ |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
481 |
"/ ns := Class nameSpaceQuerySignal isHandled |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
482 |
"/ ifTrue:[ Class nameSpaceQuerySignal query ] |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
483 |
"/ ifFalse:[ self nameSpace ]. |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
484 |
"/ |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
485 |
"/ Class nameSpaceQuerySignal answer:ns do:[ |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
486 |
"/ Parser evaluate:(self source) |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
487 |
"/ ]. |
2315 | 488 |
|
489 |
"Modified: / 29-01-2011 / 12:28:03 / cg" |
|
3464 | 490 |
! |
491 |
||
492 |
applyWithNameSpaceOverride: nameSpaceOrNameSpaceName |
|
493 |
"Apply the change, overriding a namespace to given one" |
|
494 |
||
495 |
| savedNameSpaceOverride | |
|
496 |
||
497 |
savedNameSpaceOverride := nameSpaceOverride. |
|
498 |
nameSpaceOverride := nameSpaceOrNameSpaceName. |
|
499 |
self apply. |
|
500 |
nameSpaceOverride := savedNameSpaceOverride |
|
501 |
||
502 |
"Created: / 04-02-2014 / 18:24:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
859 | 503 |
! ! |
504 |
||
962 | 505 |
!ClassChange methodsFor:'printing & storing'! |
101 | 506 |
|
507 |
printOn:aStream |
|
801 | 508 |
"append a user printed representation of the receiver to aStream. |
509 |
The format is suitable for a human - not meant to be read back." |
|
510 |
||
911 | 511 |
source isNil ifTrue:[ |
3183 | 512 |
aStream nextPutAll:self class nameWithArticle,'-change (no source)'. |
911 | 513 |
^ self |
514 |
]. |
|
1469 | 515 |
aStream nextPutAll:(self class name , ' - ' , source string firstLine , '...'). |
101 | 516 |
! ! |
517 |
||
932 | 518 |
!ClassChange methodsFor:'queries'! |
519 |
||
2315 | 520 |
cutMyNameSpaceOf:aString |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
521 |
|ns| |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
522 |
|
3216 | 523 |
aString isNil ifTrue:[ ^ nil ]. |
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
524 |
(ns := self nameSpaceOverride) isNil ifTrue:[ ^ aString ]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
525 |
(aString startsWith:(ns , '.')) ifTrue:[ ^ self cutNameSpaceOf:aString ]. |
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
526 |
(aString startsWith:(ns , '::')) ifTrue:[ ^ self cutNameSpaceOf:aString ]. |
2315 | 527 |
|
528 |
^ aString |
|
529 |
||
2514
36e11e387006
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2315
diff
changeset
|
530 |
"Modified: / 07-09-2011 / 20:49:33 / cg" |
2315 | 531 |
! |
532 |
||
1196 | 533 |
cutNameSpaceOf:aString |
1304 | 534 |
|dotIndex colonIndex| |
1300
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
535 |
|
2314
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
536 |
aString isNil ifTrue:[ ^ nil]. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
537 |
|
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
538 |
dotIndex := aString indexOf:$.. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
539 |
dotIndex ~~ 0 ifTrue:[ |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
540 |
^ aString copyFrom:dotIndex+1 |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
541 |
]. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
542 |
colonIndex := aString indexOf:$:. |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
543 |
colonIndex ~~ 0 ifTrue:[ |
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
544 |
^ aString copyFrom:colonIndex+2 |
1196 | 545 |
]. |
546 |
^ aString |
|
2314
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
547 |
|
ba70ddd96c9e
added: #classNameForWellKnownVisualWorksNamespaceClass:
Claus Gittinger <cg@exept.de>
parents:
2245
diff
changeset
|
548 |
"Modified: / 29-01-2011 / 11:32:01 / cg" |
1196 | 549 |
! |
550 |
||
2169 | 551 |
isForMeta |
552 |
^ (self className endsWith:' class') |
|
553 |
! |
|
554 |
||
1300
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
555 |
nameSpaceForVWNamespace:ns class:className ifAbsent:default |
2094 | 556 |
"map the namespace for a given class - hack; only works for some" |
1303 | 557 |
|
1300
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
558 |
ns = 'Core' ifTrue:[^ 'Smalltalk']. |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
559 |
ns = 'Kernel' ifTrue:[^ 'Smalltalk']. |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
560 |
ns = 'Graphics' ifTrue:[^ 'Smalltalk']. |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
561 |
ns = 'OS' ifTrue:[^ 'Smalltalk']. |
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
562 |
ns = 'Smalltalk' ifTrue:[^ 'Smalltalk']. |
1303 | 563 |
ns = 'UI' ifTrue:[^ 'Smalltalk']. |
1300
3847c8f8a4f5
handle NS.Classname (vw files)
Claus Gittinger <cg@exept.de>
parents:
1286
diff
changeset
|
564 |
^ default value |
932 | 565 |
! ! |
566 |
||
3502
5793bda4b06b
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3464
diff
changeset
|
567 |
!ClassChange methodsFor:'testing'! |
5793bda4b06b
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3464
diff
changeset
|
568 |
|
5793bda4b06b
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3464
diff
changeset
|
569 |
isClassChange |
5793bda4b06b
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3464
diff
changeset
|
570 |
^ true |
5793bda4b06b
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3464
diff
changeset
|
571 |
! ! |
5793bda4b06b
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3464
diff
changeset
|
572 |
|
634 | 573 |
!ClassChange class methodsFor:'documentation'! |
100 | 574 |
|
575 |
version |
|
3897 | 576 |
^ '$Header$' |
2245 | 577 |
! |
578 |
||
579 |
version_CVS |
|
3897 | 580 |
^ '$Header$' |
3271 | 581 |
! |
582 |
||
583 |
version_HG |
|
584 |
||
585 |
^ '$Changeset: <not expanded> $' |
|
586 |
! |
|
587 |
||
588 |
version_SVN |
|
3897 | 589 |
^ '$Id$' |
100 | 590 |
! ! |
3110 | 591 |