--- a/Tools_ClassList.st	Thu Aug 17 09:48:28 2006 +0200
+++ b/Tools_ClassList.st	Thu Aug 17 09:48:38 2006 +0200
@@ -999,6 +999,12 @@
 
 !ClassList methodsFor:'private'!
 
+iconForClass:aClass
+    ^ SystemBrowser iconForClass:aClass
+
+    "Created: / 17-08-2006 / 09:12:32 / cg"
+!
+
 listOfClasses
     |classesAlready classesOrdered generator nameSpaceFilter packageFilter allName hidePrivate
      privateClassesPerClass|
@@ -1279,7 +1285,7 @@
 "/                                                               string:nm
 "/                                        ].
                             markApplicationsHolder value== true ifTrue:[
-                                icon := self nameListIconForClass:cls theNonMetaclass.
+                                icon := self iconForClass:cls theNonMetaclass.
                                 icon isNil ifTrue:[
                                     icon := SystemBrowser emptyIcon
                                 ].
@@ -1291,51 +1297,7 @@
 
     ^ nameList
 
-    "Modified: / 10-08-2006 / 17:02:32 / cg"
-!
-
-nameListIconForClass:cls
-    |c|
-
-    cls isVisualStartable ifTrue:[
-        ^ SystemBrowser startableVisualAppIcon
-    ].
-    (cls isStartableWithMain 
-    or:[ cls isStartableWithStart ]) ifTrue:[
-        ^ SystemBrowser startableClassIcon
-    ].
-    cls isLoaded ifFalse:[
-        ^ 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
-    ].
-    ^ nil
+    "Modified: / 17-08-2006 / 09:12:24 / cg"
 !
 
 reconstructNameList
@@ -1648,5 +1610,5 @@
 !ClassList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.17 2006-08-10 15:16:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.18 2006-08-17 07:48:38 cg Exp $'
 ! !