--- a/AbstractSettingsApplication.st	Wed Jul 09 14:56:02 2003 +0200
+++ b/AbstractSettingsApplication.st	Wed Jul 09 15:04:00 2003 +0200
@@ -1,7 +1,8 @@
 "{ Package: 'stx:libtool' }"
 
 ApplicationModel subclass:#AbstractSettingsApplication
-	instanceVariableNames:'settingsString currentUserPrefs modifiedChannel requestor'
+	instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
+		requestor'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Smalltalk'
@@ -243,16 +244,18 @@
 
 !AbstractSettingsApplication methodsFor:'accessing'!
 
-requestor
-    "return the value of the instance variable 'requestor' (automatically generated)"
-
-    ^ requestor
-!
-
 requestor:something
     "set the value of the instance variable 'requestor' (automatically generated)"
 
     requestor := something.
+!
+
+settingsDialog
+    ^ settingsDialog
+!
+
+settingsDialog:something
+    settingsDialog := something.
 ! !
 
 !AbstractSettingsApplication methodsFor:'actions'!
@@ -353,7 +356,7 @@
 !AbstractSettingsApplication methodsFor:'queries'!
 
 itemPathName
-    ^ self requestor getNameOfApplication:self.
+    ^ self settingsDialog getNameOfApplication:self.
 ! !
 
 !AbstractSettingsApplication::ByteCodeCompilerSettingsAppl class methodsFor:'defaults'!
@@ -3008,7 +3011,7 @@
 !AbstractSettingsApplication::HTTPStartServerSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.77 2003-07-09 12:56:02 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.78 2003-07-09 13:04:00 penk Exp $'
 ! !
 
 !AbstractSettingsApplication::HTTPStartServerSettingsApplication class methodsFor:'image specs'!
@@ -3204,14 +3207,14 @@
 createServerApplicationFor:aServerInstance
     |settingsApp itemPathName newItem openApps|
 
-    openApps := self requestor getAllChildrenAppsForApplication:self childrenClass:HTTPServerSettingsAppl.
+    openApps := self settingsDialog getAllChildrenAppsForApplication:self childrenClass:HTTPServerSettingsAppl.
     (openApps contains:[:app | app httpServerInstance == aServerInstance]) ifTrue:[
         " already have an Item for this application "
         ^ self 
     ].
 
     settingsApp := HTTPServerSettingsAppl basicNew.
-    settingsApp requestor:self requestor.
+    settingsApp settingsDialog:self settingsDialog.
     settingsApp httpServerInstance:aServerInstance.
     settingsApp basicInitialize.
     itemPathName := self itemPathName , '/HTTPServer Port ', aServerInstance port asString.
@@ -3351,7 +3354,7 @@
 
 hasCreatedServer
 
-    ^ (self requestor getAllChildrenAppsForApplication:self childrenClass:HTTPServerSettingsAppl) notEmpty
+    ^ (self settingsDialog getAllChildrenAppsForApplication:self childrenClass:HTTPServerSettingsAppl) notEmpty
 !
 
 hasUnsavedChanges
@@ -3905,7 +3908,7 @@
                     switch := false
                 ] ifFalse:[
                     answer ifTrue:[
-                        switch := ( self requestor fontBoxForEncoding:fontPref)
+                        switch := ( self settingsDialog fontBoxForEncoding:fontPref)
                     ]
                 ].
             ].
@@ -3919,8 +3922,8 @@
         ].
     ].
     switch ifTrue:[       
-        self requestor notNil ifTrue:[
-            self requestor reopenLauncher.
+        self settingsDialog notNil ifTrue:[
+            self settingsDialog reopenLauncher.
         ] ifFalse:[
             NewLauncher current reopenLauncher.
         ].
@@ -10813,5 +10816,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.77 2003-07-09 12:56:02 penk Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.78 2003-07-09 13:04:00 penk Exp $'
+! !