[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic DefaultCallFactory.java,1.6,1.7

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

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

Modified Files:
	DefaultCallFactory.java 
Log Message:
Simplified

Index: DefaultCallFactory.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/DefaultCallFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultCallFactory.java	6 Jul 2003 02:31:37 -0000	1.6
+++ DefaultCallFactory.java	9 Aug 2003 13:18:15 -0000	1.7
@@ -2,26 +2,10 @@
 
 public class DefaultCallFactory implements CallableFactory {
 
-	private Callable createReturnStub(Object result) {
-		return new ReturnStub(result);
-	}
-
-	private Callable createThrowStub( Throwable exception ) {
-		return new ThrowStub(exception);
-	}
-
-	private Callable createVoidStub() {
-		return new VoidStub();
-	}
-
 	public Callable createCallExpectation(Callable callable) {
 		return new CallOnceExpectation(callable);
 	}
 
-	private Callable createCallSignature(String methodName, ConstraintMatcher constraints, Callable callable) {
-		return new CallSignature( methodName, constraints, callable );
-	}
-
 	public Callable createReturnCallable(String methodName, ConstraintMatcher constraints, Object result) {
 		return createCallSignature(methodName, constraints, createReturnStub(result));
 	}
@@ -33,5 +17,21 @@
 	public Callable createVoidCallable(String methodName, ConstraintMatcher constraints) {
 		return createCallSignature(methodName, constraints, createVoidStub());
 	}
+
+    private Callable createCallSignature(String methodName, ConstraintMatcher constraints, Callable callable) {
+        return new CallSignature( methodName, constraints, callable );
+    }
+
+    private Callable createReturnStub(Object result) {
+        return new ReturnStub(result);
+    }
+
+    private Callable createThrowStub( Throwable exception ) {
+        return new ThrowStub(exception);
+    }
+
+    private Callable createVoidStub() {
+        return new VoidStub();
+    }
 
 }