hg/stx-libtool2: comparison MethodFinderWindow.st

equal deleted inserted replaced

-:9d4f8cd101fa
+:318c295490c1
 ApplicationModel subclass:#MethodFinderWindow
 	instanceVariableNames:'argumentsEditor messageAnswerEditor receiverEditor receiver
 		resultSelectors arg2BoxVisible arg1BoxVisible arg4BoxVisible
 		arg3BoxVisible argCountHolder argCountList argument1Editor
 		argument2Editor argument3Editor argument4Editor resultSelected
-		lookAtResultEditor'
+		lookAtResultEditor codeHolder'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'MethodFinder'
 !
 documentation
 "
 [author:]
 ported from Squeak and GUI enhanced by James Hayes james@exept.de
 "
+! !
+!MethodFinderWindow class methodsFor:'constants'!
+markerForImplementingClass
+^ '=> '.
+^ '*'
+"Created: / 13.11.2001 / 12:09:52 / cg"
+"Modified: / 13.11.2001 / 12:11:57 / cg"
 ! !
 !MethodFinderWindow class methodsFor:'interface specs'!
 windowSpec
 #forceRecursiveBackground: false
 )
 #component:
 #(#SpecCollection
 #collection: #(
-#(#ViewSpec
+#(#VariableHorizontalPanelSpec
-#name: 'Box6'
+#name: 'VariableHorizontalPanel1'
 #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-#level: 1
+#snapMode: #both
 #component:
 #(#SpecCollection
 #collection: #(
-#(#SequenceViewSpec
-#name: 'List1'
-#layout: #(#LayoutFrame 0 0 0 0.5 0 0.65 0 1)
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#autoHideScrollBars: true
-#valueChangeSelector: #updateImplementorsOf:
-#useIndex: true
-#sequenceList: #resultHolder
-)
-#(#SequenceViewSpec
-#name: 'List2'
-#layout: #(#LayoutFrame 0 0.65 0 0 0 1 0 1)
-#model: #selectedClassOfResultHolder
-#menu: #implementorListMenu
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#autoHideScrollBars: true
-#doubleClickSelector: #openBrowserOn:
-#useIndex: false
-#sequenceList: #classOfResultHolder
-)
 #(#ViewSpec
-#name: 'Box4'
+#name: 'Box6'
-#layout: #(#LayoutFrame 0 0 0 0 0 0.65 -25 0.5)
+#level: 1
 #component:
 #(#SpecCollection
 #collection: #(
-#(#LabelSpec
+#(#SequenceViewSpec
-#label: 'Receiver'
+#name: 'List1'
-#name: 'ReceiverLabel'
+#layout: #(#LayoutFrame 0 0 0 0.5 0 1 0 1)
-#layout: #(#LayoutFrame -4 0.0162791 0 0 -4 0.293023 24 0)
+#hasHorizontalScrollBar: true
-#translateLabel: true
+#hasVerticalScrollBar: true
-#adjust: #left
+#autoHideScrollBars: true
+#valueChangeSelector: #updateImplementorsOf:
+#useIndex: true
+#sequenceList: #resultHolder
 )
-#(#ComboListSpec
+#(#ViewSpec
-#name: 'allowedArgments'
+#name: 'Box4'
-#layout: #(#LayoutFrame 0 0.339535 1 0 0 0.653488 23 0)
+#layout: #(#LayoutFrame 0 0 0 0 0 1 -25 0.5)
-#model: #argCountHolder
-#comboList: #argCountList
-#useIndex: true
-)
-#(#LabelSpec
-#label: 'MessageAnswer'
-#name: 'MessageAnswerLabel'
-#layout: #(#LayoutFrame 0 0.6693 0 0 0 0.99023 24 0)
-#translateLabel: true
-#adjust: #left
-)
-#(#HorizontalPanelViewSpec
-#name: 'HorizontalPanel1'
-#layout: #(#LayoutFrame 0 0 25 0 0 1 0 1)
-#horizontalLayout: #fit
-#verticalLayout: #fit
-#horizontalSpace: 3
-#verticalSpace: 3
 #component:
 #(#SpecCollection
 #collection: #(
