hg/stx-libtool2: comparison MenuEditor.st

equal deleted inserted replaced

-:72029523c30a
+:5427bb64d15e
 "
 |holder|
 holder := builder bindingAt:#wizardHolder.
-holder ifNil:[
+holder isNil ifTrue:[
-	holder := nil asValue.
+holder := nil asValue.
-	builder aspectAt:#wizardHolder put:holder.
+builder aspectAt:#wizardHolder put:holder.
 ].
 ^ holder
 ! !
 !MenuEditor methodsFor:'building'!
 "
 |tab selector item canvas wizardHolder|
 wizardHolder := self wizardHolder.
 item := self selectedItem.
-item ifNil:[ ^ wizardHolder value:nil ].
+item isNil ifTrue:[ ^ wizardHolder value:nil ].
 tab := tabHolder value.
 tab notNil ifTrue:[
 tab := item slices detect:[:el| el first = tab ] ifNone:nil.
 doDrop:aDropContext
 "drop the dropContext into the hierachical list of items
 "
 |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).
 done := false.
 dropOver:aDropContext
 "called during drag & drop while moving over the widget."
 |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.
 lnNr ifNotNil:[
 (item isAction and:[item hasDelayedMenu]) ifTrue:[
 item := nil
 ]
 ]
 ].
-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.
 "Modified: / 13-10-2006 / 16:04:05 / cg"
 |evView inView rawKey key|
 anEvent isKeyPressEvent ifFalse:[ ^ false].
 evView := anEvent targetView.
-evView ifNil:[ ^ false ].
+evView isNil ifTrue:[ ^ false ].
 inView := evView isSameOrComponentOf:listOfItemsView.
 inView ifFalse:[^ false].
 key    := anEvent key.
 is enabled. On success the new item(s) are returned otherwise nil.
 "
 |intoItem index newItem|
 intoItem := self selectedItem.
-intoItem ifNil:[ ^ nil].
+intoItem isNil ifTrue:[ ^ nil].
 self askForItemModification ifFalse:[ ^ nil ].
 index := 1.
 "generate and returns the current menu spec or nil
 "
 |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.
 !
 submenuTest
 "returns a menu on the current editing menu
 "
 |menu indication choice submenu retriever|
 menu := listOfItems root submenu.
-menu ifNil:[^ nil ].
+menu isNil ifTrue:[^ nil ].
 menu allItemsDo:[:anItem|
 anItem isVisible:true.
 anItem   enabled:true.
 anItem translateLabel:false.
 hasValidSpecClass
 "returns true if a valid specClass exists
 "
 |cls|
-specClass ifNil:[^ false].
+specClass isNil ifTrue:[^ false].
 cls := self resolveName:specClass.
 ^ cls notNil
 ! !
 !MenuEditor methodsFor:'selection'!
 canSelect:anIndex
 self enablingCommitButtonsHolder value ifFalse:[
 ^ true
 ].
 oldSelectedItem := self selectedItem.
-oldSelectedItem ifNil:[^ true].
+oldSelectedItem isNil ifTrue:[^ true].
 newSelectedItem := listOfItems at:anIndex ifAbsent:nil.
 oldSelectedItem == newSelectedItem ifTrue:[
 ^ true
 ].
 doGenerateAspectMethods
 "compile aspect and action methods"
 |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
 ].
 category := UserPreferences current categoryForMenuActionsMethods.
 "
 |cls spec mthd category code excla|
 super doSave ifFalse: [^nil].
 spec := self generateMenuSpec.
-spec ifNil:[^ nil].
+spec isNil ifTrue:[^ nil].
 cls  := self resolveName:specClass.
 "/ if that method already exists, do not overwrite the category
 doCreateDelayedMenu:what
 |selectedItem delayedItem|
 selectedItem := self selectedItem.
-selectedItem ifNil:[^ self].
+selectedItem isNil ifTrue:[^ self].
 selectedItem canAddDelayedMenu      ifFalse:[ ^ self ].
 self askForItemModification ifFalse:[ ^ self ].
 what == #menu ifTrue:[ delayedItem := RegularMenuItem new ]
 |item loMenuItems|
 aCollection size == 0 ifTrue:[ ^ self ].
 item := self selectedItem.
