Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tools__VisualProfilerCanvas.st
changeset 14383 4f852986915b
parent 14027 92b437417e1c
child 14820 e4a7f24d860b 
--- a/Tools__VisualProfilerCanvas.st	Wed May 21 11:03:22 2014 +0200
+++ b/Tools__VisualProfilerCanvas.st	Wed May 21 21:56:43 2014 +0200
@@ -910,7 +910,7 @@
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.8 2014-02-25 10:41:40 vrany Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.9 2014-05-21 19:56:43 vrany Exp $'
 ! !
 
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'instance creation'!
@@ -1078,16 +1078,18 @@
     |mergedChildren|
 
     mergedChildren := OrderedCollection new.
-    [rawChildren isEmpty] whileFalse:
-        [|childToMerge childrenToMerge|
+    [rawChildren isEmpty] whileFalse:[
+        | childToMerge childrenToMerge |
+
         childToMerge := mergedChildren add:(rawChildren removeFirst).
-        childrenToMerge := rawChildren select:[:e|e shouldBeMergedWith:childToMerge].
+        childrenToMerge := rawChildren select:[:e|e shouldBeMergedWith:childToMerge] as: OrderedCollection.
         rawChildren removeAll: childrenToMerge.
         childrenToMerge do:[:e|childToMerge subjects addAll:e subjects].
-        ].
+    ].
     ^mergedChildren
 
     "Created: / 24-11-2007 / 09:20:07 / janfrog"
+    "Modified: / 21-05-2014 / 15:49:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !VisualProfilerCanvas::CallTreeItem methodsFor:'testing'!
@@ -1106,14 +1108,14 @@
 !VisualProfilerCanvas class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.8 2014-02-25 10:41:40 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.9 2014-05-21 19:56:43 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.8 2014-02-25 10:41:40 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.9 2014-05-21 19:56:43 vrany Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__VisualProfilerCanvas.st,v 1.8 2014-02-25 10:41:40 vrany Exp $'
+    ^ '$Id: Tools__VisualProfilerCanvas.st,v 1.9 2014-05-21 19:56:43 vrany Exp $'
 ! !
hg/stx-libtool