[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock Behavior.java, 1.3, 1.4 MockObject.java, 1.7, 1.8 MockSuperclass.java, 1.14, 1.15 MethodBehavior.java, 1.1, NONE

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

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

Modified Files:
	Behavior.java MockObject.java MockSuperclass.java 
Removed Files:
	MethodBehavior.java 
Log Message:
back out changes for new behavior.

Index: Behavior.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/Behavior.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Behavior.java	10 Sep 2006 17:18:39 -0000	1.3
--- Behavior.java	10 Sep 2006 17:41:29 -0000	1.4
***************
*** 6,17 ****
  /**
   * Use MethodBehavior interface instead of Behavior interface
-  * @deprecated
   */
! public interface Behavior extends MethodBehavior
  {
  	/**
! 	 * Use MethodBehavior interface instead of Behavior interface
! 	 * 
! 	 * @deprecated
  	 * @param params
  	 * @return
--- 6,14 ----
  /**
   * Use MethodBehavior interface instead of Behavior interface
   */
! public interface Behavior
  {
  	/**
! 
  	 * @param params
  	 * @return
***************
*** 20,26 ****
      
      /**
-      * Use MethodBehavior interface instead of Behavior interface
-      * 
-      * @deprecated
       * @param params
       */
--- 17,20 ----

Index: MockSuperclass.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/MockSuperclass.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MockSuperclass.java	10 Sep 2006 17:18:39 -0000	1.14
--- MockSuperclass.java	10 Sep 2006 17:41:29 -0000	1.15
***************
*** 244,249 ****
          if(retVal instanceof Behavior) {
              return ((Behavior)retVal).runMethod(params);
-         } else if(retVal instanceof MethodBehavior) {
-         	throw new UnsupportedOperationException("Not supported yet, use Behavior instead of MethodBehavior");
          } else if(retVal instanceof Throwable) {
              Throwable t = (Throwable)retVal;
--- 244,247 ----
***************
*** 677,681 ****
      }
  
!     public void addBehavior(String method, MethodBehavior behavior) {
          if(method == null)
              throw new IllegalArgumentException("method parameter cannot be null");
--- 675,679 ----
      }
  
!     public void addBehavior(String method, Behavior behavior) {
          if(method == null)
              throw new IllegalArgumentException("method parameter cannot be null");

Index: MockObject.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/MockObject.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MockObject.java	10 Sep 2006 17:18:39 -0000	1.7
--- MockObject.java	10 Sep 2006 17:41:29 -0000	1.8
***************
*** 172,176 ****
  	public int getExpectTimeout();
  
!     public void addBehavior(String string, MethodBehavior behavior);
  
  }
--- 172,176 ----
  	public int getExpectTimeout();
  
!     public void addBehavior(String string, Behavior behavior);
  
  }

--- MethodBehavior.java DELETED ---