--- a/AbstractLauncherApplication.st Wed Mar 05 23:18:57 2014 +0100
+++ b/AbstractLauncherApplication.st Wed Mar 05 23:20:05 2014 +0100
@@ -702,46 +702,48 @@
"find some application, given the classes name.
Look for it in Smalltalk and the given nameSpace"
- |cls|
+ |cls classNameSymbol|
classOrClassName isBehavior ifTrue:[
cls := classOrClassName.
] ifFalse:[
- cls := Smalltalk at:classOrClassName asSymbol.
- cls isNil ifTrue:[
- "/ look if its in the nameSpace
- aNameSpace notNil ifTrue:[
- cls := aNameSpace at:classOrClassName asSymbol
- ].
+ (classNameSymbol := classOrClassName asSymbolIfKnown) notNil ifTrue:[
+ cls := Smalltalk at:classNameSymbol.
cls isNil ifTrue:[
- (Dialog confirm:(resources
- stringWithCRs:'Sorry, the ''%1''-class is not available.\\Shall I try to autoload it?'
- with:classOrClassName allBold)) ifFalse:[
- ^ nil
+ "/ look if its in the nameSpace
+ aNameSpace notNil ifTrue:[
+ cls := aNameSpace at:classNameSymbol
].
- self withWaitCursorDo:[
- #(
- 'stx:clients'
- 'stx:goodies'
- 'stx:libwidg3'
- ) do:[:pkg |
- Processor activeProcess withPriority:(Processor userSchedulingPriority) do:[
- Smalltalk recursiveInstallAutoloadedClassesFrom:(Smalltalk projectDirectoryForPackage:pkg).
+ cls isNil ifTrue:[
+ (Dialog confirm:(resources
+ stringWithCRs:'Sorry, the ''%1''-class is not available.\\Shall I try to autoload it?'
+ with:classOrClassName allBold)) ifFalse:[
+ ^ nil
+ ].
+ self withWaitCursorDo:[
+ #(
+ 'stx:clients'
+ 'stx:goodies'
+ 'stx:libwidg3'
+ ) do:[:pkg |
+ Processor activeProcess withPriority:(Processor userSchedulingPriority) do:[
+ Smalltalk recursiveInstallAutoloadedClassesFrom:(Smalltalk projectDirectoryForPackage:pkg).
+ ].
].
].
- ].
- cls := Smalltalk at:classOrClassName asSymbol.
- cls isNil ifTrue:[
- "/ look if it's in the nameSpace
- aNameSpace notNil ifTrue:[
- cls := aNameSpace at:classOrClassName asSymbol
+ cls := Smalltalk at:classNameSymbol.
+ cls isNil ifTrue:[
+ "/ look if it's in the nameSpace
+ aNameSpace notNil ifTrue:[
+ cls := aNameSpace at:classNameSymbol
+ ].
+ cls isNil ifTrue:[
+ Dialog warn:(resources stringWithCRs:'Autoload failed.\\Sorry, please check the "stx:clients/demos" & "stx:goodies/clients" directories and load manually.').
+ ^ nil
+ ]
].
- cls isNil ifTrue:[
- Dialog warn:(resources stringWithCRs:'Autoload failed.\\Sorry, please check the "stx:clients/demos" & "stx:goodies/clients" directories and load manually.').
- ^ nil
- ]
+ "/ self halt.
].
- "/ self halt.
].
].
].
@@ -6949,14 +6951,14 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.451 2014-03-05 10:10:27 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.452 2014-03-05 22:20:05 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.451 2014-03-05 10:10:27 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.452 2014-03-05 22:20:05 cg Exp $'
!
version_SVN
- ^ '$Id: AbstractLauncherApplication.st,v 1.451 2014-03-05 10:10:27 cg Exp $'
+ ^ '$Id: AbstractLauncherApplication.st,v 1.452 2014-03-05 22:20:05 cg Exp $'
! !