[jboss-svn-commits] JBL Code SVN: r13463 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base: mvel and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 13 17:52:23 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-07-13 17:52:23 -0400 (Fri, 13 Jul 2007)
New Revision: 13463
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
Log:
-variables are now explicitely passed to mvel factories
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -38,7 +38,8 @@
this.factory.setContext( tuple,
null,
null,
- wm );
+ wm,
+ null );
//this.expression.
final Object result = MVEL.executeExpression( this.expression,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -43,7 +43,6 @@
this.previousDeclarations = previousDeclarations;
this.localDeclarations = localDeclarations;
this.globals = globals;
- //this.variables = new HashMap();
}
public Object getObject() {
@@ -57,11 +56,13 @@
public void setContext(final Tuple tuple,
final KnowledgeHelper knowledgeHelper,
final Object object,
- final WorkingMemory workingMemory) {
+ final WorkingMemory workingMemory,
+ final Map variables) {
this.tuple = tuple;
this.knowledgeHelper = knowledgeHelper;
this.object = object;
this.workingMemory = workingMemory;
+ this.variables = variables;
}
public KnowledgeHelper getKnowledgeHelper() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -27,7 +27,8 @@
this.factory.setContext( knowledgeHelper.getTuple(),
knowledgeHelper,
null,
- workingMemory );
+ workingMemory,
+ null );
MVEL.executeExpression( this.expr,
null,
this.factory );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -31,7 +31,8 @@
this.factory.setContext( tuple,
null,
null,
- workingMemory );
+ workingMemory,
+ null );
final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
new Object(),
this.factory );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -31,7 +31,8 @@
this.factory.setContext( tuple,
null,
object,
- workingMemory );
+ workingMemory,
+ null );
final Boolean result = (Boolean) MVEL.executeExpression( this.expr,
null,
this.factory );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -32,7 +32,8 @@
this.factory.setContext( tuple,
null,
object,
- workingMemory );
+ workingMemory,
+ null );
return org.drools.base.FieldFactory.getFieldValue( MVEL.executeExpression( this.expr,
null,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2007-07-13 21:47:01 UTC (rev 13462)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2007-07-13 21:52:23 UTC (rev 13463)
@@ -28,7 +28,8 @@
this.factory.setContext( tuple,
null,
null,
- workingMemory );
+ workingMemory,
+ null );
return ((Integer) MVEL.executeExpression( this.expr,
this.factory )).intValue();
}
More information about the jboss-svn-commits
mailing list