-item ifNil:[ ^ self ].
+item isNil ifTrue:[ ^ self ].
 loMenuItems := OrderedCollection new.
 aCollection do:[:el|
 (el askFor:#isMenuItem) ifTrue:[ loMenuItems add:el ].
 ].
 "move selected item into the next (#inNext) or previous (#inPrev) item
 "
 |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] ].
 self askForItemModification ifFalse:[ ^ self ].
 "move selected item out of current item
 "
 |item parent grandParent index|
 item := self selectedItem.
-item ifNil:[^ self].
+item isNil ifTrue:[^ self].
 item canMoveOut ifFalse:[^ self].
 self askForItemModification ifFalse:[ ^ self ].
 parent      := item parent.
 "move selected item up (#up) or down (#down)
 "
 |item index parent children|
 item := self selectedItem.
-item ifNil:[^ self].
+item isNil ifTrue:[^ self].
 item canMoveUpOrDown ifFalse:[^ self].
 self askForItemModification ifFalse:[ ^ self ].
 self withoutNotifyDo:[
 menuItem:aMenuItem
 |item cls|
 cls := self classFor:aMenuItem.
-cls ifNil:[^ nil].
+cls isNil ifTrue:[^ nil].
 item := cls new.
 item menuItem:aMenuItem.
 ^ item
 ! !
 !MenuEditor::Item class methodsFor:'interface specs'!
 detailsEditSpec
 !
 heightOn:aGC
 "returns the height of the label on a GC
 "
-height ifNil:[ height := parent heightOn:aGC ].
+height isNil ifTrue:[ height := parent heightOn:aGC ].
 ^ height
 !
 label
 "get the rawLabel assigned to the item
 "
 !
 widthOn:aGC
 "returns the height of the displayLabel on a GC
 "
-width ifNil:[ width := self widthOf:(self displayLabel) on:aGC ].
+width isNil ifTrue:[ width := self widthOf:(self displayLabel) on:aGC ].
 ^ width
 ! !
 !MenuEditor::Item methodsFor:'initialization'!
 initialize
 siblings size > 1 ifFalse:[ ^ false ].
 index    := siblings identityIndexOf:self.
 nextItem := siblings at:(index - 1)  ifAbsent:nil.
-nextItem ifNil:[^ false].
+nextItem isNil ifTrue:[^ false].
 ^ nextItem canAddChildren
 !
 canMoveInNext
 "returns true if the item can become a child of its next sibling
 "
 siblings size > 1 ifFalse:[ ^ false ].
 index    := siblings identityIndexOf:self.
 nextItem := siblings at:(index + 1)  ifAbsent:nil.
-nextItem ifNil:[^ false].
+nextItem isNil ifTrue:[^ false].
 ^ nextItem canAddChildren
 !
 canMoveOut
 "returns true if the item can be moved out from its current parent
 "
 item := super menuItem.
 self hasDelayedMenu ifTrue:[
 children first setDelayedAttributesTo:item.
-menuItem value ifNil:[
+menuItem value isNil ifTrue:[
 menuItem value:#unspecified
 ]
 ].
 ^ item
 !
 retrieverList
 |list|
 list := builder bindingAt:#retrieverList.
-list ifNil:[
+list isNil ifTrue:[
-	list := MenuEditor imageRetrieverClasses asList.
+list := MenuEditor imageRetrieverClasses asList.
-	builder aspectAt:#retrieverList put:list.
+builder aspectAt:#retrieverList put:list.
 ].
 ^ list
 !
 selectorHolder
 sel := anItem selector.
 selector == sel ifTrue:[
 imageHolder value:anItem.
 ^ self
 ].
-item ifNil:[
+item isNil ifTrue:[
 (sel startsWith:selector) ifTrue:[ item := anItem ]
 ]
 ].
 imageHolder value:nil.
 ! !
 !MenuEditor::RootItem methodsFor:'displaying'!
 heightOn:aGC
-height ifNil:[ height := aGC font heightOn:aGC device ].
+height isNil ifTrue:[ height := aGC font heightOn:aGC device ].
 ^ height
 ! !
 !MenuEditor::RootItem methodsFor:'initialization'!
 initialize
 ].
 aGC displayLineFromX:x y:y0 toX:x1 y:y0
 !
 widthOn:aGC
-width ifNil:[ width := 60 ].
+width isNil ifTrue:[ width := 60 ].
 ^ width
 ! !
 !MenuEditor class methodsFor:'documentation'!
 version

changeset 2151	5427bb64d15e
parent 2137	70f859d89841
child 2156	215e8d8f965e