diff -r 72029523c30a -r 5427bb64d15e MenuEditor.st
--- a/MenuEditor.st	Thu Jan 11 19:20:57 2007 +0100
+++ b/MenuEditor.st	Fri Jan 12 18:39:48 2007 +0100
@@ -1658,9 +1658,9 @@
 
     holder := builder bindingAt:#wizardHolder.
 
-    holder ifNil:[
-	holder := nil asValue.
-	builder aspectAt:#wizardHolder put:holder.
+    holder isNil ifTrue:[
+        holder := nil asValue.
+        builder aspectAt:#wizardHolder put:holder.
     ].
     ^ holder
 ! !
@@ -1788,7 +1788,7 @@
 
     wizardHolder := self wizardHolder.
     item := self selectedItem.
-    item ifNil:[ ^ wizardHolder value:nil ].
+    item isNil ifTrue:[ ^ wizardHolder value:nil ].
 
     tab := tabHolder value.
 
@@ -2025,11 +2025,11 @@
     "
     |done item|
 
-    dropOverLine ifNil:[^ false ].      "/ context not valid to me ...
+    dropOverLine isNil ifTrue:[^ false ].      "/ context not valid to me ...
 
     item := listOfItems at:dropOverLine ifAbsent:nil.
     self dropLeave:aDropContext.
-    item ifNil:[^ false].
+    item isNil ifTrue:[^ false].
 
     selectionHolder setValue:(Array with:item).
 
@@ -2097,7 +2097,7 @@
 
     |lnNr item|
 
-    dropOverLine ifNil:[^ self ].       "/ context not valid to me ...
+    dropOverLine isNil ifTrue:[^ self ].       "/ context not valid to me ...
 
     lnNr := listOfItemsView yVisibleToLineNr:(aDropContext targetPoint y).
     item := nil.
@@ -2110,7 +2110,7 @@
             ]
         ]
     ].
-    item ifNil:[ lnNr := 0 ].   "/ not dropable for item
+    item isNil ifTrue:[ lnNr := 0 ].   "/ not dropable for item
 
     "/ redraw drop indication
     self changeDropLineTo:lnNr in:aDropContext.
@@ -2129,7 +2129,7 @@
     anEvent isKeyPressEvent ifFalse:[ ^ false].
 
     evView := anEvent targetView.
-    evView ifNil:[ ^ false ].
+    evView isNil ifTrue:[ ^ false ].
 
     inView := evView isSameOrComponentOf:listOfItemsView.
     inView ifFalse:[^ false].
@@ -2254,7 +2254,7 @@
     |intoItem index newItem|
 
     intoItem := self selectedItem.
-    intoItem ifNil:[ ^ nil].
+    intoItem isNil ifTrue:[ ^ nil].
 
     self askForItemModification ifFalse:[ ^ nil ].
 
@@ -2302,11 +2302,11 @@
     |menu spec|
 
     menu := listOfItems root submenu.
-    menu ifNil:[^ nil].
+    menu isNil ifTrue:[^ nil].
     menu := menu literalArrayEncoding.
     spec := WriteStream on:String new.
     UISpecification prettyPrintSpecArray:menu on:spec indent:5.
-  ^ spec contents.
+    ^ spec contents.
 !
 
 submenuTest
@@ -2315,7 +2315,7 @@
     |menu indication choice submenu retriever|
 
     menu := listOfItems root submenu.
-    menu ifNil:[^ nil ].
+    menu isNil ifTrue:[^ nil ].
 
     menu allItemsDo:[:anItem|
         anItem isVisible:true.
@@ -2378,9 +2378,9 @@
     "
     |cls|
 
-    specClass ifNil:[^ false].
+    specClass isNil ifTrue:[^ false].
     cls := self resolveName:specClass.
-  ^ cls notNil
+    ^ cls notNil
 ! !
 
 !MenuEditor methodsFor:'selection'!
@@ -2395,7 +2395,7 @@
         ^ true
     ].
     oldSelectedItem := self selectedItem.
