--- a/ClassDefinitionChange.st Wed Sep 07 21:27:31 2011 +0200
+++ b/ClassDefinitionChange.st Wed Sep 07 21:27:48 2011 +0200
@@ -122,9 +122,9 @@
objectType == #variable ifTrue:[
^ nil
].
- ^ self cutNameSpaceOf:(nameSpaceOverride ? super nameSpaceName)
+ ^ self cutNameSpaceOf:(self nameSpaceOverride ? super nameSpaceName)
- "Modified: / 15-06-2010 / 14:50:27 / cg"
+ "Modified: / 07-09-2011 / 20:47:14 / cg"
!
nameSpaceName: aNameSpaceName classType: aClassType otherParameters:otherParametersArg
@@ -184,22 +184,22 @@
source
"return the source of the change"
- |src|
+ |src ns|
(src := source) isNil ifTrue:[
src := self definitionString
].
- nameSpaceOverride notNil ifTrue:[
- (className startsWith:(nameSpaceOverride,'::')) ifFalse:[
- ^ '"{ NameSpace: ' , nameSpaceOverride , ' }"' ,
+ (ns := self nameSpaceOverride) notNil ifTrue:[
+ (className startsWith:(ns,'::')) ifFalse:[
+ ^ '"{ NameSpace: ' , ns , ' }"' ,
Character cr, Character cr ,
src string
].
].
^ src
- "Modified: / 15-06-2010 / 14:51:09 / cg"
+ "Modified: / 07-09-2011 / 20:46:13 / cg"
!
superClassName
@@ -312,11 +312,15 @@
!ClassDefinitionChange methodsFor:'printing & storing'!
definitionString
+ |ns|
+
+ ns := self nameSpaceOverride.
+
objectType == #variable ifTrue:[
^ String streamContents:[:stream |
- nameSpaceOverride notNil ifTrue:[
+ ns notNil ifTrue:[
stream
- nextPutAll:((nameSpaceOverride asCollectionOfSubstringsSeparatedBy:$.) asStringWith:'::')
+ nextPutAll:((ns asCollectionOfSubstringsSeparatedBy:$.) asStringWith:'::')
] ifFalse:[
self halt:'can this happen ?'.
stream
@@ -353,7 +357,7 @@
nextPutAll:(category ? '') storeString
]
- "Modified: / 15-06-2010 / 14:53:57 / cg"
+ "Modified: / 07-09-2011 / 20:47:42 / cg"
!
printOn:aStream
@@ -526,7 +530,7 @@
!ClassDefinitionChange class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.60 2011-08-31 10:06:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.61 2011-09-07 19:27:48 cg Exp $'
!
version_SVN