[jboss-svn-commits] JBL Code SVN: r5297 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule

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

Author: mark.proctor at jboss.com
Date: 2006-07-26 14:59:27 -0400 (Wed, 26 Jul 2006)
New Revision: 5297

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
Log:
JBRULES-333 Update constraints to handle connectives
JBRULES-334 language support for field constraints

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java	2006-07-26 18:59:20 UTC (rev 5296)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java	2006-07-26 18:59:27 UTC (rev 5297)
@@ -43,6 +43,12 @@
         this.extractor = extractor;
         this.restriction = new LiteralRestriction(field, evaluator);
     }
+    
+    public LiteralConstraint(final FieldExtractor extractor,
+                             final LiteralRestriction restriction) {
+        this.extractor = extractor;
+        this.restriction = restriction;
+    }    
 
     public Evaluator getEvaluator() {
         return this.restriction.getEvaluator();

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java	2006-07-26 18:59:20 UTC (rev 5296)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java	2006-07-26 18:59:27 UTC (rev 5297)
@@ -223,8 +223,8 @@
                                           InstantiationException,
                                           IllegalAccessException {
         final Class clazz = this.classLoader.findClass( className );
-        if ( invoker instanceof ReturnValueConstraint ) {
-            ((ReturnValueConstraint) invoker).setReturnValueExpression( (ReturnValueExpression) clazz.newInstance() );
+        if ( invoker instanceof ReturnValueRestriction ) {
+            ((ReturnValueRestriction) invoker).setReturnValueExpression( (ReturnValueExpression) clazz.newInstance() );
         } else if ( invoker instanceof PredicateConstraint ) {
             ((PredicateConstraint) invoker).setPredicateExpression( (PredicateExpression) clazz.newInstance() );
         } else if ( invoker instanceof EvalCondition ) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java	2006-07-26 18:59:20 UTC (rev 5296)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java	2006-07-26 18:59:27 UTC (rev 5297)
@@ -54,6 +54,12 @@
                                                        declarations,
                                                        evaluator );
     }
+    
+    public ReturnValueConstraint(final FieldExtractor fieldExtractor,
+                                 final ReturnValueRestriction restriction) {
+        this.fieldExtractor = fieldExtractor;
+        this.restriction = restriction;
+    }    
 
     public Declaration[] getRequiredDeclarations() {
         return this.restriction.getRequiredDeclarations();

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java	2006-07-26 18:59:20 UTC (rev 5296)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java	2006-07-26 18:59:27 UTC (rev 5297)
@@ -44,6 +44,12 @@
         this.restriction = new VariableRestriction( declaration,
                                                     evaluator );
     }
+    
+    public VariableConstraint(final FieldExtractor fieldExtractor,
+                              final VariableRestriction restriction) {
+        this.fieldExtractor = fieldExtractor;
+        this.restriction = restriction;
+    }    
 
     public Declaration[] getRequiredDeclarations() {
         return this.restriction.getRequiredDeclarations();