hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:25c2a13f00c5
+:184cea584be5
 "
 COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
-	      All Rights Reserved
+All Rights Reserved
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
 files (the 'Software'), to deal in the Software without
 restriction, including without limitation the rights to use,
 "{ NameSpace: Tools }"
 BrowserListWithFilter subclass:#ChangeList
 	instanceVariableNames:'listHolder showRemovedHolder showSameHolder showTimestampHolder
 		allowRemoveHolder allowAcceptHolder scrollToBottom applyAction
-		showConflictsOnlyHolder'
+		showConflictsOnlyHolder showDefinitionsOnlyHolder'
 	classVariableNames:'LastSelectionConditionString'
 	poolDictionaries:''
 	category:'Interface-Browsers-ChangeSet'
 !
 !ChangeList class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
-	      All Rights Reserved
+All Rights Reserved
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
 files (the 'Software'), to deal in the Software without
 restriction, including without limitation the rights to use,
 iconMinusGrayed
 ^ ToolbarIconLibrary iconMinusGray12x12
 "Modified: / 31-08-2011 / 10:54:40 / cg"
+!
+iconNone
+^ nil
+"Created: / 05-09-2014 / 00:34:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 iconPlus
 ^ ToolbarIconLibrary iconPlusBlue12x12
 <resource: #tableColumns>
 ^#(
 (DataSetColumnSpec
-	 label: 'Removed'
+label: 'Removed'
-	 id: 'removed'
+id: 'removed'
-	 labelButtonType: Button
+labelButtonType: Button
-	 width: 20
+width: 20
-	 minWidth: 20
+minWidth: 20
-	 editorType: CheckToggle
+height: heightOfFirstRow
-	 rendererType: CheckToggle
+editorType: CheckToggle
-	 model: notRemoved
+rendererType: CheckToggle
-	 menuFromApplication: false
+model: notRemoved
-	 printSelector: notRemoved
+menuFromApplication: false
-	 isResizeable: false
+printSelector: notRemoved
-	 showRowSeparator: false
+isResizeable: false
-	 showSelectionHighLighted: false
+showRowSeparator: false
-	 showColSeparator: false
+showColSeparator: false
 )
 (DataSetColumnSpec
-	 label: 'Delta'
+label: 'Delta'
-	 id: 'delta'
+id: 'delta'
-	 labelButtonType: Button
+labelButtonType: Button
-	 width: 20
+width: 20
-	 minWidth: 20
+minWidth: 20
-	 menuFromApplication: false
+height: heightOfFirstRow
-	 printSelector: iconDelta
+menuFromApplication: false
-	 canSelect: false
+printSelector: iconDelta
-	 isResizeable: false
+canSelect: false
-	 showRowSeparator: false
+isResizeable: false
-	 showSelectionHighLighted: false
+showRowSeparator: false
-	 showColSeparator: false
+showColSeparator: false
 )
 (DataSetColumnSpec
-	 label: 'Change'
+label: 'Change'
-	 id: change
+id: change
-	 labelAlignment: left
+labelAlignment: left
-	 labelButtonType: Button
+labelButtonType: Button
-	 menuFromApplication: false
+height: heightOfFirstRow
-	 printSelector: label
+menuFromApplication: false
-	 canSelect: false
+printSelector: label
-	 showRowSeparator: false
+canSelect: false
-	 showColSeparator: false
+showRowSeparator: false
+showColSeparator: false
 )
 (DataSetColumnSpec
-	 label: 'Class'
+label: 'Class'
-	 id: 'className'
+id: 'className'
-	 labelAlignment: left
+labelAlignment: left
-	 activeHelpKey: ''
+activeHelpKey: ''
-	 activeHelpKeyForLabel: ''
+activeHelpKeyForLabel: ''
-	 labelButtonType: Button
+labelButtonType: Button
-	 usePreferredWidth: true
+usePreferredWidth: true
-	 model: className
+height: heightOfFirstRow
-	 menuFromApplication: false
+model: className
-	 canSelect: false
+menuFromApplication: false
-	 showRowSeparator: false
+canSelect: false
-	 showColSeparator: false
+showRowSeparator: false
+showColSeparator: false
 )
 (DataSetColumnSpec
-	 label: 'Selector'
+label: 'Selector'
-	 id: 'selector'
+id: 'selector'
-	 labelAlignment: left
+labelAlignment: left
-	 activeHelpKey: ''
+activeHelpKey: ''
-	 activeHelpKeyForLabel: ''
+activeHelpKeyForLabel: ''
-	 labelButtonType: Button
+labelButtonType: Button
-	 usePreferredWidth: true
+usePreferredWidth: true
-	 model: selector
+height: heightOfFirstRow
-	 menuFromApplication: false
+model: selector
-	 canSelect: false
+menuFromApplication: false
-	 showRowSeparator: false
+canSelect: false
-	 showColSeparator: false
+showRowSeparator: false
+showColSeparator: false
 )
 (DataSetColumnSpec
-	 label: 'Category'
+label: 'Category'
-	 id: category
+id: category
-	 labelAlignment: left
+labelAlignment: left
-	 labelButtonType: Button
+labelButtonType: Button
-	 usePreferredWidth: true
+usePreferredWidth: true
-	 model: category
+height: heightOfFirstRow
-	 menuFromApplication: false
+model: category
-	 canSelect: false
+menuFromApplication: false
-	 showRowSeparator: false
+canSelect: false
-	 showColSeparator: false
+showRowSeparator: false
+showColSeparator: false
 )
 (DataSetColumnSpec
-	 label: 'Time Stamp'
+label: 'Time Stamp'
-	 id: timeStamp
+id: timeStamp
-	 labelAlignment: left
+labelAlignment: left
-	 labelButtonType: Button
+labelButtonType: Button
-	 usePreferredWidth: true
+usePreferredWidth: true
-	 model: timeStamp
+height: heightOfFirstRow
-	 menuFromApplication: false
+model: timeStamp
-	 canSelect: false
+menuFromApplication: false
-	 showRowSeparator: false
+canSelect: false
-	 showColSeparator: false
+showRowSeparator: false
+showColSeparator: false
 )
 )
 ! !
 !ChangeList class methodsFor:'menu specs'!
 listMenu
 (Menu new fromLiteralArrayEncoding:(Tools::ChangeList listMenu)) startUp
 "
 <resource: #menu>
 ^
 #(Menu
 (
 (MenuItem
 enabled: hasChangeSelectedAndNotRemoved
 label: 'Apply'
 isVisible: allowRemoveHolder
 )
 (MenuItem
 label: 'Select...'
 translateLabel: true
 submenu:
 (Menu
 (
 (MenuItem
 label: 'Select same'
 itemValue: listMenuSelectSame
 "Return a description of exported aspects;
 these can be connected to aspects of an embedding application
 (if this app is embedded in a subCanvas)."
 ^ #(
+environmentHolder
 #allowAcceptHolder
 #allowRemoveHolder
 #inGeneratorHolder
 #menuHolder
 #outGeneratorHolder
 #showFilterHolder
 #showRemovedHolder
 #showSameHolder
 #showTimestampHolder
 #showConflictsOnlyHolder
+#showDefinitionsOnlyHolder
 ).
+"Modified: / 24-02-2014 / 10:37:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeList methodsFor:'accessing'!
 acceptEnabled
 allowAcceptHolder
 "return/create the valueHolder 'acceptEnabledHolder'"
 allowAcceptHolder isNil ifTrue:[
-	allowAcceptHolder := ValueHolder with:nil "defaultValue here".
+allowAcceptHolder := ValueHolder with:nil "defaultValue here".
 ].
 ^ allowAcceptHolder
 "Created: / 24-01-2012 / 19:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 allowAcceptHolder := something.
 !
 allowRemoveHolder
 "return/create the 'allowRemoveHolder' value holder (automatically generated)"
 allowRemoveHolder isNil ifTrue:[
-	allowRemoveHolder := ValueHolder with:true.
+allowRemoveHolder := ValueHolder with:true.
-	allowRemoveHolder addDependent:self.
+allowRemoveHolder addDependent:self.
 ].
 ^ allowRemoveHolder
 "Modified (comment): / 24-01-2012 / 19:44:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 allowRemoveHolder:something
 "set the 'showRemovedHolder' value holder (automatically generated)"
 |oldValue newValue|
 allowRemoveHolder notNil ifTrue:[
-	oldValue := allowRemoveHolder value.
+oldValue := allowRemoveHolder value.
-	allowRemoveHolder removeDependent:self.
+allowRemoveHolder removeDependent:self.
 ].
 allowRemoveHolder := something.
 allowRemoveHolder notNil ifTrue:[
-	allowRemoveHolder addDependent:self.
+allowRemoveHolder addDependent:self.
 ].
 newValue := allowRemoveHolder value.
 oldValue ~~ newValue ifTrue:[
-	self
+self
-	    update:#value
+update:#value
-	    with:newValue
+with:newValue
-	    from:allowRemoveHolder.
+from:allowRemoveHolder.
 ].
 !
 listColumns
 "Created: / 26-07-2012 / 18:03:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listHolder
 listHolder isNil ifTrue:[
-	listHolder := ValueHolder new.
+listHolder := ValueHolder new.
 ].
 ^ listHolder
 !
 showConflictsOnlyHolder
 "return/create the 'showConflictsOnlyHolder' value holder (automatically generated)"
 showConflictsOnlyHolder isNil ifTrue:[
-showConflictsOnlyHolder := ValueHolder with: true.
+showConflictsOnlyHolder := ValueHolder with: false.
 showConflictsOnlyHolder addDependent: self.
 ].
 ^ showConflictsOnlyHolder
+"Modified: / 05-09-2014 / 00:54:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 showConflictsOnlyHolder:something
 "set the 'showConflictsOnlyHolder' value holder (automatically generated)"
 oldValue ~~ newValue ifTrue:[
 self update:#value with:newValue from:showConflictsOnlyHolder.
 ].
 !
+showDefinitionsOnlyHolder
+"return/create the 'showDefinitionsOnlyHolder' value holder (automatically generated)"
+showDefinitionsOnlyHolder isNil ifTrue:[
+showDefinitionsOnlyHolder := ValueHolder with: false.
+showDefinitionsOnlyHolder addDependent: self.
+].
+^ showDefinitionsOnlyHolder
+"Modified: / 05-09-2014 / 00:52:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+showDefinitionsOnlyHolder:something
+"set the 'showDefinitionsOnlyHolder' value holder (automatically generated)"
+|oldValue newValue|
+showDefinitionsOnlyHolder notNil ifTrue:[
+oldValue := showDefinitionsOnlyHolder value.
+showDefinitionsOnlyHolder removeDependent:self.
+].
+showDefinitionsOnlyHolder := something.
+showDefinitionsOnlyHolder notNil ifTrue:[
+showDefinitionsOnlyHolder addDependent:self.
+].
+newValue := showDefinitionsOnlyHolder value.
+oldValue ~~ newValue ifTrue:[
+self update:#value with:newValue from:showDefinitionsOnlyHolder.
+].
+!
 showRemovedHolder
 "return/create the 'showRemovedHolder' value holder (automatically generated)"
 showRemovedHolder isNil ifTrue:[
-	showRemovedHolder := ValueHolder with: true.
+showRemovedHolder := ValueHolder with: true.
-	showRemovedHolder addDependent: self.
+showRemovedHolder addDependent: self.
 ].
 ^ showRemovedHolder
 !
 showRemovedHolder:something
 "set the 'showRemovedHolder' value holder (automatically generated)"
 |oldValue newValue|
 showRemovedHolder notNil ifTrue:[
-	oldValue := showRemovedHolder value.
+oldValue := showRemovedHolder value.
-	showRemovedHolder removeDependent:self.
+showRemovedHolder removeDependent:self.
 ].
 showRemovedHolder := something.
 showRemovedHolder notNil ifTrue:[
-	showRemovedHolder addDependent:self.
+showRemovedHolder addDependent:self.
 ].
 newValue := showRemovedHolder value.
 oldValue ~~ newValue ifTrue:[
-	self update:#value with:newValue from:showRemovedHolder.
+self update:#value with:newValue from:showRemovedHolder.
 ].
 !
 showSameHolder
 "return/create the 'showSameHolder' value holder (automatically generated)"
 showSameHolder isNil ifTrue:[
-	showSameHolder := ValueHolder with: true.
+showSameHolder := ValueHolder with: true.
-	showSameHolder addDependent:self.
+showSameHolder addDependent:self.
 ].
 ^ showSameHolder
 "Modified: / 04-08-2011 / 18:39:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 "set the 'showSameHolder' value holder (automatically generated)"
 |oldValue newValue|
 showSameHolder notNil ifTrue:[
-	oldValue := showSameHolder value.
+oldValue := showSameHolder value.
-	showSameHolder removeDependent:self.
+showSameHolder removeDependent:self.
 ].
 showSameHolder := something.
 showSameHolder notNil ifTrue:[
-	showSameHolder addDependent:self.
+showSameHolder addDependent:self.
 ].
 newValue := showSameHolder value.
 oldValue ~~ newValue ifTrue:[
-	self update:#value with:newValue from:showSameHolder.
+self update:#value with:newValue from:showSameHolder.
 ].
 !
 showTimestampHolder
 "return/create the 'showTimestampHolder' value holder (automatically generated)"
 ].
 sender == showRemovedHolder ifTrue:[
 self updateList
 ].
 sender == showConflictsOnlyHolder ifTrue:[
+self updateList
+].
+sender == showDefinitionsOnlyHolder ifTrue:[
 self updateList
 ].
 ^super update: aspect with: param from: sender
 !ChangeList methodsFor:'event processing'!
 handlesKeyPress:key inView:aView
 <resource: #keyboard (#Accept #Ctrls)>
-^(key == #Accept or:[ key == #Ctrls])
+(super handlesKeyPress:key inView:aView)
-and:[ listView scrolledView == aView ]
+or:[(key == #Accept or:[ key == #Ctrls])
+and:[ listView scrolledView == aView ]]
 "Created: / 08-02-2012 / 14:43:11 / cg"
+"Modified: / 10-04-2014 / 11:31:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 keyPress:key x:x y:y view:aView
 (key == #Accept or:[ key == #Ctrls]) ifTrue:[
-	self listMenuApply.
+self listMenuApply.
-	^ self
+^ self
 ].
+super keyPress:key x:x y:y view:aView
 "Created: / 08-02-2012 / 14:42:18 / cg"
+"Modified: / 10-04-2014 / 11:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeList methodsFor:'generators'!
 makeGenerator
 "Superclass Tools::BrowserList says that I am responsible to implement this method"
 ^Iterator on:
 [:whatToDo|
-selectionHolder value do:
+(selectionHolder value ? #()) do:
 [:changeListItem| | change |
 change := changeListItem change.
 change isCompositeChange ifTrue:
 [change changes do: whatToDo]]].
 !ChangeList methodsFor:'hooks'!
 postBuildListView: aView
 super postBuildListView: aView.
-listView scrolledView delegate: self.
+aView scrolledView delegate: self.
 "Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 10-04-2014 / 11:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeList methodsFor:'initialization'!
 initialize
 listMenuApplyAll
 self acceptEnabled ifFalse:[^self].
 self selection value do:
-	[:e|e removed ifFalse:[applyAction value:e change]].
+[:e|e removed ifFalse:[applyAction value:e change]].
 "Created: / 05-12-2009 / 14:53:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 10-09-2012 / 13:57:58 / cg"
 !
 listMenuBrowse
 self listMenuBrowseChanges:
-	((self selectionHolder value ? #()) collect:[:e|e change])
+((self selectionHolder value ? #()) collect:[:e|e change])
 "Modified: / 24-01-2012 / 22:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listMenuBrowseChanges: changes
-| classes methods methodsOnly browserClass|
+| collectChanges classes methods methodsOnly browserClass|
 classes := Set new.
 methods := Set new.
 methodsOnly := true.
-changes do: [:each |
-each isClassChange ifTrue:[
+collectChanges :=
-each changeClass ifNotNil:[
+[:each |
+(each isClassChange and:[each changeClass notNil]) ifTrue:[
 classes add: each  changeClass.
-each isMethodCodeChange
+each isMethodCodeChange ifTrue:[
-ifTrue:
+each changeMethod notNil ifTrue: [methods add:each changeMethod]
-[each changeMethod ifNotNil:
+] ifFalse:[
-[methods add:each changeMethod]]
+methodsOnly := false
-ifFalse:
+]
-[methodsOnly := false]
+] ifFalse:[
+each isCompositeChange ifTrue:[
+each changes do:collectChanges
+]
 ]
-]
+].
-].
+changes do: collectChanges.
 browserClass := environment browserClass.
 methodsOnly
 ifTrue:
 [methods size = 1
 !
 listMenuDeleteSelection
 self selectionHolder value do:
-	[:each|each removed: true].
+[:each|each removed: true].
 self updateList
 !
 listMenuInspect
 | selection |
 selection := self selectionHolder value collect:[:e|e change].
 selection size = 1
-	ifTrue:[selection anyOne inspect]
+ifTrue:[selection anyOne inspect]
-	ifFalse:[selection inspect].
+ifFalse:[selection inspect].
 "Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listMenuSelectAdditions
 listMenuSelectAll
 self listMenuSelectAllSuchThat:[:change|true]
 !
 listMenuSelectAllSuchThat:conditionBlock
 |newSelection|
 newSelection := self listHolder value
-		select:[:entry | conditionBlock value:entry change ].
+select:[:entry | conditionBlock value:entry change ].
 self selectionHolder value:newSelection
 !
 listMenuSelectNone
 '[:change|
 "/ Define condition for selection below:
 "/ change is an instance of Change
 "/ change will be selected if and only if block returns true
 true"/always select the change
 ]
 '.
 LastSelectionConditionString isNil ifTrue:[
-	LastSelectionConditionString := template.
+LastSelectionConditionString := template.
 ].
 textHolder := ValueHolder new.
 dialog := Dialog
-		 forRequestText:(resources string:'Enter condition for selection')
+forRequestText:(resources string:'Enter condition for selection')
-		 lines:20
+lines:20
-		 columns:70
+columns:70
-		 initialAnswer:LastSelectionConditionString
+initialAnswer:LastSelectionConditionString
-		 model:textHolder.
+model:textHolder.
 dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]).
 dialog open.
 dialog accepted ifFalse:[^ self].
 conditionBlockString := textHolder value.
 LastSelectionConditionString := conditionBlockString.
 conditionBlock := Parser evaluate:conditionBlockString.
 conditionBlock isBlock ifFalse:[
-	self error:'Bad selection block (syntax error?)'.
+self error:'Bad selection block (syntax error?)'.
-	^ self
+^ self
 ].
 self listMenuSelectAllSuchThat: conditionBlock
 !
 listMenuUndeleteSelection
 self selectionHolder value do:
-	[:each|each removed: false].
+[:each|each removed: false].
 self updateList
 ! !
 !ChangeList methodsFor:'private'!
 ].
 "Created: / 26-07-2012 / 17:56:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listEntryFor:chg
 ^ListEntry change:chg application: self
 "Modified: / 05-12-2009 / 14:39:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 "Created: / 05-12-2009 / 14:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 updateList
-|inGenerator changeset firstLineShown oldSel newList newSel |
+|inGenerator changeset firstLineShown oldSel newList newSel|
 self withWaitCursorDo:[
 inGenerator := self inGeneratorHolder value.
 listView notNil ifTrue:[
 ((listView isKindOf: ScrollableView) not or:[listView scrolledView notNil]) ifTrue:[
 firstLineShown := listView firstLineShown
 ].
 ].
 oldSel := self selection.
 changeset := inGenerator isNil ifTrue:[ #() ] ifFalse:[ inGenerator ].
-newList := changeset
+self showDefinitionsOnlyHolder value ifTrue:[
-select:
+newList := changeset select: [:chg | chg isOrContainsClassDefinitionChange ].
-[:chg |
+] ifFalse:[
-(self showRemovedHolder value or:[ chg removed not ])
+self showConflictsOnlyHolder value ifTrue:[
-and:[self showSameHolder value or:[chg delta ~~ #=]]
+newList := changeset select: [:chg | chg isConflict ].
-].
+] ifFalse:[
+| showRemoved showSame |
+showRemoved := self showRemovedHolder value.
+showSame := self showSameHolder value.
+newList := changeset select: [:chg |
+(showRemoved or:[ chg removed not ])
+and:[showSame or:[chg delta ~~ #=]]
+].
+].
+].
+"/ OLD CODE
+"/        newList := changeset
+"/                    select:
+"/                        [:chg |
+"/                        (self showRemovedHolder value or:[ chg removed not ])
+"/                            and:[self showSameHolder value or:[chg delta ~~ #=]]
+"/                        ].
 newList := self filterList: newList.
 newList := newList collect:[:chg | self listEntryFor:chg ].
 self listHolder value ~= newList ifTrue:[
 self listHolder value: newList.
 ((newList size ~~ 0) and:[scrollToBottom]) ifTrue:[
 ].
 scrollToBottom := false.
 ]
 ]
 "Modified: / 28-12-2011 / 15:46:15 / cg"
-"Modified: / 01-08-2012 / 18:10:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 12-02-2014 / 17:15:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeList methodsFor:'queries'!
 hasChangeSelected
 "Modified (comment): / 25-07-2012 / 17:39:39 / cg"
 "Modified: / 14-11-2013 / 14:55:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 children
+|app addIf showRemoved showSame|
 children isNil ifTrue:[
 change isCompositeChange ifTrue:[
+app := self application.
 children := OrderedCollection new: change changes size.
-self application showConflictsOnlyHolder value ifTrue:[
+app showDefinitionsOnlyHolder value ifTrue:[
-change changes do:[:chg|
+addIf := [:chg | chg isOrContainsClassDefinitionChange].
-(chg isConflict) ifTrue:[
-children add: ((self application listEntryFor: chg) parent: self)
-]
-].
 ] ifFalse:[
-|showRemoved showSame|
+app showConflictsOnlyHolder value ifTrue:[
+addIf := [:chg | chg isConflict].
-showRemoved := self application showRemovedHolder value.
+] ifFalse:[
-showSame := self application showSameHolder value.
+showRemoved := app showRemovedHolder value.
+showSame := app showSameHolder value.
-change changes do:[:chg|
-((showRemoved or:[ chg removed not ])
+addIf := [:chg |
-and:[showSame or:[chg delta ~~ #=]])
+((showRemoved or:[ chg removed not ])
-ifTrue:[
+and:[showSame or:[chg delta ~~ #=]])
-children add: ((self application listEntryFor: chg) parent: self)
+].
 ]
 ].
-]
+change changes do:[:chg|
+(addIf value:chg) ifTrue:[
+children add: ((app listEntryFor: chg) parent: self)
+]
+].
 ] ifFalse:[
 children :=  #()
 ]
 ].
 ^children
 ^change deltaDetail
 "Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Created: / 31-08-2011 / 10:29:21 / cg"
-!
-iconDelta
-| iconSelector |
-iconSelector := self iconSelector.
-iconSelector isNil ifTrue:[^nil].
-self removed ifTrue:[iconSelector := iconSelector , #Grayed].
-^self application class perform: iconSelector asSymbol.
-"Created: / 05-12-2009 / 14:11:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 18-11-2011 / 14:56:33 / cg"
-!
-iconRemoved
-|appClass|
-appClass := self application class.
-^self removed
-ifTrue: [appClass uncheckedIcon ]
-ifFalse:[appClass checkedIcon ]
-"Created: / 05-12-2009 / 14:11:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 imageSource
 "return the source for the in-image version of the change"
 ! !
 !ChangeList::ListEntry methodsFor:'displaying'!
 displayLabel:aLabel h:lH on:aGC x:newX y:y h:h
+| list cx icon |
-| list cx icon colW colS |
 list := self application.
 cx := x := newX.
 (list allowRemoveHolder value and:[list showRemovedHolder value]) ifTrue: [
-	(icon := self iconRemoved) notNil ifTrue:[
+(icon := self iconRemoved) notNil ifTrue:[
-	    icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2)
+icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2)
-	].
+].
-	cx := cx + 22."experimental value - this looks good"
+cx := cx + 22."experimental value - this looks good"
 ].
 (icon := self iconDelta) notNil ifTrue:[
-	icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2)
+icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2)
 ].
 cx := cx + 16."12 + 2px gap"
 super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h.
 "/        ].
 "/        super displayLabel:colS h:lH on:aGC x: (aGC width - 5 - colW) y:y h:h.
 "/    ].
 "Modified: / 27-07-2012 / 17:13:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
-!ChangeList::ListEntry methodsFor:'private'!
+displayLabel:aLabel h:lH on:aGC x:newX y:y h:h isHighlightedAsSelected:isHighlightedAsSelected
+| list cx icon |
+list := self application.
+cx := x := newX.
+(list allowRemoveHolder value and:[list showRemovedHolder value]) ifTrue: [
+(icon := self iconRemoved) notNil ifTrue:[
+icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2)
+].
+cx := cx + 22."experimental value - this looks good"
+].
+(icon := self iconDelta) notNil ifTrue:[
+icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2)
+].
+cx := cx + 16."12 + 2px gap"
+super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h isHighlightedAsSelected:isHighlightedAsSelected.
+"/    "Now, display additional columns..."
+"/    (list showColumn: #timestamp) ifTrue:[
+"/        cx := cx + (aLabel widthOn: aGC) + 5."px - padding"
+"/        colS := change timeOfChangeIfKnown notNil
+"/                    ifTrue:[change timeOfChangeIfKnown printString]
+"/                    ifFalse:['???'].
+"/        [ (colW := colS widthOn: aGC) > (aGC width - cx - 5) ] whileTrue:[
+"/            colS = '...' ifTrue:[ ^ self ].
+"/            colS := '...' , (colS copyFrom: 6).
+"/        ].
+"/        super displayLabel:colS h:lH on:aGC x: (aGC width - 5 - colW) y:y h:h.
+"/    ].
+"Modified: / 27-07-2012 / 17:13:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+iconDelta
+| iconSelector |
+iconSelector := self iconSelector.
+iconSelector isNil ifTrue:[^nil].
+self removed ifTrue:[iconSelector := iconSelector , #Grayed].
+^self application class perform: iconSelector asSymbol.
+"Created: / 05-12-2009 / 14:11:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 18-11-2011 / 14:56:33 / cg"
+!
+iconRemoved
+|appClass|
+appClass := self application class.
+^self removed
+ifTrue: [appClass uncheckedIcon ]
+ifFalse:[appClass checkedIcon ]
+"Created: / 05-12-2009 / 14:11:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 iconSelector
 ^ application iconSelectorForChange:change
 ! !
 ! !
 !ChangeList class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.26 2013-09-05 23:18:30 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.37 2015-02-26 01:06:39 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.26 2013-09-05 23:18:30 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.37 2015-02-26 01:06:39 cg Exp $'
-!
-version_HG
-^ '$Changeset: <not expanded> $'
 !
 version_SVN
-^ '$Id: Tools__ChangeList.st,v 1.26 2013-09-05 23:18:30 cg Exp $'
+^ '$Id: Tools__ChangeList.st,v 1.37 2015-02-26 01:06:39 cg Exp $'
 ! !

branch	jv
changeset 15566	184cea584be5
parent 13676	b14ed2a36bae
parent 15432	e4656b4e606d
child 15600	067b6e4913af