--- a/WorkspaceApplication.st	Thu Aug 11 01:45:39 2011 +0200
+++ b/WorkspaceApplication.st	Thu Aug 11 08:34:22 2011 +0200
@@ -63,25 +63,31 @@
 !
 
 defaultMyWorkspaceDotWspFile
-    | f |
-
-    f := Filename homeDirectory / '.smalltalk' / 'MyWorkspace.wsp'.
+    |stxFolder f |
+
+    stxFolder := Filename homeDirectory / '.smalltalk'. 
+    f := stxFolder / 'MyWorkspace.wsp'.
     f exists ifFalse:[
-        (Filename homeDirectory / '.smalltalk') recursiveMakeDirectory.
+        stxFolder makeDirectory.
+
         f writingFileDo:[:s|
             'MyWorkspace.wsp' asFilename exists ifTrue:[
                 s nextPutAll:('MyWorkspace.wsp' asFilename contentsAsString)   
             ] ifFalse:[
                 s nextPutLine: '"This is your personal workspace..."'.
                 s nextPutLine: '"Edit and save as  ', f pathName , '"'.
+
+                'MyWorkspaceSample.wsp' asFilename exists ifTrue:[
+                    s nextPutAll:('MyWorkspaceSample.wsp' asFilename contentsAsString)   
+                ]
             ]
         ]
     ].
     ^f
 
     "Created: / 21-06-2011 / 08:45:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 05-07-2011 / 15:23:40 / cg"
     "Modified: / 14-07-2011 / 13:08:30 / Administrator"
+    "Modified: / 10-08-2011 / 21:40:31 / cg"
 !
 
 defaultToolbarVisible
@@ -1688,8 +1694,13 @@
 
     ws := self openWith: nil.
     ws enqueueDelayedAction:[
-        BookmarkList forWorkspace myWorkspaces do:[:bookmark|
-            ws switchToBookmarkEntry: bookmark
+        Error handle:[:ex |
+            "/ no time to debug that stuff now...
+            Dialog information:'Error in bookmark handling: ',ex description
+        ] do:[
+            BookmarkList forWorkspace myWorkspaces do:[:bookmark|
+                ws switchToBookmarkEntry: bookmark
+            ].
         ].
         ws selectedWorkspaceIndexHolder value: 1.
     ].
@@ -1700,6 +1711,7 @@
 
     "Modified: / 21-06-2011 / 08:58:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 14-07-2011 / 13:11:32 / Administrator"
+    "Modified: / 10-08-2011 / 21:31:49 / cg"
 !
 
 openMyWorkspace_old
@@ -3767,11 +3779,11 @@
 !WorkspaceApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.211 2011-08-09 21:00:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.212 2011-08-11 06:34:22 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.211 2011-08-09 21:00:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.212 2011-08-11 06:34:22 cg Exp $'
 !
 
 version_SVN