--- a/Tools__VisualProfilerCanvas.st	Sun Jan 12 23:30:25 2014 +0000
+++ b/Tools__VisualProfilerCanvas.st	Wed Apr 01 10:38:01 2015 +0100
@@ -524,12 +524,14 @@
      (if this app is embedded in a subCanvas)."
 
     ^ #(
+        environmentHolder
         #packageFilter
         #profilerStatistics
         #selectedMethods
       ).
 
     "Modified: / 01-12-2007 / 23:57:41 / janfrog"
+    "Modified: / 24-02-2014 / 10:37:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !VisualProfilerCanvas class methodsFor:'tableColumns specs'!
@@ -591,19 +593,9 @@
 !VisualProfilerCanvas methodsFor:'aspects'!
 
 callTreeHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     callTreeHolder isNil ifTrue:[
         callTreeHolder := HierarchicalList new.
         callTreeHolder application: self.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       callTreeHolder addDependent:self.
-"/       callTreeHolder onChangeSend:#callTreeHolderChanged to:self.
     ].
     ^ callTreeHolder.
 
@@ -679,18 +671,8 @@
 !
 
 perspectiveSpecHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     perspectiveSpecHolder isNil ifTrue:[
         perspectiveSpecHolder := #callTreeSpec asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       perspectiveSpecHolder addDependent:self.
-"/       perspectiveSpecHolder onChangeSend:#perspectiveSpecHolderChanged to:self.
     ].
     ^ perspectiveSpecHolder.
 
@@ -720,13 +702,6 @@
 !
 
 selectedCallTreeItemHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     selectedCallTreeItemHolder isNil ifTrue:[
         selectedCallTreeItemHolder := ValueHolder new.
         selectedCallTreeItemHolder onChangeSend:#selectedCallTreeItemChanged to:self.
@@ -908,7 +883,7 @@
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.7 2012-11-04 21:42:49 cg Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.10 2014-11-10 22:34:53 cg Exp $'
 ! !
 
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'instance creation'!
@@ -1076,16 +1051,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'!
@@ -1104,19 +1081,14 @@
 !VisualProfilerCanvas class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.7 2012-11-04 21:42:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.10 2014-11-10 22:34:53 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.7 2012-11-04 21:42:49 cg Exp $'
-!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.10 2014-11-10 22:34:53 cg Exp $'
 !
 
 version_SVN
-    ^ '§Id: Tools__VisualProfilerCanvas.st 7486 2009-10-26 22:06:24Z vranyj1 §'
+    ^ '$Id: Tools__VisualProfilerCanvas.st,v 1.10 2014-11-10 22:34:53 cg Exp $'
 ! !