[jboss-svn-commits] JBL Code SVN: r15656 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel.

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

Author: pombredanne
Date: 2007-10-08 14:08:53 -0400 (Mon, 08 Oct 2007)
New Revision: 15656

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
Log:
Made the macro map initialization static. Reformatted code.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-10-08 17:43:17 UTC (rev 15655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-10-08 18:08:53 UTC (rev 15656)
@@ -20,24 +20,21 @@
     //private final Interceptor assertInterceptor;
     //private final Interceptor modifyInterceptor;
 
-    private final Map macros;
-
-    public MVELConsequenceBuilder() {
-        macros = new HashMap( 4 );
-
+    private static final Map macros = new HashMap( 5 );
+    static {
         macros.put( "insert",
                     new Macro() {
                         public String doMacro() {
                             return "drools.insert";
                         }
                     } );
-        
+
         macros.put( "insertLogical",
                     new Macro() {
                         public String doMacro() {
                             return "drools.insertLogical";
                         }
-                    } );        
+                    } );
 
         macros.put( "modify",
                     new Macro() {
@@ -58,9 +55,13 @@
                         public String doMacro() {
                             return "drools.retract";
                         }
-                    } );
+                    } );;
     }
 
+    public MVELConsequenceBuilder() {
+
+    }
+
     public void build(final RuleBuildContext context) {
         // pushing consequence LHS into the stack for variable resolution
         context.getBuildStack().push( context.getRule().getLhs() );
@@ -68,7 +69,6 @@
         try {
             MVELDialect dialect = (MVELDialect) context.getDialect();
 
-
             String text = processMacros( (String) context.getRuleDescr().getConsequence() );
 
             Dialect.AnalysisResult analysis = dialect.analyzeBlock( context,
@@ -81,12 +81,12 @@
                                                        analysis,
                                                        dialect.getInterceptors(),
                                                        null,
-                                                       context );            
-            
+                                                       context );
+
             final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
                                                                      null,
                                                                      context.getPkg().getGlobals(),
-                                                                     analysis.getBoundIdentifiers() );                        
+                                                                     analysis.getBoundIdentifiers() );
 
             context.getRule().setConsequence( new MVELConsequence( expr,
                                                                    factory ) );
@@ -98,7 +98,7 @@
         }
     }
 
-    public String processMacros(String consequence) {
+    public static String processMacros(String consequence) {
         MacroProcessor macroProcessor = new MacroProcessor();
         macroProcessor.setMacros( macros );
         return macroProcessor.parse( delimitExpressions( consequence ) );
@@ -157,5 +157,4 @@
         return result.toString();
     }
 
-        }
-
+}