[jboss-svn-commits] JBL Code SVN: r13298 - 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-07-10 09:24:16 -0400 (Tue, 10 Jul 2007)
New Revision: 13298

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.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/mvel/MVELDialect.java
Log:
-Now initialises all dialects for the current package
-LineMappings are now shared ant not set, in the init method.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-07-10 13:19:28 UTC (rev 13297)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-07-10 13:24:16 UTC (rev 13298)
@@ -305,7 +305,10 @@
         final Package pkg = new Package( packageDescr.getName(),
                                          this.configuration.getClassLoader() );       
 
-        this.dialect.init( pkg );
+        for ( Iterator it = this.dialects.iterator(); it.hasNext(); ) {
+            Dialect dialect = ( Dialect ) it.next();
+            dialect.init( pkg );
+        }
 
         mergePackage( pkg,
                       packageDescr );

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-07-10 13:19:28 UTC (rev 13297)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-07-10 13:24:16 UTC (rev 13298)
@@ -173,18 +173,13 @@
         this.results = new ArrayList();
 
         this.src = new MemoryResourceReader();
-        if ( pkg != null ) {
-            this.packageStoreWrapper = new PackageStore( pkg.getPackageCompilationData(),
-                                                         this.results );
-            this.lineMappings = pkg.getPackageCompilationData().getLineMappings();
-        }
 
         this.generatedClassList = new ArrayList();
 
         this.packageStoreWrapper = new PackageStore( pkg.getPackageCompilationData(),
                                                      this.results );
-        this.lineMappings = new HashMap();
-        pkg.getPackageCompilationData().setLineMappings( this.lineMappings );
+        
+        this.lineMappings = pkg.getPackageCompilationData().getLineMappings();
     }
 
     public void init(final RuleDescr ruleDescr) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-07-10 13:19:28 UTC (rev 13297)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-07-10 13:24:16 UTC (rev 13298)
@@ -301,7 +301,8 @@
         parserContext.addInput( "drools", KnowledgeHelper.class );
 
         ExpressionCompiler compiler = new ExpressionCompiler( text );
-        return compiler.compile( parserContext );
+        Serializable expr = compiler.compile( parserContext );
+        return expr;
     }
 
     public RuleConditionBuilder getBuilder(final Class clazz) {