--- a/Project.st	Fri Oct 06 17:15:27 2000 +0200
+++ b/Project.st	Fri Oct 06 22:11:48 2000 +0200
@@ -22,15 +22,15 @@
 	category:'System-Support'
 !
 
-Object subclass:#MethodInfo
-	instanceVariableNames:'conditionForInclusion methodName className fileName'
+Object subclass:#ClassInfo
+	instanceVariableNames:'conditionForInclusion className classFileName'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:Project
 !
 
-Object subclass:#ClassInfo
-	instanceVariableNames:'conditionForInclusion className classFileName'
+Object subclass:#MethodInfo
+	instanceVariableNames:'conditionForInclusion methodName className fileName'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:Project
@@ -3134,16 +3134,18 @@
 
     |infoCollection index nm prefix|
 
+    prefix := self defaultNameSpace name , '::'.
+
     infoCollection := self methodInfo.
 
     index := infoCollection findFirst:[:i | |cnm1 cnm2|
                                         cnm1 := i className.
                                         cnm2 := newInfo className.
                                         (cnm1 includes:$:) ifFalse:[
-                                            cnm1 := self defaultNameSpace name , '::' , cnm1
+                                            cnm1 := prefix , cnm1
                                         ].
                                         (cnm2 includes:$:) ifFalse:[
-                                            cnm2 := self defaultNameSpace name , '::' , cnm2
+                                            cnm2 := prefix , cnm2
                                         ].
                                         cnm1 = cnm2 and:[i methodName = newInfo methodName]
                                       ].
@@ -3151,7 +3153,6 @@
     "/ the default ...
 
     nm := newInfo className.
-    prefix := self defaultNameSpace name , '::'.
     (nm startsWith:prefix) ifTrue:[
         nm := nm copyFrom:(prefix size + 1).
         newInfo className:nm asSymbol.
@@ -3745,6 +3746,56 @@
     "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,59 +3865,9 @@
     "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.161 2000-09-03 14:44:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.162 2000-10-06 20:11:48 cg Exp $'
 ! !
 Project initialize!