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

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

Author: mark.proctor at jboss.com
Date: 2006-10-24 13:42:28 -0400 (Tue, 24 Oct 2006)
New Revision: 7092

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
Log:
-Fixed so 'exists' uses Column column, instead  of an  int

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java	2006-10-24 17:20:33 UTC (rev 7091)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java	2006-10-24 17:42:28 UTC (rev 7092)
@@ -454,7 +454,7 @@
         if ( not.getChild() instanceof Not ) {
 
             final RightInputAdapterNode adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
-                                                                                                                 column.getFactIndex(),
+                                                                                                                 column,
                                                                                                                  notNode ) );
             attachNot( tupleSource,
                        (Not) not.getChild(),
@@ -463,7 +463,7 @@
                        column );
         } else if ( not.getChild() instanceof Exists ) {
             final RightInputAdapterNode adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
-                                                                                                                 column.getFactIndex(),
+                                                                                                                 column,
                                                                                                                  notNode ) );
             attachExists( tupleSource,
                           (Exists) not.getChild(),
@@ -485,7 +485,7 @@
                                                              ObjectSource,
                                                              binder ) );
         RightInputAdapterNode adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
-                                                                                                       column.getFactIndex(),
+                                                                                                       column,
                                                                                                        notNode ) );
 
         final BetaConstraints identityBinder = new SingleBetaConstraints( new InstanceEqualsConstraint( column ) );
@@ -496,7 +496,7 @@
 
         if ( exists.getChild() instanceof Not ) {
             adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
-                                                                                     column.getFactIndex(),
+                                                                                     column,
                                                                                      notNode ) );
             attachNot( tupleSource,
                        (Not) exists.getChild(),
@@ -505,7 +505,7 @@
                        column );
         } else if ( exists.getChild() instanceof Exists ) {
             adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
-                                                                                     column.getFactIndex(),
+                                                                                     column,
                                                                                      notNode ) );
             attachExists( tupleSource,
                           (Exists) exists.getChild(),

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java	2006-10-24 17:20:33 UTC (rev 7091)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java	2006-10-24 17:42:28 UTC (rev 7092)
@@ -19,6 +19,7 @@
 import org.drools.common.BaseNode;
 import org.drools.common.InternalFactHandle;
 import org.drools.common.InternalWorkingMemory;
+import org.drools.rule.Column;
 import org.drools.spi.PropagationContext;
 
 /**
@@ -39,7 +40,7 @@
 
     private final TupleSource tupleSource;
 
-    private final int         column;
+    private final Column         column;
 
     /**
      * Constructor specifying the unique id of the node in the Rete network, the position of the propagating <code>FactHandleImpl</code> in
@@ -53,7 +54,7 @@
      *      The <code>TupleSource</code> which propagates the received <code>ReteTuple</code>
      */
     public RightInputAdapterNode(final int id,
-                                 final int column,
+                                 final Column column,
                                  final TupleSource source) {
 
         super( id );
@@ -75,7 +76,7 @@
     public void assertTuple(final ReteTuple tuple,
                             final PropagationContext context,
                             final InternalWorkingMemory workingMemory) {
-        this.sink.propagateAssertObject( tuple.get( this.column ),
+        this.sink.propagateAssertObject( tuple.get( this.column.getFactIndex() ),
                                          context,
                                          workingMemory );
     }
@@ -86,7 +87,7 @@
     public void retractTuple(final ReteTuple tuple,
                              final PropagationContext context,
                              final InternalWorkingMemory workingMemory) {
-        this.sink.propagateRetractObject( tuple.get( this.column ),
+        this.sink.propagateRetractObject( tuple.get( this.column.getFactIndex() ),
                                           context,
                                           workingMemory,
                                           true );
@@ -111,7 +112,7 @@
                            final PropagationContext context,
                            final InternalWorkingMemory workingMemory) {
         this.tupleSource.updateSink( new TupleSinkAdapter( sink,
-                                                           this.column ),
+                                                           this.column.getFactIndex() ),
                                      context,
                                      workingMemory );
     }