[jboss-svn-commits] JBL Code SVN: r14681 - in labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main: rules/org/drools/examples and 1 other directory.

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

Author: tirelli
Date: 2007-08-28 00:21:52 -0400 (Tue, 28 Aug 2007)
New Revision: 14681

Modified:
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl
Log:
Fixing bug when buying suggested fish tank

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java	2007-08-28 03:19:22 UTC (rev 14680)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java	2007-08-28 04:21:52 UTC (rev 14681)
@@ -7,9 +7,8 @@
 import java.awt.event.MouseEvent;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Vector;
 
 import javax.swing.AbstractButton;
@@ -34,8 +33,6 @@
 import org.drools.RuleBaseFactory;
 import org.drools.WorkingMemory;
 import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.RuleBaseLoader;
-import java.util.Iterator;
 
 public class PetStore {
 

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl	2007-08-28 03:19:22 UTC (rev 14680)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/PetStore.drl	2007-08-28 04:21:52 UTC (rev 14681)
@@ -11,7 +11,7 @@
         
 global JFrame frame 
 global javax.swing.JTextArea textArea
-
+ 
 dialect "mvel"
 
 // insert each item in the shopping cart into the Working Memory 
@@ -59,7 +59,7 @@
 		ArrayList( $total : size > 5 ) from collect( Purchase( product.name == "Gold Fish" ) )
 		$fishTank : Product( name == "Fish Tank" )		
 	then
-		requireTank(frame, drools.getWorkingMemory(), $order, $fishTank, $total); 		
+		requireTank(frame, drools.getWorkingMemory(), $order, $fishTank, $total); 	
 end	
 
 rule "Show Items"
@@ -84,7 +84,7 @@
     dialect "mvel"
 	when
 	    $order : Order( grossTotal == -1)
-		Number( total : doubleValue ) from accumulate( Purchase( $price : product.price ) from $order.items,
+		Number( total : doubleValue ) from accumulate( Purchase( $price : product.price ),
    			        			   				 	   sum( $price ) )
 	then	
 	    modify( $order ) { grossTotal = total };