hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:a60283327f16
+:5528c812da8f
 "{ Package: 'stx:libtool2' }"
 ToolApplicationModel subclass:#UIPainter
-	instanceVariableNames:'specClass specSelector specSuperclassName aspects treeView
+	instanceVariableNames:'specClassName specSelector specSuperclassName aspects treeView
 		selectionPanel tabSelection modified specTool layoutTool helpTool'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 helpTool := UIHelpTool new.
 applBuilder := helpTool builder.
 applWindow  := ApplicationSubView origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
 applWindow level:0.
-helpTool loadFromClass:specClass.
+helpTool loadFromClass:specClassName.
 helpTool masterApplication:self.
 applBuilder window:applWindow.
-applWindow client:helpTool spec:#windowSpec builder:applBuilder.
+applWindow client:helpTool spec:#innerSpec builder:applBuilder.
 applBuilder window:applWindow.
 helpTool modifiedHolder:modifiedChannel.
 specTool := UISpecificationTool new.
 specTool createBuilder.
 openDataSetColumnEditor
 "opens a Table Column Editor on current widget"
 |cls editor specTool columnHolder tableSelector columns|
-(cls := self resolveName:specClass) isNil ifTrue:[
+(cls := self resolveName:specClassName) isNil ifTrue:[
-self askForSaving ifTrue:[cls := self resolveName:specClass].
+self askForSaving ifTrue:[cls := self resolveName:specClassName].
 ].
 cls isNil ifTrue:[^ self].
 self modifiedChannel value ifTrue:[
 (self confirm:'Accept changes made to spec ?') ifTrue:[
 openEditMenu
 "opens a Menu Editor on current widget"
 |cls selectorOrMenu editor selectedSpec spec holder|
-(cls := self resolveName:specClass) isNil ifTrue:[
+(cls := self resolveName:specClassName) isNil ifTrue:[
-self askForSaving ifTrue:[cls := self resolveName:specClass].
+self askForSaving ifTrue:[cls := self resolveName:specClassName].
 ].
 cls isNil ifTrue:[^ self].
 self modifiedChannel value ifTrue:[
 (self confirm:'Accept changes made to spec ?') ifTrue:[
 openHierarchicalListEditor
 "opens a Hierarchical List Editor on current widget"
 |selector editor spec|
-(self resolveName:specClass) isNil ifTrue:[
+(self resolveName:specClassName) isNil ifTrue:[
 	self askForSaving ifFalse: [^self]
 ].
 spec := self specTool specification.
 (selector := spec hierarchicalList) notNil ifTrue:[
 	selector := selector asSymbol
 ].
 editor := HierarchicalListEditor new.
 editor masterApplication:self.
-editor openModalOnClass:specClass andSelector:selector.
+editor openModalOnClass:specClassName andSelector:selector.
 editor specSelector ~= selector ifTrue:[
 	editor hasSaved ifTrue:[
 	    spec hierarchicalList:editor specSelector.
 	    self modifiedChannel value:true.
 openSubSpecGUIPainter
 "opens a GUI Painter on the current subspecification"
 |spec cls meta sel|
-(self resolveName:specClass) isNil ifTrue:[
+(self resolveName:specClassName) isNil ifTrue:[
 self askForSaving ifFalse: [^self]
 ].
 spec := self specTool specification.
 cls := spec majorKey.
 cls isNil ifTrue:[
-cls := specClass.
+cls := specClassName.
 ].
-(cls := self resolveName:cls inClass:(Smalltalk at: specClass asSymbol)) isNil ifTrue:[
+(cls := self resolveName:cls inClass:(Smalltalk at: specClassName asSymbol)) isNil ifTrue:[
 spec majorKey isNil ifTrue:[
 ^ self warn:'Cannot find class (no majorKey specified).'.
 ].
 ^ self warn:('Cannot find class ', spec majorKey asBoldText, '.').
 ].
 openTabListEditor
 "opens a Tab List Editor on current widget"
 |selector editor spec cls holder|
-(cls := self resolveName:specClass) isNil ifTrue:[
+(cls := self resolveName:specClassName) isNil ifTrue:[
-self askForSaving ifTrue:[cls := self resolveName:specClass].
+self askForSaving ifTrue:[cls := self resolveName:specClassName].
 ].
 cls isNil ifTrue:[^ self].
 self modifiedChannel value ifTrue:[
 (self confirm:'Accept changes made to spec ?') ifTrue:[
 !UIPainter methodsFor:'help'!
 defaultInfoLabel
 "returns the default info label"
-specClass isNil ifTrue: [^'No class and selector defined.'].
+specClassName isNil ifTrue: [^'No class and selector defined.'].
 specSelector isNil ifTrue: [^'No selector defined.'].
-^specClass printString, ' >> ', specSelector
+^specClassName printString, ' >> ', specSelector
 "Modified: / 20.6.1998 / 16:49:16 / cg"
 ! !
 !UIPainter methodsFor:'help spec'!
 checkClassAndSelector
 "checks for class & superclass"
 |superclass cls|
-specClass isNil ifTrue:[^ false].
+specClassName isNil ifTrue:[^ false].
-cls := self resolveName:specClass.
+cls := self resolveName:specClassName.
 cls isNil ifTrue:[
 superclass := self resolveName:specSuperclassName.
 superclass isNil ifTrue:[
 self warn:'No class named ' , specSuperclassName , ' exists!!'.
 ^ false.
 ].
-(self confirm:'Create class ' , specClass asBoldText, '?') ifTrue:[
+(self confirm:'Create class ' , specClassName asBoldText, '?') ifTrue:[
 cls := superclass
-subclass:(specClass asSymbol)
+subclass:(specClassName asSymbol)
 instanceVariableNames:''
 classVariableNames:''
 poolDictionaries:''
 category:'Applications'.
-cls name ~= specClass ifTrue:[
+cls name ~= specClassName ifTrue:[
 self information:'Created new class is ' , cls name.
-specClass := cls name
+specClassName := cls name
 ].
 ^ true.
 ].
 ^ false.
 ].
 cls isBehavior ifFalse:[
-self warn:'A global named ' , specClass , ' exists, but it is no class.'.
+self warn:'A global named ' , specClassName , ' exists, but it is no class.'.
 ^ false.
 ].
 specSuperclassName isBehavior ifFalse:[
 specSuperclassName isEmpty ifFalse:[
 self warn:'No class named ' , specSuperclassName , ' exists!!'.
 ^ false.
 ].
 (cls isSubclassOf:superclass) ifFalse:[
-self information:('A global named ' , specClass , ' exists,\' ,
+self information:('A global named ' , specClassName , ' exists,\' ,
 'but is not a subclass of ' , superclass name , '.\\' ,
 'Check and try again if that is not what you want.') withCRs.
 ]
 ].
 self specClass:clsName.
 specSelector := (selector ? '').
 specSuperclassName := superClassName.
-(specClass notNil and:[ selector notNil ]) ifTrue:[
+(specClassName notNil and:[ selector notNil ]) ifTrue:[
-self addHistoryEntryForClass:specClass selector:specSelector.
+self addHistoryEntryForClass:specClassName selector:specSelector.
 self updateInfoLabel
 ].
 "Modified: / 5.2.1998 / 09:44:58 / stefan"
 !
 specClass:aClassOrClassName
 "sets the specClass and updates the Help Tool"
 aClassOrClassName isBehavior
-ifTrue: [ specClass := aClassOrClassName ]
+ifTrue: [ specClassName := aClassOrClassName ]
-ifFalse:[ specClass := Smalltalk classNamed:aClassOrClassName ].
+ifFalse:[ specClassName := Smalltalk classNamed:aClassOrClassName ].
-self helpTool loadFromClass:specClass.
+self helpTool loadFromClass:specClassName.
 self clearModifiedFlag.
 ! !
 !UIPainter methodsFor:'private-tools'!
 !UIPainter methodsFor:'queries'!
 hasSpecClass
 "answers whether an application class is defined"
-^ (self resolveName:specClass) notNil
+^ (self resolveName:specClassName) notNil
 !
 hasSpecClassAndSelector
 "answers whether an application class and a selector under which
 the window spec is stored is defined"
 	].
 	topView raise.
 ].
 !
+initialize
+super initialize.
+modified := false.
+aspects := IdentityDictionary new.
+aspects at:#classNameChannel put:'NewApplication' asValue.
+!
 loadFromClass:aClass andSelector:selector
 "loads a window spec by evaluating aMessageString
 (which is something like 'fooClass windowSpec')"
 self assert:(aClass isNil or:[aClass isClass]).
 openInterface:aSymbol
 "opens the interface on the selector aSymbol"
 |cls painterView painter topView galleryWindow icon name|
-modified := false.
+specClassName notNil ifTrue:[
-aspects := IdentityDictionary new.
+specClassName isBehavior ifTrue:[
-specClass notNil ifTrue:[
+name := specClassName nameWithoutPrefix.
-specClass isBehavior ifTrue:[
-name := specClass nameWithoutPrefix.
 ] ifFalse:[
-name := specClass printString string
+name := specClassName printString string
 ]
 ].
-aspects at:#classNameChannel
+(aspects at:#classNameChannel) value:(specClassName ? 'NewApplication').
-put:((specClass notNil ifTrue:[ specClass ] ifFalse:[ 'NewApplication' ])
-asValue).
 specSuperclassName isNil ifTrue:[
-specClass notNil ifTrue:[
+specClassName notNil ifTrue:[
-(cls := self resolveName:specClass) notNil ifTrue:[
+(cls := self resolveName:specClassName) notNil ifTrue:[
 specSuperclassName := cls superclass name.
 ]
 ]
 ].
 aspects at:#superclassNameChannel
 (self confirm:'No class given to the GUI Painter (class was probably renamed?)\\Open anyway (to create a new window spec) ?' withCRs)
 ifFalse:[^ nil].
 ].
 specSelector := aSelector.
-specClass := aClass.
+specClassName := aClass.
 self openInterface.
 "/    specSelector := aSelector.
 "/    specClass := aClass.
 |painter settings gridPara hspace vspace cls sel|
 super postBuildWith:aBuilder.
-cls := specClass.
+cls := specClassName.
 cls isString ifTrue:[
 cls := Smalltalk at:(cls string asSymbol)
 ].
 sel := specSelector.
 specSelector := nil.
-specClass    := nil.
+specClassName    := nil.
 painter  := self painter.
 settings := self class settings.
 gridPara := painter gridParameters copy.
 hspace   := settings at: #HGridSpace ifAbsent:10.
 self painter isModified ifTrue:[
 self warn:'The current window spec has not yet been saved!!\\The System Browser will show the code of the old window spec.' withCRs.
 ].
-UserPreferences systemBrowserClass openInClass:(self resolveName:specClass)
+UserPreferences systemBrowserClass openInClass:(self resolveName:specClassName)
 !
 doBrowseViewClass
 "opens a browser on the selected widgets class"
 ].
 [
 again := false.
-aspects at:#classNameChannel      put:(specClass      ? 'NewApplication')   asValue.
+aspects at:#classNameChannel      put:(specClassName      ? 'NewApplication')   asValue.
 aspects at:#methodNameChannel     put:(specSelector   ? 'windowSpec')       asValue.
 aspects at:#superclassNameChannel put:(specSuperclassName ? 'ApplicationModel') asValue.
 (self openDialogInterface:#dialogSpecForDefiningClassAndSelector) ifTrue:[
-specClass      := readFromModelKeyed value:#classNameChannel.
+specClassName      := readFromModelKeyed value:#classNameChannel.
 specSelector   := readFromModelKeyed value:#methodNameChannel.
 specSuperclassName := readFromModelKeyed value:#superclassNameChannel.
 (again := self checkClassAndSelector not) ifFalse:[
-self painter className:specClass
+self painter className:specClassName
 superclassName:specSuperclassName
 selector:specSelector.
 ].
 again ifFalse:[
-((Smalltalk at:specClass asSymbol) notNil
+((Smalltalk at:specClassName asSymbol) notNil
-and:[ (Smalltalk at:specClass asSymbol) class includesSelector:specSelector ])
+and:[ (Smalltalk at:specClassName asSymbol) class includesSelector:specSelector ])
 ifTrue:[
-(self confirm:('%1 already implements %2. Overwrite ?' bindWith:specClass with:specSelector))
+(self confirm:('%1 already implements %2. Overwrite ?' bindWith:specClassName with:specSelector))
 ifFalse:[
 again := true.
 ].
 ].
 ].
 ^nil
 ]
 ] doWhile:[again].
-specClass := specClass isBehavior ifTrue:[specClass name]
+specClassName := specClassName isBehavior ifTrue:[specClassName name]
-ifFalse:[specClass].
+ifFalse:[specClassName].
 self clearModifiedFlag.
-self helpTool buildAndMergeFromClass:specClass.
+self helpTool buildAndMergeFromClass:specClassName.
 self updateInfoLabel
 "Modified: / 16.7.1998 / 18:26:33 / cg"
 !
 self loadFromMessage:
 	(ResourceSelectionBrowser
 	    request: 'Load Window Spec From Class'
 	    onSuperclass: nil
-	    andClass: specClass
+	    andClass: specClassName
 	    andSelector: specSelector ? #windowSpec
 	    withResourceTypes: #(canvas))
 !
 doLoadSubspec
 self askForSectionModification.
 classAndSelector := ResourceSelectionBrowser
 request: 'Load Subspec From Class'
 onSuperclass: nil
-andClass: specClass
+andClass: specClassName
 andSelector: specSelector
 withResourceTypes: #(canvas).
 classAndSelector isNil ifTrue:[^ self].
 class := classAndSelector methodClass.
 selector := classAndSelector methodSelector.
-(class == specClass and: [selector == specSelector]) ifTrue: [
+(class == specClassName and: [selector == specSelector]) ifTrue: [
 self warn: 'Current interface as subspec not allowed!!'.
 ^ self.
 ].
 (class respondsTo:selector) ifTrue:[
 self addWidgetOfSpec:(Array with: (UISubSpecification new majorKey: class name; minorKey: selector))
 doNew
 "removes all widgets, specClass, and specSelector"
 self askForModification ifFalse: [^nil].
-specClass := specSelector := nil.
+specClassName := specSelector := nil.
 self painter removeAll.
 treeView canvas topView name:  UIPainter defaultNameOfCanvas.
 treeView canvas topView label: UIPainter defaultNameOfCanvas.
 self helpTool doNew.
 self treeSelectionChanged.
 self doDefineClassAndSelector isNil ifTrue:[
 ^ nil
 ]
 ].
-(specClass notNil and:[ specClass isClass ]) ifFalse:[
+(specClassName notNil and:[ specClassName isClass ]) ifFalse:[
-self warn:('Oops - cannot save - class not found: ' , specClass).
+self warn:('Oops - cannot save - class not found: ' , specClassName).
 ^ nil
 ].
 painter := self painter.
 painter
-class:specClass
+class:specClassName
 superclassName:specSuperclassName
 selector:specSelector.
 "/    Transcript showCR:'generating windowSpec code...'.
 self doGenerateAspectSelectorsMethod.
 self helpTool doSave.
 self updateInfoLabel.
 modified := false.
 painter resetModification.
-(specClass respondsTo:specSelector) ifTrue:[
+(specClassName respondsTo:specSelector) ifTrue:[
-self addHistoryEntryForClass:specClass selector:specSelector.
+self addHistoryEntryForClass:specClassName selector:specSelector.
 ].
 !
 doSaveAs
 "opens a ResourceSelectionBrowser for saving the window spec on a class"
 self askForModification ifFalse:[^ false].
 classAndSelector := ResourceSelectionBrowser
 request: 'Save Window Spec In Class'
 onSuperclass: #Object
-andClass: (specClass ? #ApplicationModel) asSymbol
+andClass: (specClassName ? #ApplicationModel) asSymbol
 andSelector: specSelector ? #windowSpec
 withResourceTypes: #(canvas).
 classAndSelector isNil ifTrue:[^ false].
 modified := false.
 self painter resetModification.
-specClass := classAndSelector methodClass.
+specClassName := classAndSelector methodClass.
 specSelector := classAndSelector methodSelector.
-specSuperclassName := specClass superclass name.
+specSuperclassName := specClassName superclass name.
 self doSave.
 ^ true
 !
 doStartApplication
 accepted) ifFalse: [^nil].
 self doSave isNil ifTrue: [^nil]
 ]
 ].
-cls := self resolveName:specClass.
+cls := self resolveName:specClassName.
 cls isNil ifTrue:[
-self warn:'Oops cannot start application - no class:' , specClass.
+self warn:'Oops cannot start application - no class:' , specClassName.
 ^ nil
 ].
 ((application := cls new) respondsTo:#openInterface:) ifFalse:[
 (self confirm:('The application does not respond to the ''openInterface:'' message.\(maybe the spec is supposed to be used as subApplication/subCanvas)\\Shall I try to open this as a standAlone dialog ?') withCRs)
 ifTrue:[

changeset 1983	5528c812da8f
parent 1976	969584dd8beb
child 1991	feaad07cb3cf