# HG changeset patch # User ca # Date 876911994 -7200 # Node ID 7661f4d15eada14641097ec3cdbcdfac1dccd2ae # Parent 0e8a4296dec1f3ff48a8670eabb7a4ce65b9e349 add: #resolveName: diff -r 0e8a4296dec1 -r 7661f4d15ead UISelectionPanel.st --- a/UISelectionPanel.st Wed Oct 15 12:38:20 1997 +0200 +++ b/UISelectionPanel.st Wed Oct 15 12:39:54 1997 +0200 @@ -1590,23 +1590,21 @@ userDefined |cls lbl sel builder| - (cls := userClass) notNil ifTrue:[ - cls isBehavior ifFalse:[ - cls := Smalltalk at:cls asSymbol - ]. - (cls notNil and:[(cls respondsTo:userLabels)]) ifTrue:[ - lbl := cls perform:userLabels. - sel := Array new:(lbl size) withAll:#userDefinedSpec. - self galleryList value:lbl. - self minorKeys value:sel. - ^ self - ] - ]. - builder := UIBuilder new. - builder application:self. - (self builder componentAt:#gallery) builder:builder. - self galleryList value:#( '???' ). - self minorKeys value:#( standardUserPanel ). + + cls := self resolveName:userClass. + + (cls notNil and:[(cls respondsTo:userLabels)]) ifTrue:[ + lbl := cls perform:userLabels. + sel := Array new:(lbl size) withAll:#userDefinedSpec. + self galleryList value:lbl. + self minorKeys value:sel. + ] ifFalse:[ + builder := UIBuilder new. + builder application:self. + (self builder componentAt:#gallery) builder:builder. + self galleryList value:#( '???' ). + self minorKeys value:#( standardUserPanel ). + ] ! userDefinedHelpText @@ -1621,19 +1619,16 @@ userDefinedSpec |cls spc idx| - (cls := userClass) notNil ifTrue:[ - cls isBehavior ifFalse:[ - cls := Smalltalk at:cls asSymbol - ]. - (cls notNil and:[(cls respondsTo:userSpecs)]) ifTrue:[ - spc := cls perform:userSpecs. - idx := self galleryModel value. + cls := self resolveName:userClass. - idx <= spc size ifTrue:[ - spc := spc at:idx. - (cls respondsTo:spc) ifTrue:[ - ^ cls perform:spc - ] + (cls notNil and:[(cls respondsTo:userSpecs)]) ifTrue:[ + spc := cls perform:userSpecs. + idx := self galleryModel value. + + idx <= spc size ifTrue:[ + spc := spc at:idx. + (cls respondsTo:spc) ifTrue:[ + ^ cls perform:spc ] ] ].