[jboss-svn-commits] JBL Code SVN: r6221 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps

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

Author: mark.proctor at jboss.com
Date: 2006-09-14 08:54:13 -0400 (Thu, 14 Sep 2006)
New Revision: 6221

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Builder.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/ColumnConstraints.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FromConstraint.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsBuilder.java
Log:
JBRULES-494 Linked Tuple
-Added missing BetaNodeBinder renaming to BetaNodeCosntraints

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Builder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Builder.java	2006-09-14 12:53:54 UTC (rev 6220)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Builder.java	2006-09-14 12:54:13 UTC (rev 6221)
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.drools.common.BetaNodeBinder;
+import org.drools.common.BetaNodeConstraints;
 import org.drools.rule.And;
 import org.drools.rule.Column;
 import org.drools.rule.Declaration;
@@ -156,7 +156,7 @@
      */
     final private static ColumnConstraints processColumn(final Column column,
                                                          final boolean removeIdentities ) {
-        BetaNodeBinder binder;
+        BetaNodeConstraints binder;
         final List alphaConstraints = new ArrayList( );
         final List predicateConstraints = new ArrayList( );
 
@@ -190,9 +190,9 @@
 
 
         if ( !predicateConstraints.isEmpty() ) {
-            binder = new BetaNodeBinder( (FieldConstraint[]) predicateConstraints.toArray( new FieldConstraint[predicateConstraints.size()] ) );
+            binder = new BetaNodeConstraints( (FieldConstraint[]) predicateConstraints.toArray( new FieldConstraint[predicateConstraints.size()] ) );
         } else {
-            binder = new BetaNodeBinder();
+            binder = new BetaNodeConstraints();
         }
 
         return new ColumnConstraints( column,

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/ColumnConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/ColumnConstraints.java	2006-09-14 12:53:54 UTC (rev 6220)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/ColumnConstraints.java	2006-09-14 12:54:13 UTC (rev 6221)
@@ -20,7 +20,7 @@
 import java.util.List;
 
 import org.drools.WorkingMemory;
-import org.drools.common.BetaNodeBinder;
+import org.drools.common.BetaNodeConstraints;
 import org.drools.common.InternalFactHandle;
 import org.drools.rule.Column;
 import org.drools.spi.FieldConstraint;
@@ -39,13 +39,13 @@
 
     private final boolean           alphaPresent;
 
-    private final BetaNodeBinder    beta;
+    private final BetaNodeConstraints    beta;
 
     private final boolean           betaPresent;
 
     public ColumnConstraints(final Column column,
                              final List alpha,
-                             final BetaNodeBinder beta) {
+                             final BetaNodeConstraints beta) {
         this.classType = LeapsBuilder.getLeapsClassType( column.getObjectType() );
 
         if ( beta != null ) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FromConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FromConstraint.java	2006-09-14 12:53:54 UTC (rev 6220)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FromConstraint.java	2006-09-14 12:54:13 UTC (rev 6221)
@@ -2,7 +2,7 @@
 
 import java.util.Arrays;
 
-import org.drools.common.BetaNodeBinder;
+import org.drools.common.BetaNodeConstraints;
 import org.drools.rule.Column;
 import org.drools.spi.DataProvider;
 
@@ -15,7 +15,7 @@
         super( column,
                ( constraints.getAlphaContraints( ) == null || constraints.getAlphaContraints( ).length == 0 ) ? Arrays.asList( new FromConstraint[0] )
                        : Arrays.asList( constraints.getAlphaContraints( ) ),
-               new BetaNodeBinder( constraints.getBetaContraints( ) ) );
+               new BetaNodeConstraints( constraints.getBetaContraints( ) ) );
         this.provider = provider;
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsBuilder.java	2006-09-14 12:53:54 UTC (rev 6220)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsBuilder.java	2006-09-14 12:54:13 UTC (rev 6221)
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import org.drools.base.ClassObjectType;
-import org.drools.common.BetaNodeBinder;
+import org.drools.common.BetaNodeConstraints;
 import org.drools.facttemplates.FactTemplateObjectType;
 import org.drools.rule.And;
 import org.drools.rule.Column;
@@ -167,7 +167,7 @@
      * @return leaps packaged ColumnConstraints
      */
     final private static ColumnConstraints processColumn(final Column column ) {
-        BetaNodeBinder binder;
+        BetaNodeConstraints binder;
         final List alphaConstraints = new ArrayList( );
         final List predicateConstraints = new ArrayList( );
 
@@ -200,9 +200,9 @@
         }
 
         if ( !predicateConstraints.isEmpty() ) {
-            binder = new BetaNodeBinder( (FieldConstraint[]) predicateConstraints.toArray( new FieldConstraint[predicateConstraints.size()] ) );
+            binder = new BetaNodeConstraints( (FieldConstraint[]) predicateConstraints.toArray( new FieldConstraint[predicateConstraints.size()] ) );
         } else {
-            binder = new BetaNodeBinder();
+            binder = new BetaNodeConstraints();
         }
 
         return new ColumnConstraints( column,