[jboss-svn-commits] JBL Code SVN: r12119 - 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: mark.proctor at jboss.com
Date: 2007-05-24 11:42:32 -0400 (Thu, 24 May 2007)
New Revision: 12119

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleClassBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
Log:
JBRULES-713 Make Dialects Pluggeable
-small api changes

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-05-24 15:36:28 UTC (rev 12118)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-05-24 15:42:32 UTC (rev 12119)
@@ -62,13 +62,12 @@
         if ( !(ruleDescr instanceof QueryDescr) ) {
             // do not build the consequence if we have a query
 
-            context.getDialect().getConsequenceBuilder().build( context,
-                                                                ruleDescr );
+            context.getDialect().getConsequenceBuilder().build( context );
         }
+
         RuleClassBuilder classBuilder = context.getDialect().getRuleClassBuilder();
         if ( classBuilder != null ) {
-            classBuilder.buildRule( context,
-                                    ruleDescr );
+            classBuilder.buildRule( context );
         }
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleClassBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleClassBuilder.java	2007-05-24 15:36:28 UTC (rev 12118)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleClassBuilder.java	2007-05-24 15:42:32 UTC (rev 12119)
@@ -4,7 +4,6 @@
 
 public interface RuleClassBuilder {
 
-    public void buildRule(final RuleBuildContext context,
-                          final RuleDescr ruleDescr);
+    public void buildRule(final RuleBuildContext context);
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2007-05-24 15:36:28 UTC (rev 12118)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2007-05-24 15:42:32 UTC (rev 12119)
@@ -38,14 +38,15 @@
     /* (non-Javadoc)
      * @see org.drools.semantics.java.builder.ConsequenceBuilder#buildConsequence(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.lang.descr.RuleDescr)
      */
-    public void build(final RuleBuildContext context,
-                      final RuleDescr ruleDescr) {
+    public void build(final RuleBuildContext context) {
 
         // pushing consequence LHS into the stack for variable resolution
         context.getBuildStack().push( context.getRule().getLhs() );
 
         final String className = "consequence";
 
+        final RuleDescr ruleDescr = context.getRuleDescr();
+        
         final List[] usedIdentifiers = context.getDialect().getBlockIdentifiers( context,
                                                                                  ruleDescr,
                                                                                  (String) ruleDescr.getConsequence() );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java	2007-05-24 15:36:28 UTC (rev 12118)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java	2007-05-24 15:42:32 UTC (rev 12119)
@@ -34,8 +34,7 @@
     /* (non-Javadoc)
      * @see org.drools.rule.builder.dialect.java.RuleClassBuilder#buildRule(org.drools.rule.builder.BuildContext, org.drools.rule.builder.dialect.java.BuildUtils, org.drools.lang.descr.RuleDescr)
      */
-    public void buildRule(final RuleBuildContext context,
-                          final RuleDescr ruleDescr) {
+    public void buildRule(final RuleBuildContext context) {
         final JavaDialect dialect = (JavaDialect) context.getDialect();
 
         // If there is no compiled code, return
@@ -56,6 +55,8 @@
             buffer.append( "import static " + it.next() + ";" + lineSeparator );
         }
 
+        final RuleDescr ruleDescr = context.getRuleDescr();
+        
         buffer.append( "public class " + StringUtils.ucFirst( ruleDescr.getClassName() ) + " {" + lineSeparator );
         buffer.append( "    private static final long serialVersionUID  = 320L;" + lineSeparator );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2007-05-24 15:36:28 UTC (rev 12118)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2007-05-24 15:42:32 UTC (rev 12119)
@@ -67,8 +67,7 @@
         context.setDeclarationResolver( declarationResolver );
 
         final MVELConsequenceBuilder builder = new MVELConsequenceBuilder();
-        builder.build( context,
-                       ruleDescr );
+        builder.build( context );
 
         final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
         final WorkingMemory wm = ruleBase.newStatefulSession();