load of explicitly install-as-autoloaded classes:
authorClaus Gittinger <cg@exept.de>
Tue, 01 Apr 2008 13:12:07 +0200
changeset 10926 64ffe2fe2340
parent 10925 61c04a27097e
child 10927 4ce8dcd6e1f3
load of explicitly install-as-autoloaded classes: use classFilename if absolute instead of project-path.
Autoload.st
--- a/Autoload.st	Mon Mar 31 17:56:21 2008 +0200
+++ b/Autoload.st	Tue Apr 01 13:12:07 2008 +0200
@@ -360,24 +360,30 @@
             do:[
                 Class classConventionViolationConfirmationQuerySignal answer:true
                 do:[
-                    (Smalltalk 
-                        fileInClass:myName
-                        package:packageID
-                        initialize:false 
-                        lazy:LazyLoading
-                        silent:nil)  
-                    isNil ifTrue:[
-                        "/ temporary: try without stx/package prefix
-                        "/ this will vanish as soon as source-directory
-                        "/ is always guaranteed to contain an stx-subtree
-                        ((packageID startsWith:'stx/') 
-                        or:[packageID startsWith:'stx:']) ifTrue:[
-                            Smalltalk 
-                                fileInClass:myName
-                                package:(packageID copyFrom:5)
-                                initialize:false 
-                                lazy:LazyLoading
-                                silent:nil.
+                    classFilename asFilename isAbsolute ifTrue:[
+                        "/ if filename is absolute, the autoload-class was created by an
+                        "/ explicit install-as-autoloaded via the fileBrowser.
+                        Smalltalk fileIn:classFilename lazy:false silent:nil.
+                    ] ifFalse:[
+                        (Smalltalk 
+                            fileInClass:myName
+                            package:packageID
+                            initialize:false 
+                            lazy:LazyLoading
+                            silent:nil)  
+                        isNil ifTrue:[
+                            "/ temporary: try without stx/package prefix
+                            "/ this will vanish as soon as source-directory
+                            "/ is always guaranteed to contain an stx-subtree
+                            ((packageID startsWith:'stx/') 
+                            or:[packageID startsWith:'stx:']) ifTrue:[
+                                Smalltalk 
+                                    fileInClass:myName
+                                    package:(packageID copyFrom:5)
+                                    initialize:false 
+                                    lazy:LazyLoading
+                                    silent:nil.
+                            ]
                         ]
                     ]
                 ]
@@ -907,7 +913,7 @@
 !Autoload class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.143 2006-10-23 16:12:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.144 2008-04-01 11:12:07 cg Exp $'
 ! !
 
 Autoload initialize!