cvs commit: xml-xalan/java/src/org/apache/xalan/templates StylesheetRoot.java

[garyp]

garyp       00/11/03 00:42:35

  Modified:    java/src/org/apache/xalan/templates StylesheetRoot.java
  Log:
  Visit compose() method for all elements in all imported and included 
stylesheets.
  
  Revision  Changes    Path
  1.15      +15 -2     
xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
  
  Index: StylesheetRoot.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- StylesheetRoot.java       2000/10/30 18:50:06     1.14
  +++ StylesheetRoot.java       2000/11/03 08:42:34     1.15
  @@ -219,7 +219,20 @@
       recomposeTemplates();
       recomposeVariables();
       recomposeWhiteSpaceInfo();
  -    composeTemplates(this);
  +
  +    // Now call the compose() method on every element.
  +
  +    for (int i = 0; i < n; i++)
  +    {
  +      StylesheetComposed imported = this.getGlobalImport(i);
  +      composeTemplates(imported);
  +      int includedCount = imported.getIncludeCountComposed();
  +      for (int j = 0; j < includedCount; j++)
  +      {
  +        Stylesheet included = imported.getIncludeComposed(j);
  +        composeTemplates(included);
  +      }
  +    }
     }
   
     /**
  @@ -227,7 +240,7 @@
      *
      * NEEDSDOC @param templ
      */
  -  void composeTemplates(ElemTemplateElement templ)
  +  static void composeTemplates(ElemTemplateElement templ)
     {
   
       templ.compose();