--- a/Tools__ChangeList.st Wed Feb 12 16:42:54 2014 +0100
+++ b/Tools__ChangeList.st Wed Feb 12 18:26:19 2014 +0100
@@ -816,35 +816,6 @@
!ChangeList methodsFor:'event processing'!
-buttonPress:button x:x y:y view:aView
-
- | itemIndex item |
-
- button ~= 1 ifTrue:[^aView buttonPress:button x:x y:y].
-
- itemIndex := aView yVisibleToLineNr:y.
- itemIndex isNil ifTrue:[^self].
- itemIndex == 0 ifTrue:[^self].
- itemIndex > aView list size ifTrue:[^self].
- item := aView list at: itemIndex.
-
- ((aView left + x) between: (item x) and: (item x + 16))
- ifFalse:[^aView buttonPress:button x:x y:y].
-
- item removed: item removed not.
- aView invalidate
-
- "Created: / 08-12-2009 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-11-2011 / 14:55:41 / cg"
-!
-
-handlesButtonPress:button inView:aView
-
- ^listView scrolledView == aView
-
- "Created: / 08-12-2009 / 14:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
handlesKeyPress:key inView:aView
<resource: #keyboard (#Accept #Ctrls)>
@@ -1207,12 +1178,26 @@
oldSel := self selection.
changeset := inGenerator isNil ifTrue:[ #() ] ifFalse:[ inGenerator ].
- newList := changeset
- select:
- [:chg |
- (self showRemovedHolder value or:[ chg removed not ])
- and:[self showSameHolder value or:[chg delta ~~ #=]]
- ].
+ self showConflictsOnlyHolder value ifTrue:[
+ 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:[
@@ -1235,8 +1220,9 @@
]
]
+
"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'!
@@ -1557,14 +1543,14 @@
!ChangeList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.27 2014-02-05 18:58:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.28 2014-02-12 17:26:19 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.27 2014-02-05 18:58:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.28 2014-02-12 17:26:19 vrany Exp $'
!
version_SVN
- ^ '$Id: Tools__ChangeList.st,v 1.27 2014-02-05 18:58:09 cg Exp $'
+ ^ '$Id: Tools__ChangeList.st,v 1.28 2014-02-12 17:26:19 vrany Exp $'
! !