FileBrowserV2SettingsAppl.st
changeset 6389 9f4010737320
parent 6063 74124a9963bc
child 7786 b23413a469e7
--- a/FileBrowserV2SettingsAppl.st	Tue Oct 04 21:57:51 2005 +0200
+++ b/FileBrowserV2SettingsAppl.st	Wed Oct 05 13:37:37 2005 +0200
@@ -336,16 +336,16 @@
 !FileBrowserV2SettingsAppl methodsFor:'actions'!
 
 basicSaveSettings
-    |aspectList req writeToCurrentFileBrowser|
+    |aspectList writeToCurrentFileBrowser|
 
     aspectList := AbstractFileBrowser userPreferencesAspectList.
-    req := self settingsDialog.
-    writeToCurrentFileBrowser := (req notNil and:[req isKindOf:AbstractFileBrowser]).
-    aspectList do:[ :aAspect | |value|
-        value := (self perform:aAspect) value.
-        (currentUserPrefs perform:((aAspect asString, ':') asSymbol) with:value).
+
+    writeToCurrentFileBrowser := (settingsDialog notNil and:[settingsDialog isKindOf:AbstractFileBrowser]).
+    aspectList do:[ :anAspect | |value|
+        value := (self perform:anAspect) value.
+        (currentUserPrefs perform:((anAspect asString, ':') asSymbol) with:value).
         writeToCurrentFileBrowser ifTrue:[
-            (req perform:aAspect) value:value.
+            (settingsDialog perform:anAspect) value:value.
         ].
     ].
 !
@@ -355,18 +355,17 @@
 !
 
 readSettings
-    |req receiver aspectList|
+    |receiver aspectList|
 
-    req := self settingsDialog.
-    receiver := (req notNil and:[req isKindOf:AbstractFileBrowser]) ifTrue:[
-                req
+    receiver := (settingsDialog notNil and:[settingsDialog isKindOf:AbstractFileBrowser]) ifTrue:[
+                settingsDialog
             ] ifFalse:[
                 currentUserPrefs
             ].
     aspectList := AbstractFileBrowser userPreferencesAspectList.
-    aspectList do:[:aAspect | |value|
-        value := (receiver perform:aAspect) value.
-        (self perform:aAspect) value:value
+    aspectList do:[:anAspect | |value|
+        value := (receiver perform:anAspect) value.
+        (self perform:anAspect) value:value
     ].
     self modifiedChannel value:false
 ! !
@@ -555,18 +554,17 @@
 
 hasUnsavedChanges
 
-    |aspectList req receiver|
+    |aspectList receiver|
 
-    req := self settingsDialog.
-    receiver := (req notNil and:[req isKindOf:AbstractFileBrowser]) ifTrue:[
-                req
+    receiver := (settingsDialog notNil and:[settingsDialog isKindOf:AbstractFileBrowser]) ifTrue:[
+                settingsDialog
             ] ifFalse:[
                 currentUserPrefs
             ].
 
     aspectList := AbstractFileBrowser userPreferencesAspectList.
-    aspectList do:[ : aAspect |
-        (self perform:aAspect) value ~= (receiver perform:aAspect) value ifTrue:[ 
+    aspectList do:[ :anAspect |
+        (self perform:anAspect) value ~= (receiver perform:anAspect) value ifTrue:[ 
             ^ true
         ]
     ].
@@ -576,5 +574,5 @@
 !FileBrowserV2SettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.20 2004-10-04 11:33:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.21 2005-10-05 11:36:39 cg Exp $'
 ! !