[jboss-svn-commits] JBL Code SVN: r14160 - 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-11 14:37:17 -0400 (Sat, 11 Aug 2007)
New Revision: 14160

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/golf.drl
Log:
JBRULES-1073: fixing NPE

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java	2007-08-11 17:33:08 UTC (rev 14159)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java	2007-08-11 18:37:17 UTC (rev 14160)
@@ -85,7 +85,7 @@
         private ContextEntry  entry;
 
         public CompositeContextEntry(final Restriction[] restrictions) {
-            final ContextEntry[] contextEntries = new ContextEntry[restrictions.length];
+            contextEntries = new ContextEntry[restrictions.length];
             for ( int i = 0; i < restrictions.length; i++ ) {
                 contextEntries[i] = restrictions[i].getContextEntry();
             }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java	2007-08-11 17:33:08 UTC (rev 14159)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AndCompositeRestriction.java	2007-08-11 18:37:17 UTC (rev 14160)
@@ -48,7 +48,4 @@
         return true;
     }
 
-    public ContextEntry getContextEntry() {
-        return this.contextEntry;
-    }
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java	2007-08-11 17:33:08 UTC (rev 14159)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/OrCompositeRestriction.java	2007-08-11 18:37:17 UTC (rev 14160)
@@ -48,7 +48,4 @@
         return false;
     }
 
-    public ContextEntry getContextEntry() {
-        return this.contextEntry;
-    }
 }

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/golf.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/golf.drl	2007-08-11 17:33:08 UTC (rev 14159)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/golf.drl	2007-08-11 18:37:17 UTC (rev 14160)
@@ -6,37 +6,27 @@
     when
         // There is a golfer named Fred, 
         // Whose positions is $p1
-        Golfer( $fredsName : name == "Fred", 
+        $fred : Golfer( $fredsName : name == "Fred", 
                 $fredsPosition : position, 
                 $fredsColor : color  )
 
-  		// The golfer to Fred's immediate right
-  		// is wearing blue pants
-        Golfer( $unknownsName : name != "Fred", 
-                $unknownsPosition :  position == ( $fredsPosition + 1 ),
-                $unknownsColor : color == "blue",
-                color != $fredsColor )
-
         // Joe is in position 2  		          
-        Golfer( $joesName : name == "Joe", 
+        $joe : Golfer( $joesName : name == "Joe", 
                 $joesPosition  : position == 2, 
                 position != $fredsPosition,
                 $joesColor : color != $fredsColor )
 
  		// Bob is wearing plaid pants        
-        Golfer( $bobsName : name == "Bob", 
-                name != $unknownsName,
+        $bob : Golfer( $bobsName : name == "Bob", 
                 $bobsPosition : position != $fredsPosition,
-                position != $unknownsPosition,              
                 position != $joesPosition,                                                  
                 $bobsColor : color == "plaid",
                 color != $fredsColor,
-                color != $joesColor,
-                color != $unknownsColor )
+                color != $joesColor )
  		  		
         // Tom isn't in position 1 or 4
         // and isn't wearing orange	
-        Golfer( $tomsName : name == "Tom", 
+        $tom : Golfer( $tomsName : name == "Tom", 
                 $tomsPosition : position != 1,
                 position != 4,
                 position != $fredsPosition,
@@ -46,7 +36,14 @@
                 color != "blue",
                 color != $fredsColor,
                 color != $joesColor,
-                color != $bobsColor )                
+                color != $bobsColor )           
+                
+  		// The golfer to Fred's immediate right
+  		// is wearing blue pants
+        $fn : Golfer( position == ( $fredsPosition + 1 ),
+                      color == "blue",
+                      this in ( $joe, $bob, $tom ) )
+
 	then
         System.out.println( "Fred " + $fredsPosition + " " + $fredsColor );
         System.out.println( "Joe " + $joesPosition + " " + $joesColor );