[jboss-svn-commits] JBL Code SVN: r24772 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/reteoo and 2 other directories.

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

Author: mark.proctor at jboss.com
Date: 2009-01-18 22:00:54 -0500 (Sun, 18 Jan 2009)
New Revision: 24772

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledCause.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
Log:
JBRULES-1775 Activation Cancelled Events are not being fired if an Agenda Filter is used
-filters now emit cancelled events
-cancelled events now have a cause - FILTER, CLEAR, WME_MODIFY

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledCause.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledCause.java	2009-01-19 03:00:04 UTC (rev 24771)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledCause.java	2009-01-19 03:00:54 UTC (rev 24772)
@@ -2,6 +2,6 @@
 
 public enum ActivationCancelledCause {
     FILTER,
-    WME_CHANGE,
+    WME_MODIFY,
     CLEAR;
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2009-01-19 03:00:04 UTC (rev 24771)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2009-01-19 03:00:54 UTC (rev 24772)
@@ -304,7 +304,7 @@
 
                 ((EventSupport) workingMemory).getAgendaEventSupport().fireActivationCancelled( activation,
                                                                                                 workingMemory,
-                                                                                                ActivationCancelledCause.WME_CHANGE );
+                                                                                                ActivationCancelledCause.WME_MODIFY );
                 ((InternalAgenda) workingMemory.getAgenda()).decreaseActiveActivations();
             }
         } else {

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java	2009-01-19 03:00:04 UTC (rev 24771)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java	2009-01-19 03:00:54 UTC (rev 24772)
@@ -192,7 +192,7 @@
                       agendaList.size() );        
         
         cancelledEvent = (ActivationCancelledEvent) agendaList.get( 0 );
-        assertEquals( ActivationCancelledCause.WME_CHANGE, cancelledEvent.getCause() );
+        assertEquals( ActivationCancelledCause.WME_MODIFY, cancelledEvent.getCause() );
         assertSame( cheddar,
                     cancelledEvent.getActivation().getTuple().get( 0 ).getObject() );
         createdEvent = (ActivationCreatedEvent) agendaList.get( 1 );

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java	2009-01-19 03:00:04 UTC (rev 24771)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java	2009-01-19 03:00:54 UTC (rev 24772)
@@ -189,7 +189,7 @@
         assertEquals( 2,
                       agendaList.size() );
         cancelledEvent = (ActivationCancelledEvent) agendaList.get( 0 );
-        assertEquals( ActivationCancelledCause.WME_CHANGE, cancelledEvent.getCause() );
+        assertEquals( ActivationCancelledCause.WME_MODIFY, cancelledEvent.getCause() );
         assertSame( cheddarHandle,
                     cancelledEvent.getActivation().getFactHandles().toArray()[0] );
         createdEvent = (ActivationCreatedEvent) agendaList.get( 1 );