mockobjects-java-dev

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

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

Modified Files:
	Mock.java MethodExpectation.java 
Log Message:
Cosmetic tweaks

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Mock.java	5 Nov 2002 16:27:29 -0000	1.9
+++ Mock.java	5 Nov 2002 16:37:54 -0000	1.10
@@ -271,12 +271,14 @@
      * This version will unpack the inovaction handler if the 
      * other object is a proxy.
      */
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj) 
+    {
         try {
             return equals(Proxy.getInvocationHandler(obj));
-        } catch (IllegalArgumentException ignored) {
+        } 
+        catch (IllegalArgumentException notAProxy) {
+            return super.equals(obj);
         }
-        return super.equals(obj);
     }
 
 

Index: MethodExpectation.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/MethodExpectation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MethodExpectation.java	5 Nov 2002 16:04:33 -0000	1.2
+++ MethodExpectation.java	5 Nov 2002 16:37:54 -0000	1.3
@@ -12,7 +12,7 @@
     final public String name;
 
     private ExpectationValue wasCalled;
-    private MockCall call;
+    private MockCall mockCall;
     private MethodMap prerequisites = new MethodMap();
 
     public MethodExpectation(String aName) {
@@ -21,12 +21,12 @@
     }
 
     public void expectCall(MockCall aCall) {
-        call = aCall;
+        mockCall = aCall;
         wasCalled.setExpected(true);
     }
 
     public void setupCall(MockCall aCall) {
-        call = aCall;
+        mockCall = aCall;
         initializeWasCalled();
     }
 
@@ -39,11 +39,11 @@
     }
 
     public boolean canBeCalled() {
-        return call != null;
+        return mockCall != null;
     }
 
     public Object callAndCheckResult(Method method, Object[] args) throws Throwable {
-        Object result = call.call(args);
+        Object result = mockCall.call(args);
         checkResultType(method, result);
         return result;
     }