--- a/FileBrowser.st	Thu Feb 28 22:46:18 2013 +0000
+++ b/FileBrowser.st	Tue Mar 05 18:10:46 2013 +0000
@@ -84,6 +84,7 @@
 "
 ! !
 
+
 !FileBrowser class methodsFor:'instance creation'!
 
 on:aDirectoryPath
@@ -149,6 +150,7 @@
     "Modified: / 17.6.1998 / 11:25:29 / cg"
 ! !
 
+
 !FileBrowser class methodsFor:'aspects'!
 
 directoryBookmarks
@@ -160,6 +162,7 @@
     ^ AbstractFileBrowser directoryHistory.
 ! !
 
+
 !FileBrowser class methodsFor:'defaults'!
 
 defaultIcon
@@ -190,12 +193,14 @@
     "Modified: / 17-09-2007 / 11:36:12 / cg"
 ! !
 
+
 !FileBrowser class methodsFor:'fileList user interaction'!
 
 goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName
     ^ DoWhatIMeanSupport goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName
 ! !
 
+
 !FileBrowser class methodsFor:'history'!
 
 addToCommandHistory:aCommandString for:aFilename
@@ -240,6 +245,7 @@
     VisitedFileHistory addFirst:path.
 ! !
 
+
 !FileBrowser class methodsFor:'icon-presentation'!
 
 addOnIconsFor:aFilename to:anIcon
@@ -307,6 +313,7 @@
     ^ MIMETypeIconLibrary iconKeyForRemoteDirectory:aFilenameArg
 ! !
 
+
 !FileBrowser class methodsFor:'interface specs'!
 
 fileSearchDialogSpec
@@ -439,6 +446,7 @@
       )
 ! !
 
+
 !FileBrowser class methodsFor:'menu specs'!
 
 baseBookmarksMenuSpec
@@ -1468,6 +1476,7 @@
     ^ m
 ! !
 
+
 !FileBrowser class methodsFor:'queries'!
 
 isVisualStartable
@@ -1477,6 +1486,7 @@
     ^ true
 ! !
 
+
 !FileBrowser methodsFor:'aspects'!
 
 anyFilesPresentWithSuffix:suffix
@@ -1872,6 +1882,7 @@
     "Created: / 4.8.1998 / 13:37:37 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'drag & drop'!
 
 canDropObjects:aCollectionOfDropObjects
@@ -1941,6 +1952,7 @@
     "Modified: 6.4.1997 / 14:46:44 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'events'!
 
 handlesKeyPress:key inView:view
@@ -2062,6 +2074,7 @@
     "Modified: / 18.2.1998 / 17:57:44 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'fileList user interaction'!
 
 bigImagePreviewSettingChanged
@@ -2310,8 +2323,11 @@
                 ].
 
                 Transcript showCR:'loading ' , p , ' ...'.
-                ObjectFileLoader loadObjectFile:p.
-                Class addInfoRecord:('fileIn ' , fileName) 
+                (ObjectFileLoader loadObjectFile:p) isNil ifTrue:[
+                    Transcript showCR:'Error: could not load ' , p.
+                ] ifFalse:[
+                    Class addInfoRecord:('fileIn ' , fileName).
+                ].
             ]
         ] ifFalse:[ ((path hasSuffix:'cls') 
                      and:[((path mimeTypeOfContents ? '') startsWith:'application/x-smalltalk-source') not ]) ifTrue:[
@@ -3828,6 +3844,7 @@
     "Modified: / 4.8.1998 / 13:44:14 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'help'!
 
 helpTextFor:aComponent
@@ -3854,6 +3871,7 @@
     ^ nil
 ! !
 
+
 !FileBrowser methodsFor:'initialization & release'!
 
 createTabRulerIn:topFrame
@@ -4358,6 +4376,7 @@
     "Created: 24.7.1997 / 18:13:46 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'menu actions'!
 
 addBookmark
@@ -4506,6 +4525,7 @@
     "Modified: / 14.8.1998 / 16:44:00 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'menu actions-cvs'!
 
 cvsAddAndCommitSelection
@@ -4720,6 +4740,7 @@
     "Modified: / 21.10.1998 / 17:02:11 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'misc user interaction'!
 
 closeRequest
@@ -4853,6 +4874,7 @@
     "Modified: 29.5.1996 / 16:13:43 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'pathField user interaction'!
 
 addDirToJavaClassPath
@@ -5184,6 +5206,7 @@
     "Created: 2.8.1997 / 14:11:41 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'private'!
 
 ask:question yesButton:yesButtonText
@@ -5365,6 +5388,7 @@
     ^ aCollection reject:[:fn | fn asFilename isHidden].
 ! !
 
+
 !FileBrowser methodsFor:'private-actions & command execution'!
 
 binaryFileAction:aFilename
@@ -5733,6 +5757,7 @@
     "Modified: 18.9.1997 / 16:58:40 / stefan"
 ! !
 
+
 !FileBrowser methodsFor:'private-directory stuff'!
 
 changeToPreviousDirectory
@@ -5989,6 +6014,7 @@
     "Modified: / 16.12.1998 / 22:55:44 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'private-file I/O'!
 
 readFile:fileName
@@ -6299,6 +6325,7 @@
     "Modified: / 6.5.1999 / 11:45:50 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'private-file stuff'!
 
 doCreateFile:newName
@@ -6654,6 +6681,7 @@
     "Modified: / 21-09-2006 / 18:34:45 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'private-file type & info'!
 
 fileTypeSpecificActions
@@ -6872,6 +6900,7 @@
     ^ (n printStringLeftPaddedTo:5) , unitString.
 ! !
 
+
 !FileBrowser methodsFor:'private-presentation'!
 
 defineTabulatorsForLongList
@@ -7465,6 +7494,7 @@
     "Modified: / 15.11.2001 / 23:49:03 / cg"
 ! !
 
+
 !FileBrowser methodsFor:'queries'!
 
 fileName
@@ -7499,14 +7529,15 @@
     "Modified: / 12.8.1998 / 14:45:48 / cg"
 ! !
 
+
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.643 2012-07-27 09:07:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.644 2013-03-02 13:19:21 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.643 2012-07-27 09:07:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.644 2013-03-02 13:19:21 stefan Exp $'
 !
 
 version_HG