--- a/Tools__SmalltalkDiffTool.st	Thu Aug 04 21:31:06 2011 +0200
+++ b/Tools__SmalltalkDiffTool.st	Thu Aug 04 21:31:35 2011 +0200
@@ -394,28 +394,31 @@
 
 selectionIsNonEmpty
 
-    ^[self selection isNilOrEmptyCollection not]
+    ^[self selection notEmptyOrNil ]
 
     "Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 22-10-2008 / 13:14:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 04-08-2011 / 21:31:28 / cg"
 !
 
 selectionIsNonEmptyAndAllHasVersionA
 
-    ^[self selection isNilOrEmptyCollection not
+    ^[self selection notEmptyOrNil 
         and:[self selection allSatisfy:[:mergeItem|mergeItem hasVersionA]]]
 
     "Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 22-10-2008 / 13:14:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 04-08-2011 / 21:31:24 / cg"
 !
 
 selectionIsNonEmptyAndAllHasVersionB
 
-    ^[self selection isNilOrEmptyCollection not
+    ^[self selection notEmptyOrNil 
         and:[self selection allSatisfy:[:mergeItem|mergeItem hasVersionB]]]
 
     "Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 22-10-2008 / 13:14:42 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 04-08-2011 / 21:31:19 / cg"
 !
 
 title
@@ -798,7 +801,7 @@
 !SmalltalkDiffTool::DiffItem class methodsFor:'documentation'!
 
 version
-    ^'$Id: Tools__SmalltalkDiffTool.st,v 1.6 2011-07-01 14:17:09 cg Exp $'
+    ^'$Id: Tools__SmalltalkDiffTool.st,v 1.7 2011-08-04 19:31:35 cg Exp $'
 ! !
 
 !SmalltalkDiffTool::DiffItem class methodsFor:'instance creation'!
@@ -979,7 +982,7 @@
 !SmalltalkDiffTool class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.6 2011-07-01 14:17:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.7 2011-08-04 19:31:35 cg Exp $'
 !
 
 version_SVN