hg/stx-libtool2: comparison ResourceSelectionBrowser.st

equal deleted inserted replaced

-:179597c2abed
+:ff417bf5f8d8
 be provided or otherwise made available to, or used by, any
 other person. No title to or ownership of the software is
 hereby transferred.
 "
+"{ Package: 'stx:libtool2' }"
 SelectionBrowser subclass:#ResourceSelectionBrowser
 	instanceVariableNames:'resourceMethod resourceClass resourceSuperclass resourceTypes
 		allClasses classSelectionBlock'
 	classVariableNames:'ClassPresentation'
 ResourceSelectionBrowser open
 "
 <resource: #canvas>
 ^
+#(#FullSpec
-#(#FullSpec
+#name: #windowSpec
 #window:
 #(#WindowSpec
-#name: 'Resource Selection Browser'
+#label: 'Resource Selection Browser'
-#layout: #(#LayoutFrame 194 0 307 0 793 0 656 0)
+#name: 'Resource Selection Browser'
-#label: 'Resource Selection Browser'
+#min: #(#Point 400 300)
-#min: #(#Point 400 300)
+#max: #(#Point 1152 864)
-#max: #(#Point 1152 864)
+#bounds: #(#Rectangle 145 206 745 556)
-#bounds: #(#Rectangle 194 307 794 657)
+)
-#usePreferredExtent: false
+#component:
-)
+#(#SpecCollection
-#component:
+#collection: #(
-#(#SpecCollection
+#(#VariableHorizontalPanelSpec
-#collection:
+#name: 'VariableHorizontalPanel'
-#(
+#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -36 1.0)
-#(#VariableHorizontalPanelSpec
+#component:
-#name: 'VariableHorizontalPanel'
+#(#SpecCollection
-#layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -36 1.0)
+#collection: #(
+#(#ViewSpec
+#name: 'Box1'
 #component:
 #(#SpecCollection
-#collection:
+#collection: #(
-#(
+#(#HorizontalPanelViewSpec
-#(#ViewSpec
+#name: 'HorizontalPanel2'
-#name: 'Box1'
+#layout: #(#LayoutFrame 0 0 2 0 297 0 23 0)
-#component:
+#horizontalLayout: #leftSpace
-#(#SpecCollection
+#verticalLayout: #fit
-#collection:
+#horizontalSpace: 3
-#(
+#verticalSpace: 3
-#(#HorizontalPanelViewSpec
+#component:
-#name: 'HorizontalPanel2'
+#(#SpecCollection
-#layout: #(#LayoutFrame 0 0 2 0 297 0 23 0)
+#collection: #(
-#component:
+#(#RadioButtonSpec
-#(#SpecCollection
+#label: 'Categories'
-#collection:
+#name: 'ClassCategoriesRadioButton'
-#(
+#translateLabel: true
-#(#RadioButtonSpec
+#model: #selectionOfClassPresentation
-#name: 'ClassCategoriesRadioButton'
+#isTriggerOnDown: true
-#label: 'Categories'
+#lampColor: #(#Color 0.0 0.0 0.0)
-#translateLabel: true
+#select: #'Class Categories'
-#model: #selectionOfClassPresentation
+#extent: #(#Point 124 21)
-#isTriggerOnDown: true
-#lampColor: #(#Color 0.0 0.0 0.0)
-#select: #'Class Categories'
-#extent: #(#Point 124 21)
-)
-#(#RadioButtonSpec
-#name: 'ClassHierarchyRadioButton'
-#label: 'Hierarchy'
-#translateLabel: true
-#model: #selectionOfClassPresentation
-#isTriggerOnDown: true
-#lampColor: #(#Color 0.0 0.0 0.0)
-#select: #'Class Hierarchy'
-#extent: #(#Point 145 21)
-)
-)
-)
-#horizontalLayout: #leftSpace
-#verticalLayout: #fit
-#horizontalSpace: 3
-#verticalSpace: 3
-)
-#(#SelectionInTreeViewSpec
-#name: 'listOfClassHierarchyView'
-#layout: #(#LayoutFrame 0 0.0 23 0.0 0 1.0 -24 1.0)
-#tabable: true
-#model: #selectionOfClassHierarchy
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#showDirectoryIndicatorForRoot: false
-#showDirectoryIndicator: true
-#valueChangeSelector: #classSelected
-#hierarchicalList: #rootOfClassHierarchy
-#validateDoubleClickSelector: #validateDoubleClick:
-#contentsSelector: #treeViewClassHierarchyContents
-#labelSelector: #treeViewClassHierarchyLabel
-#childrenSelector: #treeViewClassHierarchyChildren
-#iconSelector: #treeViewClassHierarchyIcon
-)
-#(#SelectionInTreeViewSpec
-#name: 'listOfClassCategoriesView'
-#layout: #(#LayoutFrame 0 0.0 23 0.0 0 1.0 -24 1.0)
-#tabable: true
-#model: #selectionOfClassCategories
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#showRoot: false
-#showDirectoryIndicator: true
-#valueChangeSelector: #classSelected
-#hierarchicalList: #rootOfClassCategories
-#validateDoubleClickSelector: #validateDoubleClick:
-#childrenSelector: #treeViewClassCategoryChildren
-#iconSelector: #treeViewClassCategoryIcon
-)
-#(#InputFieldSpec
-#name: 'classNameInputField'
-#layout: #(#LayoutFrame 2 0.0 -22 1 -1 1.0 0 1)
-#tabable: true
-#model: #valueOfClassName
-)
-)
 )
