[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic CoreMock.java,1.10,1.11 Mock.java,1.35,1.36 DynamicMock.java,1.3,1.4

[Steve F. <sm...@us...>]

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

Modified Files:
	CoreMock.java Mock.java DynamicMock.java 
Log Message:
removed stub() from DynamicMock

Index: CoreMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CoreMock.java	11 Sep 2003 21:39:01 -0000	1.10
+++ CoreMock.java	1 Oct 2003 20:21:59 -0000	1.11
@@ -60,10 +60,6 @@
 		invocationDispatcher.add(invocationMatcher);
 	}
 	
-	public void stub(Invokable invocationMatcher) {
-		invocationDispatcher.add(invocationMatcher);
-	}
-	
 	public void reset() {
 	    invocationDispatcher.clear();
 	}

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Mock.java	1 Oct 2003 19:02:54 -0000	1.35
+++ Mock.java	1 Oct 2003 20:21:59 -0000	1.36
@@ -50,15 +50,15 @@
     }
 
     public void match(String methodName, ConstraintMatcher args) {
-        coreMock.stub(callableFactory.createVoidCallable(methodName, args));
+        coreMock.expect(callableFactory.createVoidCallable(methodName, args));
     }
 
     public void matchAndReturn(String methodName, ConstraintMatcher args, Object result) {
-        coreMock.stub(callableFactory.createReturnCallable(methodName, args, result));
+        coreMock.expect(callableFactory.createReturnCallable(methodName, args, result));
     }
 
     public void matchAndThrow(String methodName, ConstraintMatcher args, Throwable throwable) {
-        coreMock.stub(callableFactory.createThrowableCallable(methodName, args, throwable));
+        coreMock.expect(callableFactory.createThrowableCallable(methodName, args, throwable));
     }
 
     /*

Index: DynamicMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DynamicMock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicMock.java	20 Aug 2003 21:51:27 -0000	1.3
+++ DynamicMock.java	1 Oct 2003 20:21:59 -0000	1.4
@@ -8,7 +8,6 @@
     extends Verifiable, InvocationHandler 
 {
 	void expect(Invokable invokable);
-	void stub(Invokable invokable);
 	
     Object proxy();