[jboss-svn-commits] JBL Code SVN: r20744 - 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
Tue Jun 24 22:08:34 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-06-24 22:08:34 -0400 (Tue, 24 Jun 2008)
New Revision: 20744
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/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/MVELReturnValueEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
Log:
JBRULES-720 Clips Parser
-getting deffunction and builtin functions to work.
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 2008-06-25 01:59:00 UTC (rev 20743)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-06-25 02:08:34 UTC (rev 20744)
@@ -27,15 +27,18 @@
private Serializable expression;
private DroolsMVELFactory prototype;
+ private String id;
public MVELDataProvider() {
}
public MVELDataProvider(final Serializable expression,
- final DroolsMVELFactory factory) {
+ final DroolsMVELFactory factory,
+ final String id) {
this.expression = expression;
this.prototype = factory;
+ this.id = id;
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
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 2008-06-25 01:59:00 UTC (rev 20743)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-06-25 02:08:34 UTC (rev 20744)
@@ -23,14 +23,17 @@
private Serializable expr;
private DroolsMVELFactory prototype;
-
+ private String id;
+
public MVELConsequence() {
- }
+ }
public MVELConsequence(final Serializable expr,
- final DroolsMVELFactory factory) {
+ final DroolsMVELFactory factory,
+ final String id) {
this.expr = expr;
this.prototype = factory;
+ this.id = id;
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@@ -52,10 +55,11 @@
null,
workingMemory,
null );
-
+
+ // do we have any functions for this namespace?
Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
if ( pkg != null ) {
- MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( "mvel" );
+ MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( this.id );
factory.setNextFactory( data.getFunctionFactory() );
}
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 2008-06-25 01:59:00 UTC (rev 20743)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-06-25 02:08:34 UTC (rev 20744)
@@ -24,14 +24,17 @@
private Serializable expr;
private DroolsMVELFactory prototype;
+ private String id;
public MVELEvalExpression() {
}
public MVELEvalExpression(final Serializable expr,
- final DroolsMVELFactory factory) {
+ final DroolsMVELFactory factory,
+ final String id) {
this.expr = expr;
this.prototype = factory;
+ this.id = id;
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@@ -59,9 +62,10 @@
workingMemory,
null );
+ // do we have any functions for this namespace?
Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
if ( pkg != null ) {
- MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( "mvel" );
+ MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( this.id );
factory.setNextFactory( data.getFunctionFactory() );
}
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 2008-06-25 01:59:00 UTC (rev 20743)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-06-25 02:08:34 UTC (rev 20744)
@@ -18,14 +18,17 @@
private Serializable expr;
private DroolsMVELFactory prototype;
+ private String id;
public MVELPredicateExpression() {
}
public MVELPredicateExpression(final Serializable expr,
- final DroolsMVELFactory factory) {
+ final DroolsMVELFactory factory,
+ final String id) {
this.expr = expr;
this.prototype = factory;
+ this.id = id;
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@@ -53,11 +56,12 @@
null,
object,
workingMemory,
- null );
+ null );
+ // do we have any functions for this namespace?
Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
if ( pkg != null ) {
- MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( "mvel" );
+ MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( this.id );
factory.setNextFactory( data.getFunctionFactory() );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-06-25 01:59:00 UTC (rev 20743)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-06-25 02:08:34 UTC (rev 20744)
@@ -22,14 +22,17 @@
private Serializable expr;
private DroolsMVELFactory prototype;
+ private String id;
public MVELReturnValueEvaluator() {
}
public MVELReturnValueEvaluator(final Serializable expr,
- final DroolsMVELFactory factory) {
+ final DroolsMVELFactory factory,
+ final String id) {
this.expr = expr;
this.prototype = factory;
+ this.id = id;
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@@ -43,7 +46,7 @@
}
public String getDialect() {
- return "mvel";
+ return this.id;
}
public Object evaluate(final WorkingMemory workingMemory) throws Exception {
@@ -54,9 +57,10 @@
workingMemory,
null );
+ // do we have any functions for this namespace?
Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
if ( pkg != null ) {
- MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( "mvel" );
+ MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( this.id );
factory.setNextFactory( data.getFunctionFactory() );
}
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 2008-06-25 01:59:00 UTC (rev 20743)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-06-25 02:08:34 UTC (rev 20744)
@@ -23,14 +23,17 @@
private Serializable expr;
private DroolsMVELFactory prototype;
-
+ private String id;
+
public MVELReturnValueExpression() {
}
public MVELReturnValueExpression(final Serializable expr,
- final DroolsMVELFactory factory) {
+ final DroolsMVELFactory factory,
+ final String id) {
this.expr = expr;
this.prototype = factory;
+ this.id = id;
}
public FieldValue evaluate(final Object object,
@@ -46,9 +49,10 @@
workingMemory,
null );
+ // do we have any functions for this namespace?
Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
if ( pkg != null ) {
- MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( "mvel" );
+ MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( this.id );
factory.setNextFactory( data.getFunctionFactory() );
}
More information about the jboss-svn-commits
mailing list