[jboss-svn-commits] JBL Code SVN: r20776 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools: rule/builder/dialect/mvel and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2008-06-25 22:22:02 -0400 (Wed, 25 Jun 2008)
New Revision: 20776

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
Log:
JBRULES-720 Clips Parser 
-Predicate now works

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2008-06-25 21:32:17 UTC (rev 20775)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2008-06-26 02:22:02 UTC (rev 20776)
@@ -42,12 +42,12 @@
     }
 
     public void insertBeforeLast(final Class clazz,
-                                 final BaseDescr baseDescr) {
+                             final BaseDescr baseDescr) {
         if ( this.descrs.isEmpty() ) {
             addDescr( baseDescr );
             return;
         }
-        
+
         for ( int i = this.descrs.size() - 1; i >= 0; i-- ) {
             if ( clazz.isInstance( this.descrs.get( i ) ) ) {
                 insertDescr( i,
@@ -55,6 +55,8 @@
                 return;
             }
         }
+        
+        addDescr( baseDescr );
     }
 
     public List getDescrs() {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java	2008-06-25 21:32:17 UTC (rev 20775)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java	2008-06-26 02:22:02 UTC (rev 20776)
@@ -43,7 +43,8 @@
                     return;
                 }                
             }
-        }        
+        }    
+        addDescr( baseDescr );
     }
     
     public void insertDescr(int index, final BaseDescr baseDescr) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-06-25 21:32:17 UTC (rev 20775)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-06-26 02:22:02 UTC (rev 20776)
@@ -242,8 +242,6 @@
         // if we want to
         builders = new HashMap();
 
-        final GroupElementBuilder gebuilder = new GroupElementBuilder();
-
         builders.put( AndDescr.class,
                       GE_BUILDER );