[jboss-svn-commits] JBL Code SVN: r34257 - labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules.

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

Author: mark.proctor at jboss.com
Date: 2010-07-28 09:13:47 -0400 (Wed, 28 Jul 2010)
New Revision: 34257

Modified:
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94EventFactHandle.java
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandle.java
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java
Log:
JBRULES-2601 Remove DisconnectedFactHandle and make DefaultFactHandle capable of being disconnected
-Fixed JSR94

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94EventFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94EventFactHandle.java	2010-07-28 13:03:58 UTC (rev 34256)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94EventFactHandle.java	2010-07-28 13:13:47 UTC (rev 34257)
@@ -60,6 +60,7 @@
 import javax.rules.Handle;
 
 import org.drools.common.EventFactHandle;
+import org.drools.runtime.rule.WorkingMemoryEntryPoint;
 
 /**
  * The Drools implementation of the <code>Handle</code> interface which provides
@@ -81,24 +82,6 @@
     private static final long serialVersionUID = -7338909470403134407L;
 
     /**
-     * Constructs a new <code>Handle</code>.
-     *
-     * @param id A unique <code>Handle</code> id.
-     * @param recency A value indicating the recency of this <code>Handle</code>
-     *        (more recently created <code>Handle</code>s have greater values
-     *         than <code>Handle</code>s created further in the past)
-     *
-     * @see org.drools.conflict.RecencyConflictResolver
-     */
-    Jsr94EventFactHandle(final long id,
-                         final Object object,
-                         final long recency) {
-        super( (int) id,
-               object,
-               recency );
-    }
-
-    /**
      * Creates a new event fact handle.
      * 
      * @param id this event fact handle ID
@@ -111,12 +94,14 @@
                                 final Object object,
                                 final long recency,
                                 final long timestamp,
-                                final long duration) {
+                                final long duration,
+                                final WorkingMemoryEntryPoint entryPoint) {
         super( (int) id,
                object,
                recency,
                timestamp,
-               duration );
+               duration,
+               entryPoint );
     }
 
 }

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandle.java	2010-07-28 13:03:58 UTC (rev 34256)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandle.java	2010-07-28 13:13:47 UTC (rev 34257)
@@ -60,6 +60,7 @@
 import javax.rules.Handle;
 
 import org.drools.common.DefaultFactHandle;
+import org.drools.runtime.rule.WorkingMemoryEntryPoint;
 
 /**
  * The Drools implementation of the <code>Handle</code> interface which provides
@@ -92,9 +93,11 @@
      */
     Jsr94FactHandle(final long id,
                     final Object object,
-                    final long recency) {
+                    final long recency,
+                    final WorkingMemoryEntryPoint entryPoint) {
         super( (int) id,
                object,
-               recency );
+               recency,
+               entryPoint );
     }
 }

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java	2010-07-28 13:03:58 UTC (rev 34256)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java	2010-07-28 13:13:47 UTC (rev 34257)
@@ -37,6 +37,7 @@
 import org.drools.common.InternalWorkingMemory;
 import org.drools.reteoo.ObjectTypeConf;
 import org.drools.rule.TypeDeclaration;
+import org.drools.runtime.rule.WorkingMemoryEntryPoint;
 import org.drools.spi.FactHandleFactory;
 
 /**
@@ -52,7 +53,8 @@
                                                      final Object object,
                                                      final long recency,
                                                      final ObjectTypeConf conf,
-                                                     final InternalWorkingMemory workingMemory) {
+                                                     final InternalWorkingMemory workingMemory,
+                                                     final WorkingMemoryEntryPoint entryPoint) {
         if ( conf != null && conf.isEvent() ) {
             // later we need to centralize the following code snippet in a common method
             // shared by all fact handle factory implementations
@@ -67,11 +69,13 @@
                                              object,
                                              recency,
                                              timestamp,
-                                             duration );
+                                             duration,
+                                             entryPoint );
         } else {
             return new Jsr94FactHandle( id,
                                         object,
-                                        recency );
+                                        recency,
+                                        entryPoint );
         }
     }