--- a/AbstractLauncherApplication.st	Fri Dec 01 14:03:51 2006 +0100
+++ b/AbstractLauncherApplication.st	Fri Dec 01 14:03:55 2006 +0100
@@ -14,7 +14,7 @@
 ToolApplicationModel subclass:#AbstractLauncherApplication
 	instanceVariableNames:'transcript'
 	classVariableNames:'NotifyingEmergencyHandler OpenLaunchers RegisteredMenuHandlers
-		OpenSettingsDialog SettingsList'
+		OpenSettingsDialog'
 	poolDictionaries:''
 	category:'Interface-Smalltalk'
 !
@@ -202,10 +202,6 @@
 !
 
 defaultSettingsApplicationList
-    "when changed, execute:
-                SettingsList := nil
-     to flush cached list.
-    "
     ^ #(          
         #('Language'                    #'AbstractSettingsApplication::LanguageSettingsAppl'            )
         #('Keyboard Mappings'           #'AbstractSettingsApplication::KbdMappingSettingsAppl'          )
@@ -238,7 +234,8 @@
         #('Communication/HTTPServer'    #'AbstractSettingsApplication::HTTPStartServerSettingsApplication'   )
     ) asOrderedCollection
 
-    "Modified: / 16.12.2002 / 18:12:28 / penk"
+    "Modified: / 16-12-2002 / 18:12:28 / penk"
+    "Modified: / 01-12-2006 / 14:00:43 / cg"
 !
 
 removeSettingsApplicationByClass:aClass
@@ -265,39 +262,37 @@
 !
 
 settingsList
-    |rawList filteredList|
-
-"/    SettingsList isNil ifTrue:[
-        rawList := self defaultSettingsApplicationList.
-        filteredList := rawList select:[:eachEntry|
-                            |className|
-
-                            className := eachEntry at:2 ifAbsent:nil.
-                            className isNil
-                            or:[ (Smalltalk at:className) notNil ]
+    |rawList filteredList settingsList|
+
+    rawList := self defaultSettingsApplicationList.
+    filteredList := rawList select:[:eachEntry|
+                        |className|
+
+                        className := eachEntry at:2 ifAbsent:nil.
+                        className isNil
+                        or:[ (Smalltalk at:className) notNil ]
+                    ].
+
+    settingsList := filteredList collect:[:eachEntry|
+                        |iconSelector newEntry|
+
+                        iconSelector := eachEntry at:3 ifAbsent:nil.
+                        iconSelector isNil ifTrue:[
+                            eachEntry     
+                        ] ifFalse:[
+                            newEntry := eachEntry copy.
+                            newEntry at:3 put:(self perform:iconSelector).
+                            newEntry
                         ].
-
-        SettingsList := filteredList collect:[:eachEntry|
-                            |iconSelector newEntry|
-
-                            iconSelector := eachEntry at:3 ifAbsent:nil.
-                            iconSelector isNil ifTrue:[
-                                eachEntry     
-                            ] ifFalse:[
-                                newEntry := eachEntry copy.
-                                newEntry at:3 put:(self perform:iconSelector).
-                                newEntry
-                            ].
-                        ].
-"/    ].
-    ^ SettingsList
+                    ].
+    ^ settingsList
 
     "
-     SettingsList := nil        
      self settingsList  
     "
 
-    "Modified: / 16.12.2002 / 18:12:50 / penk"
+    "Modified: / 16-12-2002 / 18:12:50 / penk"
+    "Modified: / 01-12-2006 / 14:01:12 / cg"
 ! !
 
 !AbstractLauncherApplication methodsFor:'private'!
@@ -6554,5 +6549,5 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.341 2006-11-07 12:59:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.342 2006-12-01 13:03:55 cg Exp $'
 ! !