pbwest      2002/11/05 06:24:58

  Modified:    src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
  Log:
  Removed foTree field from FONode.
  Saved pageSequenceMaster HashMap from FoLayoutMasterSet.
  Deleted layout-master-set subtree.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +10 -5     xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
  
  Index: FoRoot.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- FoRoot.java       4 Nov 2002 14:54:56 -0000       1.1.2.13
  +++ FoRoot.java       5 Nov 2002 14:24:58 -0000       1.1.2.14
  @@ -19,6 +19,7 @@
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.pagination.FoLayoutMasterSet;
  +import org.apache.fop.fo.declarations.FoDeclarations;
   import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
  @@ -43,7 +44,7 @@
       private static final String tag = "$Name$";
       private static final String revision = "$Revision$";
   
  -    private FoLayoutMasterSet layoutMasters;
  +    private HashMap pageSequenceMasters;
   
       /** Map of <tt>Integer</tt> indices of <i>sparsePropsSet</i> array.
           It is indexed by the FO index of the FO associated with a given
  @@ -122,9 +123,12 @@
           }
           // Process the layout-master-set
           try {
  -            layoutMasters = new FoLayoutMasterSet(foTree, this, ev);
  +            FoLayoutMasterSet layoutMasters =
  +                                new FoLayoutMasterSet(getFOTree(), this, ev);
               // Clean up the fo:layout-master-set event
  +            pageSequenceMasters = layoutMasters.getPageSequenceMasters();
               xmlevents.getEndElement(ev);
  +            layoutMasters.deleteSubTree();
           } catch(TreeException e) {
               throw new FOPException("TreeException: " + e.getMessage());
           } catch(PropertyException e) {
  @@ -136,6 +140,7 @@
                           (FObjectNames.DECLARATIONS, XMLEvent.DISCARD_W_SPACE);
               if (ev != null) {
                   // process the declarations
  +                new FoDeclarations(getFOTree(), this, ev);
                   xmlevents.getEndElement(FObjectNames.DECLARATIONS);
               }
           } catch (NoSuchElementException e) {
  
  
  

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

Reply via email to