class: HierarchicalItem
authorClaus Gittinger <cg@exept.de>
Tue, 03 Feb 2015 15:17:29 +0100
changeset 4704 a9cbcda2e6b3
parent 4703 7fadc047104c
child 4705 63975d17295d
class: HierarchicalItem changed:8 methods all do-like enumerators should be consistent in their return value (returning the receiver), so they can be used consistently.
HierarchicalItem.st
--- a/HierarchicalItem.st	Sun Feb 01 14:15:13 2015 +0100
+++ b/HierarchicalItem.st	Tue Feb 03 15:17:29 2015 +0100
@@ -899,20 +899,20 @@
 do:aOneArgBlock
     "evaluate a block for each child"
 
-    ^ self from:1 to:nil do:aOneArgBlock
+    self from:1 to:nil do:aOneArgBlock
 !
 
 from:startIndex do:aOneArgBlock
     "evaluate a block on each child starting with the
      child at startIndex to the end.
     "
-    ^ self from:startIndex to:nil do:aOneArgBlock
+    self from:startIndex to:nil do:aOneArgBlock
 !
 
 from:startIndex reverseDo:aOneArgBlock
     "evaluate a block on each child starting at end to the startIndex
     "
-    ^ self from:startIndex to:nil reverseDo:aOneArgBlock
+    self from:startIndex to:nil reverseDo:aOneArgBlock
 !
 
 from:startIndex to:endIndex do:aOneArgBlock
@@ -921,13 +921,13 @@
     "
     |res|
 
-    self size < startIndex ifTrue:[^ nil].
+    self size < startIndex ifTrue:[^ self "nil"].
     res := nil.
 
     self criticalDo:[
         res := self nonCriticalFrom:startIndex to:endIndex do:aOneArgBlock
     ].
-    ^ res
+    "/ ^ res - return the receiver, as all other collections do
 !
 
 from:startIndex to:endIndex reverseDo:aOneArgBlock
@@ -936,13 +936,13 @@
 
     |res|
 
-    self size < startIndex ifTrue:[^ nil].
+    self size < startIndex ifTrue:[^ self "nil"].
     res := nil.
 
     self criticalDo:[
         res := self nonCriticalFrom:startIndex to:endIndex reverseDo:aOneArgBlock
     ].
-    ^ res
+    "/ ^ res - return the receiver, as all other collections do
 !
 
 keysAndValuesDo:aTwoArgBlock
@@ -958,7 +958,7 @@
         res := el value:key value:el.
         key := key + 1.
     ].
-    ^ res
+    "/ ^ res - no: return the receiver, as all other collections do
 !
 
 keysAndValuesReverseDo:aTwoArgBlock
@@ -967,13 +967,13 @@
 
     |res|
 
-    self size == 0 ifTrue:[^ nil].
+    self size == 0 ifTrue:[^ self "nil"].
     res := nil.
 
     self criticalDo:[
         res := self nonCriticalKeysAndValuesReverseDo:aTwoArgBlock
     ].
-    ^ res
+    "/ ^ res - no: return the receiver, as all other collections do
 !
 
 recursiveCollect:aBlock
@@ -1020,7 +1020,7 @@
 reverseDo:aOneArgBlock
     "evaluate a block on each child in reverse direction"
 
-    ^ self from:1 reverseDo:aOneArgBlock
+    self from:1 reverseDo:aOneArgBlock
 !
 
 select:aBlock
@@ -2011,10 +2011,10 @@
 !HierarchicalItem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.108 2015-02-01 13:14:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.109 2015-02-03 14:17:29 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.108 2015-02-01 13:14:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.109 2015-02-03 14:17:29 cg Exp $'
 ! !