[Jboss-svn-commits] JBL Code SVN: r3681 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-04-12 23:31:52 -0400 (Wed, 12 Apr 2006)
New Revision: 3681

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java
Log:
JBRULES-88

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java	2006-04-13 03:03:19 UTC (rev 3680)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java	2006-04-13 03:31:52 UTC (rev 3681)
@@ -41,15 +41,18 @@
     private final int       template;
     private final int       offset;
     private final String    token;
+    private String templateText;
 
     public MappingError(int errorCode,
                         int template,
                         int offset,
-                        String token) {
+                        String token,
+                        String templateText) {
         this.errorCode = errorCode;
         this.template = template;
         this.token = token;
         this.offset = offset;
+        this.templateText = templateText;
     }
 
     /**
@@ -73,6 +76,13 @@
     public int getTemplate() {
         return template;
     }
+    
+    /**
+     * @return the original content.
+     */
+    public String getTemplateText() {
+        return templateText;
+    }
 
     /**
      * @inheritDoc 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java	2006-04-13 03:03:19 UTC (rev 3680)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java	2006-04-13 03:31:52 UTC (rev 3681)
@@ -96,14 +96,14 @@
                 result.add( new MappingError(MappingError.ERROR_UNUSED_TOKEN,
                                              MappingError.TEMPLATE_NATURAL,
                                              item.getNaturalTemplate().indexOf( token ), 
-                                             token) );
+                                             token, this.naturalTemplate) );
             }
             for(Iterator i = targetSet.iterator(); i.hasNext() ; ) {
                 String token = (String) i.next();
                 result.add( new MappingError(MappingError.ERROR_UNDECLARED_TOKEN,
                                              MappingError.TEMPLATE_TARGET,
                                              item.getTargetTemplate().indexOf( token ),
-                                             token ) );
+                                             token, this.naturalTemplate ) );
             }
         }
         return result;
@@ -129,7 +129,7 @@
             result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
                                           MappingError.TEMPLATE_NATURAL,
                                           natural1.start(),
-                                          token));
+                                          token, this.naturalTemplate));
         }
         
         while(natural2.find()) {
@@ -137,7 +137,7 @@
             result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
                                           MappingError.TEMPLATE_NATURAL,
                                           natural2.start(),
-                                          token));
+                                          token, this.naturalTemplate));
         }
         
         while(target1.find()) {
@@ -145,7 +145,7 @@
             result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
                                           MappingError.TEMPLATE_TARGET,
                                           target1.start(),
-                                          token));
+                                          token, this.naturalTemplate));
         }
         
         while(target2.find()) {
@@ -153,7 +153,7 @@
             result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
                                           MappingError.TEMPLATE_TARGET,
                                           target2.start(),
-                                          token));
+                                          token, this.naturalTemplate));
         }
         
         return result;