-#(#WorkspaceSpec
+#(#LabelSpec
-#name: 'ReceiverEditor'
+#label: 'Receiver'
-#tabable: true
+#name: 'ReceiverLabel'
-#hasHorizontalScrollBar: true
+#layout: #(#LayoutFrame -4 0.0162791 0 0 -4 0.293023 24 0)
-#hasVerticalScrollBar: true
+#translateLabel: true
-#miniScrollerHorizontal: true
+#adjust: #center
-#miniScrollerVertical: true
-#autoHideScrollBars: true
-#extent: #(#Point 116 149)
-#postBuildCallback: #receiverWidgetCreated:
 )
-#(#VerticalPanelViewSpec
+#(#ComboListSpec
-#name: 'VerticalPanel1'
+#name: 'allowedArgments'
+#layout: #(#LayoutFrame 0 0.339535 1 0 0 0.653488 23 0)
+#model: #argCountHolder
+#comboList: #argCountList
+#useIndex: true
+)
+#(#LabelSpec
+#label: 'Answer'
+#name: 'MessageAnswerLabel'
+#layout: #(#LayoutFrame 0 0.6693 0 0 0 0.99023 24 0)
+#translateLabel: true
+#adjust: #center
+)
+#(#HorizontalPanelViewSpec
+#name: 'HorizontalPanel1'
+#layout: #(#LayoutFrame 0 0 25 0 0 1 0 1)
 #horizontalLayout: #fit
 #verticalLayout: #fit
 #horizontalSpace: 3
 #verticalSpace: 3
 #component:
 #(#SpecCollection
 #collection: #(
-#(#ViewSpec
+#(#WorkspaceSpec
-#name: 'Box1'
+#name: 'ReceiverEditor'
-#visibilityChannel: #arg1BoxVisible
+#tabable: true
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#autoHideScrollBars: true
+#extent: #(#Point 87 149)
+#postBuildCallback: #receiverWidgetCreated:
+)
+#(#VerticalPanelViewSpec
+#name: 'VerticalPanel1'
+#horizontalLayout: #fit
+#verticalLayout: #fit
+#horizontalSpace: 3
+#verticalSpace: 3
 #component:
 #(#SpecCollection
 #collection: #(
-#(#WorkspaceSpec
+#(#ViewSpec
-#name: 'Arg1Editor'
+#name: 'Box1'
-#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#visibilityChannel: #arg1BoxVisible
-#tabable: true
+#component:
-#hasHorizontalScrollBar: true
+#(#SpecCollection
-#hasVerticalScrollBar: true
+#collection: #(
-#miniScrollerHorizontal: true
+#(#WorkspaceSpec
-#miniScrollerVertical: true
+#name: 'Arg1Editor'
-#autoHideScrollBars: true
+#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-#postBuildCallback: #argument1WidgetCreated:
+#tabable: true
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#autoHideScrollBars: true
+#postBuildCallback: #argument1WidgetCreated:
+)
+)
+)
+#extent: #(#Point 87 48)
+)
+#(#ViewSpec
+#name: 'Box2'
+#visibilityChannel: #arg2BoxVisible
+#component:
+#(#SpecCollection
+#collection: #(
+#(#WorkspaceSpec
+#name: 'TextEditor5'
+#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#tabable: true
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#autoHideScrollBars: true
+#postBuildCallback: #argument2WidgetCreated:
+)
+)
+)
+#extent: #(#Point 87 47)
+)
+#(#ViewSpec
+#name: 'Box3'
+#visibilityChannel: #arg3BoxVisible
+#component:
+#(#SpecCollection
+#collection: #(
+#(#WorkspaceSpec
+#name: 'TextEditor6'
+#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#tabable: true
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#autoHideScrollBars: true
+#postBuildCallback: #argument3WidgetCreated:
+)
+)
+)
+#extent: #(#Point 87 48)
 )
 )
 )
