[jboss-svn-commits] JBL Code SVN: r12788 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools: rule/builder/dialect/java and 1 other directories.

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

Author: tirelli
Date: 2007-06-23 09:27:56 -0400 (Sat, 23 Jun 2007)
New Revision: 12788

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
Log:
JBRULES-941: Refactoring a few method names

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2007-06-23 09:17:39 UTC (rev 12787)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2007-06-23 13:27:56 UTC (rev 12788)
@@ -18,6 +18,7 @@
 
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -62,7 +63,7 @@
 
     private ChainedProperties    chainedProperties;
 
-    private Map                  accumulatorFunctions;
+    private Map                  accumulateFunctions;
 
     /**
      * Programmatic properties file, added with lease precedence
@@ -243,31 +244,36 @@
     }
 
     private void buildAccumulateFunctionsMap() {
-        this.accumulatorFunctions = new HashMap();
+        this.accumulateFunctions = new HashMap();
         Map temp = new HashMap();
         this.chainedProperties.mapStartsWith( temp,
                                               ACCUMULATE_FUNCTION_PREFIX );
-        for( Iterator it = temp.entrySet().iterator(); it.hasNext(); ) {
+        for ( Iterator it = temp.entrySet().iterator(); it.hasNext(); ) {
             Map.Entry entry = (Map.Entry) it.next();
             String identifier = ((String) entry.getKey()).trim().substring( ACCUMULATE_FUNCTION_PREFIX.length() );
-            this.accumulatorFunctions.put( identifier, entry.getValue() );
+            this.accumulateFunctions.put( identifier,
+                                           entry.getValue() );
         }
     }
+    
+    public Map getAccumulateFunctionsMap() {
+        return Collections.unmodifiableMap( this.accumulateFunctions );
+    }
 
-    public void addAccumulatorFunction(String identifier,
-                                       String className) {
-        this.accumulatorFunctions.put( identifier,
+    public void addAccumulateFunction(String identifier,
+                                      String className) {
+        this.accumulateFunctions.put( identifier,
                                        className );
     }
 
-    public void addAccumulatorFunction(String identifier,
-                                       Class clazz) {
-        this.accumulatorFunctions.put( identifier,
+    public void addAccumulateFunction(String identifier,
+                                      Class clazz) {
+        this.accumulateFunctions.put( identifier,
                                        clazz.getName() );
     }
 
-    public AccumulateFunction getAccumulatorFunction(String identifier) {
-        String className = (String) this.accumulatorFunctions.get( identifier );
+    public AccumulateFunction getAccumulateFunction(String identifier) {
+        String className = (String) this.accumulateFunctions.get( identifier );
         if ( className == null ) {
             throw new RuntimeDroolsException( "No accumulator function found for identifier: " + identifier );
         }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2007-06-23 09:17:39 UTC (rev 12787)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2007-06-23 13:27:56 UTC (rev 12788)
@@ -111,7 +111,7 @@
                                                    requiredGlobals );
 
 
-            AccumulateFunction function = context.getConfiguration().getAccumulatorFunction( accumDescr.getFunctionIdentifier() );
+            AccumulateFunction function = context.getConfiguration().getAccumulateFunction( accumDescr.getFunctionIdentifier() );
 
             JavaAccumulatorFunctionExecutor accumulator = new JavaAccumulatorFunctionExecutor( function );
             

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java	2007-06-23 09:17:39 UTC (rev 12787)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java	2007-06-23 13:27:56 UTC (rev 12788)
@@ -101,7 +101,7 @@
             final Serializable expression = MVEL.compileExpression( (String) accumDescr.getExpression(),
                                                                     ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
 
-            AccumulateFunction function = context.getConfiguration().getAccumulatorFunction( accumDescr.getFunctionIdentifier() );
+            AccumulateFunction function = context.getConfiguration().getAccumulateFunction( accumDescr.getFunctionIdentifier() );
             
             accumulator = new MVELAccumulatorFunctionExecutor( factory,
                                                                expression,