hg/stx-libtool2: comparison UIPainterView.st

equal deleted inserted replaced

-:6ad211a201cf
+:2c640b5f7fa9
 "
 COPYRIGHT (c) 1995 by Claus Gittinger / eXept Software AG
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice. This software may not
 be provided or otherwise made available to, or used by, any
 !UIPainterView class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1995 by Claus Gittinger / eXept Software AG
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice. This software may not
 be provided or otherwise made available to, or used by, any
 "
 buildIn view used by the UIPainter; from this view, the layout of the
 new application derives from.
 [see also:]
-UIBuilder
+	UIBuilder
-UIObjectView
+	UIObjectView
 [author:]
-Claus Gittinger
+	Claus Gittinger
-Claus Atzkern
+	Claus Atzkern
 "
 ! !
 !UIPainterView class methodsFor:'initialization'!
 ! !
 !UIPainterView class methodsFor:'defaults'!
 defaultMenuMessage
 "This message is the default yo be sent to the menuHolder to get a menu
 "
 ^ #showMiddleButtonMenu
 selectNames:aStringOrCollection
 |prop coll s n newSel|
 (aStringOrCollection size == 0) ifTrue:[
-newSel := nil.
+	newSel := nil.
 ] ifFalse:[
-(s := aStringOrCollection) isString ifFalse:[
+	(s := aStringOrCollection) isString ifFalse:[
-s size == 1 ifTrue:[
+	    s size == 1 ifTrue:[
-s := s first
+		s := s first
-] ifFalse:[
+	    ] ifFalse:[
-coll := OrderedCollection new.
+		coll := OrderedCollection new.
-s do:[:aName|
+		s do:[:aName|
-(prop := self propertyOfName:aName) notNil ifTrue:[
+		    (prop := self propertyOfName:aName) notNil ifTrue:[
-coll add:(prop view)
+			coll add:(prop view)
-]
+		    ]
-].
+		].
-(n := coll size) == 1 ifTrue:[
+		(n := coll size) == 1 ifTrue:[
-newSel := coll at:1
+		    newSel := coll at:1
-] ifFalse:[
+		] ifFalse:[
-n == 0 ifTrue:[
+		    n == 0 ifTrue:[
-newSel := nil
+			newSel := nil
-] ifFalse:[
+		    ] ifFalse:[
-newSel := coll
+			newSel := coll
-]
+		    ]
-].
+		].
-^ self select:newSel.
+		^ self select:newSel.
-]
+	    ]
-].
+	].
-prop := self propertyOfName:s.
+	prop := self propertyOfName:s.
-prop isNil ifTrue:[
+	prop isNil ifTrue:[
-newSel := nil
+	    newSel := nil
-] ifFalse:[
+	] ifFalse:[
-newSel := prop view
+	    newSel := prop view
-].
+	].
 ].
 ^ self select:newSel
 ! !
 !UIPainterView methodsFor:'change & update'!
 layoutChanged
 treeView notNil ifTrue:[
-treeView layoutChanged
+	treeView layoutChanged
 ]
 ! !
 !UIPainterView methodsFor:'copy & cut & paste'!
 |container|
 container := someComponents first container.
 [container notNil
 and:[ (someComponents conform:[:eachComponent | eachComponent isComponentOf:container]) not]]
-whileTrue:[
+	whileTrue:[
-container := container container.
+	container := container container.
 ].
 ^ container
 !
 copySelection
 coll := self minSetOfSuperViews:(self selection).
 coll notNil ifTrue:[
 "/        self select:nil.
-specs := coll collect:[:aView| self fullSpecFor:aView ].
+	specs := coll collect:[:aView| self fullSpecFor:aView ].
-self setSelection:specs.
+	self setSelection:specs.
 "/        treeView selection: sel
 ].
 !
 treeView askForSelectionChangeAllowed ifFalse:[^ self].
 coll := self minSetOfSuperViews:(self selection).
 coll notNil ifTrue:[
-treeView cvsEventsDisabledDo:[
+	treeView cvsEventsDisabledDo:[
-treeModel    := treeView model.
+	    treeModel    := treeView model.
-oldSelection := treeModel selectedNodes at:1 ifAbsent: nil.
+	    oldSelection := treeModel selectedNodes at:1 ifAbsent: nil.
-oldSelection notNil ifTrue:[
+	    oldSelection notNil ifTrue:[
-children := oldSelection parent children.
+		children := oldSelection parent children.
-(size := children size) > 1 ifTrue:[
+		(size := children size) > 1 ifTrue:[
-index := children identityIndexOf:oldSelection.
+		    index := children identityIndexOf:oldSelection.
-size == index ifTrue:[
+		    size == index ifTrue:[
-index := index - 1
+			index := index - 1
-].
+		    ].
-newSelection := children at:index ifAbsent:1.
+		    newSelection := children at:index ifAbsent:1.
-] ifFalse:[
+		] ifFalse:[
-newSelection := oldSelection parent
+		    newSelection := oldSelection parent
-].
+		].
-newSelection := treeModel indexOf:newSelection.
+		newSelection := treeModel indexOf:newSelection.
-] ifFalse:[
+	    ] ifFalse:[
-newSelection := 1
+		newSelection := 1
-].
+	    ].
-self hideSelection.
+	    self hideSelection.
-selection := nil.
+	    selection := nil.
-specs := coll collect:[:aView| self fullSpecFor:aView ].
+	    specs := coll collect:[:aView| self fullSpecFor:aView ].
-self withinTransaction:#cut objects:coll do:[
+	    self withinTransaction:#cut objects:coll do:[
-coll reverseDo:[:aView|
+		coll reverseDo:[:aView|
-self createUndoRemove:aView.
+		    self createUndoRemove:aView.
-self remove:aView.
+		    self remove:aView.
-]
+		]
-].
+	    ].
-buffered ifTrue: [self setSelection:specs].
+	    buffered ifTrue: [self setSelection:specs].
-treeView selection:nil.
+	    treeView selection:nil.
-treeView selection:(Array with: newSelection).
+	    treeView selection:(Array with: newSelection).
-(nd := treeView selectedNode) notNil ifTrue:[
+	    (nd := treeView selectedNode) notNil ifTrue:[
-self setSelection:nd contents view withRedraw:true.
+		self setSelection:nd contents view withRedraw:true.
-]
+	    ]
-]
+	]
 ]
 !
 deleteTotalSelection
 "delete the selection
 "
 self deleteSelectionBuffered: false
 !
 getSelectedViewsAndSpecs
 "return an array filed with selected views and corresponding specs.
 |sel|
 sel := self pasteSpecifications:(self getSelection) keepLayout:false.
 sel notNil ifTrue:[
-self select:sel.
+	self select:sel.
 ].
 !
 pasteFromClipBoard:aString
 !
 pasteKeepingPosition
 "add the objects in the paste-buffer to the object view;
 translate the layout as appropriate, to position the component
 at the same absolute position (relative to topView) as before
 "
 |sel|
 sel := self
-pasteSpecifications:(self getSelection)
+	pasteSpecifications:(self getSelection)
-keepLayout:true
+	keepLayout:true
-keepPosition:true
+	keepPosition:true
-at:nil.
+	at:nil.
 sel notNil ifTrue:[
-self select:sel.
+	self select:sel.
 ].
 !
 pasteSpecifications:aSpecificationOrList keepLayout:keepLayout
 "add the specs to the object view; returns list of pasted components
 "
 ^ self
-pasteSpecifications:aSpecificationOrList
+	pasteSpecifications:aSpecificationOrList
-keepLayout:keepLayout
+	keepLayout:keepLayout
-at:nil
+	at:nil
 "Modified: 11.8.1997 / 01:00:35 / cg"
 !
 pasteSpecifications:aSpecificationOrList keepLayout:keepLayout at:aPointOrNil
 "add the specs to the object view; returns list of pasted components
 "
 ^ self
-pasteSpecifications:aSpecificationOrList
+	pasteSpecifications:aSpecificationOrList
-keepLayout:keepLayout
+	keepLayout:keepLayout
-keepPosition:false
+	keepPosition:false
-at:aPointOrNil
+	at:aPointOrNil
 !
 pasteSpecifications:aSpecificationOrList keepLayout:keepLayout keepPosition:keepPosition at:aPointOrNil
 "add the specs to the object view; returns list of pasted components
 treeView askForSelectionChangeAllowed ifFalse:[^ nil].
 containerToPasteInto := self singleSelection.
 containerToPasteInto isNil ifTrue:[
-self selection size > 0 ifTrue:[
+	self selection size > 0 ifTrue:[
-containerToPasteInto := self commonContainerOf:self selection
+	    containerToPasteInto := self commonContainerOf:self selection
-] ifFalse:[
+	] ifFalse:[
-containerToPasteInto := self
+	    containerToPasteInto := self
-].
+	].
-self selection:containerToPasteInto.
+	self selection:containerToPasteInto.
 ].
 (self canPasteInto:containerToPasteInto) ifFalse:[
-containerToPasteInto notNil ifTrue:[
+	containerToPasteInto notNil ifTrue:[
-"/ search up parent list for something we can paste into
+	    "/ search up parent list for something we can paste into
-[containerToPasteInto notNil and:[(self canPasteInto:containerToPasteInto) not]] whileTrue:[
+	    [containerToPasteInto notNil and:[(self canPasteInto:containerToPasteInto) not]] whileTrue:[
-containerToPasteInto := containerToPasteInto container.
+		containerToPasteInto := containerToPasteInto container.
-].
+	    ].
-self selection:containerToPasteInto.
+	    self selection:containerToPasteInto.
-].
+	].
 ].
 containerToPasteInto isNil ifTrue:[
-containerToPasteInto := self
+	containerToPasteInto := self
 ].
 (self canPaste:aSpecificationOrList) ifFalse:[
-Dialog warn:'Cannot paste into selected component (not a container ?)'.
+	Dialog warn:'Cannot paste into selected component (not a container ?)'.
-^ nil
+	^ nil
 ].
 aSpecificationOrList isCollection ifTrue:[
-paste := aSpecificationOrList
+	paste := aSpecificationOrList
 ] ifFalse:[
-paste := Array with:aSpecificationOrList
+	paste := Array with:aSpecificationOrList
 ].
 self setSelection:nil.
 newSel  := OrderedCollection new.
 builder := UIBuilder new isEditing:true.
 className notNil ifTrue:[
-builder applicationClass:(self resolveName:className)
+	builder applicationClass:(self resolveName:className)
 ].
 (keepLayout not or:[keepPosition]) ifTrue:[
-pasteOffset := 0@0.
+	pasteOffset := 0@0.
-keepPosition ifTrue:[
+	keepPosition ifTrue:[
-pasteOrigin := device translatePoint:0@0
+	    pasteOrigin := device translatePoint:0@0
-fromView:self
+				  fromView:self
-toView:containerToPasteInto.
+				  toView:containerToPasteInto.
-] ifFalse:[
+	] ifFalse:[
-aPointOrNil isNil ifTrue:[
+	    aPointOrNil isNil ifTrue:[
-pasteOrigin := self sensor mousePoint.
+		pasteOrigin := self sensor mousePoint.
-pasteOrigin := device translatePoint:pasteOrigin
+		pasteOrigin := device translatePoint:pasteOrigin
-fromView:nil
+					    fromView:nil
-toView:containerToPasteInto.
+					      toView:containerToPasteInto.
-] ifFalse:[
+	    ] ifFalse:[
-pasteOrigin := device translatePoint:aPointOrNil
+		pasteOrigin := device translatePoint:aPointOrNil
-fromView:self
+					    fromView:self
-toView:containerToPasteInto.
+					      toView:containerToPasteInto.
-]
+	    ]
-].
+	].
-bounds := Rectangle origin:0@0 extent:(containerToPasteInto bounds extent)
+	bounds := Rectangle origin:0@0 extent:(containerToPasteInto bounds extent)
 ].
 paste do:[:aSpec|
-|view newOrigin|
+	|view newOrigin|
-view := self addSpec:aSpec builder:builder in:containerToPasteInto.
+	view := self addSpec:aSpec builder:builder in:containerToPasteInto.
-keepPosition ifTrue:[
+	keepPosition ifTrue:[
-self moveObject:view to:(view origin + pasteOrigin).
+	    self moveObject:view to:(view origin + pasteOrigin).
-] ifFalse:[
+	] ifFalse:[
-keepLayout ifFalse:[
+	    keepLayout ifFalse:[
-(bounds containsPoint:pasteOrigin) ifFalse:[
+		(bounds containsPoint:pasteOrigin) ifFalse:[
-newOrigin := pasteOffset.
+		    newOrigin := pasteOffset.
-] ifTrue:[
+		] ifTrue:[
-newOrigin := pasteOrigin + pasteOffset.
+		    newOrigin := pasteOrigin + pasteOffset.
-].
+		].
-self moveObject:view to:newOrigin.
+		self moveObject:view to:newOrigin.
-pasteOffset := pasteOffset + 4
+		pasteOffset := pasteOffset + 4
-].
+	    ].
-].
+	].
-view realize.
+	view realize.
-newSel add:view.
+	newSel add:view.
 ].
 self withinTransaction:#paste objects:newSel do:[
