--- a/FileDialog.st	Sat Feb 22 01:26:07 2020 +0100
+++ b/FileDialog.st	Sat Feb 22 01:34:15 2020 +0100
@@ -1671,8 +1671,8 @@
     self beLoadDialog:asLoadDialog ? false.
     self viewFiles:(viewFilesArg ? true).
 
-    self okLabelHolder value:okText.
-    self cancelLabelHolder value:abortText.
+    okLabelHolder value:okText.
+    cancelLabelHolder value:abortText.
 
     self doubleClickAction:[:anIndex|
         | item |
@@ -1862,7 +1862,7 @@
 !FileDialog methodsFor:'accessing-look'!
 
 hideButtonPanel
-    self buttonPanelVisibleHolder value:false
+    buttonPanelVisibleHolder value:false
 !
 
 newDirectoryVisibilityHolder
@@ -1873,7 +1873,7 @@
 !
 
 showButtonPanel
-    self buttonPanelVisibleHolder value:true
+    buttonPanelVisibleHolder value:true
 !
 
 viewFiles
@@ -1896,16 +1896,10 @@
     "if set, an additional 'append' button is shown
      (to let user append to a file, instead of overwriting the file)"
 
-    appendButtonVisibleHolder isNil ifTrue:[
-        appendButtonVisibleHolder := false asValue.
-    ].
     ^ appendButtonVisibleHolder
 !
 
 appendLabelHolder
-    appendLabelHolder isNil ifTrue:[
-        appendLabelHolder := 'Append' asValue.
-    ].
     ^ appendLabelHolder
 !
 
@@ -1923,31 +1917,20 @@
 browseMenuItemVisible:aBoolean
     "controls if an 'open filebrowser' menu item is to be shown in the toolbar"
 
-    self browseMenuItemVisibleHolder value:aBoolean
+    browseMenuItemVisibleHolder value:aBoolean
 !
 
 browseMenuItemVisibleHolder
     "controls if an 'open filebrowser' menu item is to be shown in the toolbar"
 
-    browseMenuItemVisibleHolder isNil ifTrue:[
-        browseMenuItemVisibleHolder := true "false" asValue.
-    ].
     ^ browseMenuItemVisibleHolder.
 !
 
 buttonPanelVisibleHolder
-    buttonPanelVisibleHolder isNil ifTrue:[
-        buttonPanelVisibleHolder := true asValue.
-        buttonPanelVisibleHolder onChangeSend:#buttonPanelVisibilityChanged to:self.
-    ].
     ^ buttonPanelVisibleHolder.
 !
 
 cancelLabelHolder
-
-    cancelLabelHolder isNil ifTrue:[
-        cancelLabelHolder := 'Cancel' asValue.
-    ].
     ^ cancelLabelHolder.
 !
 
@@ -2023,18 +2006,12 @@
 filenameLabelHolder
     "Return a value holder for the input string.
     "
-    filenameLabelHolder isNil ifTrue:[
-        filenameLabelHolder := 'Filename:' asValue.
-    ].
     ^ filenameLabelHolder
 !
 
 filterHolder
     "Return a value holder for filter"
 
-    filterHolder isNil ifTrue:[
-        filterHolder := (self pattern ? '*') asValue.
-    ].
     ^ filterHolder
 !
 
@@ -2122,11 +2099,6 @@
 !
 
 okLabelHolder
-    <resource: #uiAspect>
-
-    okLabelHolder isNil ifTrue:[
-        okLabelHolder := 'OK' asValue.
-    ].
     ^ okLabelHolder.
 !
 
@@ -2148,18 +2120,12 @@
 searchInfoBoxVisibleHolder
     "set during search-file operation"
 
-    searchInfoBoxVisibleHolder isNil ifTrue:[
-        searchInfoBoxVisibleHolder := false asValue.
-    ].
     ^ searchInfoBoxVisibleHolder
 !
 
 searchedDirectoryInfoHolder
     "updated during search-file operation"
 
-    searchedDirectoryInfoHolder isNil ifTrue:[
-        searchedDirectoryInfoHolder := nil asValue.
-    ].
     ^ searchedDirectoryInfoHolder
 !
 
@@ -2354,7 +2320,7 @@
         ] ifFalse:[
             newLabel := 'Directory:'.
         ].
-        self filenameLabelHolder value:(resources string:newLabel)
+        filenameLabelHolder value:(resources string:newLabel)
     ].
     changedObject == self filenameHolder ifTrue:[
         fn := changedObject value asFilename.
@@ -2476,10 +2442,26 @@
 
 initialize
     super initialize.
+
     isLoadDialog := false.
     viewFiles := true.
     multipleSelect := false.
 
+    appendButtonVisibleHolder := false asValue.
+    appendLabelHolder := 'Append' asValue.
+    okLabelHolder := 'OK' asValue.
+    browseMenuItemVisibleHolder := true "false" asValue.
+
+    buttonPanelVisibleHolder := true asValue.
+    buttonPanelVisibleHolder onChangeSend:#buttonPanelVisibilityChanged to:self.
+
+    cancelLabelHolder := 'Cancel' asValue.
+    filenameLabelHolder := 'Filename:' asValue.
+    filterHolder := (self pattern ? '*') asValue.
+    searchInfoBoxVisibleHolder := false asValue.
+
+    searchedDirectoryInfoHolder := nil asValue.
+
     "Modified: / 10-09-2019 / 18:40:07 / Stefan Vogel"
 !
 
@@ -2778,8 +2760,8 @@
         [
             |dirHolder|
 
-            dirHolder := self searchedDirectoryInfoHolder.
-            self searchInfoBoxVisibleHolder value:true.
+            dirHolder := searchedDirectoryInfoHolder.
+            searchInfoBoxVisibleHolder value:true.
             self windowGroup processExposeEvents.
 
             treeBrowser 
@@ -2787,7 +2769,7 @@
                 under:searchRoot
                 searchInfoInto:[:path | dirHolder value:path. self windowGroup processExposeEvents].
         ] ensure:[
-            self searchInfoBoxVisibleHolder value:false
+            searchInfoBoxVisibleHolder value:false
         ]
     ].