Mercurial Mercurial > hg > stx-libbasic / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed Namespace to NameSpace
authorClaus Gittinger <cg@exept.de>
Fri, 24 Mar 2000 18:04:25 +0100
changeset 5328 319b8e3ee60e
parent 5327 5e5602d156fa
child 5329 1a7da7f4c744
renamed Namespace to NameSpace
Metaclass.st file | annotate | diff | comparison | revisions
NameSpace.st file | annotate | diff | comparison | revisions
Namespace.st file | annotate | diff | comparison | revisions
Project.st file | annotate | diff | comparison | revisions
Smalltalk.st file | annotate | diff | comparison | revisions 
--- a/Metaclass.st	Fri Mar 24 17:43:57 2000 +0100
+++ b/Metaclass.st	Fri Mar 24 18:04:25 2000 +0100
@@ -635,7 +635,7 @@
                     or:[(self 
                             confirm:('nonexistent namespace: `' , nsName , '''.\\Create ?') withCRs)])
                     ifFalse:[^ nil].
-                    namespace := Namespace name:nsName.
+                    namespace := NameSpace name:nsName.
                 ] ifFalse:[
                     self warn:('a global named ' , nsName , ' exists, but is no namespace.') withCRs.
                     ^ nil
@@ -1443,7 +1443,9 @@
     "/ change any private subclasses' owners
 
     oldClass privateClassesDo:[:aClass |
-        aClass class setOwningClass:newClass
+        aClass isLoaded ifTrue:[
+            aClass class setOwningClass:newClass
+        ]
     ].
 
     "/ change category in oldClass - so we see immediately what it is ...
@@ -1577,7 +1579,7 @@
 
     "let user confirm, if the classname is no good"
     className first isUppercase ifFalse:[
-        aClass == Namespace ifTrue:[
+        aClass == NameSpace ifTrue:[
             what := 'namespace'
         ] ifFalse:[
             what := 'class'
@@ -2100,6 +2102,6 @@
 !Metaclass class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.163 2000-03-24 16:43:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.164 2000-03-24 17:03:24 cg Exp $'
 ! !
 Metaclass initialize!
--- a/NameSpace.st	Fri Mar 24 17:43:57 2000 +0100
+++ b/NameSpace.st	Fri Mar 24 18:04:25 2000 +0100
@@ -12,7 +12,7 @@
 
 
 Object subclass:#Namespace
-	instanceVariableNames:''
+	instanceVariableNames:'category'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Kernel-Classes'
@@ -162,7 +162,7 @@
 
     nameSym := aStringOrSymbol asSymbol.
 
-    self == Namespace ifTrue:[
+    self == NameSpace ifTrue:[
         currentNameSpace := Class nameSpaceQuerySignal query.
         currentNameSpace isNil ifTrue:[currentNameSpace := Smalltalk].
         fullName := nameSym
@@ -186,15 +186,15 @@
     ^ newNamespace
 
     "
-     Namespace name:'foo'
-     (Namespace name:'foo') category:'my name space'
+     NameSpace name:'foo'
+     (NameSpace name:'foo') category:'my name space'
      foo at:#bar put:(Metaclass new new)
-     (Namespace name:'foo') name:'bar'
+     (NameSpace name:'foo') name:'bar'
     "
     "
-     Namespace name:'an-invalid++name'
-     Namespace name:'another:invalidName'
-     Namespace name:'another::invalidName'
+     NameSpace name:'an-invalid++name'
+     NameSpace name:'another:invalidName'
+     NameSpace name:'another::invalidName'
     "
 
     "Modified: / 14.9.1997 / 09:46:59 / cg"
@@ -368,10 +368,10 @@
 fileOutDefinitionOn:aStream
     "redefined to generate another definition message"
 
-    self == Namespace ifTrue:[
+    self == NameSpace ifTrue:[
         super fileOutDefinitionOn:aStream
     ] ifFalse:[
-        aStream nextPutAll:('Namespace name:' , self name storeString)
+        aStream nextPutAll:('NameSpace name:' , self name storeString)
     ]
 
     "Modified: 8.11.1996 / 21:39:03 / cg"
@@ -397,10 +397,10 @@
     "return a printed represenation - here, a reminder is appended,
      that this is not a regular class"
 
-    self == Namespace ifTrue:[
+    self == NameSpace ifTrue:[
         ^ super displayString
     ].
-    ^ self name , ' (* namespace *)'
+    ^ self name , ' (* NameSpace *)'
 
     "Created: 8.11.1996 / 21:37:24 / cg"
     "Modified: 20.12.1996 / 15:11:31 / cg"
@@ -416,7 +416,7 @@
     set := IdentitySet with:Smalltalk.
     Smalltalk allBehaviorsDo:[:aClass |
         (aClass isNameSpace 
-        and:[aClass ~~ Namespace
+        and:[aClass ~~ NameSpace
         and:[aClass ~~ Smalltalk]]) ifTrue:[
             set add:aClass
         ]
@@ -429,7 +429,7 @@
 isNameSpace
     "return true - I am a namespace"
 
-    self == Namespace ifTrue:[^ false].
+    self == NameSpace ifTrue:[^ false].
     ^ true
 
 !
@@ -443,5 +443,5 @@
 !Namespace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/NameSpace.st,v 1.35 2000-03-24 16:41:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NameSpace.st,v 1.36 2000-03-24 17:03:34 cg Exp $'
 ! !
--- a/Namespace.st	Fri Mar 24 17:43:57 2000 +0100
+++ b/Namespace.st	Fri Mar 24 18:04:25 2000 +0100
@@ -12,7 +12,7 @@
 
 
 Object subclass:#Namespace
-	instanceVariableNames:''
+	instanceVariableNames:'category'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Kernel-Classes'
@@ -162,7 +162,7 @@
 
     nameSym := aStringOrSymbol asSymbol.
 
-    self == Namespace ifTrue:[
+    self == NameSpace ifTrue:[
         currentNameSpace := Class nameSpaceQuerySignal query.
         currentNameSpace isNil ifTrue:[currentNameSpace := Smalltalk].
         fullName := nameSym
@@ -186,15 +186,15 @@
     ^ newNamespace
 
     "
-     Namespace name:'foo'
-     (Namespace name:'foo') category:'my name space'
+     NameSpace name:'foo'
+     (NameSpace name:'foo') category:'my name space'
      foo at:#bar put:(Metaclass new new)
-     (Namespace name:'foo') name:'bar'
+     (NameSpace name:'foo') name:'bar'
     "
     "
-     Namespace name:'an-invalid++name'
-     Namespace name:'another:invalidName'
-     Namespace name:'another::invalidName'
+     NameSpace name:'an-invalid++name'
+     NameSpace name:'another:invalidName'
+     NameSpace name:'another::invalidName'
     "
 
     "Modified: / 14.9.1997 / 09:46:59 / cg"
@@ -368,10 +368,10 @@
 fileOutDefinitionOn:aStream
     "redefined to generate another definition message"
 
-    self == Namespace ifTrue:[
+    self == NameSpace ifTrue:[
         super fileOutDefinitionOn:aStream
     ] ifFalse:[
-        aStream nextPutAll:('Namespace name:' , self name storeString)
+        aStream nextPutAll:('NameSpace name:' , self name storeString)
     ]
 
     "Modified: 8.11.1996 / 21:39:03 / cg"
@@ -397,10 +397,10 @@
     "return a printed represenation - here, a reminder is appended,
      that this is not a regular class"
 
-    self == Namespace ifTrue:[
+    self == NameSpace ifTrue:[
         ^ super displayString
     ].
-    ^ self name , ' (* namespace *)'
+    ^ self name , ' (* NameSpace *)'
 
     "Created: 8.11.1996 / 21:37:24 / cg"
     "Modified: 20.12.1996 / 15:11:31 / cg"
@@ -416,7 +416,7 @@
     set := IdentitySet with:Smalltalk.
     Smalltalk allBehaviorsDo:[:aClass |
         (aClass isNameSpace 
-        and:[aClass ~~ Namespace
+        and:[aClass ~~ NameSpace
         and:[aClass ~~ Smalltalk]]) ifTrue:[
             set add:aClass
         ]
@@ -429,7 +429,7 @@
 isNameSpace
     "return true - I am a namespace"
 
-    self == Namespace ifTrue:[^ false].
+    self == NameSpace ifTrue:[^ false].
     ^ true
 
 !
@@ -443,5 +443,5 @@
 !Namespace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/Namespace.st,v 1.35 2000-03-24 16:41:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/Namespace.st,v 1.36 2000-03-24 17:03:34 cg Exp $'
 ! !
--- a/Project.st	Fri Mar 24 17:43:57 2000 +0100
+++ b/Project.st	Fri Mar 24 18:04:25 2000 +0100
@@ -20,15 +20,15 @@
 	category:'System-Support'
 !
 
-Object subclass:#ClassInfo
-	instanceVariableNames:'conditionForInclusion className classFileName'
+Object subclass:#MethodInfo
+	instanceVariableNames:'conditionForInclusion methodName className fileName'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:Project
 !
 
-Object subclass:#MethodInfo
-	instanceVariableNames:'conditionForInclusion methodName className fileName'
+Object subclass:#ClassInfo
+	instanceVariableNames:'conditionForInclusion className classFileName'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:Project
@@ -1272,7 +1272,7 @@
 
     s := pack at:'nameSpace' ifAbsent:nil.
     s notNil ifTrue:[
-        self defaultNameSpace:(Namespace name:s asSymbol).
+        self defaultNameSpace:(NameSpace name:s asSymbol).
     ].
 
     subProjects := pack at:'subProjects' ifAbsent:subProjects.
@@ -3695,56 +3695,6 @@
     "Modified: 14.2.1997 / 15:38:47 / cg"
 ! !
 
-!Project::ClassInfo methodsFor:'accessing'!
-
-classFileName
-    "return the value of the instance variable 'classFileName' (automatically generated)"
-
-    ^ classFileName!
-
-classFileName:something
-    "set the value of the instance variable 'classFileName' (automatically generated)"
-
-    classFileName := something.!
-
-className
-    "return the value of the instance variable 'className' (automatically generated)"
-
-    ^ className!
-
-className:something
-    "set the value of the instance variable 'className' (automatically generated)"
-
-    className := something.!
-
-conditionForInclusion
-    "return the value of the instance variable 'conditionForInclusion' (automatically generated)"
-
-    ^ conditionForInclusion!
-
-conditionForInclusion:something
-    "set the value of the instance variable 'conditionForInclusion' (automatically generated)"
-
-    conditionForInclusion := something.! !
-
-!Project::ClassInfo methodsFor:'printing & storing'!
-
-displayString
-    ^ 'ClassInfo: ' , className
-! !
-
-!Project::ClassInfo methodsFor:'queries'!
-
-theClass
-    |cls|
-
-    cls := Smalltalk classNamed:className.
-    cls isNil ifTrue:[ ^ nil].
-    ^ cls
-
-    "Created: / 26.9.1999 / 13:39:00 / cg"
-! !
-
 !Project::MethodInfo methodsFor:'accessing'!
 
 className
@@ -3814,9 +3764,59 @@
     "Created: / 26.9.1999 / 13:39:07 / cg"
 ! !
 
+!Project::ClassInfo methodsFor:'accessing'!
+
+classFileName
+    "return the value of the instance variable 'classFileName' (automatically generated)"
+
+    ^ classFileName!
+
+classFileName:something
+    "set the value of the instance variable 'classFileName' (automatically generated)"
+
+    classFileName := something.!
+
+className
+    "return the value of the instance variable 'className' (automatically generated)"
+
+    ^ className!
+
+className:something
+    "set the value of the instance variable 'className' (automatically generated)"
+
+    className := something.!
+
+conditionForInclusion
+    "return the value of the instance variable 'conditionForInclusion' (automatically generated)"
+
+    ^ conditionForInclusion!
+
+conditionForInclusion:something
+    "set the value of the instance variable 'conditionForInclusion' (automatically generated)"
+
+    conditionForInclusion := something.! !
+
+!Project::ClassInfo methodsFor:'printing & storing'!
+
+displayString
+    ^ 'ClassInfo: ' , className
+! !
+
+!Project::ClassInfo methodsFor:'queries'!
+
+theClass
+    |cls|
+
+    cls := Smalltalk classNamed:className.
+    cls isNil ifTrue:[ ^ nil].
+    ^ cls
+
+    "Created: / 26.9.1999 / 13:39:00 / cg"
+! !
+
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.153 2000-03-24 16:43:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.154 2000-03-24 17:04:03 cg Exp $'
 ! !
 Project initialize!
--- a/Smalltalk.st	Fri Mar 24 17:43:57 2000 +0100
+++ b/Smalltalk.st	Fri Mar 24 18:04:25 2000 +0100
@@ -864,7 +864,7 @@
 !
 
 defineNameSpace: name private: private imports: imports category: category attributes: annotations
-    Namespace name:name
+    NameSpace name:name
 
 !
 
@@ -5556,5 +5556,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.442 2000-03-24 16:41:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.443 2000-03-24 17:04:25 cg Exp $'
 ! !
hg/stx-libbasic