-)
+#(#RadioButtonSpec
-#(#ViewSpec
+#label: 'Hierarchy'
-#name: 'Box2'
+#name: 'ClassHierarchyRadioButton'
-#component:
+#translateLabel: true
-#(#SpecCollection
+#model: #selectionOfClassPresentation
-#collection:
+#isTriggerOnDown: true
-#(
+#lampColor: #(#Color 0.0 0.0 0.0)
-#(#DataSetSpec
+#select: #'Class Hierarchy'
-#name: 'resourcesDataSetView'
+#extent: #(#Point 145 21)
-#layout: #(#LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0)
-#model: #selectionOfResourceMethod
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#miniScrollerHorizontal: true
-#rowClassName: 'ResourceSelectionBrowser::Row'
-#dataList: #listOfResourceMethods
-#useIndex: false
-#has3Dsepartors: true
-#has3Dseparators: true
-#doubleClickSelector: #resourceDoubleClicked
-#columnHolder: #resourceMethodColumns
-#valueChangeSelector: #resourceSelected
-#verticalSpacing: 1
-)
-#(#InputFieldSpec
-#name: 'selectorInputField'
-#layout: #(#LayoutFrame 2 0.0 -22 1 -2 1.0 0 1)
-#tabable: true
-#model: #valueOfResourceSelector
-)
-)
 )
+)
 )
 )
+#(#SelectionInTreeViewSpec
+#name: 'listOfClassHierarchyView'
+#layout: #(#LayoutFrame 0 0.0 23 0.0 0 1.0 -24 1.0)
+#tabable: true
+#model: #selectionOfClassHierarchy
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#showDirectoryIndicatorForRoot: false
+#showDirectoryIndicator: true
+#valueChangeSelector: #classSelected
+#hierarchicalList: #rootOfClassHierarchy
+#validateDoubleClickSelector: #validateDoubleClick:
+#contentsSelector: #treeViewClassHierarchyContents
+#labelSelector: #treeViewClassHierarchyLabel
+#childrenSelector: #treeViewClassHierarchyChildren
+#iconSelector: #treeViewClassHierarchyIcon
+#highlightMode: #line
+)
+#(#SelectionInTreeViewSpec
+#name: 'listOfClassCategoriesView'
+#layout: #(#LayoutFrame 0 0.0 23 0.0 0 1.0 -24 1.0)
+#tabable: true
+#model: #selectionOfClassCategories
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#showRoot: false
+#showDirectoryIndicator: true
+#valueChangeSelector: #classSelected
+#hierarchicalList: #rootOfClassCategories
+#validateDoubleClickSelector: #validateDoubleClick:
+#childrenSelector: #treeViewClassCategoryChildren
+#iconSelector: #treeViewClassCategoryIcon
+#highlightMode: #line
+)
+#(#InputFieldSpec
+#name: 'classNameInputField'
+#layout: #(#LayoutFrame 2 0.0 -22 1 -1 1.0 0 1)
+#tabable: true
+#model: #valueOfClassName
+#acceptOnLeave: true
+#acceptOnLostFocus: true
+#acceptOnPointerLeave: true
+)
+)
 )
