[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic Or.java,1.2,1.3 And.java,1.2,1.3

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

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

Modified Files:
	Or.java And.java 
Log Message:
Removed unnecessary if/else statements.
Unlike C and C++, Java preserves ordering in 
conditional and/or expressions.


Index: Or.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Or.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Or.java	22 Oct 2002 13:00:58 -0000	1.2
+++ Or.java	10 Nov 2002 11:28:46 -0000	1.3
@@ -19,11 +19,7 @@
     }
     
     public boolean eval( Object o ) {
-        if( _p1.eval(o) ) {
-            return true;
-        } else {
-            return _p2.eval(o);
-        }
+        return _p1.eval(o) || _p2.eval(o);
     }
     
     public String toString() {

Index: And.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/And.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- And.java	22 Oct 2002 13:00:58 -0000	1.2
+++ And.java	10 Nov 2002 11:28:46 -0000	1.3
@@ -19,11 +19,7 @@
     }
     
     public boolean eval( Object o ) {
-        if( !_p1.eval(o) ) {
-            return false;
-        } else {
-            return _p2.eval(o);
-        }
+        return _p1.eval(o) && _p2.eval(o);
     }
     
     public String toString() {