[jboss-svn-commits] JBL Code SVN: r14786 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang: dsl and 1 other directory.

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

Author: tirelli
Date: 2007-08-31 11:56:36 -0400 (Fri, 31 Aug 2007)
New Revision: 14786

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java
Log:
Improving error messages

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java	2007-08-31 15:52:17 UTC (rev 14785)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java	2007-08-31 15:56:36 UTC (rev 14786)
@@ -45,5 +45,9 @@
     public int getLine() {
         return this.line[0];
     }
+    
+    public String toString() { 
+        return this.getMessage();
+    }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java	2007-08-31 15:52:17 UTC (rev 14785)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java	2007-08-31 15:56:36 UTC (rev 14786)
@@ -234,7 +234,7 @@
                 // do we need to report errors for that?
                 if ( lines[i].equals( expanded[lastExpanded] ) ) {
                     // report error
-                    this.addError( new ExpanderException( "Unable to expand: [" + lines[i] + "]",
+                    this.addError( new ExpanderException( "Unable to expand: " + lines[i].replaceAll( "[\n\r]", "" ),
                                                           i + lineOffset ) );
                 }
                 // but if the original starts with a "-", it means we need to add it