hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:7dffb3cbf7c4
+:4e2f5b0d4cb2
 "{ NameSpace: Tools }"
 Tools::BrowserListWithFilter subclass:#ChangeList
 	instanceVariableNames:'listHolder showRemovedHolder showSameHolder showTimestampHolder
-		allowRemoveHolder allowAcceptHolder scrollToBottom applyAction'
+allowRemoveHolder allowAcceptHolder scrollToBottom applyAction showConflictsOnlyHolder'
 	classVariableNames:'LastSelectionConditionString'
 	poolDictionaries:''
 	category:'Interface-Browsers-ChangeSet'
 !
 iconEqualGrayed
 ^ ToolbarIconLibrary iconEqualGray12x12
 "Modified: / 31-08-2011 / 10:54:00 / cg"
+!
+iconExcla
+^ ToolbarIconLibrary iconExclaRed12x12
 !
 iconMinus
 ^ ToolbarIconLibrary iconMinusRed12x12
 "Return a description of exported aspects;
 these can be connected to aspects of an embedding application
 (if this app is embedded in a subCanvas)."
 ^ #(
-	#allowAcceptHolder
+#allowAcceptHolder
-	#allowRemoveHolder
+#allowRemoveHolder
-	#inGeneratorHolder
+#inGeneratorHolder
-	#menuHolder
+#menuHolder
-	#outGeneratorHolder
+#outGeneratorHolder
-	#selectionHolder
+#selectionHolder
-	#showFilterHolder
+#showFilterHolder
-	#showRemovedHolder
+#showRemovedHolder
-	#showSameHolder
+#showSameHolder
-	#showTimestampHolder
+#showTimestampHolder
+#showConflictsOnlyHolder
 ).
 ! !
 	listHolder := ValueHolder new.
 ].
 ^ listHolder
 !
