hg/stx-libtool2: comparison UIHelpTool.st

equal deleted inserted replaced

-:7746185a3621
+:2aae4f3b6526
 #(#FullSpec
 #window:
 #(#WindowSpec
 #name: 'HelpTool'
-#layout: #(#LayoutFrame 59 0 376 0 344 0 646 0)
+#layout: #(#LayoutFrame 90 0 295 0 375 0 565 0)
 #label: 'unnamed canvas'
 #min: #(#Point 10 10)
 #max: #(#Point 1160 870)
-#bounds: #(#Rectangle 59 376 345 647)
+#bounds: #(#Rectangle 90 295 376 566)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #activeHelpKey: #listOfHelpTexts
 #tabable: true
 #model: #listModel
 #hasHorizontalScrollBar: true
 #hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
 #useIndex: false
 #sequenceList: #listChannel
 )
 #(#HorizontalPanelViewSpec
 #name: 'HorizontalPanelView'
 #layout: #(#LayoutFrame 1 0.5 53 0 -3 1 -1 0.5)
 #activeHelpKey: #listOfHelpSpecClasses
 #model: #selectionOfHelpSpecClass
 #hasHorizontalScrollBar: true
 #hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
 #valueChangeSelector: #helpSpecClassSelected
 #useIndex: false
 #sequenceList: #listOfHelpSpecClasses
 )
 #(#TextEditorSpec
 dictionary:aDictionary
 "set the value of the instance variable 'dictionary' (automatically generated)"
 (dictionary := aDictionary) isNil ifTrue:[
-dictionary := IdentityDictionary new.
+dictionary := Dictionary new.
 ].
 self updateList
 !
 helpKey
 "read help text from an application associated with the class
 "
 |help|
 isModified := false.
-dictionary   := IdentityDictionary new.
+specClass notNil
-dictionaries := IdentityDictionary new.
+ifTrue:
+[
+dictionary   := Dictionary new.
+dictionaries := Dictionary new.
+].
 specClass  := self applicationClassAssociatedWith:aClass.
