Author: henning Date: Tue Oct 10 15:51:49 2006 New Revision: 462624 URL: http://svn.apache.org/viewvc?view=rev&rev=462624 Log: add toString() methods to allow inspection of the AST using a debugger (buuh!) and get some readable results.
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java?view=diff&rev=462624&r1=462623&r2=462624 ============================================================================== --- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java (original) +++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java Tue Oct 10 15:51:49 2006 @@ -19,6 +19,7 @@ import java.io.Writer; import java.io.IOException; +import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.directive.Directive; import org.apache.velocity.runtime.parser.Parser; @@ -161,6 +162,15 @@ { return directiveName; } + + public String toString() + { + return new ToStringBuilder(this) + .appendSuper(super.toString()) + .append("directiveName", getDirectiveName()) + .toString(); + } + } Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java?view=diff&rev=462624&r1=462623&r2=462624 ============================================================================== --- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java (original) +++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Tue Oct 10 15:51:49 2006 @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.Writer; +import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; @@ -385,6 +386,36 @@ public int getColumn() { return first.beginColumn; + } + + public String toString() + { + StringBuffer tokens = new StringBuffer(); + + for (Token t = getFirstToken(); t != null; ) + { + tokens.append("[").append(t.image).append("]"); + if (t.next != null) + { + if (t.equals(getLastToken())) + { + break; + } + else + { + tokens.append(", "); + } + } + t = t.next; + } + + return new ToStringBuilder(this) + .append("id", getType()) + .append("info", getInfo()) + .append("invalid", isInvalid()) + .append("children", jjtGetNumChildren()) + .append("tokens", tokens) + .toString(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]