--- a/SnapShotImageMemory.st	Fri Sep 03 16:25:38 2004 +0200
+++ b/SnapShotImageMemory.st	Fri Sep 03 19:25:08 2004 +0200
@@ -1455,6 +1455,16 @@
 
     "there is no previous version"
     ^ nil
+!
+
+sends:aSelectorSymbol
+    "return true, if this method contains a message-send
+     with aSelectorSymbol as selector."
+
+"/    (self referencesLiteral:aSelectorSymbol) ifTrue:[
+"/        ^ self messagesSent includesIdentical:aSelectorSymbol
+"/    ].
+    ^ false
 ! !
 
 !SnapShotImageMemory::ImageClassObject methodsFor:'accessing - slots'!
@@ -3435,7 +3445,7 @@
         ^ nil
     ].
 
-    ^ memory at:nmSym.
+    ^ memory image at:nmSym.
 !
 
 privateClassesOrAll:allOfThem
@@ -3930,11 +3940,11 @@
 at:aKey
     |fullName|
 
-    aKey isSymbol ifFalse:[
+    aKey isString ifFalse:[
         ^ super at:aKey
     ].
 
-    self isNameSpace ifFalse:[ self error ].
+    self isNameSpace ifFalse:[ self error:'namespace expected' ].
     fullName := self name , '::' , aKey.
     ^ memory image at:fullName asSymbol
 ! !
@@ -4042,19 +4052,9 @@
 !
 
 isTopLevelNameSpace
-    "return true, if this is a nameSpace."
-
-    <resource:#obsolete>
-
-    ^ self isNameSpace
-!
-
-isTopLevelNamespace
-    "return true, if this is a nameSpace."
-
-    <resource:#obsolete>
-
-    ^ self isNameSpace
+    "return true, if this is a top level nameSpace."
+
+    ^ self isNameSpace and:[(self name includes:$:) not]
 !
 
 isVariable
@@ -4103,6 +4103,13 @@
     ^ true
 !
 
+topNameSpace
+    "return the nameSpace of my topOwningClass (if private) or my own nameSpace."
+
+    self isPrivate ifTrue:[^ self topOwningClass topNameSpace].
+    ^ self nameSpace
+!
+
 topOwningClass
     |owner|