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

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

Author: mark.proctor at jboss.com
Date: 2007-09-19 20:02:38 -0400 (Wed, 19 Sep 2007)
New Revision: 15244

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
Log:
-made Fact more extensible

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java	2007-09-19 21:37:21 UTC (rev 15243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java	2007-09-20 00:02:38 UTC (rev 15244)
@@ -84,7 +84,7 @@
      *         object type, else <code>false</code>.
      */
     public boolean matches(final Object object) {
-        if ( object.getClass() == FactImpl.class ) {
+        if ( object instanceof Fact ) {
             return this.factTemplate.equals( ((Fact) object).getFactTemplate() );
         } else {
             return false;
@@ -125,7 +125,7 @@
             return true;
         }
 
-        if ( object == null || object.getClass() != FactTemplateObjectType.class ) {
+        if ( object == null || !(object instanceof FactTemplateObjectType) ) {
             return false;
         }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java	2007-09-19 21:37:21 UTC (rev 15243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java	2007-09-20 00:02:38 UTC (rev 15244)
@@ -131,7 +131,7 @@
         Object object = handle.getObject();
 
         ObjectTypeConf ojectTypeConf;
-        if ( object instanceof FactImpl ) {
+        if ( object instanceof Fact ) {
             String key = ((Fact) object).getFactTemplate().getName();
             ojectTypeConf = (ObjectTypeConf) memory.get( key );
             if ( ojectTypeConf == null ) {