Tools::MethodList manually merged with CVS HEAD.
--- a/Tools__MethodList.st Wed Jun 12 16:47:06 2013 +0100
+++ b/Tools__MethodList.st Thu Jun 13 11:42:57 2013 +0100
@@ -765,15 +765,16 @@
methods := ((self selectedMethodNameIndices value) ? #()) collect:[:idx | methodList at:idx].
methods notEmpty ifTrue:[
- lastSelectedMethods := methods asOrderedCollection.
+ lastSelectedMethods := methods asOrderedCollection.
].
"/ to allow reselect, change my valueHolder, even if the same collection
"/ self selectedMethods value ~= methods ifTrue:[
- self selectedMethods value:methods
+ self selectedMethods value:methods isSequenceable
"/ ]
- "Created: / 5.2.2000 / 13:42:14 / cg"
- "Modified: / 5.2.2000 / 23:32:20 / cg"
+ "Created: / 05-02-2000 / 13:42:14 / cg"
+ "Modified: / 05-02-2000 / 23:32:20 / cg"
+ "Modified: / 13-06-2013 / 11:41:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selectionChangedByClick
@@ -841,10 +842,12 @@
cls := aParameter at:1.
sel := aParameter at:2.
mthd := cls compiledMethodAt:sel.
- (mthd isWrapped or:[mthd isMethodWithBreakpoints]) ifTrue:[
+ (mthd notNil and:[mthd isWrapped or:[mthd isMethodWithBreakpoints]]) ifTrue:[
(methodList includes:mthd originalMethod) ifTrue:[
methodList replaceAll:mthd originalMethod with:mthd.
- lastSelectedMethods replaceAll:mthd originalMethod with:mthd.
+ lastSelectedMethods notNil ifTrue:[
+ lastSelectedMethods replaceAll:mthd originalMethod with:mthd.
+ ].
]
].
mustFlushInheritanceInfo := false.
@@ -1026,7 +1029,7 @@
enforceClassAndProtocolInList := false.
anyMethodToWatch := false.
"/ no longer filter those
- packageFilterValue := packageFilter value.
+"/ packageFilterValue := packageFilter value.
"/ generator generates nil-selector entries
"/ to pass multiple-class and multiple-protocol info
@@ -1049,7 +1052,7 @@
"/ JV: Filter method through package filter
"/ but not, if it is an extension method and we are showing extensions
(mthd notNil
- and:[ (mthd isSynthetic not or:[ self showSyntheticMethods value ])
+ and:[ mthd isSynthetic not
and:[ sel notNil ]]
) ifTrue:[
(packageFilterValue isNil
@@ -1261,9 +1264,9 @@
^ newNameList.
"Created: / 05-02-2000 / 22:43:40 / cg"
+ "Modified: / 20-07-2010 / 11:21:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 24-08-2010 / 20:34:09 / Jan Vrany <enter your email here>"
"Modified: / 20-07-2012 / 20:00:58 / cg"
- "Modified: / 23-04-2013 / 00:41:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
makeDependent
@@ -1605,7 +1608,7 @@
"/
(aMethod notNil and:[aMethod isWrapped]) ifTrue:[
(s endsWith:' !!') ifTrue:[
- s := s copyWithoutLast:2
+ s := s copyButLast:2
].
aMethod isBreakpointed ifTrue:[
icn := self stopIcon
@@ -1623,7 +1626,7 @@
"/
icn isNil ifTrue:[
(aMethod notNil and:[aMethod isMethodWithBreakpoints]) ifTrue:[
- icn := self stopIcon
+ icn := self breakPointedIcon
].
].
@@ -1671,14 +1674,15 @@
state := lastResultOrNil result.
(state == TestResult statePass) ifTrue:[
- icn := SystemBrowser testCasePassedIcon
+ icn := ToolbarIconLibrary testCasePassedIcon
] ifFalse:[
- ((state == TestResult stateError)
- or:[ (state == TestResult stateFail) ]) ifTrue:[
- icn := SystemBrowser testCaseFailedIcon
+ (state == TestResult stateError) ifTrue:[
+ icn := ToolbarIconLibrary testCaseErrorIcon
] ifFalse:[
- (state == TestResult stateSkip) ifTrue:[
- icn := SystemBrowser testCaseSkippedIcon
+ (state == TestResult stateFail) ifTrue:[
+ icn := ToolbarIconLibrary testCaseFailedIcon
+ ] ifFalse:[
+ icn := ToolbarIconLibrary testCaseSkippedIcon
]
]
]
@@ -1786,8 +1790,8 @@
"Created: / 22-10-1996 / 19:51:00 / cg"
"Modified: / 15-08-2009 / 13:13:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 17-11-2011 / 20:51:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-03-2012 / 19:06:09 / cg"
- "Modified: / 10-04-2013 / 11:45:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MethodList methodsFor:'private-watching'!