[Jboss-svn-commits] JBL Code SVN: r3810 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-04-19 17:08:57 -0400 (Wed, 19 Apr 2006)
New Revision: 3810

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
Log:
-conditional elements now build up from bottom upwards

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-04-19 21:00:50 UTC (rev 3809)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-04-19 21:08:57 UTC (rev 3810)
@@ -294,36 +294,36 @@
             if ( object instanceof ConditionalElementDescr ) {
                 if ( object instanceof AndDescr ) {
                     And and = new And();
-                    ce.addChild( and );
                     build( rule,
                            (ConditionalElementDescr) object,
                            and,
                            false,
                            false);
+                    ce.addChild( and );                    
                 } else if ( object instanceof OrDescr ) {
                     Or or = new Or();
-                    ce.addChild( or );
                     build( rule,
                            (ConditionalElementDescr) object,
                            or,
                            true,
                            false);
+                    ce.addChild( or );                    
                 } else if ( object instanceof NotDescr ) {
                     Not not = new Not();
-                    ce.addChild( not );
                     build( rule,
                            (ConditionalElementDescr) object,
                            not,
                            true,
                            true);
+                    ce.addChild( not );                    
                 } else if ( object instanceof ExistsDescr ) {
                     Exists exists = new Exists();
-                    ce.addChild( exists );
                     build( rule,
                            (ConditionalElementDescr) object,
                            exists,
                            true, 
                            true);
+                    ce.addChild( exists );                    
                 } else if ( object instanceof EvalDescr ) {
                     EvalCondition eval = build( (EvalDescr) object );
                     if ( eval != null ) {