[jboss-svn-commits] JBL Code SVN: r17906 - in labs/jbossrules/branches/temporal_rete: drools-core/src/main/java/org/drools and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 16 16:20:30 EST 2008
Author: tirelli
Date: 2008-01-16 16:20:30 -0500 (Wed, 16 Jan 2008)
New Revision: 17906
Modified:
labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/ObjectStore.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java
labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java
Log:
JBRULES-1390: fixing tests
Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -460,4 +460,9 @@
return null;
}
+ public FactHandle getFactHandleByIdentity(Object object) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -142,6 +142,8 @@
*/
FactHandle getFactHandle(Object object);
+ FactHandle getFactHandleByIdentity(final Object object);
+
/**
* Returns an Iterator for the Objects in the Working Memory. This Iterator is not thread safe.
* This means that any working memory actions during iteration may invalidate the iterator.
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -127,7 +127,7 @@
}
public void update(final Object object) throws FactException {
- FactHandle handle = this.workingMemory.getFactHandle( object );
+ FactHandle handle = this.workingMemory.getFactHandleByIdentity( object );
if ( handle == null ) {
throw new FactException( "Update error: handle not found for object: " + object + ". Is it in the working memory?" );
}
@@ -147,7 +147,7 @@
}
public void retract(final Object object) throws FactException {
- FactHandle handle = this.workingMemory.getFactHandle( object );
+ FactHandle handle = this.workingMemory.getFactHandleByIdentity( object );
if ( handle == null ) {
throw new FactException( "Retract error: handle not found for object: " + object + ". Is it in the working memory?" );
}
@@ -159,7 +159,7 @@
}
public void modifyRetract(final Object object) {
- FactHandle handle = this.workingMemory.getFactHandle( object );
+ FactHandle handle = this.workingMemory.getFactHandleByIdentity( object );
this.workingMemory.modifyRetract( handle, rule, activation );
}
@@ -168,7 +168,7 @@
}
public void modifyInsert(final Object object) {
- FactHandle handle = this.workingMemory.getFactHandle( object );
+ FactHandle handle = this.workingMemory.getFactHandleByIdentity( object );
this.workingMemory.modifyInsert( handle, object, rule, activation );
}
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -518,6 +518,12 @@
return this.objectStore.getHandleForObject( object );
}
+ /**
+ * @see WorkingMemory
+ */
+ public FactHandle getFactHandleByIdentity(final Object object) {
+ return this.objectStore.getHandleForObjectIdentity( object );
+ }
/**
* This class is not thread safe, changes to the working memory during iteration may give unexpected results
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/ObjectStore.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/ObjectStore.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/ObjectStore.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -13,6 +13,8 @@
public abstract Object getObjectForHandle(InternalFactHandle handle);
public abstract InternalFactHandle getHandleForObject(Object object);
+
+ public abstract InternalFactHandle getHandleForObjectIdentity(Object object);
public abstract void updateHandle(InternalFactHandle handle,
Object object);
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -85,6 +85,13 @@
}
/* (non-Javadoc)
+ * @see org.drools.common.ObjectStore#getHandleForObject(java.lang.Object)
+ */
+ public InternalFactHandle getHandleForObjectIdentity(Object object) {
+ return (InternalFactHandle) this.identityMap.get( object );
+ }
+
+ /* (non-Javadoc)
* @see org.drools.common.ObjectStore#updateHandle(org.drools.common.InternalFactHandle, java.lang.Object)
*/
public void updateHandle(InternalFactHandle handle, Object object){
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -57,10 +57,12 @@
}
public void removeEventListener(Class cls) {
- for ( Iterator<RuleBaseEventListener> it = this.listeners.iterator(); it.hasNext(); ) {
- RuleBaseEventListener listener = it.next();
+ for ( int i = 0; i < this.listeners.size(); ) {
+ RuleBaseEventListener listener = this.listeners.get( i );
if ( cls.isAssignableFrom( listener.getClass() ) ) {
- it.remove();
+ this.listeners.remove( i );
+ } else {
+ i++;
}
}
}
Modified: labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java 2008-01-16 21:15:09 UTC (rev 17905)
+++ labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java 2008-01-16 21:20:30 UTC (rev 17906)
@@ -427,6 +427,11 @@
// TODO Auto-generated method stub
return null;
}
+
+ public FactHandle getFactHandleByIdentity(Object object) {
+ // TODO Auto-generated method stub
+ return null;
+ }
};
}
}
More information about the jboss-svn-commits
mailing list