[jboss-svn-commits] JBL Code SVN: r14227 - 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-08-14 20:39:27 -0400 (Tue, 14 Aug 2007)
New Revision: 14227

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
Log:
JBRULES-1080: extracted a public method processMacros to make macros processing available for completions and other tooling

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-08-14 23:14:20 UTC (rev 14226)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-08-15 00:39:27 UTC (rev 14227)
@@ -65,11 +65,8 @@
                                                                      context.getPkg().getGlobals() );
             factory.setNextFactory( dialect.getClassImportResolverFactory() );
 
-            MacroProcessor macroProcessor = new MacroProcessor();
-            macroProcessor.setMacros( macros );
+            String text = processMacros( (String) context.getRuleDescr().getConsequence() );
 
-            String text = macroProcessor.parse( delimitExpressions( (String) context.getRuleDescr().getConsequence() ) );
-
             Dialect.AnalysisResult analysis = dialect.analyzeBlock( context,
                                                                     context.getRuleDescr(),
                                                                     dialect.getInterceptors(),
@@ -92,6 +89,12 @@
         }
     }
 
+    public String processMacros(String consequence) {
+        MacroProcessor macroProcessor = new MacroProcessor();
+        macroProcessor.setMacros( macros );
+        return macroProcessor.parse( delimitExpressions( consequence ) );
+    }
+
     /**
      * Allows newlines to demarcate expressions, as per MVEL command line.
      * If expression spans multiple lines (ie inside an unbalanced bracket) then