[Mocklib-checkins] mocklib3/input/javasrc/biz/xsoftware/mock MockObject.java, 1.6, 1.7

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

Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20057/input/javasrc/biz/xsoftware/mock

Modified Files:
	MockObject.java 
Log Message:
refactor mocklib back to original api.

Index: MockObject.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MockObject.java	12 Sep 2006 15:02:11 -0000	1.6
--- MockObject.java	13 Sep 2006 03:09:00 -0000	1.7
***************
*** 48,68 ****
      /**
       * Set the DefaultReturnValue for a 'method'
-      * 
-      * @param returnValue
       * @param method The method name to set the default return value for
       */
!     public void setDefaultReturnValue(Object returnValue, String method);
  
  	/**
  	 * Set the DefaultReturnValue for a 'method'
- 	 * 
-      * @param returnValue
  	 * @param method The method name to set the default return value for
  	 * @param argTypes Optionally specify the type of parameters of the method
  	 */
! 	public void setDefaultReturnValue(Object returnValue, String method, Class... argTypes);
  	
!     public void setDefaultBehavior(Behavior b, String method);
! 	public void setDefaultBehavior(Behavior b, String method, Class ... argTypes);
      
      /**
--- 48,66 ----
      /**
       * Set the DefaultReturnValue for a 'method'
       * @param method The method name to set the default return value for
+      * @param returnValue
       */
!     public void setDefaultReturnValue(String method, Object returnValue);
  
  	/**
  	 * Set the DefaultReturnValue for a 'method'
  	 * @param method The method name to set the default return value for
+ 	 * @param returnValue
  	 * @param argTypes Optionally specify the type of parameters of the method
  	 */
! 	public void setDefaultReturnValue(String method, Object returnValue, Class... argTypes);
  	
!     public void setDefaultBehavior(String method, Behavior b);
! 	public void setDefaultBehavior(String method, Behavior b, Class ... argTypes);
      
      /**
***************
*** 82,89 ****
       * <li> RuntimeException for Subclasses of MockSuperclass</li>
       * </ol>
-      * @param e The exception to throw on method.
       * @param method The method to throw the exception on when it is called.
       */
!     public void addThrowException(Throwable e, String method);
  	
  	/**
--- 80,87 ----
       * <li> RuntimeException for Subclasses of MockSuperclass</li>
       * </ol>
       * @param method The method to throw the exception on when it is called.
+      * @param e The exception to throw on method.
       */
!     public void addThrowException(String method, Throwable e);
  	
  	/**
***************
*** 103,111 ****
  	 * <li> RuntimeException for Subclasses of MockSuperclass</li>
  	 * </ol>
- 	 * @param e The exception to throw on method.
  	 * @param method The method to throw the exception on when it is called.
  	 * @param argTypes Optionally specify the type of parameters of the method
  	 */
! 	public void addThrowException(Throwable e, String method, Class... argTypes);
      
      /**
--- 101,109 ----
  	 * <li> RuntimeException for Subclasses of MockSuperclass</li>
  	 * </ol>
  	 * @param method The method to throw the exception on when it is called.
+ 	 * @param e The exception to throw on method.
  	 * @param argTypes Optionally specify the type of parameters of the method
  	 */
! 	public void addThrowException(String method, Throwable e, Class... argTypes);
      
      /**
***************
*** 119,126 ****
       * <br></br>
       * Use Integer to return int, Long for long, etc.
-      * @param o The object to return that is added to the queue
       * @param method The method that when called returns first value on queue
       */
!     public void addReturnValue(Object o, String method);
      
  	/**
--- 117,124 ----
       * <br></br>
       * Use Integer to return int, Long for long, etc.
       * @param method The method that when called returns first value on queue
+      * @param o The object to return that is added to the queue
       */
!     public void addReturnValue(String method, Object o);
      
  	/**
***************
*** 134,145 ****
  	 * <br></br>
  	 * Use Integer to return int, Long for long, etc.
- 	 * @param o The object to return that is added to the queue
  	 * @param method The method that when called returns first value on queue
  	 * @param argTypes Optionally specify the type of parameters of the method
  	 */
! 	public void addReturnValue(Object o, String method, Class... argTypes);
  
!     public void addBehavior(Behavior behavior, String method);
!     public void addBehavior(Behavior behavior, String method, Class... argTypes);
      
      /**
--- 132,143 ----
  	 * <br></br>
  	 * Use Integer to return int, Long for long, etc.
  	 * @param method The method that when called returns first value on queue
+ 	 * @param o The object to return that is added to the queue
  	 * @param argTypes Optionally specify the type of parameters of the method
  	 */
! 	public void addReturnValue(String method, Object o, Class... argTypes);
  
!     public void addBehavior(String method, Behavior behavior);
!     public void addBehavior(String method, Behavior behavior, Class... argTypes);
      
      /**