hg/stx-libtool2: comparison DataSetBuilder.st

equal deleted inserted replaced

-:58e2df779faa
+:f3e9c2ded641
 ! !
 !DataSetBuilder methodsFor:'building'!
-buildFromClass:aClass andSelector:aSelector
+buildFromResourceSpec:aResourceSpec
+self columns:aResourceSpec.
+"/    columns notEmpty ifTrue: [
+"/        self tabModel value: 1.
+"/        self selectedColumnModel value:nil; value:1.    "/ toggle to force change
+"/        self updateInputFields.
+"/        self updateInfoLabel.
+"/        self updateHistory
+"/    ].
+!
+loadFromClass:aClass andSelector:aSelector
 |updateBlock cls list|
+self assert:(aClass isNil or:[aClass isClass]).
 selectedColumnIndex := 0.
 updateBlock := [
 columns notEmpty ifTrue: [
 self tabModel value: 0.
 self columns removeAll.
 self seqList removeAll.
 self updateColumnView.
 self updateInfoLabel.
-^ self isColumnSelected value: false.
+self isColumnSelected value: false.
+^ self.
 ].
 specSelector isNil ifTrue: [updateBlock value. ^self].
 list := nil.
 (aClass notNil or:[self isStandAlone or:[self window shown]]) ifTrue:[
 (aClass notNil and:[aSelector notNil]) ifTrue:[
-cls := self resolveName:aClass.
+cls := aClass isBehavior ifTrue:[ aClass ] ifFalse:[ self resolveName:aClass].
-(cls respondsTo:aSelector) ifTrue:[
+(cls respondsTo: aSelector) ifTrue:[
-list := cls perform:aSelector
+list := cls perform: aSelector.
-]
+].
 ]
 ] ifFalse:[
 list := columns
 ].
 self columns:list.
 updateBlock value.
-!
-buildFromResourceSpec:aResourceSpec
-self columns:aResourceSpec.
-"/    columns notEmpty ifTrue: [
-"/        self tabModel value: 1.
-"/        self selectedColumnModel value:nil; value:1.    "/ toggle to force change
-"/        self updateInputFields.
-"/        self updateInfoLabel.
-"/        self updateHistory
-"/    ].
 ! !
 !DataSetBuilder methodsFor:'code generation'!
 compile:aCode forClass:aClass inCategory:aCategory
 column perform:(aKey , ':') asSymbol with: aModel value
 ].
 self seqList at:selectedColumnIndex put:(self labelFromColumn:column).
 self updateColumnView.
 self cancel.
-modified := true.
+self clearModified.
 !
 cancel
 "remove all changes and reload selected column values"
 columns isEmpty ifTrue:[
 self isColumnSelected value: false
 ].
 self cancel.
-modified := true.
+self setModified.
 !
 doBrowseRowClass
 "browse class of columns spec"
 self valueOfEnablingCommitButtons value ifFalse:[
 self selectedColumnModel value:selectedColumnIndex + 1
 ].
 self cancel.
 self updateColumnView.
-modified := true.
+self setModified.
 !
 doCut
 "remove selected column and put it to the clipboard"
 ].
 columns add:col   beforeIndex:idx.
 list    add:label beforeIndex:idx.
 self selectedColumnModel value:idx.
 self updateColumnView.
-modified := true.
+self setModified.
 !
 doPaste
 "paste clipboard copy column after selected column or at left (nothing selected)"
 self valueOfEnablingCommitButtons value ifFalse:[
 self selectedColumnModel value:selectedColumnIndex + 1
 ].
 self updateColumnView.
 self updateInputFields.
-modified := true.
+self setModified.
 !
 doPickColumns
 |view cls|
 self updateHistory.
 self updateInfoLabel.
 hasSaved := true.
-modified := false.
+self clearModified.
 !
 openDocumentation
 self openHTMLDocument:'tools/uipainter/DataSetBuilder.html'.
 ! !

changeset 1974	f3e9c2ded641
parent 1944	f35d2f61f294
child 1981	d28960fc1576