[jboss-svn-commits] JBL Code SVN: r5037 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common

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

Author: mark.proctor at jboss.com
Date: 2006-07-12 08:00:31 -0400 (Wed, 12 Jul 2006)
New Revision: 5037

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
Log:
JBRULES-365 bug in fields inspection when creating Field Extractors for non-camelcase accessors
-Code now uses Introspector.decapitalize(name);

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2006-07-12 11:54:29 UTC (rev 5036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2006-07-12 12:00:31 UTC (rev 5037)
@@ -60,6 +60,8 @@
     // ------------------------------------------------------------
     // Instance members
     // ------------------------------------------------------------
+    protected String                                id;
+    
     protected RuleBaseConfiguration                 config;
 
     protected Map                                   pkgs;
@@ -84,14 +86,21 @@
     // Constructors
     // ------------------------------------------------------------
 
+    public AbstractRuleBase(final RuleBaseConfiguration config,
+                            final FactHandleFactory factHandleFactory) {
+        this("default", config, factHandleFactory);
+    }
+    
     /**
      * Construct.
      * 
      * @param rete
      *            The rete network.
      */
-    public AbstractRuleBase(final RuleBaseConfiguration config,
+    public AbstractRuleBase(final String id,
+                            final RuleBaseConfiguration config,
                             final FactHandleFactory factHandleFactory) {
+        this.id = id;
         this.config = (config != null) ? config : new RuleBaseConfiguration();
         this.config.makeImmutable();
         this.factHandleFactory = factHandleFactory;
@@ -167,6 +176,20 @@
     }
 
     /**
+     * @return the id
+     */
+    public String getId() {
+        return this.id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+    
+    /**
      * @see RuleBase
      */
     public WorkingMemory newWorkingMemory() {
@@ -401,7 +424,6 @@
         AbstractWorkingMemory workingMemory = ( AbstractWorkingMemory ) streamWithLoader.readObject();
         workingMemory.setRuleBase( this );
         
-        return workingMemory;
-    
-    }
+        return workingMemory;    
+    }      
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java	2006-07-12 11:54:29 UTC (rev 5036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java	2006-07-12 12:00:31 UTC (rev 5037)
@@ -30,6 +30,16 @@
     extends
     RuleBase {
 
+    /**
+     * @return the id
+     */
+    public String getId();
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(String id);    
+    
     public FactHandleFactory newFactHandleFactory();
 
     public Map getGlobals();