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

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

Author: mark.proctor at jboss.com
Date: 2007-04-25 13:37:34 -0400 (Wed, 25 Apr 2007)
New Revision: 11330

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
   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/dialect/java/JavaDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java
Log:
JBRULES-713 Make Dialects Pluggeable
-the ruleCass content has been moved from the BuildContext to the JavaDialect, as it was dialect specific.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2007-04-25 17:14:03 UTC (rev 11329)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2007-04-25 17:37:34 UTC (rev 11330)
@@ -58,9 +58,6 @@
     // errors found when building the current context
     private List                     errors;
 
-    // the class name for the rule    
-    private String                   ruleClass;
-
     // list of generated methods
     private List                     methods;
 
@@ -230,14 +227,14 @@
         this.patternId = patternId;
     }
 
-    public String getRuleClass() {
-        return this.ruleClass;
-    }
+//    public String getRuleClass() {
+//        return this.ruleClass;
+//    }
+//
+//    public void setRuleClass(final String ruleClass) {
+//        this.ruleClass = ruleClass;
+//    }
 
-    public void setRuleClass(final String ruleClass) {
-        this.ruleClass = ruleClass;
-    }
-
     public Stack getBuildStack() {
         return this.buildStack;
     }

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-04-25 17:14:03 UTC (rev 11329)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-04-25 17:37:34 UTC (rev 11330)
@@ -73,9 +73,9 @@
         return (this.context == null) ? null : this.context.getDescrLookups();
     }
 
-    public String getRuleClass() {
-        return (this.context == null) ? null : this.context.getRuleClass();
-    }
+//    public String getRuleClass() {
+//        return (this.context == null) ? null : this.context.getRuleClass();
+//    }
 
     public Map getInvokerLookups() {
         return (this.context == null) ? null : this.context.getInvokerLookups();

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-04-25 17:14:03 UTC (rev 11329)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-04-25 17:37:34 UTC (rev 11330)
@@ -100,8 +100,12 @@
     private Map                            lineMappings;
     private Map                            errorHandlers;
     private List                           results;
+    // the class name for the rule    
+    private String                   ruleClass;
+    
     private final TypeResolver             typeResolver;
     private final ClassFieldExtractorCache classFieldExtractorCache;
+    
 
     // a map of registered builders
     private Map                            builders;
@@ -196,6 +200,10 @@
                                                          this.src );
         ruleDescr.setClassName( ucFirst( ruleClassName ) );
     }
+    
+    public void setRuleClass(String ruleClass) {
+        this.ruleClass = ruleClass;
+    }
 
     public List[] getExpressionIdentifiers(final RuleBuildContext context,
                                            final BaseDescr descr,
@@ -403,14 +411,14 @@
                         final Rule rule,
                         final RuleDescr ruleDescr) {
         // return if there is no ruleclass name;       
-        if ( builder.getRuleClass() == null ) {
+        if ( this.ruleClass == null ) {
             return;
         }
 
         // The compilation result is for th entire rule, so difficult to associate with any descr
         addClassCompileTask( this.pkg.getName() + "." + ruleDescr.getClassName(),
                              ruleDescr,
-                             builder.getRuleClass(),
+                             this.ruleClass,
                              this.src,
                              new RuleErrorHandler( ruleDescr,
                                                    rule,

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-04-25 17:14:03 UTC (rev 11329)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java	2007-04-25 17:37:34 UTC (rev 11330)
@@ -36,9 +36,11 @@
      */
     public void buildRule(final RuleBuildContext context,
                           final RuleDescr ruleDescr) {
+        JavaDialect dialect = (JavaDialect) context.getDialect();
+        
         // If there is no compiled code, return
         if ( context.getMethods().isEmpty() ) {
-            context.setRuleClass( null );
+            dialect.setRuleClass( null );
             return;
         }
         final String lineSeparator = System.getProperty( "line.separator" );
@@ -68,6 +70,6 @@
         buffer.append( context.getMethods().get( context.getMethods().size() - 1 ) + lineSeparator );
         buffer.append( "}" );
 
-        context.setRuleClass( buffer.toString() );
+        dialect.setRuleClass( buffer.toString() );
     }
 }