-#handles: #(#Any 0.5 1.0)
+)
-)
+#(#ViewSpec
-#(#HorizontalPanelViewSpec
+#name: 'Box2'
-#name: 'HorizontalPanel1'
-#layout: #(#LayoutFrame 2 0.0 -30 1 -2 1.0 -4 1.0)
 #component:
 #(#SpecCollection
-#collection:
+#collection: #(
-#(
+#(#DataSetSpec
-#(#ActionButtonSpec
+#name: 'resourcesDataSetView'
-#name: 'HelpButton'
+#layout: #(#LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0)
-#activeHelpKey: #dss
+#model: #selectionOfResourceMethod
-#label: 'Help'
+#hasHorizontalScrollBar: true
-#model: #openHTMLDocument:
+#hasVerticalScrollBar: true
-#initiallyDisabled: true
+#miniScrollerHorizontal: true
-#enableChannel: #helpEnabled
+#rowClassName: 'ResourceSelectionBrowser::Row'
-#actionValue: 'tools/uipainter/ResourceSelectionBrowser.html'
+#dataList: #listOfResourceMethods
-#extent: #(#Point 196 26)
+#useIndex: false
-)
+#has3Dsepartors: true
-#(#ActionButtonSpec
+#has3Dseparators: true
-#name: 'cancelButton'
+#doubleClickSelector: #resourceDoubleClicked
-#activeHelpKey: #commitCancel
+#columnHolder: #resourceMethodColumns
-#label: 'Cancel'
+#valueChangeSelector: #resourceSelected
-#tabable: true
+#verticalSpacing: 1
-#model: #cancel
-#extent: #(#Point 196 26)
-)
-#(#ActionButtonSpec
-#name: 'okButton'
-#activeHelpKey: #commitOK
-#label: 'OK'
-#tabable: true
-#model: #accept
-#isDefault: true
-#extent: #(#Point 196 24)
-)
 )
+#(#InputFieldSpec
+#name: 'selectorInputField'
+#layout: #(#LayoutFrame 2 0.0 -22 1 -2 1.0 0 1)
+#tabable: true
+#model: #valueOfResourceSelector
+#acceptOnLeave: true
+#acceptOnLostFocus: true
+#acceptOnPointerLeave: true
+)
+)
 )
-#horizontalLayout: #fit
+)
-#verticalLayout: #fit
+)
-)
 )
-)
+#handles: #(#Any 0.5 1.0)
+)
+#(#HorizontalPanelViewSpec
+#name: 'HorizontalPanel1'
+#layout: #(#LayoutFrame 2 0.0 -30 1 -2 1.0 -4 1.0)
+#horizontalLayout: #fit
+#verticalLayout: #fit
+#component:
+#(#SpecCollection
+#collection: #(
+#(#ActionButtonSpec
+#label: 'Help'
+#name: 'HelpButton'
+#activeHelpKey: #dss
+#model: #openHTMLDocument:
+#initiallyDisabled: true
+#enableChannel: #helpEnabled
+#actionValue: 'tools/uipainter/ResourceSelectionBrowser.html'
+#extent: #(#Point 196 26)
+)
+#(#ActionButtonSpec
+#label: 'Cancel'
+#name: 'cancelButton'
+#activeHelpKey: #commitCancel
+#tabable: true
+#model: #cancel
+#extent: #(#Point 196 26)
+)
+#(#ActionButtonSpec
+#label: 'OK'
+#name: 'okButton'
+#activeHelpKey: #commitOK
+#tabable: true
+#model: #accept
+#isDefault: true
+#extent: #(#Point 196 24)
+)
+)
+)
+)
+)
+)
 )
-"Modified: / 27.7.1998 / 18:05:40 / cg"
 ! !
 !ResourceSelectionBrowser class methodsFor:'list specs'!
 tableColumnsForResourceMethodAttributes
 "returns the value holder for the name of the class"
 |holder|
 (holder := builder bindingAt:#valueOfClassName) isNil ifTrue:[
 builder aspectAt:#valueOfClassName put:(holder :=  '' asValue).
+holder onChangeEvaluate:[self classSelectionUpdate:holder value].
 ].
 ^ holder
 !
 valueOfResourceSelector
 [:m| m resources notNil and: [resourceTypes includes: m resourceType]]))
 collect: [:m| (ResourceMethod new method: m)]).
 ]
 !
