--- a/NewSystemBrowser.st Fri Feb 25 14:28:33 2005 +0100
+++ b/NewSystemBrowser.st Fri Feb 25 17:41:48 2005 +0100
@@ -13533,7 +13533,9 @@
classes := OrderedCollection new.
Smalltalk allClassesDo:[:eachClass |
- (eachClass isVisualStartable or:[eachClass isStartableWithMain])
+ (eachClass isVisualStartable
+ or:[eachClass isStartableWithMain
+ or:[eachClass isStartableWithStart]])
ifTrue:[
classes add:eachClass.
].
@@ -34693,22 +34695,30 @@
doSwitchDisplayMode := false.
] ifFalse:[
(cls isStartableWithMain) ifTrue:[
- self busyLabel:'starting main of %1' with:clsName.
- (self confirm:('Invoke %1''s main ?' bindWith:clsName)) ifTrue:[
+ self busyLabel:'invoking main of %1' with:clsName.
+ "/ (self confirm:('Invoke %1''s main ?' bindWith:clsName)) ifTrue:[
cls main.
- ].
+ "/ ].
doSwitchDisplayMode := false.
] ifFalse:[
- cls isLoaded ifFalse:[
- self busyLabel:'loading %1' with:clsName.
- self classLoad.
+ (cls isStartableWithStart) ifTrue:[
+ self busyLabel:'invoking start of %1' with:clsName.
+ "/ (self confirm:('Invoke %1''s start ?' bindWith:clsName)) ifTrue:[
+ cls start.
+ "/ ].
doSwitchDisplayMode := false.
- ] ifTrue:[
- (TestRunner notNil
- and:[(cls isSubclassOf:TestCase)
- and:[cls isAbstract not]]) ifTrue:[
- TestRunner openOnTestCase:cls.
+ ] ifFalse:[
+ cls isLoaded ifFalse:[
+ self busyLabel:'loading %1' with:clsName.
+ self classLoad.
doSwitchDisplayMode := false.
+ ] ifTrue:[
+ (TestRunner notNil
+ and:[(cls isSubclassOf:TestCase)
+ and:[cls isAbstract not]]) ifTrue:[
+ TestRunner openOnTestCase:cls.
+ doSwitchDisplayMode := false.
+ ].
].
].
].
@@ -36424,7 +36434,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.810 2005-02-25 13:28:33 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.811 2005-02-25 16:41:33 cg Exp $'
! !
NewSystemBrowser initialize!
--- a/Tools_ClassList.st Fri Feb 25 14:28:33 2005 +0100
+++ b/Tools_ClassList.st Fri Feb 25 17:41:48 2005 +0100
@@ -1280,41 +1280,44 @@
|c|
cls isVisualStartable ifTrue:[
- ^ SystemBrowser startableVisualAppIcon
+ ^ SystemBrowser startableVisualAppIcon
].
cls isStartableWithMain ifTrue:[
- ^ SystemBrowser startableClassIcon
+ ^ SystemBrowser startableClassIcon
+ ].
+ cls isStartableWithStart ifTrue:[
+ ^ SystemBrowser startableClassIcon
].
cls isLoaded ifFalse:[
- ^ SystemBrowser autoloadedClassIcon
+ ^ SystemBrowser autoloadedClassIcon
].
c := cls.
[c notNil] whileTrue:[
- c == Warning ifTrue:[
- ^ SystemBrowser warningClassIcon
- ].
- c == Query ifTrue:[
- ^ SystemBrowser queryClassIcon
- ].
- c == Notification ifTrue:[
- ^ SystemBrowser notificationClassIcon
- ].
- c == Error ifTrue:[
- ^ SystemBrowser errorClassIcon
- ].
- c == GenericException ifTrue:[
- ^ SystemBrowser exceptionClassIcon
- ].
- c == SimpleView ifTrue:[
- ^ SystemBrowser windowClassIcon
- ].
- c == Collection ifTrue:[
- ^ SystemBrowser containerClassIcon
- ].
- (c == TestCase and:[cls isAbstract not "cls ~~ TestCase"]) ifTrue:[
- ^ SystemBrowser testCaseClassIconFor:cls
- ].
- c := c superclass
+ c == Warning ifTrue:[
+ ^ SystemBrowser warningClassIcon
+ ].
+ c == Query ifTrue:[
+ ^ SystemBrowser queryClassIcon
+ ].
+ c == Notification ifTrue:[
+ ^ SystemBrowser notificationClassIcon
+ ].
+ c == Error ifTrue:[
+ ^ SystemBrowser errorClassIcon
+ ].
+ c == GenericException ifTrue:[
+ ^ SystemBrowser exceptionClassIcon
+ ].
+ c == SimpleView ifTrue:[
+ ^ SystemBrowser windowClassIcon
+ ].
+ c == Collection ifTrue:[
+ ^ SystemBrowser containerClassIcon
+ ].
+ (c == TestCase and:[cls isAbstract not "cls ~~ TestCase"]) ifTrue:[
+ ^ SystemBrowser testCaseClassIconFor:cls
+ ].
+ c := c superclass
].
^ nil
!
@@ -1595,5 +1598,5 @@
!ClassList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.5 2005-02-02 11:01:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.6 2005-02-25 16:41:48 cg Exp $'
! !
--- a/Tools__NewSystemBrowser.st Fri Feb 25 14:28:33 2005 +0100
+++ b/Tools__NewSystemBrowser.st Fri Feb 25 17:41:48 2005 +0100
@@ -13533,7 +13533,9 @@
classes := OrderedCollection new.
Smalltalk allClassesDo:[:eachClass |
- (eachClass isVisualStartable or:[eachClass isStartableWithMain])
+ (eachClass isVisualStartable
+ or:[eachClass isStartableWithMain
+ or:[eachClass isStartableWithStart]])
ifTrue:[
classes add:eachClass.
].
@@ -34693,22 +34695,30 @@
doSwitchDisplayMode := false.
] ifFalse:[
(cls isStartableWithMain) ifTrue:[
- self busyLabel:'starting main of %1' with:clsName.
- (self confirm:('Invoke %1''s main ?' bindWith:clsName)) ifTrue:[
+ self busyLabel:'invoking main of %1' with:clsName.
+ "/ (self confirm:('Invoke %1''s main ?' bindWith:clsName)) ifTrue:[
cls main.
- ].
+ "/ ].
doSwitchDisplayMode := false.
] ifFalse:[
- cls isLoaded ifFalse:[
- self busyLabel:'loading %1' with:clsName.
- self classLoad.
+ (cls isStartableWithStart) ifTrue:[
+ self busyLabel:'invoking start of %1' with:clsName.
+ "/ (self confirm:('Invoke %1''s start ?' bindWith:clsName)) ifTrue:[
+ cls start.
+ "/ ].
doSwitchDisplayMode := false.
- ] ifTrue:[
- (TestRunner notNil
- and:[(cls isSubclassOf:TestCase)
- and:[cls isAbstract not]]) ifTrue:[
- TestRunner openOnTestCase:cls.
+ ] ifFalse:[
+ cls isLoaded ifFalse:[
+ self busyLabel:'loading %1' with:clsName.
+ self classLoad.
doSwitchDisplayMode := false.
+ ] ifTrue:[
+ (TestRunner notNil
+ and:[(cls isSubclassOf:TestCase)
+ and:[cls isAbstract not]]) ifTrue:[
+ TestRunner openOnTestCase:cls.
+ doSwitchDisplayMode := false.
+ ].
].
].
].
@@ -36424,7 +36434,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.810 2005-02-25 13:28:33 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.811 2005-02-25 16:41:33 cg Exp $'
! !
NewSystemBrowser initialize!