-undoHistory addUndoSelector:#undoCreate:
+	undoHistory addUndoSelector:#undoCreate:
-withArgs:(newSel collect:[:v|(self propertyOfView:v) identifier])
+			   withArgs:(newSel collect:[:v|(self propertyOfView:v) identifier])
 ].
 self realizeAllSubViews.
 newSel do:[:v| v raise].
 self elementChangedSize:containerToPasteInto.
 |sel|
 sel := self pasteSpecifications:(self getSelection) keepLayout:true.
 sel notNil ifTrue:[
-self select:sel.
+	self select:sel.
 ].
 ! !
 !UIPainterView methodsFor:'drag & drop'!
 canDrop:something
 "returns true if something can be droped
 "
 (something size == 1 and:[self enabled and:[self numberOfSelections <= 1]]) ifTrue:[
 ^ something first theObject isKindOf:UISpecification
 ].
 ^ false
 !
 "returns true if something could be paste
 "
 |el size|
 ((size := self numberOfSelections) <= 1 and:[self enabled]) ifFalse:[
-^ false
+	^ false
 ].
 something isCollection ifTrue:[something notEmpty ifTrue:[el := something first]]
-ifFalse:[el := something].
+			  ifFalse:[el := something].
 (el isKindOf:UISpecification) ifFalse:[
-^ false
+	^ false
 ].
 size == 1 ifTrue:[
-^ self canPasteInto:(self singleSelection)
+	^ self canPasteInto:(self singleSelection)
 ].
 ^ true
 !
 canPasteInto:aView
 "can paste into a view
 "
 |prop|
 aView notNil ifTrue:[
-(prop := self propertyRespondsToView:aView) notNil ifTrue:[
+	(prop := self propertyRespondsToView:aView) notNil ifTrue:[
-^ prop spec class supportsSubComponents
+	    ^ prop spec class supportsSubComponents
-].
+	].
 ^ aView specClass supportsSubComponents.
 ].
 ^ false
 !
 drop:anObjectOrCollection at:aPoint
 |spec newSel oldSel dragOffset widg doit|
 doit := true.
 self selection notNil ifTrue:[
-oldSel := self singleSelection.
+	oldSel := self singleSelection.
-"/ search selections hierarchy for a widget into which we can paste
+	"/ search selections hierarchy for a widget into which we can paste
-widg := oldSel.
+	widg := oldSel.
-[widg isNil or:[self canPasteInto:widg]] whileFalse:[
+	[widg isNil or:[self canPasteInto:widg]] whileFalse:[
-widg notNil ifTrue:[
+	    widg notNil ifTrue:[
-widg := widg container
+		widg := widg container
-].
+	    ].
-].
+	].
-oldSel := nil.
+	oldSel := nil.
-self setSelection:widg withRedraw:true.
+	self setSelection:widg withRedraw:true.
 ].
 spec := (anObjectOrCollection at:1) theObject.
 doit ifTrue:[
-dragOffset := DragAndDropManager dragOffsetQuerySignal query.
+	dragOffset := DragAndDropManager dragOffsetQuerySignal query.
-newSel := self pasteSpecifications:spec keepLayout:false at:aPoint - dragOffset.
+	newSel := self pasteSpecifications:spec keepLayout:false at:aPoint - dragOffset.
-self select:(oldSel ? newSel)
+	self select:(oldSel ? newSel)
 ].
 "Modified: / 18.3.1999 / 18:29:43 / stefan"
 "Modified: / 30.10.2001 / 14:02:35 / cg"
 ! !
 "Modified: / 31.10.1997 / 20:27:32 / cg"
 !
 sizeChanged:how
 super sizeChanged:how.
 self layoutChanged
 ! !
 !UIPainterView methodsFor:'generating output'!
 "extract a list of aspect methods - for browsing"
 |cls methods|
 className isNil ifTrue:[
-self warn:'No class defined !!'.
+	self warn:'No class defined !!'.
-^ #()
+	^ #()
 ].
 cls := self resolveName:className.
 methods := IdentitySet new.
 self aspectSelectorsAndTypesDo:
-[:selector :typeSymbol |
+	[:selector :typeSymbol |
-|skip|
+	    |skip|
-(cls includesSelector:selector) ifTrue:[
+	    (cls includesSelector:selector) ifTrue:[
-skip := false.
+		skip := false.
-(typeSymbol == #modelAspect) ifTrue:[
+		(typeSymbol == #modelAspect) ifTrue:[
-(cls isSubclassOf:SimpleDialog) ifTrue:[
+		    (cls isSubclassOf:SimpleDialog) ifTrue:[
-skip := SimpleDialog includesSelector:(selector asSymbol)
+			skip := SimpleDialog includesSelector:(selector asSymbol)
-].
+		    ].
-].
+		].
-skip ifFalse:[
+		skip ifFalse:[
-methods add:(cls compiledMethodAt:selector)
+		    methods add:(cls compiledMethodAt:selector)
-].
+		].
-]
+	    ]
-].
+	].
 ^ methods
 "Created: / 25.10.1997 / 18:58:25 / cg"
 "Modified: / 26.10.1997 / 15:06:18 / cg"
 "evaluate aBlock for every aspect methods selector; 2nd arg describes the aspects type"
 |cls selector protoSpec|
 className isNil ifTrue:[
-self warn:'No class defined !!'.
+	self warn:'No class defined !!'.
-^ self
+	^ self
 ].
 cls := self resolveName:className.
 treeView propertiesDo:[:aProp|
-|selector|
+	|selector|
-(selector := aProp model) notNil ifTrue:[
+	(selector := aProp model) notNil ifTrue:[
-selector isArray ifFalse:[
+	    selector isArray ifFalse:[
-aTwoArgBlock value:(selector asSymbol) value:#modelAspect
+		aTwoArgBlock value:(selector asSymbol) value:#modelAspect
-].
+	    ].
-].
+	].
-(selector := aProp menu) notNil ifTrue:[
+	(selector := aProp menu) notNil ifTrue:[
-selector isArray ifFalse:[
+	    selector isArray ifFalse:[
-aTwoArgBlock value:(selector asSymbol) value:#menu
+		aTwoArgBlock value:(selector asSymbol) value:#menu
-].
+	    ].
-].
+	].
-(aProp spec aspectSelectors) do:[:aSel |
+	(aProp spec aspectSelectors) do:[:aSel |
-aSel isArray ifFalse:[
+	    aSel isArray ifFalse:[
-aTwoArgBlock value:(aSel asSymbol) value:#channelAspect
+		aTwoArgBlock value:(aSel asSymbol) value:#channelAspect
-].
+	    ].
-].
+	].
-aProp spec actionSelectors do:[:aSel|
+	aProp spec actionSelectors do:[:aSel|
-aSel isArray ifFalse:[
+	    aSel isArray ifFalse:[
-aTwoArgBlock value:(aSel asSymbol) value:#actionSelector
+		aTwoArgBlock value:(aSel asSymbol) value:#actionSelector
-].
+	    ].
-].
+	].
-aProp spec valueSelectors do:[:aSel|
+	aProp spec valueSelectors do:[:aSel|
-aSel isArray ifFalse:[
+	    aSel isArray ifFalse:[
-aTwoArgBlock value:(aSel asSymbol) value:#valueSelector
+		aTwoArgBlock value:(aSel asSymbol) value:#valueSelector
-].
+	    ].
-]
+	]
 ].
 protoSpec := treeView canvasSpec.
 (selector := protoSpec menu) notNil ifTrue:[
-selector isArray ifFalse:[
+	selector isArray ifFalse:[
-aTwoArgBlock value:(selector asSymbol) value:#menu
+	    aTwoArgBlock value:(selector asSymbol) value:#menu
-].
+	].
 ].
 !
 generateActionMethodFor:aspect spec:protoSpec inClass:targetClass
 |selector args showIt code alreadyInSuperclass numArgs method|
 numArgs := selector numArgs.
 method  := aspect.
 numArgs == 1 ifTrue:[
-args := 'anArgument'.
+	args := 'anArgument'.
-showIt := ''' , anArgument printString , '' ...''.\'.
+	showIt := ''' , anArgument printString , '' ...''.\'.
 ] ifFalse:[
-args := ''.
+	args := ''.
-showIt := ' ...''.\'.
+	showIt := ' ...''.\'.
-numArgs ~~ 0 ifTrue:[
+	numArgs ~~ 0 ifTrue:[
-method := ''.
+	    method := ''.
-selector keywords keysAndValuesDo:[:i :key|
+	    selector keywords keysAndValuesDo:[:i :key|
-method := method, key, 'arg', i printString, ' '
+		method := method, key, 'arg', i printString, ' '
-]
+	    ]
-]
+	]
 ].
 code := '!!' , targetClass name , ' methodsFor:''actions''!!\\' ,
