cvs commit: jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator JspParseEventListener.java ServletWriter.java

[costin]

costin      01/06/16 13:41:13

  Modified:    jasper34/generator/org/apache/jasper34/generator
                        JspParseEventListener.java ServletWriter.java
  Log:
  Adapt to the changed signature in JspPageInfo ( it was very confusing to
  have different method names for the same thing - and the same info in 2 classes ).
  
  Mangler is now used for all info related with the java/class file names.
  
  Revision  Changes    Path
  1.7       +2 -1      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java
  
  Index: JspParseEventListener.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspParseEventListener.java        2001/06/12 15:12:58     1.6
  +++ JspParseEventListener.java        2001/06/16 20:41:12     1.7
  @@ -162,7 +162,8 @@
               String uri = (String) attrs.get("uri");
               String prefix = (String) attrs.get("prefix");
               try {
  -             pageInfo.libraries.addTagLibrary( prefix, uri );
  +             pageInfo.libraries.addTagLibrary( prefix, uri,
  +                                               pageInfo.getJspFile() );
               } catch (Exception ex) {
                   Object[] args = new Object[] { uri, ex.getMessage() };
                   throw new CompileException(start, 
containerL.getString("jsp.error.badtaglib",
  
  
  
  1.7       +6 -3      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java
  
  Index: ServletWriter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServletWriter.java        2001/06/12 15:13:00     1.6
  +++ ServletWriter.java        2001/06/16 20:41:12     1.7
  @@ -120,8 +120,10 @@
       private void generateHeader(JspPageInfo pageInfo)
        throws JasperException
       {
  -        String servletPackageName = pageInfo.getServletPackageName();
  -        String servletClassName = pageInfo.getServletClassName();
  +        String servletPackageName =
  +         pageInfo.getMangler().getPackageName();
  +        String servletClassName =
  +         pageInfo.getMangler().getClassName();
        // First the package name:
        this.setPackage( servletPackageName );
        
  @@ -233,7 +235,8 @@
       private void generateConstructor(JspPageInfo pageInfo )
        throws JasperException
       {
  -        this.println("public "+ pageInfo.getServletClassName()+"( ) {");
  +        this.println("public "+
  +                  pageInfo.getMangler().getClassName()+"( ) {");
           this.println("}");
           this.println();
       }