+showConflictsOnlyHolder
+"return/create the 'showConflictsOnlyHolder' value holder (automatically generated)"
+showConflictsOnlyHolder isNil ifTrue:[
+showConflictsOnlyHolder := ValueHolder with: true.
+showConflictsOnlyHolder addDependent: self.
+].
+^ showConflictsOnlyHolder
+!
+showConflictsOnlyHolder:something
+"set the 'showConflictsOnlyHolder' value holder (automatically generated)"
+|oldValue newValue|
+showConflictsOnlyHolder notNil ifTrue:[
+oldValue := showConflictsOnlyHolder value.
+showConflictsOnlyHolder removeDependent:self.
+].
+showConflictsOnlyHolder := something.
+showConflictsOnlyHolder notNil ifTrue:[
+showConflictsOnlyHolder addDependent:self.
+].
+newValue := showConflictsOnlyHolder value.
+oldValue ~~ newValue ifTrue:[
+self update:#value with:newValue from:showConflictsOnlyHolder.
+].
+!
 showRemovedHolder
 "return/create the 'showRemovedHolder' value holder (automatically generated)"
 showRemovedHolder isNil ifTrue:[
 	showRemovedHolder := ValueHolder with: true.
 ! !
 !ChangeList methodsFor:'change & update'!
+selectionChanged
+super selectionChanged
+!
 update: aspect with: param from: sender
 sender == allowRemoveHolder ifTrue:[
-	self listColumn: #removed visible: allowRemoveHolder value.
+self listColumn: #removed visible: allowRemoveHolder value.
-	^self.
+^self.
 ].
 sender == showTimestampHolder ifTrue:[
-	self listColumn: #timeStamp visible: showTimestampHolder value.
+self listColumn: #timeStamp visible: showTimestampHolder value.
-	^self.
+^self.
 ].
 sender == selectionHolder ifTrue:[
-	self selectionChanged.
+self selectionChanged.
-	^self
+^ self
 ].
 sender == showSameHolder ifTrue:[
-	self updateList.
+self updateList.
-	^self.
+^self.
 ].
 sender == showRemovedHolder ifTrue:[
-	self updateList.
+self updateList
-	^self.
+].
+sender == showConflictsOnlyHolder ifTrue:[
+self updateList
 ].
 ^super update: aspect with: param from: sender
 "Created: / 24-10-2009 / 19:47:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 makeGenerator
 "Superclass Tools::BrowserList says that I am responsible to implement this method"
 ^Iterator on:
-	[:whatToDo|
+[:whatToDo|
-	selectionHolder value do:
-	    [:changeListItem| | change |
+selectionHolder value do:
-	    changeListItem notNil ifTrue:[
+[:changeListItem| | change |
-		change := changeListItem change.
+change := changeListItem change.
-		change isCompositeChange ifTrue:
+change isCompositeChange ifTrue:
-		    [change changes do: whatToDo]]]]
+[change changes do: whatToDo]]].
 "Modified: / 24-07-2009 / 23:00:41 / Jan Vrany <vranyj1@fel.cvut.cz>"
-"Modified: / 25-07-2012 / 15:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 24-10-2009 / 20:00:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeList methodsFor:'hooks'!
 !ChangeList methodsFor:'menu actions'!
 listMenuApply
-|sel list idx|
+|sel list idx selectionHolder|
 self acceptEnabled ifFalse:[^self].
+selectionHolder := self selectionHolder.
-(sel := self selectionHolder value) do:[:e| applyAction value:e change].
+(sel := selectionHolder value) do:[:e| applyAction value:e change].
 sel size == 1 ifTrue:[
-	list := self listHolder value.
+list := self listHolder value.
-	idx := list indexOf:(sel first).
+idx := list indexOf:(sel first).
-	idx < list size ifTrue:[
+idx < list size ifTrue:[
-	    self selectionHolder value:(Array with:(list at:idx+1))
+selectionHolder value:(Array with:(list at:idx+1))
-	] ifFalse:[
+] ifFalse:[
-	    self selectionHolder value:#()
+selectionHolder value:#()
-	].
+].
 ].
 "Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 10-09-2012 / 13:57:46 / cg"
 !
 "Modified: / 24-01-2012 / 22:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 listMenuBrowseChanges: changes
+| classes methods methodsOnly browserClass|
-| classes methods methodsOnly |
 classes := Set new.
 methods := Set new.
 methodsOnly := true.
-changes do:
+changes do: [:each |
-	[:each|
+each isClassChange ifTrue:[
-	each  isClassChange ifTrue:
+each changeClass ifNotNil:[
-	    [each  changeClass ifNotNil:
+classes add: each  changeClass.
-		[classes add: each  changeClass.
+each isMethodCodeChange
-		each isMethodCodeChange
+ifTrue:
-		    ifTrue:
+[each changeMethod ifNotNil:
-			[each changeMethod ifNotNil:
+[methods add:each changeMethod]]
-			    [methods add:each changeMethod]]
+ifFalse:
-		    ifFalse:
+[methodsOnly := false]
-			[methodsOnly := false]]]].
+]
-methodsOnly
+]
-	ifTrue:
+].
-	    [methods size = 1
-		ifTrue:[Smalltalk browserClass openInMethod: methods anyOne]
+browserClass := Smalltalk browserClass.
-		ifFalse:[Smalltalk browserClass browseMethods: methods asArray title: 'Selected methods from changeset' sort: true]]
+methodsOnly
-	ifFalse:
+ifTrue:
-	    [classes size = 1
+[methods size = 1
-		ifTrue:[Smalltalk browserClass browseClass: classes anyOne]
+ifTrue:[ browserClass openInMethod: methods anyOne]
-		ifFalse:[Smalltalk browserClass browseClasses: classes]]
+ifFalse:[ browserClass browseMethods: methods asArray title: 'Selected methods from changeset' sort: true]]
+ifFalse:
+[classes size = 1
+ifTrue:[ browserClass browseClass: classes anyOne]
+ifFalse:[ browserClass browseClasses: classes]]
 "Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Created: / 24-01-2012 / 22:00:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 browserNameList
 ^'Change list'
 "Modified: / 24-07-2009 / 22:06:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+iconSelectorForChange:change
+| delta sym selectorOrNil |
+masterApplication notNil ifTrue:[
+selectorOrNil := masterApplication iconSelectorForChange:change.
+selectorOrNil notNil ifTrue:[ ^ selectorOrNil ].
+].
+delta := change deltaDetail.
+sym := delta shortDeltaSymbol.
+sym = #+ ifTrue:[^#iconPlus].
+sym = #- ifTrue:[^#iconMinus].
+sym = #= ifTrue:[^#iconEqual].
+"/ different.
+^ nil.
 !
 listColumn: columnId visible: visible
 visible ifTrue:[
 self listColumnShow: columnId
 "Created: / 05-12-2009 / 14:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 updateList
 |inGenerator changeset firstLineShown oldSel newList newSel |
+self withWaitCursorDo:[
 inGenerator := self inGeneratorHolder value.
 listView notNil ifTrue:[
-	((listView isKindOf: ScrollableView) not or:[listView scrolledView notNil]) ifTrue:[
+((listView isKindOf: ScrollableView) not or:[listView scrolledView notNil]) ifTrue:[
-	    firstLineShown := listView firstLineShown
+firstLineShown := listView firstLineShown
-	].
+].
 ].
 oldSel := self selection.
 changeset := inGenerator isNil ifTrue:[ #() ] ifFalse:[ inGenerator ].
 newList := changeset
-		select:
+select:
-		    [:chg |
+[:chg |
-		    (self showRemovedHolder value or:[ chg removed not ])
+(self showRemovedHolder value or:[ chg removed not ])
-			and:[self showSameHolder value or:[chg delta ~~ #=]]
+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.
+self listHolder value: newList.
-	((newList size ~~ 0) and:[scrollToBottom]) ifTrue:[
+((newList size ~~ 0) and:[scrollToBottom]) ifTrue:[
-	    self selection: { newList last }
+self selection: { newList last }
-	] ifFalse:[
+] ifFalse:[
-	    oldSel notEmptyOrNil ifTrue:[
+oldSel notEmptyOrNil ifTrue:[
-		newSel := OrderedCollection new: oldSel size.
+newSel := OrderedCollection new: oldSel size.
-		oldSel := oldSel reject:[:e|e isNil].
+oldSel := oldSel reject:[:e|e isNil].
-		oldSel := oldSel collect:[:e|e change].
+oldSel := oldSel collect:[:e|e change].
-		newList do:[:e|(oldSel includes:e change) ifTrue:[newSel add:e]].
+newList do:[:e|(oldSel includes:e change) ifTrue:[newSel add:e]].
-		self selection: newSel.
+self selection: newSel.
-	    ].
+].
-	    (listView notNil and:[firstLineShown notNil]) ifTrue:[
+(listView notNil and:[firstLineShown notNil]) ifTrue:[
-		listView scrollToLine: (newList size min: firstLineShown).
+listView scrollToLine: (newList size min: firstLineShown).
-	    ].
+].
-	].
+].
-	scrollToBottom := false.
+scrollToBottom := false.
+]
 ]
 "Modified: / 28-12-2011 / 15:46:15 / cg"
 "Modified: / 01-08-2012 / 18:10:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 ^self selectionHolder value size = 1
 !
 hasSingleChangeSelectedAndCanBrowse
+self selectionHolder value ? #() do: [:each |
+|chg|
-self selectionHolder value ? #() do:
-	[:each|
+chg := each change.
-	(each change isClassChange and:
+chg isClassChange ifTrue:[
-	    [each change isMethodChange not
+(chg isMethodChange not or:[chg isMethodCodeChange]) ifFalse:[^ false]
-		or:[each change isMethodCodeChange]]) ifFalse:[^false]].
+].
-^true
+].
+^ true
 !
 showColumn: columnSymbol
 ^self showColumnSpecHolder value includes: columnSymbol.
 !
 children
 children isNil ifTrue:[
-	change isCompositeChange ifTrue:[
+change isCompositeChange ifTrue:[
-	    children := OrderedCollection new: change changes size.
+children := OrderedCollection new: change changes size.
-	    change changes do:[:chg|
+self application showConflictsOnlyHolder value ifTrue:[
-		((self application showRemovedHolder value or:[ chg removed not ])
+change changes do:[:chg|
-		    and:[self application showSameHolder value or:[chg delta ~~ #=]])
+(chg isConflict) ifTrue:[
-			ifTrue:[
+children add: ((self application listEntryFor: chg) parent: self)
-			    children add: ((self application listEntryFor: chg) parent: self)
+]
-			]
+].
-	    ].
+] ifFalse:[
-	] ifFalse:[
+|showRemoved showSame|
-	    children :=  #()
-	]
+showRemoved := self application showRemovedHolder value.
+showSame := self application showSameHolder value.
+change changes do:[:chg|
+((showRemoved or:[ chg removed not ])
+and:[showSame or:[chg delta ~~ #=]])
+ifTrue:[
+children add: ((self application listEntryFor: chg) parent: self)
+]
+].
+]
+] ifFalse:[
+children :=  #()
+]
 ].
 ^children
 "Created: / 25-07-2009 / 23:32:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified (format): / 18-11-2011 / 14:56:25 / cg"
 "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|
-^self removed
-	ifTrue: [self application class uncheckedIcon ]
+appClass := self application class.
-	ifFalse:[self application class checkedIcon ]
+^self removed
+ifTrue: [appClass uncheckedIcon ]
+ifFalse:[appClass checkedIcon ]
 "Created: / 05-12-2009 / 14:11:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 imageSource
 !ChangeList::ListEntry methodsFor:'private'!
 iconSelector
-| delta |
+^ application iconSelectorForChange:change
-delta := change deltaDetail.
-delta shortDeltaSymbol = #+ ifTrue:[^#iconPlus].
-delta shortDeltaSymbol = #- ifTrue:[^#iconMinus].
-delta shortDeltaSymbol = #= ifTrue:[^#iconEqual].
-^ nil.
-"Modified: / 31-08-2011 / 10:39:32 / cg"
 ! !
 !ChangeList::ListEntry methodsFor:'protocol-queries'!
 !ChangeList class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.21 2013-03-30 01:59:17 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.24 2013-04-14 19:55:58 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.21 2013-03-30 01:59:17 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.24 2013-04-14 19:55:58 cg Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'

branch	jv
changeset 12680	4e2f5b0d4cb2
parent 12650	e0f607754b9a
parent 12666	c90e266fc135
child 13530	2269bce1636d