Project.st
changeset 4885 bdbdb37f4252
parent 4850 43b7eac07273
child 4886 63d9275b8210
--- a/Project.st	Fri Oct 08 17:24:09 1999 +0200
+++ b/Project.st	Sat Oct 09 12:01:13 1999 +0200
@@ -2357,11 +2357,9 @@
     Transcript current showCR:'creating sources in ' , dir pathName , ' ...'; endEntry.
 
     classes := self classes.
-    classes isNil ifTrue:[
+    classes size == 0 ifTrue:[
         self warn:'no classes in current project'
-    ].
-
-    classes notNil ifTrue:[
+    ] ifFalse:[
         classes do:[:aClass |
             aClass isLoaded ifFalse:[
                 aClass autoload.
@@ -2378,7 +2376,7 @@
     ].
 
     methods := self individualMethods.
-    methods notNil ifTrue:[
+    methods size > 0 ifTrue:[
         methods := methods asIdentitySet.
         "
          get classes ...
@@ -2733,9 +2731,10 @@
     |classes|
 
     classes := self classes.
-    classes isNil ifTrue:[^ isLoaded ? false].
+    classes size == 0 ifTrue:[^ isLoaded ? false].
+
     classes do:[:aClass |
-	aClass isLoaded ifFalse:[^ false].
+        aClass isLoaded ifFalse:[^ false].
     ].
     ^ true
 
@@ -2795,28 +2794,27 @@
     |classes classInfo|
 
     properties notNil ifTrue:[
-	classInfo := properties at:#classInfo ifAbsent:nil.
-	classInfo notNil ifTrue:[
-	    classes := classInfo collect:[:i | i className]
-	] ifFalse:[
-	    classes := properties at:#classes ifAbsent:nil
-	]
+        classInfo := properties at:#classInfo ifAbsent:nil.
+        classInfo notNil ifTrue:[
+            classes := classInfo collect:[:i | i className]
+        ] ifFalse:[
+            classes := properties at:#classes ifAbsent:nil
+        ]
     ].
 
     classes isNil ifTrue:[
-	classes := OrderedCollection new.
-	Smalltalk 
-	    allClassesDo:[:aClass |
-		(true "aClass owningClass isNil"
-		and:[aClass isMeta not
-		and:[aClass package = packageName
-		and:[aClass isNamespace not or:[aClass == Smalltalk]]]]) ifTrue:[
-		    classes add:aClass
-		]
-	    ].
-	classes isEmpty ifTrue:[^ nil].
+        classes := OrderedCollection new.
+        Smalltalk 
+            allClassesDo:[:aClass |
+                (true "aClass owningClass isNil"
+                and:[aClass isMeta not
+                and:[aClass package = packageName
+                and:[aClass isNamespace not or:[aClass == Smalltalk]]]]) ifTrue:[
+                    classes add:aClass
+                ]
+            ].
     ].
-    ^ classes
+    ^ classes ? #()
 
     "Modified: 4.1.1997 / 16:51:18 / cg"
 !
@@ -2833,34 +2831,32 @@
     |classes methods|
 
     classes := self classes.
-    classes notNil ifTrue:[
-	classes := classes asIdentitySet.
-    ] ifFalse:[
-	classes := #()
+    classes size > 0 ifTrue:[
+        classes := classes asIdentitySet.
     ].
 
     methods := IdentitySet new.
     Smalltalk allBehaviorsDo:[:cls |
-	|classToCheck|
-
-	classToCheck := cls.
+        |classToCheck|
+
+        classToCheck := cls.
 "/        cls isPrivate ifTrue:[
 "/            classToCheck := cls topOwningClass
 "/        ].
-	(classes isNil 
-	or:[((classes includes:classToCheck) 
-	    or:[classes includes:classToCheck name]) not]) ifTrue:[
-	    cls methodDictionary do:[:m |
-		m package = packageName ifTrue:[
-		    methods add:m
-		]
-	    ].
-	    cls class methodDictionary do:[:m |
-		m package = packageName ifTrue:[
-		    methods add:m
-		]
-	    ].
-	]
+        ((classes includes:classToCheck) 
+        or:[classes includes:classToCheck name]) not 
+        ifTrue:[
+            cls methodDictionary do:[:m |
+                m package = packageName ifTrue:[
+                    methods add:m
+                ]
+            ].
+            cls class methodDictionary do:[:m |
+                m package = packageName ifTrue:[
+                    methods add:m
+                ]
+            ].
+        ]
     ].
     ^ methods asArray
 
@@ -3225,6 +3221,6 @@
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.121 1999-10-06 12:32:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.122 1999-10-09 10:01:13 cg Exp $'
 ! !
 Project initialize!