[jboss-svn-commits] JBL Code SVN: r6071 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: reteoo rule

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

Author: mark.proctor at jboss.com
Date: 2006-09-02 19:15:18 -0400 (Sat, 02 Sep 2006)
New Revision: 6071

Added:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java
Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java
Log:
JBRULES-118 Map generated .java compilation errors to drl
-Added LineMappings class which is referenced from PackageCompilationData. It provides linestart and offset to
 determine correct line numbers for compiled code.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java	2006-09-02 23:15:11 UTC (rev 6070)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java	2006-09-02 23:15:18 UTC (rev 6071)
@@ -236,11 +236,6 @@
         final InitialFactHandle handle = new InitialFactHandle( workingMemory.getFactHandleFactory().newFactHandle( new Serializable() {
         } ) );
 
-        final PropagationContext propagationContext = new PropagationContextImpl( workingMemory.getNextPropagationIdCounter(),
-                                                                                  PropagationContext.ASSERTION,
-                                                                                  null,
-                                                                                  null );
-
         workingMemory.queueWorkingMemoryAction( workingMemory.new WorkingMemoryReteAssertAction( handle,
                                                                                                  false,
                                                                                                  true,

Added: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java	2006-09-02 23:15:11 UTC (rev 6070)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java	2006-09-02 23:15:18 UTC (rev 6071)
@@ -0,0 +1,33 @@
+package org.drools.rule;
+
+public class LineMappings {
+    private String className;
+    private int startLine;
+    private int offset;
+    
+    public LineMappings(String className) {
+        this.className = className;
+    }
+    
+    public String getClassName() {
+        return this.className;
+    }
+    
+    public void setStartLine(int startLine) {
+        this.startLine = startLine;
+    }
+    
+    public int getStartLine() {
+        return this.startLine;
+    }
+  
+    public void setOffset(int offset) {
+        this.offset = offset;
+    } 
+    
+    public int getOffset() {
+       return this.offset;
+    }      
+    
+    
+}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java	2006-09-02 23:15:11 UTC (rev 6070)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PackageCompilationData.java	2006-09-02 23:15:18 UTC (rev 6071)
@@ -25,6 +25,7 @@
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -45,17 +46,19 @@
     /**
      * 
      */
-    private static final long            serialVersionUID = -4351259299237235523L;
+    private static final long            serialVersionUID = 320L;
 
     private Map                          invokerLookups;
 
     private Object                       AST;
 
     private Map                          store;
+    
+    private Map                          lineMappings;
 
     private transient PackageClassLoader classLoader;
 
-    private transient ClassLoader        parentClassLoader;
+    private transient ClassLoader        parentClassLoader;   
 
     /**
      * Default constructor - for Externalizable. This should never be used by a user, as it 
@@ -69,6 +72,7 @@
         initClassLoader( parentClassLoader );
         this.invokerLookups = new HashMap();
         this.store = new HashMap();
+        this.lineMappings = Collections.EMPTY_MAP;
     }
 
     private void initClassLoader(ClassLoader parentClassLoader) {
@@ -256,6 +260,18 @@
     public void removeInvoker(final String className) {
         this.invokerLookups.remove( className );
     }
+    
+    public Map getLineMappings() {
+        return this.lineMappings;
+    }
+    
+    public void setLineMappings(Map lineMappings) {
+        this.lineMappings = lineMappings;
+    }
+    
+    public LineMappings getLineMappings(String className) {
+        return ( LineMappings ) this.lineMappings.get( className );
+    }
 
     public Object getAST() {
         return this.AST;