-method , args , '\' ,
+		method , args , '\' ,
-'    "automatically generated by UIPainter ..."\\' ,
+		'    "automatically generated by UIPainter ..."\\' ,
-'    "*** the code below performs no action"\' ,
+		'    "*** the code below performs no action"\' ,
-'    "*** (except for some feedback on the Transcript)"\' ,
+		'    "*** (except for some feedback on the Transcript)"\' ,
-'    "*** Please change as required and accept in the browser."\' ,
+		'    "*** Please change as required and accept in the browser."\' ,
-'\' .
+		'\' .
 alreadyInSuperclass ifTrue:[
-code := code ,
+	code := code ,
-'    "action for ' , aspect , ' is already provided in a superclass."\' ,
+		    '    "action for ' , aspect , ' is already provided in a superclass."\' ,
-'    "It may be redefined here ..."\\'.
+		    '    "It may be redefined here ..."\\'.
 ] ifFalse:[
-code := code ,
+	code := code ,
-'    "action to be added ..."\\'.
+		    '    "action to be added ..."\\'.
 ].
 code := code ,
-'    Transcript showCR:self class name, '': '.
+		'    Transcript showCR:self class name, '': '.
 alreadyInSuperclass ifTrue:[
-code := code , 'inherited '.
+	code := code , 'inherited '.
 ].
 code := code , 'action for ' , aspect , showIt.
 alreadyInSuperclass ifTrue:[
-code := code ,
+	code := code ,
-'    super ' , aspect , args , '.\'.
+			'    super ' , aspect , args , '.\'.
 ].
 code := code ,
