[jboss-svn-commits] JBL Code SVN: r36457 - labs/jbossrules/branches/5.2.0.36439-M1/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2010-12-17 15:33:58 -0500 (Fri, 17 Dec 2010)
New Revision: 36457

Modified:
   labs/jbossrules/branches/5.2.0.36439-M1/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl
Log:
-&& and || between patterns is now removed.

Modified: labs/jbossrules/branches/5.2.0.36439-M1/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl
===================================================================
--- labs/jbossrules/branches/5.2.0.36439-M1/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl	2010-12-17 20:12:20 UTC (rev 36456)
+++ labs/jbossrules/branches/5.2.0.36439-M1/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl	2010-12-17 20:33:58 UTC (rev 36457)
@@ -53,9 +53,9 @@
 	dialect "mvel"
 	when
 	    $order : Order()
-		not ( $p : Product( name == "Fish Food") && Purchase( product == $p ) )
-		not ( $p : Product( name == "Fish Food Sample") && Purchase( product == $p ) )		
-		exists ( $p : Product( name == "Gold Fish") && Purchase( product == $p ) )	
+		not ( $p : Product( name == "Fish Food") and Purchase( product == $p ) )
+		not ( $p : Product( name == "Fish Food Sample") and Purchase( product == $p ) )		
+		exists ( $p : Product( name == "Gold Fish") and Purchase( product == $p ) )	
 		$fishFoodSample : Product( name == "Fish Food Sample" );
 	then
 		System.out.println( "Adding free Fish Food Sample to cart" );
@@ -71,7 +71,7 @@
        dialect "java"
 	when
 	    $order : Order()
-		not ( $p : Product( name == "Fish Tank") && Purchase( product == $p ) )	
+		not ( $p : Product( name == "Fish Tank") and Purchase( product == $p ) )	
 		ArrayList( $total : size > 5 ) from collect( Purchase( product.name == "Gold Fish" ) )
 		$fishTank : Product( name == "Fish Tank" )		
 	then