-#extent: #(#Point 117 48)
+#extent: #(#Point 87 149)
 )
-#(#ViewSpec
+#(#WorkspaceSpec
-#name: 'Box2'
+#name: 'AnswerEditor'
-#visibilityChannel: #arg2BoxVisible
+#tabable: true
-#component:
+#hasHorizontalScrollBar: true
-#(#SpecCollection
+#hasVerticalScrollBar: true
-#collection: #(
+#miniScrollerHorizontal: true
-#(#WorkspaceSpec
+#miniScrollerVertical: true
-#name: 'TextEditor5'
+#autoHideScrollBars: true
-#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+#extent: #(#Point 88 149)
-#tabable: true
+#postBuildCallback: #messageAnswerWidgetCreated:
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#miniScrollerVertical: true
-#autoHideScrollBars: true
-#postBuildCallback: #argument2WidgetCreated:
-)
-)
-)
-#extent: #(#Point 117 47)
-)
-#(#ViewSpec
-#name: 'Box3'
-#visibilityChannel: #arg3BoxVisible
-#component:
-#(#SpecCollection
-#collection: #(
-#(#WorkspaceSpec
-#name: 'TextEditor6'
-#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-#tabable: true
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#miniScrollerVertical: true
-#autoHideScrollBars: true
-#postBuildCallback: #argument3WidgetCreated:
-)
-)
-)
-#extent: #(#Point 117 48)
 )
 )
 )
-#extent: #(#Point 117 149)
 )
-#(#WorkspaceSpec
+)
-#name: 'AnswerEditor'
+)
+)
+#(#ViewSpec
+#name: 'Box5'
+#layout: #(#LayoutFrame 53 0.224737 -23 0.5 0 1 0 0.5)
+#component:
+#(#SpecCollection
+#collection: #(
+#(#ActionButtonSpec
+#label: 'Clear'
+#name: 'Button2'
+#layout: #(#LayoutFrame 0 0 0 0 -5 0.5 0 1)
+#translateLabel: true
+#model: #clear
+)
+#(#ActionButtonSpec
+#label: 'Search'
+#name: 'Button1'
+#layout: #(#LayoutFrame 5 0.5 0 0 0 1 0 1)
+#translateLabel: true
 #tabable: true
-#hasHorizontalScrollBar: true
+#model: #search
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#miniScrollerVertical: true
-#autoHideScrollBars: true
-#extent: #(#Point 117 149)
-#postBuildCallback: #messageAnswerWidgetCreated:
 )
 )
 )
 )
 )
 )
 )
-#(#ViewSpec
+#(#VariableVerticalPanelSpec
-#name: 'Box5'
+#name: 'VariableVerticalPanel1'
-#layout: #(#LayoutFrame 53 0.224737 -23 0.5 0 0.65 0 0.5)
 #component:
 #(#SpecCollection
 #collection: #(
-#(#ActionButtonSpec
+#(#SequenceViewSpec
-#label: 'Clear'
+#name: 'List2'
-#name: 'Button2'
+#model: #selectedClassOfResultHolder
-#layout: #(#LayoutFrame 0 0 0 0 -5 0.5 0 1)
+#menu: #implementorListMenu
-#translateLabel: true
+#hasHorizontalScrollBar: true
-#model: #clear
+#hasVerticalScrollBar: true
+#autoHideScrollBars: true
+#doubleClickSelector: #openBrowserOn:
+#valueChangeSelector: #selectedClassOfResultHolderChanged
+#useIndex: false
+#sequenceList: #classOfResultHolder
 )
