[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock2/impl MockObjectImpl.java,1.1.2.2,1.1.2.3 MockObjectSuperImpl.java,1.3.2.2,1.3.2.3

[Nobody <fas...@us...>]

Update of /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4274/xsoftware/mock2/impl

Modified Files:
      Tag: branchForOffice
	MockObjectImpl.java MockObjectSuperImpl.java 
Log Message:
change back api to original api.  api is agreed upon by C# and Java impl, and we should discuss if changes are needed.  We are 90% sure no changes to the api are needed.

Index: MockObjectImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl/MockObjectImpl.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** MockObjectImpl.java	17 Jan 2006 07:58:27 -0000	1.1.2.2
--- MockObjectImpl.java	18 Jan 2006 01:46:29 -0000	1.1.2.3
***************
*** 7,13 ****
  import java.util.Set;
  
- import biz.xsoftware.mock2.CalledMethod;
  import biz.xsoftware.mock2.MockObject;
- import biz.xsoftware.mock2.impl.MockObjectSuperImpl;
  
  /**
--- 7,11 ----

Index: MockObjectSuperImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl/MockObjectSuperImpl.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** MockObjectSuperImpl.java	17 Jan 2006 07:58:27 -0000	1.3.2.2
--- MockObjectSuperImpl.java	18 Jan 2006 01:46:29 -0000	1.3.2.3
***************
*** 62,73 ****
  		return calledMethod;
  	}
! 
! 	private void waitForCalledMethod(String methodName,long timeout) {
! 		// TODO Auto-generated method stub
! 		
! 		CalledMethod calledMethod=methodsCalled.remove(0);
! 		
! 		
! 	}
  
  	public CalledMethod expect(Object returnValue, String methodName,
--- 62,73 ----
  		return calledMethod;
  	}
! //This class shows eclipse warnings....commented out to keep eclipse warnings at zero
! //	private void waitForCalledMethod(String methodName,long timeout) {
! //		// TODO Auto-generated method stub
! //		
! //		CalledMethod calledMethod=methodsCalled.remove(0);
! //		
! //		
! //	}
  
  	public CalledMethod expect(Object returnValue, String methodName,
***************
*** 89,93 ****
  	}
  
! 	public void verify(String methodName,long timeout) {
  		// TODO Auto-generated method stub
  			
--- 89,97 ----
  	}
  
! 	private void verify(String method, long timeout) {
! 		
! 	}
! 	
! 	public void verify() {
  		// TODO Auto-generated method stub