You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/08/28 22:04:35 UTC

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

mmidy       00/08/28 13:04:33

  Modified:    java/src/org/apache/xalan/templates ElemUse.java
  Log:
  Apply attribute sets from imported stylesheets.
  
  Revision  Changes    Path
  1.3       +9 -6      xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java
  
  Index: ElemUse.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ElemUse.java	2000/07/05 14:40:21	1.2
  +++ ElemUse.java	2000/08/28 20:04:32	1.3
  @@ -149,11 +149,14 @@
         {
           QName qname = attributeSetsNames[i];
           Vector attrSets = stylesheet.getAttributeSetComposed(qname);
  -        int nSets = attrSets.size();
  -        for(int k = 0; k < nSets; k++)
  -        {
  -          ElemAttributeSet attrSet = (ElemAttributeSet)attrSets.elementAt(k);
  -          attrSet.execute(transformer, sourceNode, mode);
  +        if (null != attrSets)
  +        {  
  +          int nSets = attrSets.size();
  +          for(int k = 0; k < nSets; k++)
  +          {
  +            ElemAttributeSet attrSet = (ElemAttributeSet)attrSets.elementAt(k);
  +            attrSet.execute(transformer, sourceNode, mode);
  +          }
           }
         }
       }
  @@ -182,7 +185,7 @@
       if(null != m_attributeSetsNames)
       {
         applyAttrSets(transformer, 
  -                    getStylesheetComposed(),
  +                    getStylesheetRoot().getStylesheetComposed(),
                       m_attributeSetsNames, 
                       sourceNode, mode);
       }