-'!! !!\\'.
+		'!! !!\\'.
 ^ code withCRs
 "Modified: / 25.10.1997 / 19:18:50 / cg"
 !
 |cls codePieces skip protoSpec thisCode
 definedMethodSelectors iVars t exportSels|
 cls := self targetClass.
 cls isNil ifTrue:[
-^ nil
+	^ nil
 ].
 codePieces := OrderedCollection new.
 definedMethodSelectors := IdentitySet new.
 treeView propertiesDo:[:aProp|
-|modelSelector|
+	|modelSelector|
-protoSpec := aProp spec.
+	protoSpec := aProp spec.
-(modelSelector := aProp model) notNil ifTrue:[
+	(modelSelector := aProp model) notNil ifTrue:[
-self generateCodeFrom:(Array with:modelSelector) in:cls
+	    self generateCodeFrom:(Array with:modelSelector) in:cls
-do:[:aSel|
+		do:[:aSel|
-(aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
+		    (aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
-skip := false.
+			skip := false.
-(cls isSubclassOf:SimpleDialog) ifTrue:[
+			(cls isSubclassOf:SimpleDialog) ifTrue:[
-skip := SimpleDialog includesSelector:aSel
+			    skip := SimpleDialog includesSelector:aSel
-].
+			].
-(definedMethodSelectors includes:aSel) ifTrue:[
+			(definedMethodSelectors includes:aSel) ifTrue:[
-skip := true.
+			    skip := true.
-].
+			].
-skip ifFalse:[
+			skip ifFalse:[
-"/ kludge ..
+			    "/ kludge ..
-"/ (protoSpec isKindOf:ActionButtonSpec)
+			    "/ (protoSpec isKindOf:ActionButtonSpec)
-(protoSpec defaultModelIsCallBackMethodSelector:aSel)
+			    (protoSpec defaultModelIsCallBackMethodSelector:aSel)
-ifTrue:[
+			    ifTrue:[
-thisCode := (self generateActionMethodFor:aSel spec:protoSpec inClass:cls).
+				thisCode := (self generateActionMethodFor:aSel spec:protoSpec inClass:cls).
-] ifFalse:[
+			    ] ifFalse:[
-thisCode := (self generateAspectMethodFor:aSel spec:protoSpec inClass:cls).
+				thisCode := (self generateAspectMethodFor:aSel spec:protoSpec inClass:cls).
-].
+			    ].
-codePieces add:thisCode.
+			    codePieces add:thisCode.
-definedMethodSelectors add:aSel.
+			    definedMethodSelectors add:aSel.
-Transcript showCR:'code generated for aspect: ' , aSel
+			    Transcript showCR:'code generated for aspect: ' , aSel
-] ifTrue:[
+			] ifTrue:[
-Transcript showCR:'*** no code generated for aspect: ' , aSel , ' (method already exists)'
+			    Transcript showCR:'*** no code generated for aspect: ' , aSel , ' (method already exists)'
-].
+			].
-].
+		    ].
-].
+		].
-].
+	].
-"/ for each aspect, generate getter (if not yet implemented)
+	"/ for each aspect, generate getter (if not yet implemented)
-self generateCodeFrom:(aProp spec aspectSelectors) in:cls
+	self generateCodeFrom:(aProp spec aspectSelectors) in:cls
-do:[:aSel|
+		do:[:aSel|
-(aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
+		    (aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
-(definedMethodSelectors includes:aSel) ifFalse:[
+			(definedMethodSelectors includes:aSel) ifFalse:[
-thisCode := (self generateAspectMethodFor:aSel spec:protoSpec inClass:cls).
+			    thisCode := (self generateAspectMethodFor:aSel spec:protoSpec inClass:cls).
-codePieces add:thisCode.
+			    codePieces add:thisCode.
-definedMethodSelectors add:aSel.
+			    definedMethodSelectors add:aSel.
-Transcript showCR:'code generated for aspect: ' , aSel
+			    Transcript showCR:'code generated for aspect: ' , aSel
-]
+			]
-]
+		    ]
-].
+		].
-"/ exported aspects - need setter methods
+	"/ exported aspects - need setter methods
-exportSels := (treeView exportedAspects ? #()) collect:[:entry | (entry subAspect , ':') asSymbol].
+	exportSels := (treeView exportedAspects ? #()) collect:[:entry | (entry subAspect , ':') asSymbol].
-self generateCodeFrom:exportSels in:cls
+	self generateCodeFrom:exportSels in:cls
-do:[:aSel|
+		do:[:aSel|
-|aspect|
+		    |aspect|
-(aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
+		    (aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
-(definedMethodSelectors includes:aSel) ifFalse:[
+			(definedMethodSelectors includes:aSel) ifFalse:[
-aspect := (aSel copyWithoutLast:1) asSymbol.
+			    aspect := (aSel copyWithoutLast:1) asSymbol.
-thisCode := (self generateAspectSetMethodFor:aspect spec:protoSpec inClass:cls).
+			    thisCode := (self generateAspectSetMethodFor:aspect spec:protoSpec inClass:cls).
-codePieces add:thisCode.
+			    codePieces add:thisCode.
-definedMethodSelectors add:aSel.
+			    definedMethodSelectors add:aSel.
-Transcript showCR:'export code generated for aspect: ' , aSel
+			    Transcript showCR:'export code generated for aspect: ' , aSel
-]
+			]
-]
+		    ]
-].
+		].
-self generateCodeFrom:(aProp spec actionSelectors) in:cls
+	self generateCodeFrom:(aProp spec actionSelectors) in:cls
-do:[:aSel|
+		do:[:aSel|
-(aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
+		    (aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
-(definedMethodSelectors includes:aSel) ifFalse:[
+			(definedMethodSelectors includes:aSel) ifFalse:[
-thisCode := (self generateActionMethodFor:aSel spec:protoSpec inClass:cls).
+			    thisCode := (self generateActionMethodFor:aSel spec:protoSpec inClass:cls).
-codePieces add:thisCode.
+			    codePieces add:thisCode.
-definedMethodSelectors add:aSel.
+			    definedMethodSelectors add:aSel.
-Transcript showCR:'action generated for aspect: ' , aSel
+			    Transcript showCR:'action generated for aspect: ' , aSel
-]
+			]
-]
+		    ]
-].
+		].
-self generateCodeFrom:(aProp spec valueSelectors) in:cls
+	self generateCodeFrom:(aProp spec valueSelectors) in:cls
-do:[:aSel|
+		do:[:aSel|
-(aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
+		    (aFilterOrEmpty isNil or:[aFilterOrEmpty includes:aSel]) ifTrue:[
-(definedMethodSelectors includes:aSel) ifFalse:[
+			(definedMethodSelectors includes:aSel) ifFalse:[
-"/ uppercase: - assume its a globals name.
+			    "/ uppercase: - assume its a globals name.
-aSel first isUppercase ifFalse:[
+			    aSel first isUppercase ifFalse:[
-thisCode := (self generateValueMethodFor:aSel spec:protoSpec inClass:cls).
+				thisCode := (self generateValueMethodFor:aSel spec:protoSpec inClass:cls).
-codePieces add:thisCode.
+				codePieces add:thisCode.
-definedMethodSelectors add:aSel.
+				definedMethodSelectors add:aSel.
-Transcript showCR:'code generated for aspect: ' , aSel
+				Transcript showCR:'code generated for aspect: ' , aSel
-]
+			    ]
-]
+			]
-]
+		    ]
-].
+		].
 ].
 AspectsAsInstances ifTrue:[
-iVars := cls instVarNames asOrderedCollection.
+	iVars := cls instVarNames asOrderedCollection.
-definedMethodSelectors do:[:ivar |
+	definedMethodSelectors do:[:ivar |
-(iVars includes:ivar) ifFalse:[
+	    (iVars includes:ivar) ifFalse:[
-iVars add:ivar
+		iVars add:ivar
-]
+	    ]
-].
+	].
-iVars := iVars asArray.
+	iVars := iVars asArray.
-t := cls shallowCopy.
+	t := cls shallowCopy.
-t setInstanceVariableString:iVars asStringCollection asString.
+	t setInstanceVariableString:iVars asStringCollection asString.
-codePieces addFirst:(t definition , '!!\' withCRs).
+	codePieces addFirst:(t definition , '!!\' withCRs).
 ].
 ^ String
-streamContents:
+	streamContents:
-[:codeStream |
+	    [:codeStream |
-codePieces do:[:eachPiece | codeStream nextPutAll:eachPiece].
+		codePieces do:[:eachPiece | codeStream nextPutAll:eachPiece].
-].
+	    ].
 "Modified: / 29.7.1998 / 12:21:19 / cg"
 !
 generateAspectMethodFor:aspect spec:protoSpec inClass:targetClass
 |modelClass modelValueString modelValue modelGen code|
 modelClass := protoSpec defaultModelClassFor:aspect.
 modelValueString := protoSpec defaultModelValueStringFor:aspect.
 modelValueString notNil ifTrue:[
-modelGen := modelValueString
+	modelGen := modelValueString
 ] ifFalse:[
-modelValue := protoSpec defaultModelValueFor:aspect.
+	modelValue := protoSpec defaultModelValueFor:aspect.
-modelValue isNil ifTrue:[
+	modelValue isNil ifTrue:[
-modelGen := modelClass name , ' new'
+	    modelGen := modelClass name , ' new'
-] ifFalse:[
+	] ifFalse:[
-modelGen := modelValue storeString , ' asValue'
+	    modelGen := modelValue storeString , ' asValue'
-].
+	].
 ].
 code := '!!' , targetClass name , ' methodsFor:''aspects''!!\\' ,
 aspect , '\' ,
 '    "*** Please change as required and accept it in the browser."\' ,
 '    "*** (and replace this comment by something more useful ;-)"\' .
 AspectsAsInstances ifTrue:[
-code := code , '\' ,
+	code := code , '\' ,
-'    ' , aspect , ' isNil ifTrue:[\' ,
+	  '    ' , aspect , ' isNil ifTrue:[\' ,
-'        ' , aspect , ' := ' , modelGen , '.\'.
+	  '        ' , aspect , ' := ' , modelGen , '.\'.
-modelClass ~~ TriggerValue ifTrue:[
+	modelClass ~~ TriggerValue ifTrue:[
-code := code ,
+	    code := code ,
-'"/ if your app needs to be notified of changes, uncomment one of the lines below:\' ,
+	      '"/ if your app needs to be notified of changes, uncomment one of the lines below:\' ,
-'"/       ' , aspect , ' addDependent:self.\' ,
+	      '"/       ' , aspect , ' addDependent:self.\' ,
-'"/       ' , aspect , ' onChangeSend:#', aspect ,'Changed to:self.\'.
+	      '"/       ' , aspect , ' onChangeSend:#', aspect ,'Changed to:self.\'.
-].
+	].
-code := code ,
+	code := code ,
-'    ].\' ,
+	  '    ].\' ,
-'    ^ ' , aspect ,'.\' ,
+	  '    ^ ' , aspect ,'.\' ,
-'!! !!\\'
+	  '!! !!\\'
 ] ifFalse:[
-code := code , '\' ,
+	code := code , '\' ,
-'    |holder|\' ,
+	  '    |holder|\' ,
-'\' ,
+	  '\' ,
-'    (holder := builder bindingAt:#' , aspect , ') isNil ifTrue:[\' ,
+	  '    (holder := builder bindingAt:#' , aspect , ') isNil ifTrue:[\' ,
-'        holder := ', modelGen, '.\',
+	  '        holder := ', modelGen, '.\',
-'        builder aspectAt:#' , aspect , ' put:holder.\'.
+	  '        builder aspectAt:#' , aspect , ' put:holder.\'.
-modelClass ~~ TriggerValue ifTrue:[
+	modelClass ~~ TriggerValue ifTrue:[
-code := code ,
+	    code := code ,
-'"/ if your app needs to be notified of changes, uncomment one of the lines below:\' ,
+	      '"/ if your app needs to be notified of changes, uncomment one of the lines below:\' ,
-'"/        holder addDependent:self.\' ,
+	      '"/        holder addDependent:self.\' ,
-'"/        holder onChangeSend:#', aspect ,'Changed to:self.\'.
+	      '"/        holder onChangeSend:#', aspect ,'Changed to:self.\'.
-].
+	].
-code := code ,
+	code := code ,
-'    ].\' ,
+	  '    ].\' ,
-'    ^ holder.\' ,
+	  '    ^ holder.\' ,
-'!! !!\\'
+	  '!! !!\\'
 ].
 ^ code withCRs
 "Modified: / 29.7.1998 / 11:29:16 / cg"
 |cls code spec|
 cls := self targetClass.
 cls isNil ifTrue:[
-^ nil
+	^ nil
 ].
 spec := treeView exportedAspects.
 spec size == 0 ifTrue:[^ nil].
 "/ make it an array ...
 spec := spec collect:[:entry | |subAspect type|
-subAspect := entry subAspect asSymbol.
+		subAspect := entry subAspect asSymbol.
-(type := entry type) isNil ifTrue:[
+		(type := entry type) isNil ifTrue:[
-subAspect
+		    subAspect
-] ifFalse:[
+		] ifFalse:[
-Array with:subAspect with:type asSymbol
+		    Array with:subAspect with:type asSymbol
-].
+		].
-].
+	    ].
 spec := spec asArray.
 code := '!!' , cls name , ' class methodsFor:''plugIn spec''!!\\' .
 code := code , 'aspectSelectors
 '    "automatically generated by UIPainter ..."\\' ,
 '    "This method is used when I am embedded as subApplication,"\' ,
 '    "and the mainApp wants to connect its aspects to mine."\'.
 AspectsAsInstances ifTrue:[
-code := (code , '\' ,
+	code := (code , '\' ,
-'"/     ' , aspect , ' notNil ifTrue:[\' ,
+	  '"/     ' , aspect , ' notNil ifTrue:[\' ,
-'"/        ' , aspect , ' removeDependent:self.\' ,
+	  '"/        ' , aspect , ' removeDependent:self.\' ,
-'"/     ].\' ,
+	  '"/     ].\' ,
-'    ' , aspect ,' := something.\' ,
+	  '    ' , aspect ,' := something.\' ,
-'"/     ' , aspect ,' notNil ifTrue:[\' ,
+	  '"/     ' , aspect ,' notNil ifTrue:[\' ,
-'"/        ' , aspect , ' addDependent:self.\' ,
+	  '"/        ' , aspect , ' addDependent:self.\' ,
-'"/     ].\' ,
+	  '"/     ].\' ,
-'    ^ self.\' ,
+	  '    ^ self.\' ,
-'!! !!\\')
+	  '!! !!\\')
 ] ifFalse:[
-code := (code , '\' ,
+	code := (code , '\' ,
-'"/     |holder|\' ,
+	  '"/     |holder|\' ,
-'\' ,
+	  '\' ,
-'"/     (holder := builder bindingAt:#' , aspect , ') notNil ifTrue:[\' ,
+	  '"/     (holder := builder bindingAt:#' , aspect , ') notNil ifTrue:[\' ,
-'"/         holder removeDependent:self.\' ,
+	  '"/         holder removeDependent:self.\' ,
-'"/     ].\' ,
+	  '"/     ].\' ,
-'    builder aspectAt:#' , aspect , ' put:something.\',
+	  '    builder aspectAt:#' , aspect , ' put:something.\',
-'"/     something notNil ifTrue:[\' ,
+	  '"/     something notNil ifTrue:[\' ,
-'"/         something addDependent:self.\' ,
+	  '"/         something addDependent:self.\' ,
-'"/     ].\' ,
+	  '"/     ].\' ,
-'    ^ self.\' ,
+	  '    ^ self.\' ,
-'!! !!\\')
+	  '!! !!\\')
 ].
 ^ code withCRs
 "Modified: / 29.7.1998 / 11:29:16 / cg"
 |realSelectors redefCondition redefMessage|
 realSelectors := aListOfSelectors select:[:sel | sel isArray not].
 self class redefineAspectMethods ifTrue:[
-redefCondition := [:cls :sel | (cls includesSelector:sel) not].
+	redefCondition := [:cls :sel | (cls includesSelector:sel) not].
-redefMessage := ' skipped - already implemented in the class'.
+	redefMessage := ' skipped - already implemented in the class'.
 ] ifFalse:[
-redefCondition := [:cls :sel | (cls canUnderstand:sel) not].
+	redefCondition := [:cls :sel | (cls canUnderstand:sel) not].
-redefMessage := ' skipped - already implemented in the class (or superclass)'.
+	redefMessage := ' skipped - already implemented in the class (or superclass)'.
 ].
 realSelectors do:[:aSelector|
-(redefCondition value:aClass value:aSelector) ifTrue:[
+	(redefCondition value:aClass value:aSelector) ifTrue:[
-aBlock value:aSelector asSymbol
+	    aBlock value:aSelector asSymbol
-] ifFalse:[
+	] ifFalse:[
-Transcript showCR:('#' , aSelector , redefMessage)
+	    Transcript showCR:('#' , aSelector , redefMessage)
-]
+	]
 ]
 !
 generateHookMethodFor:selectorSpec comment:commentWhen note:noteOrNil defaultCode:defaultCode inClass:targetClass
 ^ ('!!' , targetClass name , ' methodsFor:''hooks''!!\\' ,
 |cls|
 cls := self targetClass.
 cls isNil ifTrue:[
-^ nil
+	^ nil
 ].
 ^ self generateHookMethodsInClass:cls.
 !
 |code|
 code := ''.
 (targetClass includesSelector:#postBuildWith:) ifFalse:[
-code := code
+	code := code
-, (self
+		, (self
-generateHookMethodFor:'postBuildWith:aBuilder'
+		    generateHookMethodFor:'postBuildWith:aBuilder'
-comment:'the widgets have been built, but before the view is opened'
+		    comment:'the widgets have been built, but before the view is opened'
-note:'or after the super send'
+		    note:'or after the super send'
-defaultCode:'    super postBuildWith:aBuilder'
+		    defaultCode:'    super postBuildWith:aBuilder'
-inClass:targetClass)
+		    inClass:targetClass)
 ].
 (targetClass includesSelector:#postOpenWith:) ifFalse:[
-code := code
+	code := code
-, (self
+		, (self
-generateHookMethodFor:'postOpenWith:aBuilder'
+		    generateHookMethodFor:'postOpenWith:aBuilder'
-comment:'the topView has been opened, but before events are dispatched for it'
+		    comment:'the topView has been opened, but before events are dispatched for it'
-note:'or after the super send'
+		    note:'or after the super send'
-defaultCode:'    super postOpenWith:aBuilder'
+		    defaultCode:'    super postOpenWith:aBuilder'
-inClass:targetClass)
+		    inClass:targetClass)
 ].
 (targetClass includesSelector:#closeRequest) ifFalse:[
-code := code
+	code := code
-, (self
+		, (self
-generateHookMethodFor:'closeRequest'
+		    generateHookMethodFor:'closeRequest'
-comment:'the topView has been asked to close'
+		    comment:'the topView has been asked to close'
-note:'return without the ''super closeRequest'' to stay open'
+		    note:'return without the ''super closeRequest'' to stay open'
-defaultCode:'    ^super closeRequest'
+		    defaultCode:'    ^super closeRequest'
-inClass:targetClass)
+		    inClass:targetClass)
 ].
 ^ code
 "Modified: / 31.10.1997 / 17:30:34 / cg"
 "Created: / 31.10.1997 / 17:32:49 / cg"
 alreadyInSuperclass := targetClass superclass canUnderstand:selector.
 code := '!!' , targetClass name , ' methodsFor:''' , category , '''!!\\'.
 selector = 'openAboutThisApplication' ifTrue:[
-code := code ,
+	code := code ,
-'openAboutThisApplication\' ,
+		'openAboutThisApplication\' ,
-'    "opens an about box for this application."\\' ,
+		'    "opens an about box for this application."\\' ,
-'    "automatically generated by UIPainter ..."\\' ,
+		'    "automatically generated by UIPainter ..."\\' ,
-'    |rev box myClass clsRev image msg|\\' ,
+		'    |rev box myClass clsRev image msg|\\' ,
-'    rev := ''''.\' ,
+		'    rev := ''''.\' ,
-'    myClass := self class.\' ,
+		'    myClass := self class.\' ,
-'    (clsRev := myClass revision) notNil ifTrue:[\' ,
+		'    (clsRev := myClass revision) notNil ifTrue:[\' ,
-'       rev := ''  (rev: '', clsRev printString, '')''].\\' ,
+		'       rev := ''  (rev: '', clsRev printString, '')''].\\' ,
-'    msg := Character cr asString , myClass name asBoldText, rev.\' ,
+		'    msg := Character cr asString , myClass name asBoldText, rev.\' ,
-'    msg := (msg , ''\\*** add more info here ***\\'') withCRs.\\' ,
+		'    msg := (msg , ''\\*** add more info here ***\\'') withCRs.\\' ,
-'    box := AboutBox title:msg.\' ,
+		'    box := AboutBox title:msg.\' ,
-'    "/ *** add a #defaultIcon method in the class\' ,
+		'    "/ *** add a #defaultIcon method in the class\' ,
-'    "/ *** and uncomment the following line:\' ,
+		'    "/ *** and uncomment the following line:\' ,
-'    "/ image := self class defaultIcon.\\' ,
+		'    "/ image := self class defaultIcon.\\' ,
-'    image notNil ifTrue:[\' ,
+		'    image notNil ifTrue:[\' ,
-'        box image:image\' ,
+		'        box image:image\' ,
-'    ].\' ,
+		'    ].\' ,
-'    box   label:(resources string:''About %1'' with:myClass name).\' ,
+		'    box   label:(resources string:''About %1'' with:myClass name).\' ,
-'    box   autoHideAfter:10 with:[].\' ,
+		'    box   autoHideAfter:10 with:[].\' ,
-'    box   showAtPointer.\' ,
+		'    box   showAtPointer.\' ,
-'!! !!\\'.
+		'!! !!\\'.
-^ code withCRs
+	^ code withCRs
 ].
 selector = 'menuOpen' ifTrue:[
-code := code ,
+	code := code ,
-'menuOpen\' ,
+		'menuOpen\' ,
-'    "automatically generated by UIPainter ..."\\' ,
+		'    "automatically generated by UIPainter ..."\\' ,
-'    "*** the code below opens a dialog for file selection"\' ,
+		'    "*** the code below opens a dialog for file selection"\' ,
-'    "*** and invokes the #doOpen: method with the selected file."\' ,
+		'    "*** and invokes the #doOpen: method with the selected file."\' ,
-'    "*** Please change as required and accept in the browser."\\' ,
+		'    "*** Please change as required and accept in the browser."\\' ,
-'    |file|\\' ,
+		'    |file|\\' ,
-'    file :=\' ,
+		'    file :=\' ,
-'        (FileSelectionBrowser\' ,
+		'        (FileSelectionBrowser\' ,
-'            request: ''Open''\' ,
+		'            request: ''Open''\' ,
-'            fileName: ''''\' ,
+		'            fileName: ''''\' ,
-'            "/ inDirectory: lastOpenDirectory\' ,
+		'            "/ inDirectory: lastOpenDirectory\' ,
-'            withFileFilters: #(''*'')).\\' ,
+		'            withFileFilters: #(''*'')).\\' ,
-'    file notNil ifTrue:[\' ,
+		'    file notNil ifTrue:[\' ,
-'       "/ lastOpenDirectory := file asFilename directory.\' ,
+		'       "/ lastOpenDirectory := file asFilename directory.\' ,
-'       self doOpen:file\' ,
+		'       self doOpen:file\' ,
-'    ]\' ,
+		'    ]\' ,
-'!! !!\'.
+		'!! !!\'.
-^ code withCRs
+	^ code withCRs
 ].
 numArgs := selector numArgs.
 method  := selector.
 numArgs == 1 ifTrue:[
-args := 'anArgument'.
+	args := 'anArgument'.
-showIt := ''' , anArgument printString , '' ...''.\'.
+	showIt := ''' , anArgument printString , '' ...''.\'.
 ] ifFalse:[
-args := ''.
+	args := ''.
-showIt := ' ...''.\'.
+	showIt := ' ...''.\'.
-numArgs ~~ 0 ifTrue:[
+	numArgs ~~ 0 ifTrue:[
-method := ''.
+	    method := ''.
-selector keywords keysAndValuesDo:[:i :key|
+	    selector keywords keysAndValuesDo:[:i :key|
-method := method, key, 'arg', i printString, ' '
+		method := method, key, 'arg', i printString, ' '
-]
+	    ]
-]
+	]
 ].
 code := code ,
-method , args , '\' ,
+		method , args , '\' ,
-'    "automatically generated by UIPainter ..."\\' ,
+		'    "automatically generated by UIPainter ..."\\' ,
-'    "*** the code below performs no action"\' ,
+		'    "*** the code below performs no action"\' ,
-'    "*** (except for some feedback on the Transcript)"\' ,
+		'    "*** (except for some feedback on the Transcript)"\' ,
-'    "*** Please change as required and accept in the browser."\' ,
+		'    "*** Please change as required and accept in the browser."\' ,
-'\' .
+		'\' .
 alreadyInSuperclass ifTrue:[
-code := code ,
+	code := code ,
-'    "action for ' , selector , ' is already provided in a superclass."\' ,
+		    '    "action for ' , selector , ' is already provided in a superclass."\' ,
-'    "It may be redefined here ..."\\'.
+		    '    "It may be redefined here ..."\\'.
 ] ifFalse:[
-code := code ,
+	code := code ,
-'    "action to be added ..."\\'.
+		    '    "action to be added ..."\\'.
 ].
 code := code ,
-'    Transcript showCR:self class name, '': '.
+		'    Transcript showCR:self class name, '': '.
 alreadyInSuperclass ifTrue:[
-code := code , 'inherited '.
+	code := code , 'inherited '.
 ].
 code := code , 'menu action for ' , selector , showIt.
 alreadyInSuperclass ifTrue:[
-code := code ,
+	code := code ,
-'    super ' , selector , args , '.\'.
+			'    super ' , selector , args , '.\'.
 ].
 code := code ,
-'!! !!\\'.
+		'!! !!\\'.
 ^ code withCRs
 "Created: / 23.8.1998 / 16:46:51 / cg"
 "Modified: / 23.8.1998 / 18:13:05 / cg"
 !
 specArray fullSpec winSpec menuSpec
 |
 cls := self targetClass.
 cls isNil ifTrue:[
-^ nil
+	^ nil
 ].
 specArray := treeView generateFullSpecForComponents:#() named:nil.
 fullSpec := specArray decodeAsLiteralArray.
 winSpec := fullSpec window.
 menuSelector := winSpec menu.
 (menuSelector notNil
 and:[ (cls respondsTo:menuSelector) ]) ifFalse:[
-self warn:'No menu defined (yet)'.
+	self warn:'No menu defined (yet)'.
-^ nil.
+	^ nil.
 ].
 menuSpec := cls perform:menuSelector.
 menuSpec := menuSpec decodeAsLiteralArray.
 definedMethodSelectors := IdentitySet new.
 code := ''.
 menuSpec allItemsDo:[:item |
-|sel|
+	|sel|
-(sel := item value) notNil ifTrue:[
+	(sel := item value) notNil ifTrue:[
-(definedMethodSelectors includes:sel) ifFalse:[
+	    (definedMethodSelectors includes:sel) ifFalse:[
-self generateCodeFrom:(Array with:sel) in:cls do:[:aSel|
+		self generateCodeFrom:(Array with:sel) in:cls do:[:aSel|
-thisCode := (self generateMenuMethodFor:aSel inClass:cls).
+		    thisCode := (self generateMenuMethodFor:aSel inClass:cls).
-code := code, thisCode.
+		    code := code, thisCode.
-].
+		].
-definedMethodSelectors add:sel.
+		definedMethodSelectors add:sel.
-].
+	    ].
-]
+	]
 ].
 (definedMethodSelectors includes:#menuOpen) ifTrue:[
-self generateCodeFrom:(Array with:#doOpen:) in:cls do:[:aSel|
+	self generateCodeFrom:(Array with:#doOpen:) in:cls do:[:aSel|
-thisCode := (self generateMenuMethodFor:aSel inClass:cls).
+	    thisCode := (self generateMenuMethodFor:aSel inClass:cls).
-code := code, thisCode.
+	    code := code, thisCode.
-].
+	].
 ].
 ^ code
 "Created: / 23.8.1998 / 16:12:09 / cg"
 |spec str code category cls mthd specCode|
 spec := OrderedCollection new.
 self subViews do:[:aView|
-|vSpec|
+	|vSpec|
-"/ care for wrapped views ...
+	"/ care for wrapped views ...
-vSpec := self fullSpecFor:aView.
+	vSpec := self fullSpecFor:aView.
-vSpec isNil ifTrue:[
+	vSpec isNil ifTrue:[
-aView subViews size == 1 ifTrue:[
+	    aView subViews size == 1 ifTrue:[
-vSpec := self fullSpecFor:(aView subViews first).
+		vSpec := self fullSpecFor:(aView subViews first).
-]
+	    ]
-].
+	].
-vSpec isNil ifTrue:[
+	vSpec isNil ifTrue:[
-self warn:'Oops - could not create spec for some view'
+	    self warn:'Oops - could not create spec for some view'
-].
+	].
-spec add:vSpec
+	spec add:vSpec
 ].
 spec := treeView generateFullSpecForComponents:spec named:methodName.
 str  := WriteStream on:String new.
 UISpecification prettyPrintSpecArray:spec on:str indent:5.
 specCode := str contents.
 (specCode includes:$!!) ifTrue:[
-"/ oops - must be chunk format ...
+	"/ oops - must be chunk format ...
-str  := WriteStream on:String new.
+	str  := WriteStream on:String new.
-str nextPutAllAsChunk:specCode.
+	str nextPutAllAsChunk:specCode.
-specCode := str contents.
+	specCode := str contents.
 ].
 "/ if that method already exists, do not overwrite the category
 category := 'interface specs'.
 cls := self resolveName:className.
 cls notNil ifTrue:[
-(mthd := cls class compiledMethodAt:methodName asSymbol) notNil ifTrue:[
+	(mthd := cls class compiledMethodAt:methodName asSymbol) notNil ifTrue:[
-category := mthd category.
+	    category := mthd category.
-]
+	]
 ].
 code := '!!'
-, className , ' class methodsFor:' , category storeString
+	    , className , ' class methodsFor:' , category storeString
-, '!!' , '\\'
+	    , '!!' , '\\'
-, methodName , '\'
+	    , methodName , '\'
-, ((ResourceSpecEditor codeGenerationCommentForClass: UIPainter) replChar:$!! withString:'!!!!')
+	    , ((ResourceSpecEditor codeGenerationCommentForClass: UIPainter) replChar:$!! withString:'!!!!')
-, '\\    "\'
+	    , '\\    "\'
-, ('     UIPainter new openOnClass:' , className , ' andSelector:#' , methodName , '\').
+	    , ('     UIPainter new openOnClass:' , className , ' andSelector:#' , methodName , '\').
 (cls notNil and:[cls isSubclassOf:ApplicationModel]) ifTrue:[
-code := code
+	code := code
-, ('     ' , className , ' new openInterface:#' , methodName , '\').
+	    , ('     ' , className , ' new openInterface:#' , methodName , '\').
 ].
 code := code
-,(methodName = 'windowSpec'
+	    ,(methodName = 'windowSpec'
-ifTrue:['     ' , className , ' open\'] ifFalse: [''])
+		ifTrue:['     ' , className , ' open\'] ifFalse: [''])
-, '    "\'.
+	    , '    "\'.
 code := code
-, '\'
+	    , '\'
-, '    <resource: #canvas>\\'
+	    , '    <resource: #canvas>\\'
-, '    ^ ' , specCode
+	    , '    ^ ' , specCode
-, '\'
+	    , '\'
-, '!! !!'
+	    , '!! !!'
-, '\\'.
+	    , '\\'.
 ^ code withCRs
 "Modified: / 5.9.1995 / 21:01:35 / claus"
 "Modified: / 15.10.1998 / 11:29:53 / cg"
 targetClass
 |cls|
 className isNil ifTrue:[
-self warn:'No TargetClass defined !!'.
+	self warn:'No TargetClass defined !!'.
-^ nil
+	^ nil
 ].
 (cls := self resolveName:className) isNil ifTrue:[
-self warn:('Class ', className asString, ' does not exist !!').
+	self warn:('Class ', className asString, ' does not exist !!').
-^ nil
+	^ nil
 ].
 ^ cls.
 ! !
 !UIPainterView methodsFor:'grid manipulation'!
 gridPixmap := nil.
 defaultViewBackground := self class defaultViewBackgroundColor.
 shown ifTrue:[
-self viewBackground: (defaultViewBackground isColor
+	self viewBackground: (defaultViewBackground isColor
-ifTrue: [defaultViewBackground]
+	    ifTrue: [defaultViewBackground]
-ifFalse:[Black]).
+	    ifFalse:[Black]).
-self clear.
+	self clear.
 ].
 gridShown ifTrue:[
-self defineGrid.
+	self defineGrid.
-gridPixmap colorMap: (defaultViewBackground isColor
+	gridPixmap colorMap: (defaultViewBackground isColor
-ifTrue: [Array with:defaultViewBackground with:Color darkGray]
+	    ifTrue: [Array with:defaultViewBackground with:Color darkGray]
-ifFalse:[Array with:White with:Black]).
+	    ifFalse:[Array with:White with:Black]).
-self viewBackground:gridPixmap.
+	self viewBackground:gridPixmap.
 ].
 self invalidate
 ! !
 (MenuPanel menu: menu) startUp.
 canvas := self painter.
 cS := canvas getSelectedViewsAndSpecs.
 cS isNil ifTrue:[^self].
 views := cS first.
 specs := cS last.
 rect := views first frame.
 2 to: views size do:[:i| rect := rect merge: (views at: i) frame].
 layout := LayoutFrame leftFraction:0.0 offset: rect origin x
-rightFraction:0.0 offset: rect corner x + 1
+			 rightFraction:0.0 offset: rect corner x + 1
-topFraction:0.0 offset: rect origin y
+			   topFraction:0.0 offset: rect origin y
-bottomFraction:0.0 offset:rect corner y + 1.
+			bottomFraction:0.0 offset:rect corner y + 1.
 oldSelection := canvas selection.
 canvas select: views first superView.
 spec layout: layout.
 spec class == VerticalPanelViewSpec ifTrue:[
-spec verticalLayout: #topSpace.
+	spec verticalLayout: #topSpace.
-spec horizontalLayout: #fit.
+	spec horizontalLayout: #fit.
 ].
 spec class == HorizontalPanelViewSpec ifTrue:[
-spec verticalLayout: #fit.
+	spec verticalLayout: #fit.
-spec horizontalLayout: #leftSpace.
+	spec horizontalLayout: #leftSpace.
 ].
 box := self pasteSpecifications:spec keepLayout:true at:nil.
 xOffset := box origin x.
 yOffset := box origin y.
 withLayout ifFalse:[
-1 to: specs size do:[:i|
+	1 to: specs size do:[:i|
-view := views at: i.
+	    view := views at: i.
-layout :=  LayoutFrame leftFraction:0.0 offset: (view origin x - xOffset)
+	    layout :=  LayoutFrame leftFraction:0.0 offset: (view origin x - xOffset)
-rightFraction:0.0 offset: (view corner x - xOffset + 1)
+				  rightFraction:0.0 offset: (view corner x - xOffset + 1)
-topFraction:0.0 offset: (view origin y - yOffset )
+				    topFraction:0.0 offset: (view origin y - yOffset )
-bottomFraction:0.0 offset: (view corner y - yOffset + 1).
+				 bottomFraction:0.0 offset: (view corner y - yOffset + 1).
-(specs at: i) layout: layout.
+	    (specs at: i) layout: layout.
-].
+	].
 ].
 canvas selection: oldSelection.
 canvas deleteSelection.
 canvas selection:box.
 nViews := canvas pasteSpecifications:specs keepLayout:true.
 canvas selection: box.
 cS isNil ifTrue:[^self].
 views := cS first first subViews copy.
 superView := cS first first superView.
 cS last first component isNil ifTrue:[^self].
 cS last first component collection isEmpty ifTrue:[^self].
 specs := cS last first component collection copy.
 frame := cS first first frame.
 canvas deleteSelection.
 withLayout ifFalse:[
-1 to: specs size do:[:i|
+	1 to: specs size do:[:i|
-view := views at: i.
+	    view := views at: i.
-layout :=  LayoutFrame leftFraction:0.0 offset: (view origin x + frame origin x)
+	    layout :=  LayoutFrame leftFraction:0.0 offset: (view origin x + frame origin x)
-rightFraction:0.0 offset: (view corner x + frame origin x + 1)
+				  rightFraction:0.0 offset: (view corner x + frame origin x + 1)
-topFraction:0.0 offset: (view origin y + frame origin y )
+				    topFraction:0.0 offset: (view origin y + frame origin y )
-bottomFraction:0.0 offset: (view corner y + frame origin y + 1).
+				 bottomFraction:0.0 offset: (view corner y + frame origin y + 1).
-(specs at: i) layout: layout.
+	    (specs at: i) layout: layout.
-].
+	].
 ].
 canvas selection: superView.
 canvas pasteSpecifications:specs keepLayout:true.
 canvas selection: superView.
 !
 setupFromSpec:specOrSpecArray
 |spec builder|
 Cursor wait showWhile: [
-self removeAll.
+	self removeAll.
-specOrSpecArray notNil ifTrue:[
+	specOrSpecArray notNil ifTrue:[
-spec    := UISpecification from:specOrSpecArray.
+	    spec    := UISpecification from:specOrSpecArray.
-].
+	].
-builder := UIBuilder new isEditing:true.
+	builder := UIBuilder new isEditing:true.
-"set applicationClass, in order that subspecifications may be resolved"
+	"set applicationClass, in order that subspecifications may be resolved"
-className notNil ifTrue:[
+	className notNil ifTrue:[
-builder applicationClass:(self resolveName:className).
+	    builder applicationClass:(self resolveName:className).
-].
+	].
-spec notNil ifTrue:[
+	spec notNil ifTrue:[
-spec window setupView:self topView for:builder.
+	    spec window setupView:self topView for:builder.
-self addSpec:(spec component) builder:builder in:self.
+	    self addSpec:(spec component) builder:builder in:self.
-].
+	].
-self realizeAllSubViews.
+	self realizeAllSubViews.
-spec notNil ifTrue:[
+	spec notNil ifTrue:[
-treeView setAttributesFromWindowSpec:(spec window)
+	    treeView setAttributesFromWindowSpec:(spec window)
-].
+	].
 ].
 !
 treeView:aTreeView
 treeView := aTreeView.
 treeView delegate:(
-"/
+	"/
-"/ I want to handle everything typed
+	"/ I want to handle everything typed
-"/ in the treeView, except for Return and Cursor-keys
+	"/ in the treeView, except for Return and Cursor-keys
-"/
+	"/
-KeyboardForwarder
+	KeyboardForwarder
-toView:self
+	    toView:self
-condition:nil
+	    condition:nil
-filter:[:k | (k isSymbol
+	    filter:[:k | (k isSymbol
-and:[k ~~ #Return
+			 and:[k ~~ #Return
-and:[k ~~ #Tab
+			 and:[k ~~ #Tab
-and:[(k startsWith:#Cursor) not]]])
+			 and:[(k startsWith:#Cursor) not]]])
-]
+		   ]
 )
 "Modified: / 31.10.1997 / 20:22:09 / cg"
 ! !
 "
 |m|
 self enabled ifTrue:[
-m := MenuPanel fromSpec:(UIPainter menuEdit) receiver:self superView application.
+	m := MenuPanel fromSpec:(UIPainter menuEdit) receiver:self superView application.
-self startUpMenu:m
+	self startUpMenu:m
 ].
 ^ nil
 ! !
 !UIPainterView methodsFor:'private-handles'!
 "show object selected
 "
 |wasClipped sel hColor bg|
 selectionHiddenLevel == 0 ifTrue:[
-sel := treeView selection.
+	sel := treeView selection.
-(sel size > 1 and:
+	(sel size > 1 and:
-[(treeView model list at: sel first) contents view == aComponent])
+	[(treeView model list at: sel first) contents view == aComponent])
-ifTrue: [
+	ifTrue: [
-hColor := handleMasterColor
+	    hColor := handleMasterColor
-] ifFalse:[
+	] ifFalse:[
-bg := aComponent viewBackground.
+	    bg := aComponent viewBackground.
-bg isColor ifTrue:[
+	    bg isColor ifTrue:[
-bg brightness < 0.5 ifTrue:[
+		bg brightness < 0.5 ifTrue:[
-hColor := handleColorWhite
+		    hColor := handleColorWhite
-] ifFalse:[
+		] ifFalse:[
-hColor := handleColorBlack
+		    hColor := handleColorBlack
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-hColor := handleColorBlack
+		hColor := handleColorBlack
-]
+	    ]
-].
+	].
-self paint:hColor.
+	self paint:hColor.
-(wasClipped := clipChildren) ifTrue:[
+	(wasClipped := clipChildren) ifTrue:[
-self clippedByChildren:(clipChildren := false).
+	    self clippedByChildren:(clipChildren := false).
-].
+	].
-self handlesOf:aComponent do:[:aRectangle :what| |l t w h|
+	self handlesOf:aComponent do:[:aRectangle :what| |l t w h|
-l := aRectangle left   + 1.
+	    l := aRectangle left   + 1.
-t := aRectangle top    + 1.
+	    t := aRectangle top    + 1.
-w := aRectangle width  - 2.
+	    w := aRectangle width  - 2.
-h := aRectangle height - 2.
+	    h := aRectangle height - 2.
-what == #view ifTrue:[self displayRectangleX:l y:t width:w height:h]
+	    what == #view ifTrue:[self displayRectangleX:l y:t width:w height:h]
-ifFalse:[self fillRectangleX:l y:t width:w height:h]
+			 ifFalse:[self fillRectangleX:l y:t width:w height:h]
-].
+	].
-wasClipped ifTrue:[
+	wasClipped ifTrue:[
-self clippedByChildren:(clipChildren := true).
+	    self clippedByChildren:(clipChildren := true).
-]
+	]
 ]
 "Modified: / 6.12.2001 / 00:00:16 / cg"
 ! !
 |appl|
 appl := self application.
 appl notNil ifTrue:[
-^ appl resolveName:aName
+	^ appl resolveName:aName
 ].
 ^ Smalltalk resolveName:aName inClass:self class
 ! !
 !UIPainterView methodsFor:'removing components'!
 remove:anObject
 "remove anObject from the contents do redraw
 "
 anObject notNil ifTrue:[
-treeView removeView:anObject.
+	treeView removeView:anObject.
 ]
 !
 removeAll
 "remove all objects and properties
 "returns the super view assigned to a view
 "
 |p|
 (p := self propertyOfParentForView:aView) isNil ifTrue:[
-^ self
+	^ self
 ].
 ^ p view
 !
 findObjectAt:aPoint
 |prop|
 prop := self propertyOfIdentifier:aViewId.
 prop notNil ifTrue:[^ prop view]
-ifFalse:[^ nil]
+	       ifFalse:[^ nil]
 !
 propertyOfIdentifier:anId
 "returns property assigned to unique identifier
 "
 anId notNil ifTrue:[
-^ treeView propertyDetect:[:p| p identifier == anId ]
+	^ treeView propertyDetect:[:p| p identifier == anId ]
 ].
 ^ nil
 !
 propertyOfName:aString
 "returns property assigned to name
 "
 |name|
 aString isNil ifFalse:[
-name := aString string withoutSeparators.
+	name := aString string withoutSeparators.
 ^ treeView propertyDetect:[:p| p name = name ].
 ].
 ^ nil
 !
 "returns the property of the parent or nil
 "
 |item|
 (item := treeView detectItemRespondsToView:aSubView) notNil ifTrue:[
-(item := item parent) notNil ifTrue:[^ item contents]
+	(item := item parent) notNil ifTrue:[^ item contents]
 ].
 ^ nil
 !
 propertyOfView:aView
 "returns property assigned to view
 "
 (aView isNil or:[aView == self]) ifFalse:[
-^ treeView propertyDetect:[:p| p view == aView ]
+	^ treeView propertyDetect:[:p| p view == aView ]
 ].
 ^ nil
 !
 propertyRespondsToView:aView
 |item|
 item := treeView detectItemRespondsToView:aView.
 (item notNil and:[item parent notNil]) ifTrue:[
-^ item contents
+	^ item contents
 ].
 ^ nil
 !
 uniqueNameFor:aSpecOrString
 "generate and return an unique name for a class
 "
 |next name size|
 aSpecOrString isString ifFalse:[name := aSpecOrString userFriendlyName]
-ifTrue:[name := aSpecOrString].
+			    ifTrue:[name := aSpecOrString].
 size  := name size + 1.
 next  := 0.
 treeView propertiesDo:[:p|
-|n|
+	|n|
-n := p name.
+	n := p name.
-(n size >= size and:[n startsWith:name]) ifTrue:[
+	(n size >= size and:[n startsWith:name]) ifTrue:[
-next := next max:(p extractNumberStartingAt:size)
+	    next := next max:(p extractNumberStartingAt:size)
-]
+	]
 ].
 next := next + 1.
 name := name, next printString.
 ^ name
 uniqueNameOf:aView
 |prop|
 (prop := self propertyOfView:aView) notNil ifTrue:[
-prop name isNil ifTrue:[
+	prop name isNil ifTrue:[
-prop name:(self uniqueNameFor:(prop spec)).
+	    prop name:(self uniqueNameFor:(prop spec)).
-].
+	].
-^ prop name
+	^ prop name
 ].
 ^ 'self'
 ! !
 addToSelection:anObject
 "add an object to the selection
 "
 (self enabled and:[(self isSelected:anObject) not]) ifTrue:[
-selection isCollection ifFalse:[
+	selection isCollection ifFalse:[
-selection isNil ifTrue:[
+	    selection isNil ifTrue:[
-selection := anObject
+		selection := anObject
-] ifFalse:[
+	    ] ifFalse:[
-selection := OrderedCollection with:selection with:anObject
+		selection := OrderedCollection with:selection with:anObject
-]
+	    ]
-] ifTrue:[
+	] ifTrue:[
-"/ to enforce the change-message (value is identical to oldValue)
+	    "/ to enforce the change-message (value is identical to oldValue)
-selection isList ifTrue:[
+	    selection isList ifTrue:[
-selection add:anObject
+		selection add:anObject
-] ifFalse:[
+	    ] ifFalse:[
-selection := selection asOrderedCollection.
+		selection := selection asOrderedCollection.
-selection := selection copyWith:anObject
+		selection := selection copyWith:anObject
-]
+	    ]
-].
+	].
-self showSelected:anObject.
+	self showSelected:anObject.
-treeView cvsSelectionAdd:anObject.
+	treeView cvsSelectionAdd:anObject.
 ]
 "Modified: / 11.2.2000 / 01:39:05 / cg"
 !
 removeFromSelection:anObject
 "remove an object from the selection
 "
 (self isSelected:anObject) ifTrue:[
-self showUnselected:anObject.
+	self showUnselected:anObject.
-selection size > 1 ifTrue:[
+	selection size > 1 ifTrue:[
-selection isList ifTrue:[
+	    selection isList ifTrue:[
-selection remove:anObject ifAbsent:nil
+		selection remove:anObject ifAbsent:nil
-] ifFalse:[
+	    ] ifFalse:[
-"/ to enforce the change-message (value is identical to oldValue)
+		"/ to enforce the change-message (value is identical to oldValue)
-selection := selection asOrderedCollection.
+		selection := selection asOrderedCollection.
-selection := selection copyWithout:anObject
+		selection := selection copyWithout:anObject
-].
+	    ].
-self showSelection.
+	    self showSelection.
-] ifFalse:[
+	] ifFalse:[
-selection := nil
+	    selection := nil
-].
+	].
-treeView cvsSelectionRemove:anObject.
+	treeView cvsSelectionRemove:anObject.
 ]
 "Modified: / 11.2.2000 / 01:41:11 / cg"
 !
 select:something
 "change selection to something
 "
 (self enabled and:[something ~= self selection]) ifTrue:[
-something isNil
+	something isNil
-ifTrue: [treeView selection: (Array with: 1)]
+	    ifTrue: [treeView selection: (Array with: 1)]
-ifFalse:[treeView cvsSelection:something].
+	    ifFalse:[treeView cvsSelection:something].
-self setSelection:something withRedraw:true
+	self setSelection:something withRedraw:true
 ]
 !
 selectNextUpInHierarchy
 | sel |
 (sel := self selection) isNil ifTrue:[^self].
 sel isCollection ifTrue:[
-sel := self selection first.
+	sel := self selection first.
 ].
 sel := sel superView.
 sel isNil ifTrue:[^self].
 treeView cvsSelection: sel.
 self selection: sel.
 "update selection from a new selection
 "
 |list|
 selectionHiddenLevel == 0 ifTrue:[
-aSelOrNil size ~~ 0 ifTrue:[
+	aSelOrNil size ~~ 0 ifTrue:[
-list := OrderedCollection new.
+	    list := OrderedCollection new.
-self selectionDo:[:el|
+	    self selectionDo:[:el|
-(aSelOrNil includes:el) ifFalse:[list add:el]
+		(aSelOrNil includes:el) ifFalse:[list add:el]
-].
+	    ].
-self showUnselected:list.
+	    self showUnselected:list.
-] ifFalse:[
+	] ifFalse:[
-self hideSelection.
+	    self hideSelection.
-]
+	]
 ].
 self setSelection:aSelOrNil withRedraw:false.
 self showSelection
 ! !
 |cls|
 cls := self resolveName:className.
 cls notNil ifTrue:[
-aBuilder applicationClass:cls.
+	aBuilder applicationClass:cls.
 ].
 aBuilder componentCreationHook:[:aView :aSpec :aBdr||sv p s n|
-p := ViewProperty new.
+	p := ViewProperty new.
-s := aSpec copy.
+	s := aSpec copy.
-p spec:s.
+	p spec:s.
-p view:aView.
+	p view:aView.
-s class supportsSubComponents ifTrue:[
+	s class supportsSubComponents ifTrue:[
-s component:nil
+	    s component:nil
-].
+	].
-n := s name.
+	n := s name.
-(n isNil or:[(self propertyOfName:n) notNil]) ifTrue:[
+	(n isNil or:[(self propertyOfName:n) notNil]) ifTrue:[
-s name:(self uniqueNameFor:s)
+	    s name:(self uniqueNameFor:s)
-].
+	].
-treeView addProperty:p.
+	treeView addProperty:p.
 ].
 ^ aSpecification buildViewWithLayoutFor:aBuilder in:aFrame.
 "Modified: 4.7.1997 / 23:48:55 / cg"
 !
 |mySpec subSpecs|
 mySpec := self specFor:anObject.
 (mySpec notNil and:[mySpec class supportsSubComponents]) ifTrue:[
-(anObject subViews notNil) ifTrue:[
+	(anObject subViews notNil) ifTrue:[
-anObject subViews do:[:aSubView||spec|
+	    anObject subViews do:[:aSubView||spec|
-spec := self fullSpecFor:aSubView.
+		spec := self fullSpecFor:aSubView.
-spec notNil ifTrue:[
+		spec notNil ifTrue:[
-subSpecs isNil ifTrue:[
+		    subSpecs isNil ifTrue:[
-subSpecs := OrderedCollection new
+			subSpecs := OrderedCollection new
-].
+		    ].
-subSpecs add:spec.
+		    subSpecs add:spec.
-].
+		].
-].
+	    ].
-subSpecs notNil ifTrue:[
+	    subSpecs notNil ifTrue:[
-mySpec component:(SpecCollection new collection:subSpecs)
+		mySpec component:(SpecCollection new collection:subSpecs)
-]
+	    ]
-]
+	]
 ].
 ^ mySpec
 rebuildView:aView fromSpec:aSpec withBuilder:aBuilderOrNil
 |v builder|
 (builder := aBuilderOrNil) isNil ifTrue:[
-"/ create a dummy builder
+	"/ create a dummy builder
-builder := UIBuilder new isEditing:true.
+	builder := UIBuilder new isEditing:true.
-className notNil ifTrue:[
+	className notNil ifTrue:[
-builder applicationClass:(self resolveName:className).
+	    builder applicationClass:(self resolveName:className).
-].
+	].
 ].
 aSpec class isLayoutContainer ifTrue:[
-"/ TODO:
+	"/ TODO:
-"/ go through subviews and let them resize to their default/preferred
+	"/ go through subviews and let them resize to their default/preferred
-"/ needed if we change a containers layout from fit to non-fit.
+	"/ needed if we change a containers layout from fit to non-fit.
-(aView subViews ? #()) do:[:aSubView |
+	(aView subViews ? #()) do:[:aSubView |
-|fix spec prop|
+	    |fix spec prop|
-(prop := self propertyOfView:aSubView) notNil ifTrue:[
+	    (prop := self propertyOfView:aSubView) notNil ifTrue:[
-spec := prop spec.
+		spec := prop spec.
-spec useDefaultExtent ifTrue:[
+		spec useDefaultExtent ifTrue:[
-fix := aSubView sizeFixed:false.
+		    fix := aSubView sizeFixed:false.
-aSubView extent:aSubView preferredExtent.
+		    aSubView extent:aSubView preferredExtent.
-aSubView sizeFixed:fix
+		    aSubView sizeFixed:fix
-]
+		]
-]
+	    ]
-].
+	].
 ].
 aSpec needsRebuildForAttributes ifTrue:[
-"/ needs a full rebuild (in case view class depends upon spec-attribute)
+	"/ needs a full rebuild (in case view class depends upon spec-attribute)
-v := aSpec buildViewWithLayoutFor:builder in:(self findContainerOfView:aView).
+	v := aSpec buildViewWithLayoutFor:builder in:(self findContainerOfView:aView).
-v realize.
+	v realize.
-aView destroy.
+	aView destroy.
-device sync.
+	device sync.
-device flush.
+	device flush.
-aView becomeSameAs:v.
+	aView becomeSameAs:v.
-inputView raise.
+	"/ inputView raise.
 ] ifFalse:[
-aSpec setAttributesIn:aView with:builder.
+	aSpec setAttributesIn:aView with:builder.
-self elementChangedSize:aView.
+	self elementChangedSize:aView.
 ].
 !
 specFor:anObject
 "update current selected view from specification
 "
 |props name|
 aSpec class == WindowSpec ifTrue:[
-^ treeView canvasSpec:aSpec
+	 ^ treeView canvasSpec:aSpec
 ].
 self singleSelection notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self transaction:#specification selectionDo:[:aView|
+	    self transaction:#specification selectionDo:[:aView|
-props   := self propertyOfView:aView.
+		props   := self propertyOfView:aView.
-name    := (aSpec name) withoutSeparators.
+		name    := (aSpec name) withoutSeparators.
-name = props name ifFalse:[
+		name = props name ifFalse:[
-(self propertyOfName:name) notNil ifTrue:[
+		    (self propertyOfName:name) notNil ifTrue:[
-name := props name
+			name := props name
-]
+		    ]
-].
+		].
-aSpec name:name.
+		aSpec name:name.
-self createUndoSpecModify:props.
+		self createUndoSpecModify:props.
-self rebuildView:aView fromSpec:aSpec withBuilder:nil.
+		self rebuildView:aView fromSpec:aSpec withBuilder:nil.
-props spec:(aSpec copy).
+		props spec:(aSpec copy).
-treeView propertyChanged:props.
+		treeView propertyChanged:props.
-]
+	    ]
-]
+	]
 ]
 "Modified: / 30.10.2001 / 13:59:45 / cg"
 ! !
 |item prnt|
 (     (item := treeView itemOfView:aView) isNil
 or:[(prnt := item parent) isNil]
 ) ifTrue:[
-^ false
+	^ false
 ].
 ^ (prnt parent isNil or:[prnt contents spec class isLayoutContainer not])
 !
 canExchangeSelectionLayouts
 "returns true if the selection size is exactly 2
 and all elements in the selection can be moved or aligned
 "
 selection size == 2 ifFalse:[
-^ false
+	^ false
 ].
 ^ self canMoveOrAlignSelection
 !
 canMove:something
 "checks whether something is not nil and if all widgets derived from
 something can change their layout ( move, align, ... operation ).
 "
 something notNil ifTrue:[
-self forEach:something do:[:aView|
+	self forEach:something do:[:aView|
-(self canChangeLayoutOfView:aView) ifFalse:[^ false]
+	    (self canChangeLayoutOfView:aView) ifFalse:[^ false]
-].
+	].
-^ true
+	^ true
 ].
 ^ false
 !
 canMoveOrAlignSelection
 transaction:aType objects:something do:aOneArgBlock
 "opens a transaction and evaluates a block within the transaction; the
 argument to the block is a view from derived from something
 "
 self withinTransaction:aType objects:something do:[
-self forEach:something do:aOneArgBlock
+	self forEach:something do:aOneArgBlock
 ]
 !
 withinTransaction:aType objects:objects do:aNoneArgBlock
 "evaluate a block with no arguments within a transaction
 objects isNil ifTrue:[ ^ self ].
 size := objects size.
 objects isCollection ifTrue:[
-size == 0 ifTrue:[ ^ self ].
+	size == 0 ifTrue:[ ^ self ].
-size == 1 ifTrue:[ prop := self propertyOfView:(objects first) ]
+	size == 1 ifTrue:[ prop := self propertyOfView:(objects first) ]
 ] ifFalse:[
-prop := self propertyOfView:objects
+	prop := self propertyOfView:objects
 ].
 prop notNil ifTrue:[
-text := prop name
+	text := prop name
 ] ifFalse:[
-text := size printString, ' elements'
+	text := size printString, ' elements'
 ].
 undoHistory withinTransaction:aType text:text do:[
-aNoneArgBlock value
+	aNoneArgBlock value
 ]
 ! !
 !UIPainterView methodsFor:'undo actions'!
 "create undo action before changing a views layout
 "
 |lyt args prop|
 undoHistory isTransactionOpen ifTrue:[
-prop := self propertyOfView:aView.
+	prop := self propertyOfView:aView.
-prop notNil ifTrue:[
+	prop notNil ifTrue:[
-args := Array new:3.
+	    args := Array new:3.
-args at:1 put:(prop identifier).
+	    args at:1 put:(prop identifier).
-(lyt := aView geometryLayout) notNil ifTrue:[
+	    (lyt := aView geometryLayout) notNil ifTrue:[
-args at:2 put:#geometryLayout:
+		args at:2 put:#geometryLayout:
-] ifFalse:[
+	    ] ifFalse:[
-lyt := aView extent.
+		lyt := aView extent.
-args at:2 put:#extent:
+		args at:2 put:#extent:
-].
+	    ].
-args at:3 put:(lyt copy).
+	    args at:3 put:(lyt copy).
-undoHistory addUndoSelector:#undoLayout: withArgs:args.
+	    undoHistory addUndoSelector:#undoLayout: withArgs:args.
-]
+	]
 ]
 !
 createUndoRemove:aView
 "create undo method before deleting views
 "
 |prop pid|
 (prop := self propertyOfView:aView) notNil ifTrue:[
-(pid := self propertyOfParentForView:aView) notNil ifTrue:[
+	(pid := self propertyOfParentForView:aView) notNil ifTrue:[
-pid := pid identifier
+	    pid := pid identifier
-].
+	].
-undoHistory addUndoSelector:#undoRemove:
+	undoHistory addUndoSelector:#undoRemove:
-withArgs:(Array with:(self fullSpecFor:aView)
+			   withArgs:(Array with:(self fullSpecFor:aView)
-with:(prop identifier)
+			       with:(prop identifier)
-with:pid)
+			       with:pid)
 ]
 !
 createUndoSpecModify:aProp
 "undo method when changing the specification for an object
 "
 aProp notNil ifTrue:[
-undoHistory addUndoSelector:#undoSpecModify:
+	undoHistory addUndoSelector:#undoSpecModify:
-withArgs:(Array with:(aProp spec) with:(aProp identifier))
+			   withArgs:(Array with:(aProp spec) with:(aProp identifier))
 ]
 !
 undoCreate:something
 "undo method for creating or pasting an object
 "undo method to set the old layout; see 'createUndoLayout:'
 "
 |view|
 (view := self findViewWithId:(args at:1)) notNil ifTrue:[
-view perform:(args at:2) with:(args at:3).
+	view perform:(args at:2) with:(args at:3).
-self layoutChanged.
+	self layoutChanged.
 ]
 !
 undoRemove:args
 "undo method when removing an object; see 'createUndoRemove:'
 "
 |frame prop view|
 (args at:3) notNil ifTrue:[
-frame := self findViewWithId:(args at:3).
+	frame := self findViewWithId:(args at:3).
 ].
 frame isNil ifTrue:[
-frame := self
+	frame := self
 ].
 view := self addSpec:(args at:1) builder:(UIBuilder new isEditing:true) in:frame.
 view realize.
 prop := self propertyOfView:view.
 |view spec props|
 props := self propertyOfIdentifier:(args at:2).
 props notNil ifTrue:[
-view    := props view.
+	view    := props view.
-spec    := args at:1.
+	spec    := args at:1.
-props spec:spec.
+	props spec:spec.
-self rebuildView:view fromSpec:spec withBuilder:nil.
+	self rebuildView:view fromSpec:spec withBuilder:nil.
-treeView propertyChanged:props.
+	treeView propertyChanged:props.
 ]
 ! !
 !UIPainterView::ViewProperty class methodsFor:'instance creation'!
 new
 Identifier notNil ifTrue:[Identifier := Identifier + 1]
-ifFalse:[Identifier := 1].
+		     ifFalse:[Identifier := 1].
 ^ self basicNew initialize
 ! !
 !UIPainterView::ViewProperty methodsFor:'accessing'!
 |val|
 val := 0.
 self name from:anIndex do:[:c|
-c isDigit ifTrue:[val := val * 10 + c digitValue]
+	c isDigit ifTrue:[val := val * 10 + c digitValue]
-ifFalse:[^ 0]
+		 ifFalse:[^ 0]
 ].
 ^ val
 ! !
 !UIPainterView::ViewProperty methodsFor:'spec messages'!
 doesNotUnderstand:aMessage
 spec notNil ifTrue:[
-(spec respondsTo:(aMessage selector)) ifTrue:[^ aMessage sendTo:spec]
+	(spec respondsTo:(aMessage selector)) ifTrue:[^ aMessage sendTo:spec]
 ].
 ^ nil
 !
 layout

changeset 1834	2c640b5f7fa9
parent 1833	6ad211a201cf
child 1869	d7a4c2b7fddb