-#(#ActionButtonSpec
+#(#CodeViewSpec
-#label: 'Search'
+#name: 'CodeView'
-#name: 'Button1'
+#model: #codeHolder
-#layout: #(#LayoutFrame 5 0.5 0 0 0 1 0 1)
+#hasHorizontalScrollBar: true
-#translateLabel: true
+#hasVerticalScrollBar: true
-#tabable: true
+#autoHideScrollBars: true
-#model: #search
+#postBuildCallback: #sourceCodeWidgetCreated:
 )
 )
 )
+#handles: #(#Any 0.5 1.0)
 )
 )
 )
+#handles: #(#Any 0.5 1.0)
 )
 )
 )
 )
-"Modified: / 9.11.2001 / 08:45:48 / cg"
+"Modified: / 13.11.2001 / 12:53:50 / cg"
 ! !
 !MethodFinderWindow class methodsFor:'menu specs'!
 implementorListMenu
 #label: 'Documentation'
 #value: #openHTMLDocumentation
 #activeHelpKey: #helpTutorial
 )
 #(#MenuItem
-#label: 'About MenuEditor...'
+#label: 'About MethodFinder...'
 #value: #openAboutThisApplication
 #activeHelpKey: #aboutThisAppliaction
 )
 )
 nil
 )
 )
 nil
 nil
 )
+"Modified: / 13.11.2001 / 12:36:39 / cg"
 ! !
 !MethodFinderWindow methodsFor:'accessing'!
 receiver
 argument2Editor contents:nil.
 argument3Editor contents:nil.
 messageAnswerEditor contents:nil.
 self resultHolder value:nil.
 self classOfResultHolder value: nil.
+!
+extractClassAndSelectorFrom:anArgument
+"Opens browser on theArgument of a specific class. anArgument being a string with the
+Class and the selector upon which the browser is to be opened. Return the receiver."
+|aClass aSelector x theArgument marker|
+anArgument isNil ifTrue:[
+^ nil
+].
+marker := self class markerForImplementingClass.
+theArgument := anArgument string.
+(theArgument startsWith:marker) ifTrue:[
+theArgument := theArgument copyFrom:marker size+1
+].
+aClass := theArgument copyUpTo:(Character space).
+x := aClass size + 2.
+aSelector := theArgument copyFrom:x.
+aClass := Smalltalk classNamed:aClass.
+^ aClass -> aSelector asSymbol
+"
+MethodFinderWindow new extractClassAndSelectorFrom: '*SmallInteger +'
+MethodFinderWindow new extractClassAndSelectorFrom: 'String ,'
+MethodFinderWindow new extractClassAndSelectorFrom: 'Number detentBy:atMultiplesOf:snap:'
+"
+"Modified: / 13.11.2001 / 12:45:43 / cg"
 !
 isExpression: aString
 "Return true or false depending on if the subString includes certain characters"
 (aString includesSubString:': ') ifTrue:[^true].
 openBrowserOn:anArgument
 "Opens browser on theArgument of a specific class. anArgument being a string with the
 Class and the selector upon which the browser is to be opened. Return the receiver."
