Fixes for reading VW .xml fileouts.
--- a/ClassChange.st Mon Dec 02 22:53:04 2013 +0000
+++ b/ClassChange.st Thu Dec 12 14:06:32 2013 +0000
@@ -102,10 +102,14 @@
clsNm := clsNm copyReplaceAll:$. withAll:'::'.
].
nsName := self nameSpaceName ? 'Smalltalk'.
+ (nsName includes:$.) ifTrue:[
+ "/ VW - namespace prefix - convert to colon-notation
+ nsName := nsName copyReplaceAll:$. withAll:'::'.
+ ].
nsName notNil ifTrue:[
ns := Smalltalk at:nsName asSymbol.
ns isNil ifTrue:[
- ns := NameSpace name:nsName
+ ns := NameSpace fullName:nsName
]
].
(meta := (clsNm endsWith:' class')) ifTrue:[
@@ -170,7 +174,7 @@
^ meta ifTrue:[class theMetaclass] ifFalse:[class].
"Modified: / 10-08-2012 / 12:07:26 / cg"
- "Modified: / 11-06-2013 / 17:00:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 12-12-2013 / 13:35:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeClass:aClass
--- a/ClassDefinitionChange.st Mon Dec 02 22:53:04 2013 +0000
+++ b/ClassDefinitionChange.st Thu Dec 12 14:06:32 2013 +0000
@@ -88,7 +88,7 @@
"/ Must enforce current namespace because caller (such as Workspace!!!!!!) enforces
"/ the namespace wia NameSpaceQuerySignal. Therefore for classes not in Smalltalk.
"/ `self changeClass` will always return nil, sigh.
- ns := nameSpaceName notNil ifTrue:[(NameSpace name: nameSpaceName)] ifFalse:[nil].
+ ns := nameSpaceName notNil ifTrue:[(NameSpace fullName: nameSpaceName)] ifFalse:[nil].
Class nameSpaceQuerySignal answer: nil do:[
changeClass := self changeClass.
changeClass isNil ifTrue:[^#+].
@@ -109,7 +109,7 @@
"
"Modified: / 31-08-2011 / 09:26:48 / cg"
- "Modified: / 13-11-2013 / 17:09:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 12-12-2013 / 13:41:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
deltaDetail
@@ -213,9 +213,9 @@
"this instance setup message is used when reading from a VW-xml change file.
Support for this is not yet complete."
- |indexedType imports|
+ | imports |
- nameSpaceOverride := aNameSpaceName.
+ nameSpaceName := aNameSpaceName.
classType := aClassType.
otherParameters := Dictionary new addAll:otherParametersArg; yourself.
@@ -232,6 +232,7 @@
category := otherParameters at:#category: ifAbsent:nil.
"Modified: / 15-06-2010 / 14:50:35 / cg"
+ "Modified: / 12-12-2013 / 12:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
objectType