--- a/Bookmark.st	Fri Jan 27 22:18:53 2012 +0100
+++ b/Bookmark.st	Sun Jan 29 12:53:39 2012 +0000
@@ -216,24 +216,22 @@
 icon
     "superclass BookmarkEntry says that I am responsible to implement this method"
     
-    icon isNil ifTrue:[ self initializeIcon ].
+    icon ifNil:[ 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 isNil ifTrue:[ self initializeLabel ].
-    ^label isNil 
-        ifTrue:[ self defaultLabel ]
-        ifFalse: [ label ].
+    label ifNil:[ self initializeLabel ].
+    ^label 
+        ifNil:[ self defaultLabel ]
+        ifNotNil: [ 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
@@ -440,12 +438,12 @@
     className := aString.
 
     (className endsWith: ' class') ifTrue:[
-        className := className copyTo: (className size - 6)"/ ' class' size - 1
+        className := className copyTo: (className size - 7)"/ ' class' size - 1
     ].
 
     className := className asSymbol.
 
-    "Modified: / 18-10-2011 / 13:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-06-2011 / 19:13:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !Bookmark::Class methodsFor:'accessing defaults'!
@@ -493,22 +491,20 @@
 
     | cls |
     cls :=  Smalltalk at: className asSymbol.
-    cls notNil ifTrue:[icon := SystemBrowser iconForClass: cls].
+    cls ifNotNil:[icon := SystemBrowser iconForClass: cls].
 
     "Created: / 05-05-2011 / 23:01:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 30-06-2011 / 19:10:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 29-11-2011 / 11:20:52 / cg"
 !
 
 initializeLabel
 
-    className isNil ifTrue:[^self].
+    className ifNil:[^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'!
@@ -676,14 +672,13 @@
 moveOut: child
 
     | index myindex |
-    self parent isNil ifTrue:[^self].
+    self parent ifNil:[^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
@@ -765,8 +760,8 @@
 
 initializeLabel
 
-    className isNil ifTrue:[^self].
-    selector  isNil ifTrue:[^self].
+    className ifNil:[^self].
+    selector  ifNil:[^self].
 
     label :=
         (className copyFrom: ((className lastIndexOf: $:) + 1)) asText allBold ,
@@ -774,7 +769,6 @@
 
     "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'!
@@ -900,9 +894,9 @@
 !Bookmark class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Bookmark.st,v 1.8 2011-11-29 10:20:58 cg Exp $'
+    ^ '§Header: /cvs/stx/stx/libtool/Bookmark.st,v 1.5 2011/07/08 09:40:06 cg Exp §'
 !
 
 version_SVN
-    ^ '§Id§'
-! !
+    ^ '$Id$'
+! !
\ No newline at end of file