pbwest      2002/11/13 07:09:27

  Modified:    src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
                        FOAttributes.java
  Log:
  Account for FoPcdata.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +11 -7     xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java
  
  Index: FOAttributes.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- FOAttributes.java 5 Nov 2002 14:23:29 -0000       1.1.2.12
  +++ FOAttributes.java 13 Nov 2002 15:09:26 -0000      1.1.2.13
  @@ -3,9 +3,10 @@
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.PropertyConsts;
  +import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.datatypes.Ints;
   import org.apache.fop.messaging.MessageHandler;
  -import org.apache.fop.xml.XMLEvent;
  +import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
   
   import org.xml.sax.Attributes;
  @@ -89,18 +90,21 @@
        * value is entered into the appropriate <tt>HashMap</tt> in the
        * <tt>ArrayList</tt> <i>nSpaceAttrMaps</i>, indexed by the attribute's
        * local name.
  -     * @param event - the XML event which triggered construction of the parent
  -     * <tt>FONode</tt>.
  +     * @param event - the FO XML event which triggered construction of the
  +     * parent <tt>FONode</tt>.
        * @param foNode - the <tt>FONode</tt> with which these attributes are
        * associated.
        */
  -    public FOAttributes (XMLEvent event, FONode foNode) throws FOPException {
  +    public FOAttributes(FoXMLEvent event, FONode foNode) throws FOPException {
   
           // If the event is null, there is no event associated with this
           // node, probably because this is a manufactured node; e.g.,
           // an "invented" FopageSequenceMaster.  The default initialisation
           // includes an empty foAttrMap HashMap.
           if (event == null) return;
  +
  +        if (event.getFoType() == FObjectNames.PCDATA)
  +            return;  // go with the empty foAttrMap
   
           // Create the foAttrMap.
           Attributes attributes = event.getAttributes();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to