[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects ReturnObjectBag.java,1.1,1.2

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects
In directory sc8-pr-cvs1:/tmp/cvs-serv24006/src/core/com/mockobjects

Modified Files:
	ReturnObjectBag.java 
Log Message:
Allow the use of null as a key


Index: ReturnObjectBag.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/ReturnObjectBag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReturnObjectBag.java	4 Dec 2002 12:36:37 -0000	1.1
+++ ReturnObjectBag.java	23 Jan 2003 13:09:13 -0000	1.2
@@ -3,6 +3,7 @@
 import com.mockobjects.ReturnObjectList;
 import com.mockobjects.Verifiable;
 import com.mockobjects.util.AssertMo;
+import com.mockobjects.util.Null;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -36,9 +37,12 @@
      * @see ReturnObjectList#addObjectToReturn
      */
     public void putObjectToReturn(Object key, Object value) {
-        ReturnObjectList returnObjectList = (ReturnObjectList)returnObjectLists.get(key);
-        if(returnObjectList==null){
-            returnObjectList = new ReturnObjectList(name+"."+key.toString());
+        ReturnObjectList returnObjectList = (ReturnObjectList) returnObjectLists.get(key);
+        if (key == null) {
+            key = Null.NULL;
+        }
+        if (returnObjectList == null) {
+            returnObjectList = new ReturnObjectList(name + "." + key.toString());
             returnObjectLists.put(key, returnObjectList);
         }
 
@@ -51,8 +55,8 @@
      * @see ReturnObjectList#verify
      */
     public void verify() {
-        for(Iterator it = returnObjectLists.values().iterator();it.hasNext();){
-            ((ReturnObjectList)it.next()).verify();
+        for (Iterator it = returnObjectLists.values().iterator(); it.hasNext();) {
+            ((ReturnObjectList) it.next()).verify();
         }
     }
 
@@ -65,7 +69,10 @@
      * @see ReturnObjectList#nextReturnObject
      */
     public Object getNextReturnObject(Object key) {
-        ReturnObjectList returnObjectList = (ReturnObjectList)returnObjectLists.get(key);
+        if (key == null) {
+            key = Null.NULL;
+        }
+        ReturnObjectList returnObjectList = (ReturnObjectList) returnObjectLists.get(key);
         AssertMo.assertNotNull(name + " does not contain " + key.toString(), returnObjectList);
         return returnObjectList.nextReturnObject();
     }