Fix when loading classes jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sat, 19 Jun 2010 14:38:38 +0100
branchjv
changeset 17770 60bc0bab4e10
parent 17769 588c89dcb634
child 17771 d6d2b68253cf
Fix when loading classes
ProjectDefinition.st
--- a/ProjectDefinition.st	Sat Jun 19 12:26:05 2010 +0100
+++ b/ProjectDefinition.st	Sat Jun 19 14:38:38 2010 +0100
@@ -4724,14 +4724,16 @@
         ((cls isNil or:[cls isLoaded not and:[isAutoload not]]) and:[clsLang notNil and:[langs includes: clsLang]]) ifTrue:[
             (eachAttributes isEmpty
              or:[(eachAttributes size == 1 and:[isAutoload])
-             or:[eachAttributes includes:platformName]]) ifTrue:[
-                hasClassesToLoad := true.
-                isAutoload ifTrue:[
-                    classNamesToAutoload add:eachClassnameSym.
-                ] ifFalse:[
-                    classNamesToLoad add:eachClassnameSym.
+             or:[(eachAttributes includes:platformName)
+             or:[eachAttributes contains:[:a|a isArray]]]]) "/FIXME: Hack."
+                ifTrue:[
+                    hasClassesToLoad := true.
+                    isAutoload ifTrue:[
+                        classNamesToAutoload add:eachClassnameSym.
+                    ] ifFalse:[
+                        classNamesToLoad add:eachClassnameSym.
+                    ].
                 ].
-            ].
         ].
     ].
 
@@ -4809,7 +4811,7 @@
     "Modified: / 26-10-2006 / 12:30:01 / cg"
     "Modified: / 16-08-2009 / 13:31:40 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Created: / 19-06-2010 / 11:35:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 19-06-2010 / 13:24:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-06-2010 / 15:06:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 loadClass: className asAutoloaded: asAutoloaded language: lang
@@ -5588,7 +5590,7 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ProjectDefinition.st 10529 2010-06-19 11:26:05Z vranyj1 $'
+    ^ '$Id: ProjectDefinition.st 10530 2010-06-19 13:38:38Z vranyj1 $'
 !
 
 version_CVS
@@ -5596,7 +5598,7 @@
 !
 
 version_SVN
-    ^ '$Id: ProjectDefinition.st 10529 2010-06-19 11:26:05Z vranyj1 $'
+    ^ '$Id: ProjectDefinition.st 10530 2010-06-19 13:38:38Z vranyj1 $'
 ! !
 
 ProjectDefinition initialize!