+classSelectionUpdate:clsPattern
+|foundClass classes|
+clsPattern notNil ifTrue:[
+foundClass := Smalltalk at:(clsPattern printString asSymbol).
+].
+(foundClass isClass not or:[foundClass name ~= clsPattern])
+ifTrue:
+[
+classes := allClasses select: [:cls| cls name size >= clsPattern size].
+1 to: clsPattern size do:
+[:i|
+classes := classes select: [:cls| (cls name at: i) == (clsPattern at: i)].
+].
+foundClass := classes at: 1 ifAbsent: [nil]
+].
+foundClass notNil
+ifTrue:
+[
+ClassPresentation = #'Class Hierarchy'
+ifTrue:
+[
+|searchArgs nonSuperclasses|
+foundClass isPrivate
+ifFalse: [searchArgs := foundClass withAllSuperclasses reverse]
+ifTrue:  [searchArgs := foundClass owningClass withAllSuperclasses reverse. searchArgs add: foundClass]
+.
+(nonSuperclasses := self treeViewClassHierarchyContents allSuperclasses) notNil
+ifTrue: [searchArgs := searchArgs reject: [:cls| nonSuperclasses includes: cls]].
+self selectionOfClassHierarchy value: (self rootOfClassHierarchy detectChild:[:child :arg| child contents == arg] arguments:searchArgs).
+]
+ifFalse:
+[
+|searchArgs|
+foundClass isPrivate
+ifTrue:  [searchArgs := Array with: 'Categories' with: foundClass category with: foundClass owningClass name with: foundClass name]
+ifFalse: [searchArgs := Array with: 'Categories' with: foundClass category with: foundClass name].
+self selectionOfClassCategories value: (self rootOfClassCategories detectChild:[:child :arg| (child name upTo: $ ) = arg] arguments:searchArgs).
+].
+].
+self valueOfClassName value: clsPattern
+!
 resourceDoubleClicked
 "after a double click on resource method, accept it and close"
 accept value: true.
 self closeRequest
 (classSelection isNil or:[Smalltalk at: classSelection]) isNil
 ifTrue: [classSelection :=  self class lastSelection].
 (classSelection isNil or:[Smalltalk at: classSelection]) isNil
 ifTrue: [classSelection :=  self treeViewContents].
-classSelectionBlock :=
+classSelectionBlock := [:clsPattern | self classSelectionUpdate:clsPattern].
-[:clsPattern|
-|foundClass classes|
-clsPattern notNil ifTrue:[
-foundClass := Smalltalk at:(clsPattern printString asSymbol).
-].
-(foundClass isClass not or:[foundClass name ~= clsPattern])
-ifTrue:
-[
-classes := allClasses select: [:cls| cls name size >= clsPattern size].
-1 to: clsPattern size do:
-[:i|
-classes := classes select: [:cls| (cls name at: i) == (clsPattern at: i)].
-].
-foundClass := classes at: 1 ifAbsent: [nil]
-].
-foundClass notNil
-ifTrue:
-[
-ClassPresentation = #'Class Hierarchy'
-ifTrue:
-[
-|searchArgs nonSuperclasses|
-foundClass isPrivate
-ifFalse: [searchArgs := foundClass withAllSuperclasses reverse]
-ifTrue:  [searchArgs := foundClass owningClass withAllSuperclasses reverse. searchArgs add: foundClass]
-.
-(nonSuperclasses := self treeViewClassHierarchyContents allSuperclasses) notNil
-ifTrue: [searchArgs := searchArgs reject: [:cls| nonSuperclasses includes: cls]].
-self selectionOfClassHierarchy value: (self rootOfClassHierarchy detectChild:[:child :arg| child contents == arg] arguments:searchArgs).
-]
-ifFalse:
-[
-|searchArgs|
-foundClass isPrivate
-ifTrue:  [searchArgs := Array with: 'Categories' with: foundClass category with: foundClass owningClass name with: foundClass name]
-ifFalse: [searchArgs := Array with: 'Categories' with: foundClass category with: foundClass name].
-self selectionOfClassCategories value: (self rootOfClassCategories detectChild:[:child :arg| (child name upTo: $ ) = arg] arguments:searchArgs).
-].
-].
-self valueOfClassName value: clsPattern
-].
 self valueOfClassName value: classSelection.
 (classNameInputField := builder componentAt: #classNameInputField) entryCompletionBlock:
 [:value|
 |what oldClassName|

changeset 1384	ff417bf5f8d8
parent 1329	a38c2e29d1fb
child 1404	f088630ac860