--- a/Tools__VisualProfilerCanvas.st	Fri Jan 27 22:18:53 2012 +0100
+++ b/Tools__VisualProfilerCanvas.st	Sun Jan 29 12:53:39 2012 +0000
@@ -501,7 +501,7 @@
             label: 'Save'
             itemValue: saveProfilerAction
             translateLabel: true
-            labelImage: (ResourceRetriever ToolbarIconLibrary saveToFileIcon)
+            labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon)
           )
          )
         nil
@@ -509,7 +509,6 @@
       )
 
     "Modified: / 24-11-2007 / 09:10:50 / janfrog"
-    "Modified: / 08-11-2011 / 16:42:53 / cg"
 ! !
 
 !VisualProfilerCanvas class methodsFor:'plugIn spec'!
@@ -630,11 +629,10 @@
 
 methodListAspect
 
-    methodList isNil ifTrue:[methodList := List new].
+    methodList ifNil:[methodList := List new].
     ^methodList
 
     "Created: / 01-12-2007 / 23:38:16 / janfrog"
-    "Modified: / 18-11-2011 / 15:01:52 / cg"
 !
 
 notesAspect
@@ -794,13 +792,11 @@
 !
 
 selectedCallTreeItemChanged
-    |selectedCallTreeItem|
 
-    (selectedCallTreeItem := self selectedCallTreeItemHolder value) isNil ifTrue:[^self].
-    self switchToMethod: selectedCallTreeItem method
+    self selectedCallTreeItemHolder value ifNil:[^self].
+    self switchToMethod: self selectedCallTreeItemHolder value method
 
     "Created: / 10-10-2007 / 08:52:33 / janfrog"
-    "Modified: / 18-11-2011 / 15:02:20 / cg"
 !
 
 update: aspect with: value from: sender
@@ -825,9 +821,8 @@
 updateCallTreeRoot
 
     |  callTree callTreeRootItem |
-
     callTree := self callTreeHolder.
-    profilerStatistics value isNil ifTrue:[^callTree root: nil].
+    profilerStatistics value ifNil:[^callTree root: nil].
     callTreeRootItem := CallTreeItem 
                             subject: profilerStatistics value tree
                             parent: callTree.
@@ -835,14 +830,13 @@
     callTree showRoot: true.
 
     "Created: / 10-10-2007 / 12:59:07 / janfrog"
-    "Modified (format): / 18-11-2011 / 15:02:32 / cg"
 !
 
 updateMethodList
+
     | items |
-
     self methodListAspect removeAll.
-    self profilerStatistics value isNil ifTrue:[^self].
+    self profilerStatistics value ifNil:[^self].
     items := ProfilerInfoBuilder::MethodList new 
                 packages: self packageFilter value;
                 build: self profilerStatistics value tree;
@@ -851,7 +845,6 @@
     self methodListAspect addAll: items
 
     "Created: / 01-12-2007 / 23:39:15 / janfrog"
-    "Modified: / 18-11-2011 / 15:02:49 / cg"
 ! !
 
 !VisualProfilerCanvas methodsFor:'hooks'!
@@ -910,7 +903,7 @@
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.6 2011-11-18 14:05:52 cg Exp $'
+    ^'$Id: Tools__VisualProfilerCanvas.st,v 1.3 2011/08/04 19:31:06 cg Exp $'
 ! !
 
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'instance creation'!
@@ -929,18 +922,17 @@
 
 children
 
-    children isNil ifTrue:[children := self createChildren].
+    children ifNil:[children := self createChildren].
     ^children
 
     "Created: / 10-10-2007 / 08:38:28 / janfrog"
     "Modified: / 10-10-2007 / 13:24:06 / janfrog"
-    "Modified: / 18-11-2011 / 15:03:00 / cg"
 !
 
 createChildren
     |childrenTmp childrenStream|
 
-    self subject isNil ifTrue:[ ^ children := #() ].
+    self subject ifNil:[ ^ children := #() ].
     childrenStream := (OrderedCollection new:self subject called size) 
                 writeStream.
     self createChildrenOn:childrenStream.
@@ -951,7 +943,6 @@
 
     "Created: / 10-10-2007 / 13:17:04 / janfrog"
     "Modified: / 24-11-2007 / 09:43:30 / janfrog"
-    "Modified: / 18-11-2011 / 15:03:03 / cg"
 !
 
 createChildrenOn:aStream 
@@ -967,15 +958,12 @@
 !
 
 directChildren
-    |called|
-
-    (called := self subject called) isNil ifTrue:[ ^ #() ].
-    ^ called 
+    self subject called ifNil:[ ^ #() ].
+    ^ self subject called 
         collect:[:childSubject | self class subject:childSubject parent:self ]
 
     "Created: / 10-10-2007 / 13:07:24 / janfrog"
     "Modified: / 24-11-2007 / 09:18:56 / janfrog"
-    "Modified: / 18-11-2011 / 15:03:31 / cg"
 !
 
 label
@@ -995,25 +983,21 @@
 !
 
 method
-    |methodClass|
-
-    (methodClass := self subject methodClass) isNil ifTrue:[ ^ nil ].
-    ^ methodClass >> self subject selector asSymbol
+    self subject methodClass ifNil:[ ^ nil ].
+    ^ self subject methodClass >> self subject selector asSymbol
 
     "Created: / 10-10-2007 / 08:49:58 / janfrog"
     "Modified: / 24-11-2007 / 09:18:56 / janfrog"
-    "Modified: / 18-11-2011 / 15:03:56 / cg"
 !
 
 methodPackage
+
     | mth |
-
     mth := self method.
-    mth isNil ifTrue:[^#__NoProject__].
-    ^ mth package
+    mth ifNil:[^#__NoProject__].
+    ^self method package
 
     "Created: / 10-10-2007 / 13:03:21 / janfrog"
-    "Modified (format): / 18-11-2011 / 15:04:15 / cg"
 !
 
 subject
@@ -1105,14 +1089,10 @@
 
 !VisualProfilerCanvas class methodsFor:'documentation'!
 
-version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.6 2011-11-18 14:05:52 cg Exp $'
-!
-
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.6 2011-11-18 14:05:52 cg Exp $'
+    ^ '§Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.3 2011/08/04 19:31:06 cg Exp §'
 !
 
 version_SVN
-    ^ '§Id: Tools__VisualProfilerCanvas.st 7486 2009-10-26 22:06:24Z vranyj1 §'
-! !
+    ^ '$Id: Tools__VisualProfilerCanvas.st 7486 2009-10-26 22:06:24Z vranyj1 $'
+! !
\ No newline at end of file