[jboss-svn-commits] JBL Code SVN: r15728 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/rule and 1 other directory.

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

Author: tirelli
Date: 2007-10-10 14:23:42 -0400 (Wed, 10 Oct 2007)
New Revision: 15728

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
Log:
JBRULES-1267: Making predicate a restriction so that it can be used nested inside field constraints

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java	2007-10-10 18:20:41 UTC (rev 15727)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java	2007-10-10 18:23:42 UTC (rev 15728)
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-public class PredicateDescr extends BaseDescr {
+public class PredicateDescr extends RestrictionDescr {
     /**
      * 
      */

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java	2007-10-10 18:20:41 UTC (rev 15727)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java	2007-10-10 18:23:42 UTC (rev 15728)
@@ -24,12 +24,22 @@
 import org.drools.reteoo.ReteTuple;
 import org.drools.spi.AlphaNodeFieldConstraint;
 import org.drools.spi.BetaNodeFieldConstraint;
+import org.drools.spi.Extractor;
 import org.drools.spi.PredicateExpression;
+import org.drools.spi.Restriction;
 
+/**
+ * A predicate can be written as a top level constraint or be nested
+ * inside inside a field constraint (and as so, must implement the 
+ * Restriction interface).
+ * 
+ * @author etirelli
+ */
 public class PredicateConstraint
     implements
     BetaNodeFieldConstraint,
-    AlphaNodeFieldConstraint {
+    AlphaNodeFieldConstraint,
+    Restriction {
 
     /**
      * 
@@ -218,6 +228,12 @@
         }
     }
 
+    public boolean isAllowed(Extractor extractor,
+                             Object object,
+                             InternalWorkingMemory workingMemory) {
+        throw new UnsupportedOperationException("Method not supported. Please contact development team.");
+    }
+
     public boolean isAllowedCachedLeft(final ContextEntry context,
                                        final Object object) {
         try {