-|aClass aSelector x theArgument|
+|classAndSelector|
-anArgument isNil ifTrue:[
+classAndSelector := self extractClassAndSelectorFrom:anArgument.
+classAndSelector isNil ifTrue:[
 ^ self
 ].
-(anArgument at:1) == $* ifTrue:[
+SystemBrowser openInClass:classAndSelector key selector:classAndSelector value
-theArgument := anArgument copyFrom:2
-] ifFalse:[
-theArgument := anArgument
-].
-aClass := theArgument copyUpTo:(Character space).
-x := aClass size + 2.
-aSelector := theArgument copyFrom:x.
-aClass := Smalltalk classNamed:aClass.
-SystemBrowser openInClass:(aClass) selector:(aSelector asSymbol)
 "
 MethodFinderWindow new openBrowserOn: '*SmallInteger +'
 MethodFinderWindow new openBrowserOn: 'String ,'
 MethodFinderWindow new openBrowserOn: 'Number detentBy:atMultiplesOf:snap:'
 "
+"Modified: / 13.11.2001 / 12:46:17 / cg"
 !
 openBrowserOnSelectedItem
 |sel|
 sel := self selectedClassOfResultHolder value.
-sel isNil ifTrue:[^ self].
 self openBrowserOn:sel
+"Modified: / 13.11.2001 / 12:47:39 / cg"
 !
 receiverEditorContents
 "Return a cleaned up version of receiver taken from the receiverEditor
 as an association. The association has aCleanedRecieverString as a key and the
 ((resultArray at:  1 )includesSubString: 'no single') ifTrue:[
 self warn: (resultArray at:  1 ).
 ^self
 ].
 "the following then replaces data1 and data2 created by the method finder to the appropriate arguments"
 resultArray keysAndValuesDo:[:key :value |   | newValue |
 newValue:= value replString: 'data1' withString:(tempReceiver key).
 (tempArguments size) >= 1 ifTrue:[
 newValue:= newValue replString: 'data2' withString:(tempArguments keyAt:1)].
 newValue:= newValue replString: 'data3' withString:(tempArguments keyAt:2).].
 (tempArguments size) > 2 ifTrue:[
 newValue:= newValue replString: 'data4' withString:(tempArguments keyAt:3).].
+(tempArguments size) > 3 ifTrue:[ self halt. ].
 "    newValue:= value replString: 'data3' withString:(self messageAnswer key). "
 newValue:=newValue, ' --> ', (tempAnswer key).
+newValue replaceAll:Character cr with:Character space.
 resultArray at: key put: newValue.
 ].
 self resultHolder value: resultArray.
 resultSelectors:= mf selectors.   "used to find implementors so we do not have to "
 receiver:=tempReceiver            "search the string for the selector found. Stored as an ordered collection"
+"Modified: / 13.11.2001 / 12:01:35 / cg"
+!
+selectedClassOfResultHolderChanged
+|sel classAndSelector mthd|
+sel := self selectedClassOfResultHolder value.
+classAndSelector := self extractClassAndSelectorFrom:sel.
+classAndSelector isNil ifTrue:[
+^ self
+].
+mthd := classAndSelector key >> classAndSelector value.
+mthd notNil ifTrue:[
+self withWaitCursorDo:[
+self codeHolder value:mthd source
+]
+] ifFalse:[
+self codeHolder value:nil
+].
+"Created: / 13.11.2001 / 12:43:43 / cg"
+"Modified: / 13.11.2001 / 12:48:56 / cg"
 !
 updateImplementorsOf:anInteger
 "Request the implementors of the selected argument provided by aNumber.
 Return the receiver. "
 classList:=methods asOrderedCollection collect:[:m | m mclass name , ' ' , m selector].
 classList:=(self markMatchingClasses:(resultSelectors at:aNumber) classesWithSelector:classList).
 self classOfResultHolder value: classList.
+self selectedClassOfResultHolder value:nil.
+"Modified: / 13.11.2001 / 12:07:31 / cg"
 ! !
 !MethodFinderWindow methodsFor:'aspects'!
 arg1BoxVisible
 builder aspectAt:#classOfResultHolder put:holder
 ].
 ^ holder
 !
