--- a/Bookmark.st	Fri Nov 18 14:33:19 2011 +0100
+++ b/Bookmark.st	Fri Nov 18 14:33:21 2011 +0100
@@ -216,22 +216,24 @@
 icon
     "superclass BookmarkEntry says that I am responsible to implement this method"
     
-    icon ifNil:[ self initializeIcon ].
+    icon isNil ifTrue:[ self initializeIcon ].
     ^ icon
 
     "Created: / 05-05-2011 / 22:52:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-11-2011 / 14:30:44 / cg"
 !
 
 label
     "superclass BookmarkEntry says that I am responsible to implement this method"
     
-    label ifNil:[ self initializeLabel ].
-    ^label 
-        ifNil:[ self defaultLabel ]
-        ifNotNil: [ label ].
+    label isNil ifTrue:[ self initializeLabel ].
+    ^label isNil 
+        ifTrue:[ self defaultLabel ]
+        ifFalse: [ label ].
 
     "Created: / 05-05-2011 / 22:56:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-06-2011 / 11:56:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 18-11-2011 / 14:31:05 / cg"
 !
 
 label: aStringOrText
@@ -499,12 +501,13 @@
 
 initializeLabel
 
-    className ifNil:[^self].
+    className isNil ifTrue:[^self].
 
     label := className copyFrom: (className lastIndexOf: $:) + 1
 
     "Created: / 05-05-2011 / 23:03:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-06-2011 / 11:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-11-2011 / 14:31:11 / cg"
 ! !
 
 !Bookmark::Class methodsFor:'testing'!
@@ -672,13 +675,14 @@
 moveOut: child
 
     | index myindex |
-    self parent ifNil:[^self].
+    self parent isNil ifTrue:[^self].
     index := children identityIndexOf: child.
     myindex := self parent children identityIndexOf: self.
     self removeIndex: index. 
     self parent add: child afterIndex: myindex.
 
     "Created: / 03-06-2011 / 10:32:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-11-2011 / 14:31:15 / cg"
 !
 
 moveUp: child
@@ -760,8 +764,8 @@
 
 initializeLabel
 
-    className ifNil:[^self].
-    selector  ifNil:[^self].
+    className isNil ifTrue:[^self].
+    selector  isNil ifTrue:[^self].
 
     label :=
         (className copyFrom: ((className lastIndexOf: $:) + 1)) asText allBold ,
@@ -769,6 +773,7 @@
 
     "Created: / 05-05-2011 / 23:04:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-06-2011 / 22:00:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-11-2011 / 14:31:19 / cg"
 ! !
 
 !Bookmark::Method methodsFor:'testing'!
@@ -894,7 +899,7 @@
 !Bookmark class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Bookmark.st,v 1.6 2011-10-18 11:37:03 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Bookmark.st,v 1.7 2011-11-18 13:33:21 cg Exp $'
 !
 
 version_SVN