[jboss-svn-commits] JBL Code SVN: r19314 - in labs/jbossrules/branches/4.0.x: drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel and 2 other directories.

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

Author: tirelli
Date: 2008-03-29 16:03:39 -0400 (Sat, 29 Mar 2008)
New Revision: 19314

Modified:
   labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaPredicateBuilder.java
   labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
   labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
Log:
Adding predicate expression logs

Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaPredicateBuilder.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaPredicateBuilder.java	2008-03-29 17:43:02 UTC (rev 19313)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaPredicateBuilder.java	2008-03-29 20:03:39 UTC (rev 19314)
@@ -28,6 +28,7 @@
                                          previousDeclarations,
                                          localDeclarations,
                                          (String[]) usedIdentifiers[1].toArray( new String[usedIdentifiers[1].size()] ) );
+        map.put( "expression", predicateDescr.getContent() );
 
         generatTemplates( "predicateMethod",
                           "predicateInvoker",

Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java	2008-03-29 17:43:02 UTC (rev 19313)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java	2008-03-29 20:03:39 UTC (rev 19314)
@@ -30,9 +30,6 @@
 import org.drools.rule.PredicateConstraint;
 import org.drools.rule.builder.PredicateBuilder;
 import org.drools.rule.builder.RuleBuildContext;
-import org.mvel.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
 
 /**
  * @author etirelli
@@ -77,7 +74,8 @@
                                                                                     context );
 
             predicate.setPredicateExpression( new MVELPredicateExpression( expr,
-                                                                           factory ) );
+                                                                           factory,
+                                                                           (String) predicateDescr.getContent() ) );
         } catch ( final Exception e ) {
             context.getErrors().add( new RuleError( context.getRule(),
                                                     predicateDescr,

Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel	2008-03-29 17:43:02 UTC (rev 19313)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel	2008-03-29 20:03:39 UTC (rev 19314)
@@ -133,6 +133,10 @@
     @includeByRef{getMethodBytecode(package = package, ruleClassName = ruleClassName, methodName = methodName)}
     
     @includeByRef{equals()}       
+    
+    public String toString() {
+        return "eval( @{expression} )";
+    }
 }     
 >>=::
 

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java	2008-03-29 17:43:02 UTC (rev 19313)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java	2008-03-29 20:03:39 UTC (rev 19314)
@@ -16,11 +16,14 @@
 
     private final Serializable      expr;
     private final DroolsMVELFactory prototype;
+    private final String            exprStr;
 
     public MVELPredicateExpression(final Serializable expr,
-                                   final DroolsMVELFactory factory) {
+                                   final DroolsMVELFactory factory,
+                                   final String exprStr ) {
         this.expr = expr;
         this.prototype = factory;
+        this.exprStr = exprStr;
     }
     
     public Object createContext() {
@@ -44,5 +47,9 @@
                                                                  factory );
         return result.booleanValue();
     }
+    
+    public String toString() {
+        return "eval( "+exprStr+" )";
+    }
 
 }