-    oldSelectedItem ifNil:[^ true].
+    oldSelectedItem isNil ifTrue:[^ true].
 
     newSelectedItem := listOfItems at:anIndex ifAbsent:nil.
     oldSelectedItem == newSelectedItem ifTrue:[
@@ -2469,14 +2469,14 @@
 
     |cls redefineAspectMethods category|
 
-    specClass ifNil:[
+    specClass isNil ifTrue:[
         self warn:'Define the class first !!'.
         ^ self
     ].
     redefineAspectMethods := self redefineAspectMethodsChannel value.
 
     cls := self resolveName:specClass.
-    cls ifNil:[
+    cls isNil ifTrue:[
         self warn:'Class ', specClass asString, ' does not exist!!'.
         ^ self  
     ].
@@ -2532,7 +2532,7 @@
 
     super doSave ifFalse: [^nil].
     spec := self generateMenuSpec.
-    spec ifNil:[^ nil].
+    spec isNil ifTrue:[^ nil].
 
     cls  := self resolveName:specClass.
 
@@ -2607,7 +2607,7 @@
     |selectedItem delayedItem|
 
     selectedItem := self selectedItem.
-    selectedItem ifNil:[^ self].
+    selectedItem isNil ifTrue:[^ self].
 
     selectedItem canAddDelayedMenu      ifFalse:[ ^ self ].
     self askForItemModification ifFalse:[ ^ self ].
@@ -2767,7 +2767,7 @@
     aCollection size == 0 ifTrue:[ ^ self ].
 
     item := self selectedItem.
-    item ifNil:[ ^ self ].
+    item isNil ifTrue:[ ^ self ].
 
     loMenuItems := OrderedCollection new.
     aCollection do:[:el|
@@ -2794,7 +2794,7 @@
     |item idx parent toParent|
 
     item := self selectedItem.
-    item ifNil:[^ self].
+    item isNil ifTrue:[^ self].
 
     aDirection == #inNext ifTrue:[ item canMoveInNext  ifFalse:[^ self] ]
                          ifFalse:[ item canMoveInAbove ifFalse:[^ self] ].
@@ -2837,7 +2837,7 @@
     |item parent grandParent index|
 
     item := self selectedItem.
-    item ifNil:[^ self].
+    item isNil ifTrue:[^ self].
     item canMoveOut ifFalse:[^ self].
 
     self askForItemModification ifFalse:[ ^ self ].
@@ -2868,7 +2868,7 @@
     |item index parent children|
 
     item := self selectedItem.
-    item ifNil:[^ self].
+    item isNil ifTrue:[^ self].
     item canMoveUpOrDown ifFalse:[^ self].
 
     self askForItemModification ifFalse:[ ^ self ].
@@ -3068,11 +3068,11 @@
     |item cls|
 
     cls := self classFor:aMenuItem.
-    cls ifNil:[^ nil].
+    cls isNil ifTrue:[^ nil].
 
     item := cls new.
     item menuItem:aMenuItem.
-  ^ item
+    ^ item
 ! !
 
 !MenuEditor::Item class methodsFor:'interface specs'!
@@ -3450,8 +3450,8 @@
 heightOn:aGC
     "returns the height of the label on a GC
     "
-    height ifNil:[ height := parent heightOn:aGC ].
-  ^ height
+    height isNil ifTrue:[ height := parent heightOn:aGC ].
+    ^ height
 !
 
 label
@@ -3469,8 +3469,8 @@
 widthOn:aGC
     "returns the height of the displayLabel on a GC
     "
-    width ifNil:[ width := self widthOf:(self displayLabel) on:aGC ].
-  ^ width
+    width isNil ifTrue:[ width := self widthOf:(self displayLabel) on:aGC ].
+    ^ width
 ! !
 
 !MenuEditor::Item methodsFor:'initialization'!
@@ -3575,8 +3575,8 @@
     index    := siblings identityIndexOf:self.
     nextItem := siblings at:(index - 1)  ifAbsent:nil.
 
-    nextItem ifNil:[^ false].
-  ^ nextItem canAddChildren
+    nextItem isNil ifTrue:[^ false].
+    ^ nextItem canAddChildren
 !
 
 canMoveInNext
@@ -3590,8 +3590,8 @@
     index    := siblings identityIndexOf:self.
     nextItem := siblings at:(index + 1)  ifAbsent:nil.
 
-    nextItem ifNil:[^ false].
-  ^ nextItem canAddChildren
+    nextItem isNil ifTrue:[^ false].
+    ^ nextItem canAddChildren
 !
 
 canMoveOut
@@ -3913,7 +3913,7 @@
     self hasDelayedMenu ifTrue:[
         children first setDelayedAttributesTo:item.
 
-        menuItem value ifNil:[
+        menuItem value isNil ifTrue:[
             menuItem value:#unspecified
         ]
     ].
@@ -5079,9 +5079,9 @@
 
     list := builder bindingAt:#retrieverList.
 
-    list ifNil:[
-	list := MenuEditor imageRetrieverClasses asList.
-	builder aspectAt:#retrieverList put:list.
+    list isNil ifTrue:[
+        list := MenuEditor imageRetrieverClasses asList.
+        builder aspectAt:#retrieverList put:list.
     ].
     ^ list
 !
@@ -5150,7 +5150,7 @@
             imageHolder value:anItem.
             ^ self
         ].
-        item ifNil:[
+        item isNil ifTrue:[
             (sel startsWith:selector) ifTrue:[ item := anItem ]
         ]
     ].
@@ -5413,8 +5413,8 @@
 !MenuEditor::RootItem methodsFor:'displaying'!
 
 heightOn:aGC
-    height ifNil:[ height := aGC font heightOn:aGC device ].
-  ^ height
+    height isNil ifTrue:[ height := aGC font heightOn:aGC device ].
+    ^ height
 ! !
 
 !MenuEditor::RootItem methodsFor:'initialization'!
@@ -5684,8 +5684,8 @@
 !
 
 widthOn:aGC
-    width ifNil:[ width := 60 ].
-  ^ width
+    width isNil ifTrue:[ width := 60 ].
+    ^ width
 ! !
 
 !MenuEditor class methodsFor:'documentation'!