+codeHolder
+codeHolder isNil ifTrue:[
+codeHolder := '' asValue.
+].
+^ codeHolder.
+"Created: / 13.11.2001 / 12:44:11 / cg"
+!
 resultHolder
 "Return a value holder which contains the results of a search as a collection."
 |holder|
 (holder := builder bindingAt:#resultHolder) isNil ifTrue:[
 argument1WidgetCreated: aWidget
 "Store the widget as an instance variable. Return the receiver"
 argument1Editor := aWidget scrolledView.
+aWidget tabMeansNextField:true.
+"Modified: / 13.11.2001 / 12:21:41 / cg"
 !
 argument2WidgetCreated: aWidget
 "Store the widget as an instance variable. Return the receiver"
 argument2Editor := aWidget scrolledView.
+aWidget tabMeansNextField:true.
+"Modified: / 13.11.2001 / 12:21:45 / cg"
 !
 argument3WidgetCreated: aWidget
 "Store the widget as an instance variable. Return the receiver"
 argument3Editor := aWidget scrolledView.
+aWidget tabMeansNextField:true.
+"Modified: / 13.11.2001 / 12:21:49 / cg"
 !
 messageAnswerWidgetCreated: aWidget
 "Store the widget as an instance variable. Return the receiver"
 messageAnswerEditor := aWidget scrolledView.
+aWidget tabMeansNextField:true.
+"Modified: / 13.11.2001 / 12:24:55 / cg"
 !
 openHTMLDocumentation
 HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#METHODFINDER'
 !
 receiverWidgetCreated: aWidget
 "Store the widget as an instance variable. Return the receiver"
 receiverEditor := aWidget scrolledView.
+aWidget tabMeansNextField:true.
+"Modified: / 13.11.2001 / 12:24:49 / cg"
+!
+sourceCodeWidgetCreated: aWidget
+aWidget acceptAction:nil.
+aWidget readOnly:true
+"Created: / 13.11.2001 / 12:50:27 / cg"
+"Modified: / 13.11.2001 / 12:51:23 / cg"
 ! !
 !MethodFinderWindow methodsFor:'controlInput'!
 cleanInputs: aDirtyString
 " Matches the class of the receiver with all the elements in anOrderedCollection
 (which are classes with selectors). If a match is found it is marked with an asterisk.
 The classes are then sorted so the the asterisk appears first. Return the
 markedClassList."
-| unmarkedClassList firstPartOfSelector markedClassList|
+| marker recClass unmarkedClassList firstPartOfSelector markedClassList|
+marker := self class markerForImplementingClass.
+recClass := receiver value class.
 unmarkedClassList:=anOrderedCollection copy.
 unmarkedClassList do:
 [:classAndMethod | | class |
 class:=Compiler evaluate:
 ((ReadStream on: classAndMethod) upToAll: aSelector).
-(receiver value class == class) ifTrue:
+"/ (recClass == class)
-[unmarkedClassList add: '*', classAndMethod.
+(recClass whichClassImplements:aSelector) == class
-unmarkedClassList remove: classAndMethod]].
+ifTrue:
+["/ unmarkedClassList add: marker, classAndMethod.
+unmarkedClassList add: classAndMethod allBold.
+unmarkedClassList remove: classAndMethod.
+].
+].
 unmarkedClassList sort:[:a :b | |rawA rawB|
-rawA := (a startsWith:'*') ifTrue:[a copyFrom:2] ifFalse:[a].
+rawA := a string.
-rawB := (b startsWith:'*') ifTrue:[b copyFrom:2] ifFalse:[b].
+(rawA startsWith:marker) ifTrue:[rawA := rawA copyFrom:marker size+1].
-rawA > rawB.  ].
+rawB := b string.
+(rawB startsWith:marker) ifTrue:[rawB := rawB copyFrom:marker size+1].
+rawA < rawB.  ].
 markedClassList:= unmarkedClassList.
 ^markedClassList
+"Modified: / 13.11.2001 / 12:16:05 / cg"
 !
 mergReciever: aReceiver WithArgument: arguments
 "Puts the receiver and arguments into an array so it can be of a suitable input for the
 ].
 ^receiverWithArgument
 ! !
+!MethodFinderWindow methodsFor:'misc'!
+aboutThisApplicationText
+|msg|
+msg := super aboutThisApplicationText.
+msg := msg , '\\Ported from Squeak to ST/X by James Hayes (james@exept.de)'.
+^msg withCRs.
+"Modified: / 13.11.2001 / 12:56:44 / cg"
+! !
 !MethodFinderWindow class methodsFor:'documentation'!
 version
 ^ '$Header$'
 ! !

changeset 1532	318c295490c1
parent 1531	9d4f8cd101fa
child 1533	fbe494613685