tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
Date Tue, 02 Mar 2004 19:39:13 GMT
kinman      2004/03/02 11:39:13

  Modified:    jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  - Annotate several node types with missing Java line information.  This
    also fixes bugzilla 27368: missing smap for UninterpretedTag nodes.
  
  Revision  Changes    Path
  1.222     +19 -3     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -r1.221 -r1.222
  --- Generator.java	1 Mar 2004 21:09:21 -0000	1.221
  +++ Generator.java	2 Mar 2004 19:39:12 -0000	1.222
  @@ -1756,6 +1756,8 @@
   
           public void visit(Node.UninterpretedTag n) throws JasperException {
   
  +            n.setBeginJavaLine(out.getJavaLine());
  +
               /*
                * Write begin tag
                */
  @@ -1816,10 +1818,14 @@
               } else {
                   out.println("/>\");");
               }
  +
  +            n.setEndJavaLine(out.getJavaLine());
           }
   
           public void visit(Node.JspElement n) throws JasperException {
   
  +            n.setBeginJavaLine(out.getJavaLine());
  +
               // Compute attribute value string for XML-style and named
               // attributes
               Hashtable map = new Hashtable();
  @@ -1882,6 +1888,8 @@
               } else {
                   out.println(" + \"/>\");");
               }
  +
  +            n.setEndJavaLine(out.getJavaLine());
           }
   
           public void visit(Node.TemplateText n) throws JasperException {
  @@ -2007,6 +2015,8 @@
   
           public void visit(Node.InvokeAction n) throws JasperException {
   
  +            n.setBeginJavaLine(out.getJavaLine());
  +
               // Copy virtual page scope of tag file to page scope of invoking
               // page
               out.printil(
  @@ -2041,10 +2051,14 @@
                   }
                   out.println(");");
               }
  +
  +            n.setEndJavaLine(out.getJavaLine());
           }
   
           public void visit(Node.DoBodyAction n) throws JasperException {
   
  +            n.setBeginJavaLine(out.getJavaLine());
  +
               // Copy virtual page scope of tag file to page scope of invoking
               // page
               out.printil(
  @@ -2081,6 +2095,8 @@
                   }
                   out.println(");");
               }
  +
  +            n.setEndJavaLine(out.getJavaLine());
           }
   
           public void visit(Node.AttributeGenerator n) throws JasperException {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message