-specClass isClass
+(specClass isClass and: [specClass isLoaded])
 ifTrue:
 [
+(specClass class implements:#helpSpec) ifFalse:[
+dictionaries at: specClass name put: dictionary
+].
 self listOfHelpSpecClasses contents: (specClass withAllSuperclasses reverse collect: [:cls| cls name]).
 self listOfHelpSpecClasses removeAll: (ApplicationModel withAllSuperclasses collect: [:cls| cls name]).
 self selectionOfHelpSpecClass value: specClass name.
 (builder componentAt: #listOfHelpSpecClassesView) selection:
 (self listOfHelpSpecClasses value indexOf: specClass name).
 self helpSpecClassSelected.
 ].
-(specClass respondsTo:#helpSpec) ifTrue:[
-help := specClass helpSpec
-] ifFalse:[
-specClass := nil
-].
 self updateList
+!
+isModified
+^ isModified
+!
+isModified: aBoolean
+isModified := aBoolean
 !
 modifiedHolder:aValueHolder
 "set the value holder set to true in case of modifying attributes
 "
 key    := listSelection asSymbol.
 list   := self listChannel value.
 (listChgd := (dictionary at:key ifAbsent:nil) isNil) ifTrue:[
 list add:key.
 ].
 dictionary at:key put:txt.
 listChgd ifTrue:[
 self updateList.
 (builder componentAt: #listOfHelpKeysView) selection: (list indexOf: key).
 !
 helpSpecClassSelected
 |clsName|
 clsName := self selectionOfHelpSpecClass value.
 (dictionary := dictionaries at: clsName ifAbsent: nil) isNil
 ifTrue:
 [
 dictionary := dictionaries at: clsName put: (self extractHelpSpecForClass: (Smalltalk at: clsName))
 ].
 self updateList.
 listSelection notNil
-ifTrue: [(dictionary keys includes: listSelection asSymbol)
+ifTrue:
-ifTrue: [(builder componentAt: #listOfHelpKeysView) selection:
+[
-(self listChannel value indexOf: (builder componentAt: #helpKeyInputField) contents)]
+(dictionary keys includes: listSelection asSymbol)
-ifFalse: [(builder componentAt: #listOfHelpKeysView) selection: nil]].
+ifTrue: [(builder componentAt: #listOfHelpKeysView) selection:
-self editTextView contents: ''
+(self listChannel value indexOf: (builder componentAt: #helpKeyInputField) contents)]
+ifFalse: [(builder componentAt: #listOfHelpKeysView) selection: nil].
+].
+listSelection notNil
+ifTrue:
+[
+self editTextView contents: (dictionary at: listSelection asSymbol ifAbsent: '')
+]
 !
 installHelpSpecInto:aClass
 "install help text
 "
-|cls src superHelpSpecKeys helpSpec mayRemoveHelpSpecSelector|
+|cls src helpSpec|
 cls := self applicationClassAssociatedWith:aClass.
 cls isNil ifTrue:[
 ^ self information:'No application class defined!!'.
 ].
-aClass == cls name
+aClass = cls name asString
-ifTrue: [cls allSuperclasses value do: [:c| self installHelpSpecInto:c]. isModified := true].
+ifTrue: [self listOfHelpSpecClasses value do: [:c| c ~~ cls name ifTrue: [self installHelpSpecInto: (Smalltalk at: c)]. isModified := true]].
 isModified not ifTrue:[
 ^nil
 ].
-(cls superclass respondsTo: #helpSpec)
+helpSpec := dictionaries at: cls name ifAbsent: [dictionary].
-ifTrue:  [superHelpSpecKeys := cls superclass helpSpec keys. mayRemoveHelpSpecSelector := true]
-ifFalse: [superHelpSpecKeys := IdentityDictionary new. mayRemoveHelpSpecSelector := false].
+(cls class implements: #helpSpec)
+ifTrue:
-helpSpec := dictionaries at: cls name ifAbsent: [^nil].
+[
+|superclassHelpKeys implementedHelpSpec hasChanged|
+implementedHelpSpec := Dictionary new.
+superclassHelpKeys := (cls superclass respondsTo: #helpSpec)
+ifTrue:  [cls superclass helpSpec keys]
+ifFalse: [Array new].
+cls helpSpec associationsDo: [:h| (superclassHelpKeys includes: h key)
+ifFalse: [implementedHelpSpec at: h key put: h value]].
+hasChanged := false.
+implementedHelpSpec associationsDo: [:h| (helpSpec            includesAssociation: h) ifFalse: [hasChanged := true]].
+helpSpec            associationsDo: [:h| (implementedHelpSpec includesAssociation: h) ifFalse: [hasChanged := true]].
+(implementedHelpSpec notEmpty and: [hasChanged and:
+[DialogBox confirm: 'Class ', cls name asBoldText, ' already implements\a menu spec!!\\Do only replace, if you have removed\help keys in an existing help spec.\' withCRs yesLabel: ' Merge ' noLabel: ' Replace ']])
+ifTrue:
+[
+implementedHelpSpec associationsDo: [:h| helpSpec at: h key put: h value].
+]
+].
 helpSpec isEmpty ifTrue:[
-mayRemoveHelpSpecSelector ifTrue: [cls class removeSelector: #helpSpec].
+(cls superclass respondsTo: #helpSpec) ifTrue: [cls class removeSelector: #helpSpec].
 ^nil
 ].
 src  := '' writeStream.
 forClass:cls class
 inCategory:'help specs'.
 isModified := false.
 !
 remove
 "remove selected help key
 "
 initialize
 "setup instance attributes
 "
 super initialize.
-dictionary   := IdentityDictionary new.
+dictionary   := Dictionary new.
-dictionaries := IdentityDictionary new.
+dictionaries := Dictionary new.
 isModified := false.
 ! !
 !UIHelpTool methodsFor:'private'!
 ((aClass class implements: #helpSpec)
 and: [(helpSpecSuperClass := aClass allSuperclasses detect: [:cls| cls class implements: #helpSpec] ifNone: nil) notNil])
 ifTrue:
 [
 superHelpSpecKeys := helpSpecSuperClass helpSpec keys.
-helpSpec := IdentityDictionary new.
+helpSpec := Dictionary new.
 aClass helpSpec associationsDo:
 [:asso|
 (superHelpSpecKeys includes: asso key) ifFalse: [helpSpec at: asso key put: asso value]
 ].
 ^dictionary := helpSpec
 ].
-^dictionary := IdentityDictionary new
+^dictionary := Dictionary new
 !
 findHelpSpecForKey: aHelpKey
 "update list from dictionary
 "
-|helpSpecClass superHelpSpecKeys helpSpec|
+|dictTemp helpSpecClass superHelpSpecKeys helpSpec|
 aHelpKey isNil ifTrue: [^nil].
+dictTemp := dictionary.
 self listOfHelpSpecClasses value do:
 [:clsName|
 (dictionary := dictionaries at: clsName ifAbsent: nil) isNil
 ifTrue:
 [
 self updateList.
 ^(builder componentAt: #listOfHelpSpecClassesView) selection:
 (self listOfHelpSpecClasses value indexOf: clsName).
 ]
 ].
+dictionary := dictTemp
 !
 updateList
 ^ UISpecificationTool
 ].
 ^ cls
-!
-isModified
-^ isModified
 ! !
 !UIHelpTool methodsFor:'selection'!
 listSelection

changeset 700	2aae4f3b6526
parent 696	e91402372900
child 701	bcd65f75ade4