[jboss-svn-commits] JBL Code SVN: r15095 - in labs/jbossrules/trunk: drools-compiler/src/test/resources/org/drools/integrationtests and 1 other directories.

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

Author: tirelli
Date: 2007-09-13 18:01:07 -0400 (Thu, 13 Sep 2007)
New Revision: 15095

Added:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_SubNetworks.drl
Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
Log:
JBRULES-1180: fixing CCE on subnetwork building

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-09-13 19:53:26 UTC (rev 15094)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-09-13 22:01:07 UTC (rev 15095)
@@ -4122,4 +4122,18 @@
                     list.get( 0 ) );
     }
 
+    public void testSubNetworks() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_SubNetworks.drl" ) ) );
+
+        final RuleBase ruleBase = getRuleBase();
+        
+        try {
+            ruleBase.addPackage( builder.getPackage() );
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail( "Should not raise any exception!");
+        }
+
+    }
 }
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_SubNetworks.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_SubNetworks.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_SubNetworks.drl	2007-09-13 22:01:07 UTC (rev 15095)
@@ -0,0 +1,21 @@
+package org.drools;
+
+import java.awt.*;
+
+rule "A"
+    when
+      exists(x : Dimension(x_height : height) and
+             y : Dimension(this!=x, height!=x_height))
+           
+    then
+      System.out.println("A");
+end
+
+rule "B"
+    when
+      not(exists(x : Dimension(x_height : height) and
+                 y : Dimension(this!=x, height!=x_height)))
+           
+    then
+      System.out.println("B");
+end

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	2007-09-13 19:53:26 UTC (rev 15094)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java	2007-09-13 22:01:07 UTC (rev 15095)
@@ -40,7 +40,7 @@
  */
 public class RightInputAdapterNode extends ObjectSource
     implements
-    TupleSink,
+    TupleSinkNode,
     NodeMemory {
 
     private static final long serialVersionUID = 400L;
@@ -49,6 +49,9 @@
     
     protected boolean          tupleMemoryEnabled;      
 
+    private TupleSinkNode       previousTupleSinkNode;
+    private TupleSinkNode       nextTupleSinkNode;
+
     /**
      * Constructor specifying the unique id of the node in the Rete network, the position of the propagating <code>FactHandleImpl</code> in
      * <code>ReteTuple</code> and the source that propagates the receive <code>ReteTuple<code>s.
@@ -178,6 +181,42 @@
 
     public void setTupleMemoryEnabled(boolean tupleMemoryEnabled) {
         this.tupleMemoryEnabled = tupleMemoryEnabled;
-    }      
+    }
 
+    /**
+     * Returns the next node
+     * @return
+     *      The next TupleSinkNode
+     */
+    public TupleSinkNode getNextTupleSinkNode() {
+        return this.nextTupleSinkNode;
+    }
+
+    /**
+     * Sets the next node 
+     * @param next
+     *      The next TupleSinkNode
+     */
+    public void setNextTupleSinkNode(final TupleSinkNode next) {
+        this.nextTupleSinkNode = next;
+    }
+
+    /**
+     * Returns the previous node
+     * @return
+     *      The previous TupleSinkNode
+     */
+    public TupleSinkNode getPreviousTupleSinkNode() {
+        return this.previousTupleSinkNode;
+    }
+
+    /**
+     * Sets the previous node 
+     * @param previous
+     *      The previous TupleSinkNode
+     */
+    public void setPreviousTupleSinkNode(final TupleSinkNode previous) {
+        this.previousTupleSinkNode = previous;
+    }
+
 }