--- a/BookmarkList.st Sun Jan 29 12:56:58 2012 +0000
+++ b/BookmarkList.st Sun Jan 29 15:33:37 2012 +0000
@@ -111,20 +111,18 @@
!
readFromFile: aStringOrFilename onError: aBlock
+ | bookmarks file |
- | bookmarks file |
file := aStringOrFilename asFilename.
- file exists ifFalse:
- [^aBlock value].
- bookmarks := self readFrom: file readStream onError:
- [^aBlock value].
- bookmarks ifNil:
- [^aBlock value].
+ file exists ifFalse: [^aBlock value].
+ bookmarks := self readFrom: file readStream onError: [^aBlock value].
+ bookmarks isNil ifTrue: [^aBlock value].
bookmarks fileName: file pathName.
^bookmarks
"Created: / 23-05-2011 / 16:32:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 02-06-2011 / 19:43:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-11-2011 / 14:32:24 / cg"
! !
!BookmarkList class methodsFor:'accessing'!
@@ -179,16 +177,17 @@
| file |
file := Filename defaultDirectory / 'browser-bookmarks.rc'.
BrowserBookmarks := self readFromFile: file onError:[nil].
- BrowserBookmarks ifNotNil:[^self].
+ BrowserBookmarks notNil ifTrue:[^self].
file := Filename homeDirectory / '.smalltalk' / 'browser-bookmarks.rc'.
BrowserBookmarks := self readFromFile: file onError:[nil].
- BrowserBookmarks ifNotNil:[^self].
+ BrowserBookmarks notNil ifTrue:[^self].
BrowserBookmarks := self new fileName: file pathName.
"Created: / 23-05-2011 / 10:06:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 23-05-2011 / 16:35:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-11-2011 / 11:21:06 / cg"
!
initializeWebBookmarks
@@ -196,15 +195,16 @@
| file |
file := Filename defaultDirectory / 'web-bookmarks.rc'.
WebBookmarks := self readFromFile: file onError:[nil].
- WebBookmarks ifNotNil:[^self].
+ WebBookmarks notNil ifTrue:[^self].
file := Filename homeDirectory / '.smalltalk' / 'web-bookmarks.rc'.
WebBookmarks := self readFromFile: file onError:[nil].
- WebBookmarks ifNotNil:[^self].
+ WebBookmarks notNil ifTrue:[^self].
WebBookmarks := self new fileName: file pathName.
"Created: / 08-06-2011 / 12:15:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-11-2011 / 11:21:10 / cg"
!
initializeWorkspaceBookmarks
@@ -212,11 +212,11 @@
| file |
file := Filename defaultDirectory / 'workspace-bookmarks.rc'.
WorkspaceBookmarks := self readFromFile: file onError:[nil].
- WorkspaceBookmarks ifNotNil:[^self].
+ WorkspaceBookmarks notNil ifTrue:[^self].
file := Filename homeDirectory / '.smalltalk' / 'workspace-bookmarks.rc'.
WorkspaceBookmarks := self readFromFile: file onError:[nil].
- WorkspaceBookmarks ifNotNil:[^self].
+ WorkspaceBookmarks notNil ifTrue:[^self].
WorkspaceBookmarks := self new fileName: file pathName.
WorkspaceBookmarks root add:
@@ -235,6 +235,7 @@
"Created: / 20-06-2011 / 22:10:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 21-06-2011 / 08:46:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-11-2011 / 11:21:16 / cg"
! !
!BookmarkList methodsFor:'accessing'!
@@ -380,9 +381,9 @@
!BookmarkList class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/BookmarkList.st,v 1.2 2011/07/03 18:00:51 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/BookmarkList.st,v 1.4 2011/11/29 10:21:52 cg Exp §'
!
version_SVN
^ '$Id$'
-! !
\ No newline at end of file
+! !