cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoRegionAfter.java FoRegionBefore.java FoRegionBeforeAfter.java FoRegionBody.java FoRegionEnd.java FoRegionStart.java FoRegionStartEnd.java FoSimplePageMaster.java PageSequenceMaster.java

2003-03-30 Thread pbwest 
pbwest  2003/03/30 18:40:09

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoRegionAfter.java FoRegionBefore.java
FoRegionBeforeAfter.java FoRegionBody.java
FoRegionEnd.java FoRegionStart.java
FoRegionStartEnd.java FoSimplePageMaster.java
PageSequenceMaster.java
  Log:
  Tidied copyright notice
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.21  +55 -55
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.20
  retrieving revision 1.1.2.21
  diff -u -r1.1.2.20 -r1.1.2.21
  --- FoLayoutMasterSet.java19 Mar 2003 14:06:48 -  1.1.2.20
  +++ FoLayoutMasterSet.java31 Mar 2003 02:40:08 -  1.1.2.21
  @@ -1,3 +1,57 @@
  +/*
  + * $Id$
  + * 
  + * 
  + *   The Apache Software License, Version 1.1
  + * 
  + * 
  + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  + * 
  + * Redistribution and use in source and binary forms, with or without modifica-
  + * tion, are permitted provided that the following conditions are met:
  + * 
  + * 1. Redistributions of  source code must  retain the above copyright  notice,
  + *this list of conditions and the following disclaimer.
  + * 
  + * 2. Redistributions in binary form must reproduce the above copyright notice,
  + *this list of conditions and the following disclaimer in the documentation
  + *and/or other materials provided with the distribution.
  + * 
  + * 3. The end-user documentation included with the redistribution, if any, must
  + *include  the following  acknowledgment:  "This product includes  software
  + *developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  + *Alternately, this  acknowledgment may  appear in the software itself,  if
  + *and wherever such third-party acknowledgments normally appear.
  + * 
  + * 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
  + *endorse  or promote  products derived  from this  software without  prior
  + *written permission. For written permission, please contact
  + *[EMAIL PROTECTED]
  + * 
  + * 5. Products  derived from this software may not  be called "Apache", nor may
  + *"Apache" appear  in their name,  without prior written permission  of the
  + *Apache Software Foundation.
  + * 
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + * FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + * ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + * (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + * 
  + * This software  consists of voluntary contributions made  by many individuals
  + * on  behalf of the Apache Software  Foundation and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see .
  + *  
  + * 
  + * @author mailto:[EMAIL PROTECTED]">Peter B. West
  + * @version $Revision$ $Name$
  + */
   package org.apache.fop.fo.pagination;
   
   import java.util.Collection;
  @@ -22,60 +76,6 @@
   import org.apache.fop.fo.pagination.FoPageSequenceMaster;
   import org.apache.fop.fo.pagination.PageSequenceMaster;
   
  -/*
  - * $Id$
  - * 
  - *  
  - *The Apache Software License, Version 1.1
  - *  
  - *  
  - *  Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - *  
  - *  Redistribution and use in source and binary forms, with or without modifica-
  - *  tion, are permitted provided that the following conditions are met:
  - *  
  - *  1. Redistributions of  source

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoRegionAfter.java FoRegionBefore.java FoRegionBeforeAfter.java FoRegionBody.java FoRegionEnd.java FoRegionStart.java FoRegionStartEnd.java FoSimplePageMaster.java PageSequenceMaster.java

2003-03-19 Thread pbwest 
pbwest  2003/03/19 06:06:49

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoRegionAfter.java FoRegionBefore.java
FoRegionBeforeAfter.java FoRegionBody.java
FoRegionEnd.java FoRegionStart.java
FoRegionStartEnd.java FoSimplePageMaster.java
PageSequenceMaster.java
  Log:
  Full LICENSE text.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.20  +51 -6 
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.19
  retrieving revision 1.1.2.20
  diff -u -r1.1.2.19 -r1.1.2.20
  --- FoLayoutMasterSet.java3 Dec 2002 07:47:44 -   1.1.2.19
  +++ FoLayoutMasterSet.java19 Mar 2003 14:06:48 -  1.1.2.20
  @@ -24,9 +24,54 @@
   
   /*
* $Id$
  - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * For details on use and redistribution please refer to the
  - * LICENSE file included with these sources.
  + * 
  + *  
  + *The Apache Software License, Version 1.1
  + *  
  + *  
  + *  Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  + *  
  + *  Redistribution and use in source and binary forms, with or without modifica-
  + *  tion, are permitted provided that the following conditions are met:
  + *  
  + *  1. Redistributions of  source code must  retain the above copyright  notice,
  + * this list of conditions and the following disclaimer.
  + *  
  + *  2. Redistributions in binary form must reproduce the above copyright notice,
  + * this list of conditions and the following disclaimer in the documentation
  + * and/or other materials provided with the distribution.
  + *  
  + *  3. The end-user documentation included with the redistribution, if any, must
  + * include  the following  acknowledgment:  "This product includes  software
  + * developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  + * Alternately, this  acknowledgment may  appear in the software itself,  if
  + * and wherever such third-party acknowledgments normally appear.
  + *  
  + *  4. The names "FOP" and  "Apache Software Foundation"  must not be used to
  + * endorse  or promote  products derived  from this  software without  prior
  + * written permission. For written permission, please contact
  + * [EMAIL PROTECTED]
  + *  
  + *  5. Products  derived from this software may not  be called "Apache", nor may
  + * "Apache" appear  in their name,  without prior written permission  of the
  + * Apache Software Foundation.
  + *  
  + *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + *  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + *  FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + *  APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + *  INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + *  DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + *  OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + *  ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + *  (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + *  
  + *  This software  consists of voluntary contributions made  by many individuals
  + *  on  behalf of the Apache Software  Foundation and was  originally created by
  + *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + *  Software Foundation, please see .
  + *  
* 
* @author mailto:[EMAIL PROTECTED]">Peter B. West
* @version $Revision$ $Name$
  
  
  
  1.1.2.18  +50 -5 
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- FoPageSequenceMaster.java 3 Dec 2002 07:47:44 -   1.1.2.17
  +++ FoPageSequenceMaster.java 19 Mar 2003 14:06:48 -  1.1.2.18

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoSimplePageMaster.java

2002-12-01 Thread pbwest 
pbwest  2002/12/01 06:44:55

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
  Log:
  Used pool.surrenderEvent().
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.18  +4 -4  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.17
  retrieving revision 1.1.2.18
  diff -u -r1.1.2.17 -r1.1.2.18
  --- FoLayoutMasterSet.java29 Nov 2002 17:11:54 -  1.1.2.17
  +++ FoLayoutMasterSet.java1 Dec 2002 14:44:55 -   1.1.2.18
  @@ -172,7 +172,7 @@
   throw new FOPException
   ("Aargh! expectStartElement(events, list)");
   // Flush the master event
  -xmlevents.getEndElement(ev);
  +ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
   pool.surrenderEvent(ev);
   } while (true);
   } catch (NoSuchElementException e) {
  
  
  
  1.1.2.16  +5 -4  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- FoPageSequenceMaster.java 29 Nov 2002 17:11:54 -  1.1.2.15
  +++ FoPageSequenceMaster.java 1 Dec 2002 14:44:55 -   1.1.2.16
  @@ -214,7 +214,7 @@
   } else
   throw new FOPException
   ("Aargh! expectStartElement(events, list)");
  -xmlevents.getEndElement(ev);
  +ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
   pool.surrenderEvent(ev);
   } while (true);
   } catch (NoSuchElementException e) {
  @@ -304,7 +304,8 @@
   //System.out.println
   //("Found conditional-page-master-reference");
   new FoConditionalPageMasterReference(foTree, this, ev);
  -this.xmlevents.getEndElement(ev);
  +ev = this.xmlevents.getEndElement
  +(this.xmlevents.DISCARD_EV, ev);
   this.pool.surrenderEvent(ev);
   } while (true);
   } catch (NoSuchElementException e) {
  
  
  
  1.1.2.13  +11 -7 
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
  
  Index: FoSimplePageMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- FoSimplePageMaster.java   29 Nov 2002 17:11:54 -  1.1.2.12
  +++ FoSimplePageMaster.java   1 Dec 2002 14:44:55 -   1.1.2.13
  @@ -103,7 +103,7 @@
   + getMasterName());
   // Process region-body
   regionBody = new FoRegionBody(foTree, this, regionEv);
  -xmlevents.getEndElement(regionEv);
  +regionEv = xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
   pool.surrenderEvent(regionEv);
   
   // Remaining regions are optional
  @@ -112,7 +112,8 @@
   != null)
   {
   regionBefore = new FoRegionBefore(foTree, this, regionEv);
  -xmlevents.getEndElement(regionEv);
  +regionEv =
  +xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
   pool.surrenderEvent(regionEv);
   }
   
  @@ -121,7 +122,8 @@
   != null)
   {
   regionAfter = new FoRegionAfter(foTree, this, regionEv);
  -xmlevents.getEndElement(regionEv);
  +regionEv =
  +xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
   pool.surrenderEvent(regionEv);
   }
   
  @@ -130,7 +132,8 @@
   != null)
   {
   regionStart = new FoRegionStart(foTree, this, regionEv);
  -xmlevents.getEndElement(regionEv);
  +regionEv =
  +xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
   pool.surrenderEvent(regionEv);
   }
   
  @@ -139,7 +142,8 @@
   != null)
   {
   regionEnd = new FoRegionEnd(foTree, this, regionEv);
  -xmlevents.g

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoSimplePageMaster.java

2002-11-29 Thread pbwest 
pbwest  2002/11/29 09:11:54

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
  Log:
  Added surrenderEvent() calls.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.17  +4 -6  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- FoLayoutMasterSet.java21 Nov 2002 08:11:50 -  1.1.2.16
  +++ FoLayoutMasterSet.java29 Nov 2002 17:11:54 -  1.1.2.17
  @@ -108,9 +108,6 @@
   setupPageMasters(event);
   // No need to clean up the build tree, because the whole subtree
   // will be deleted.
  -// This is problematical: while Node is obliged to belong to a Tree,
  -// any remaining references to elements of the subtree will keep the
  -// whole subtree from being GCed.
   makeSparsePropsSet();
   }
   
  @@ -176,6 +173,7 @@
   ("Aargh! expectStartElement(events, list)");
   // Flush the master event
   xmlevents.getEndElement(ev);
  +pool.surrenderEvent(ev);
   } while (true);
   } catch (NoSuchElementException e) {
   // Unexpected end of file
  
  
  
  1.1.2.15  +4 -2  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- FoPageSequenceMaster.java 13 Nov 2002 04:15:19 -  1.1.2.14
  +++ FoPageSequenceMaster.java 29 Nov 2002 17:11:54 -  1.1.2.15
  @@ -215,6 +215,7 @@
   throw new FOPException
   ("Aargh! expectStartElement(events, list)");
   xmlevents.getEndElement(ev);
  +pool.surrenderEvent(ev);
   } while (true);
   } catch (NoSuchElementException e) {
   throw new FOPException("Unexpected EOF in page-sequence-master.");
  @@ -304,6 +305,7 @@
   //("Found conditional-page-master-reference");
   new FoConditionalPageMasterReference(foTree, this, ev);
   this.xmlevents.getEndElement(ev);
  +this.pool.surrenderEvent(ev);
   } while (true);
   } catch (NoSuchElementException e) {
   // End of file reached
  
  
  
  1.1.2.12  +7 -2  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
  
  Index: FoSimplePageMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- FoSimplePageMaster.java   13 Nov 2002 04:15:19 -  1.1.2.11
  +++ FoSimplePageMaster.java   29 Nov 2002 17:11:54 -  1.1.2.12
  @@ -104,6 +104,7 @@
   // Process region-body
   regionBody = new FoRegionBody(foTree, this, regionEv);
   xmlevents.getEndElement(regionEv);
  +pool.surrenderEvent(regionEv);
   
   // Remaining regions are optional
   if ((regionEv = xmlevents.expectStartElement
  @@ -112,6 +113,7 @@
   {
   regionBefore = new FoRegionBefore(foTree, this, regionEv);
   xmlevents.getEndElement(regionEv);
  +pool.surrenderEvent(regionEv);
   }
   
   if ((regionEv = xmlevents.expectStartElement
  @@ -120,6 +122,7 @@
   {
   regionAfter = new FoRegionAfter(foTree, this, regionEv);
   xmlevents.getEndElement(regionEv);
  +pool.surrenderEvent(regionEv);
   }
   
   if ((regionEv = xmlevents.expectStartElement
  @@ -128,6 +131,7 @@
   {
   regionStart = new FoRegionStart(foTree, this, regionEv);
   xmlevents.getEndElement(regionEv);
  +pool.surrenderEvent(regionEv);
   }
   
   if ((regionEv = xmlevents.expectStartElement
  @@ -136,6 +140,7 @@
   {
   regionEnd = new FoRegionEnd(foTree, this, regionEv);
   xmlevents.getEndElement(regionEv);
  +pool.surrenderEvent(regionEv);
   }
   
   // Clean up the build environment

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java

2002-11-21 Thread pbwest 
pbwest  2002/11/21 00:11:50

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
  Log:
  Add processing of simplepage-masters into PageSequenceMasters.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.16  +22 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- FoLayoutMasterSet.java13 Nov 2002 04:15:19 -  1.1.2.15
  +++ FoLayoutMasterSet.java21 Nov 2002 08:11:50 -  1.1.2.16
  @@ -1,6 +1,6 @@
   package org.apache.fop.fo.pagination;
   
  -import java.util.Set;
  +import java.util.Collection;
   import java.util.HashMap;
   import java.util.LinkedList;
   import java.util.Iterator;
  @@ -150,6 +150,7 @@
   ("simple-page-master master-name clash in "
+ "simplePageMasters: " + masterName);
   simplePageMasters.put(masterName, simple);
  +System.out.println("simple-page-master ok");
   } else if (foType == FObjectNames.PAGE_SEQUENCE_MASTER) {
   //System.out.println("Found page-sequence-master");
   try {
  @@ -169,6 +170,7 @@
   ("page-sequence-master master-name clash in "
+ "simplePageMasters: " + masterName);
   pageMasters.put(masterName, foPageSeq);
  +System.out.println("page-sequence-master ok");
   } else
   throw new FOPException
   ("Aargh! expectStartElement(events, list)");
  @@ -185,25 +187,32 @@
   catch (TreeException e) {
   throw new FOPException(e);
   }
  -if (pageMasters.size() == 0)
  +if (pageMasters.size() == 0 && simplePageMasters.size() == 0)
   throw new FOPException
   ("No page masters defined in layout-master-set.");
   // Create the master set structures.
  -// Scan the page-sequence-masters
   // N.B. Processing of the page-sequence-masters must be deferred until
   // now because contained master-references may be to
   // simple-page-masters which follow the page-sequence-master in the
   // input tree.
  -Set pageSeqSet = pageMasters.keySet();
  -Iterator pageSeqNames = pageSeqSet.iterator();
  -while (pageSeqNames.hasNext()) {
  -masterName = (String)(pageSeqNames.next());
  +// Scan the simple-page-masters
  +Collection set = simplePageMasters.values();
  +Iterator values = set.iterator();
  +while (values.hasNext()) {
  +// Create a new PageSequenceMaster object - NOT an foPageSeqM
  +PageSequenceMaster pageSeq = new PageSequenceMaster
  +((FoSimplePageMaster)(values.next()));
  +pageSequenceMasters.put(pageSeq.getMasterName(), pageSeq);
  +}
  +// Scan the page-sequence-masters
  +set = pageMasters.values();
  +values = set.iterator();
  +while (values.hasNext()) {
   // Get the FoPageSequenceMaster
  -foPageSeq = (FoPageSequenceMaster)(pageMasters.get(masterName));
   // Create a new PageSequenceMaster object - NOT an foPageSeqM
   PageSequenceMaster pageSeq = new PageSequenceMaster
  -(masterName, foPageSeq, simplePageMasters);
  -pageSequenceMasters.put(masterName, pageSeq);
  +((FoPageSequenceMaster)(values.next()), simplePageMasters);
  +pageSequenceMasters.put(pageSeq.getMasterName(), pageSeq);
   }
   }
   
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoRegionBeforeAfter.java FoRegionBody.java FoRegionStartEnd.java FoSimplePageMaster.java

2002-11-12 Thread pbwest 
pbwest  2002/11/12 20:15:20

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoRegionBeforeAfter.java FoRegionBody.java
FoRegionStartEnd.java FoSimplePageMaster.java
  Log:
  Attribute set constants moved from FOPropertySets to FONode.
  numProps arg to FONode constructor removed.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.15  +4 -6  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- FoLayoutMasterSet.java5 Nov 2002 14:18:52 -   1.1.2.14
  +++ FoLayoutMasterSet.java13 Nov 2002 04:15:19 -  1.1.2.15
  @@ -7,7 +7,6 @@
   import java.util.NoSuchElementException;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.fo.FOPropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
  @@ -105,8 +104,7 @@
   throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
  -  FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
  -  numProps);
  +  FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
   setupPageMasters(event);
   // No need to clean up the build tree, because the whole subtree
   // will be deleted.
  
  
  
  1.1.2.14  +11 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- FoPageSequenceMaster.java 4 Nov 2002 14:46:03 -   1.1.2.13
  +++ FoPageSequenceMaster.java 13 Nov 2002 04:15:19 -  1.1.2.14
  @@ -23,7 +23,6 @@
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.properties.Property;
   import org.apache.fop.fo.PropNames;
  -import org.apache.fop.fo.FOPropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
  @@ -191,8 +190,7 @@
   throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
  -  FOPropertySets.SEQ_MASTER_SET, sparsePropsMap, sparseIndices,
  -  numProps);
  +  FONode.SEQ_MASTER_SET, sparsePropsMap, sparseIndices);
   // Process sequence members here
   try {
   do {
  @@ -244,8 +242,8 @@
   throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
  -event, FOPropertySets.SEQ_MASTER_SET, s_p_m_r_PropsMap,
  -s_p_m_r_Indices, s_p_m_r_numProps);
  +event, FONode.SEQ_MASTER_SET, s_p_m_r_PropsMap,
  +s_p_m_r_Indices);
   this.makeSparsePropsSet();
   }
   
  @@ -266,8 +264,8 @@
   throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
  -parent, event, FOPropertySets.SEQ_MASTER_SET,
  -r_p_m_r_PropsMap, r_p_m_r_Indices, r_p_m_r_numProps);
  +parent, event, FONode.SEQ_MASTER_SET,
  +r_p_m_r_PropsMap, r_p_m_r_Indices);
   this.makeSparsePropsSet();
   }
   
  @@ -292,8 +290,8 @@
   throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES,
  -parent, event, FOPropertySets.SEQ_MASTER_SET,
  -r_p_m_a_PropsMap, r_p_m_a_Indices, r_p_m_a_numProps);
  +parent, event, FONode.SEQ_MASTER_SET,
  +r_p_m_a_PropsMap, r_p_m_a_Indices);
   
   // Process conditional-page-master-references here
   try {
  @@ -325,8 +323,8 @@
   throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,
  -parent, event, FOPropertySets.SEQ_MASTER_SET,
  -c_p_m_r_PropsMap, c_p_m_r_Indices, c_p_m_r_num

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java

2002-11-05 Thread pbwest 
pbwest  2002/11/05 06:18:52

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
  Log:
  Removed foTree field from FONode.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.14  +5 -5  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- FoLayoutMasterSet.java4 Nov 2002 14:46:03 -   1.1.2.13
  +++ FoLayoutMasterSet.java5 Nov 2002 14:18:52 -   1.1.2.14
  @@ -139,7 +139,7 @@
   foType = ev.getFoType();
   if (foType == FObjectNames.SIMPLE_PAGE_MASTER) {
   //System.out.println("Found simple-page-master");
  -simple = new FoSimplePageMaster(foTree, this, ev);
  +simple = new FoSimplePageMaster(getFOTree(), this, ev);
   masterName = simple.getMasterName();
   if (pageMasters.get(masterName) != null)
   throw new FOPException
  @@ -156,7 +156,7 @@
   //System.out.println("Found page-sequence-master");
   try {
   foPageSeq =
  -new FoPageSequenceMaster(foTree, this, ev);
  +new FoPageSequenceMaster(getFOTree(), this, ev);
   } catch (TreeException e) {
   throw new FOPException
   ("TreeException: " + e.getMessage());
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoRegionAfter.java FoRegionBeforeAfter.java FoRegionBefore.java FoRegionBody.java FoRegionEnd.java FoRegionStartEnd.java FoRegionStart.java FoSimplePageMaster.java

2002-11-04 Thread pbwest 
pbwest  2002/11/04 06:46:03

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoRegionAfter.java FoRegionBeforeAfter.java
FoRegionBefore.java FoRegionBody.java
FoRegionEnd.java FoRegionStartEnd.java
FoRegionStart.java FoSimplePageMaster.java
  Log:
  Node and TreeException extracted from Tree.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.13  +7 -7  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- FoLayoutMasterSet.java30 Oct 2002 13:19:04 -  1.1.2.12
  +++ FoLayoutMasterSet.java4 Nov 2002 14:46:03 -   1.1.2.13
  @@ -17,7 +17,7 @@
   import org.apache.fop.xml.UriLocalName;
   import org.apache.fop.xml.XMLNamespaces;
   import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
  -import org.apache.fop.datastructs.Tree;
  +import org.apache.fop.datastructs.TreeException;
   import org.apache.fop.fo.pagination.FoPageSequenceMaster;
   import org.apache.fop.fo.pagination.PageSequenceMaster;
   
  @@ -102,7 +102,7 @@
*/
   public FoLayoutMasterSet
   (FOTree foTree, FONode parent, FoXMLEvent event)
  -throws Tree.TreeException, FOPException, PropertyException
  +throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
 FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
  @@ -157,7 +157,7 @@
   try {
   foPageSeq =
   new FoPageSequenceMaster(foTree, this, ev);
  -} catch (Tree.TreeException e) {
  +} catch (TreeException e) {
   throw new FOPException
   ("TreeException: " + e.getMessage());
   }
  @@ -184,7 +184,7 @@
   catch (PropertyException e) {
   throw new FOPException(e);
   }
  -catch (Tree.TreeException e) {
  +catch (TreeException e) {
   throw new FOPException(e);
   }
   if (pageMasters.size() == 0)
  
  
  
  1.1.2.13  +8 -8  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- FoPageSequenceMaster.java 30 Oct 2002 13:09:11 -  1.1.2.12
  +++ FoPageSequenceMaster.java 4 Nov 2002 14:46:03 -   1.1.2.13
  @@ -27,7 +27,7 @@
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.datastructs.Tree;
  +import org.apache.fop.datastructs.TreeException;
   import org.apache.fop.datatypes.PropertyValue;
   import org.apache.fop.datatypes.NCName;
   import org.apache.fop.datatypes.Ints;
  @@ -188,7 +188,7 @@
   };
   
   public FoPageSequenceMaster(FOTree foTree, FONode parent, FoXMLEvent event)
  -throws Tree.TreeException, FOPException, PropertyException
  +throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
 FOPropertySets.SEQ_MASTER_SET, sparsePropsMap, sparseIndices,
  @@ -241,7 +241,7 @@
   
   public FoSinglePageMasterReference
   (FOTree foTree, FONode parent, FoXMLEvent event)
  -throws Tree.TreeException, FOPException, PropertyException
  +throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
   event, FOPropertySets.SEQ_MASTER_SET, s_p_m_r_PropsMap,
  @@ -263,7 +263,7 @@
   
   public FoRepeatablePageMasterReference
   (FOTree foTree, FONode parent, FoXMLEvent event)
  -throws Tree.TreeException, FOPException, PropertyException
  +throws TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
   parent, event, FOPropertySets.SEQ_MASTER_SET,
  @@ -289,7 +289,7 @@
   
   public FoRepeatablePageMasterAlternatives

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java

2002-10-30 Thread pbwest 
pbwest  2002/10/30 05:19:04

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
  Log:
  Added sparsePropsSet support. Untabified.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.12  +61 -29
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- FoLayoutMasterSet.java28 Oct 2002 00:08:11 -  1.1.2.11
  +++ FoLayoutMasterSet.java30 Oct 2002 13:19:04 -  1.1.2.12
  @@ -41,6 +41,30 @@
   private static final String tag = "$Name$";
   private static final String revision = "$Revision$";
   
  +/** Map of Integer indices of sparsePropsSet array.
  +It is indexed by the FO index of the FO associated with a given
  +position in the sparsePropsSet array.  See
  +{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
  + */
  +private static final HashMap sparsePropsMap;
  +
  +/** An int array of of the applicable property indices, in
  +property index order. */
  +private static final int[] sparseIndices;
  +
  +/** The number of applicable properties.  This is the size of the
  +sparsePropsSet array. */
  +private static final int numProps;
  +
  +static {
  +// applicableProps is a HashMap containing the indicies of the
  +// sparsePropsSet array, indexed by the FO index of the FO slot
  +// in sparsePropsSet.
  +sparsePropsMap = new HashMap(0);
  +numProps = 0;
  +sparseIndices = new int[] {};
  +}
  +
   /**
* An array with ints identifying
* simple-page-master and page-sequence-master
  @@ -81,8 +105,15 @@
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
  -  FOPropertySets.LAYOUT_SET);
  - setupPageMasters(event);
  +  FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
  +  numProps);
  +setupPageMasters(event);
  +// No need to clean up the build tree, because the whole subtree
  +// will be deleted.
  +// This is problematical: while Node is obliged to belong to a Tree,
  +// any remaining references to elements of the subtree will keep the
  +// whole subtree from being GCed.
  +makeSparsePropsSet();
   }
   
   /**
  @@ -93,12 +124,12 @@
* @throws FOPException.
*/
   public void setupPageMasters(FoXMLEvent event)
  - throws FOPException, PropertyException
  +throws FOPException, PropertyException
   {
  - FoSimplePageMaster simple;
  - String masterName;
  +FoSimplePageMaster simple;
  +String masterName;
   int foType;
  - FoPageSequenceMaster foPageSeq;
  +FoPageSequenceMaster foPageSeq;
   try {
   do {
   FoXMLEvent ev =
  @@ -125,7 +156,7 @@
   //System.out.println("Found page-sequence-master");
   try {
   foPageSeq =
  - new FoPageSequenceMaster(foTree, this, ev);
  +new FoPageSequenceMaster(foTree, this, ev);
   } catch (Tree.TreeException e) {
   throw new FOPException
   ("TreeException: " + e.getMessage());
  @@ -143,6 +174,8 @@
   } else
   throw new FOPException
   ("Aargh! expectStartElement(events, list)");
  +// Flush the master event
  +xmlevents.getEndElement(ev);
   } while (true);
   } catch (NoSuchElementException e) {
   // Unexpected end of file
  @@ -155,26 +188,25 @@
   throw new FOPException(e);
   }
   if (pageMasters.size() == 0)
  -throw new FOPException("No pageg masters defined in 
layout-master-set.");
  - // Create the master set structures.
  - // Scan the page-sequence-masters
  - // N.B. Processing of the page-sequence-masters must be deferred until
  - // now because contained master-references may be to
  - // simple-page-masters which follow the page-sequence-master in the
  - // input tree.
  - Set pageSeqSet = pageMasters.keySet();
  - Iterator pageSeqNames = pageSeqSet.iterator();
  - while (pageSeqNames.hasNext()) {
  - masterName = (String)(pageSeqNames.next());
  - // Get the Fo

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoSimplePageMaster.java

2002-10-27 Thread pbwest 
pbwest  2002/10/27 16:08:12

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
  Log:
  Use foType in get/expect calls.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.11  +11 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- FoLayoutMasterSet.java24 Oct 2002 14:58:14 -  1.1.2.10
  +++ FoLayoutMasterSet.java28 Oct 2002 00:08:11 -  1.1.2.11
  @@ -42,15 +42,13 @@
   private static final String revision = "$Revision$";
   
   /**
  - * An array with UriLocalName objects identifying
  + * An array with ints identifying
* simple-page-master and page-sequence-master
* XML events.
*/
  -private static final UriLocalName[] simpleOrSequenceMaster = {
  -new UriLocalName
  -  (XMLNamespaces.XSLNSpaceIndex, "simple-page-master"),
  -new UriLocalName
  - (XMLNamespaces.XSLNSpaceIndex, "page-sequence-master")
  +private static final int[] simpleOrSequenceMaster = {
  +FObjectNames.SIMPLE_PAGE_MASTER,
  +FObjectNames.PAGE_SEQUENCE_MASTER
   };
   
   /**
  @@ -99,7 +97,7 @@
   {
FoSimplePageMaster simple;
String masterName;
  - String localName;
  +int foType;
FoPageSequenceMaster foPageSeq;
   try {
   do {
  @@ -107,8 +105,8 @@
   xmlevents.expectStartElement
   (simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
   if (ev == null) break; // No instance of these elements found
  -localName = ev.getLocalName();
  -if (localName.equals("simple-page-master")) {
  +foType = ev.getFoType();
  +if (foType == FObjectNames.SIMPLE_PAGE_MASTER) {
   //System.out.println("Found simple-page-master");
   simple = new FoSimplePageMaster(foTree, this, ev);
   masterName = simple.getMasterName();
  @@ -123,7 +121,7 @@
   ("simple-page-master master-name clash in "
+ "simplePageMasters: " + masterName);
   simplePageMasters.put(masterName, simple);
  -} else if (localName.equals("page-sequence-master")) {
  +} else if (foType == FObjectNames.PAGE_SEQUENCE_MASTER) {
   //System.out.println("Found page-sequence-master");
   try {
   foPageSeq =
  
  
  
  1.1.2.11  +17 -31
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- FoPageSequenceMaster.java 24 Oct 2002 14:58:14 -  1.1.2.10
  +++ FoPageSequenceMaster.java 28 Oct 2002 00:08:11 -  1.1.2.11
  @@ -43,28 +43,17 @@
   private static final String revision = "$Revision$";
   
   /**
  - * An array with UriLocalName objects identifying
  + * An array with ints identifying
* single-page-master-reference,
* repeatable-page-master-reference and
* repeatable-page-master-alternatives XML events.
*/
  -private static final UriLocalName[] singleOrRepeatableMasterRefs = {
  -new UriLocalName
  -  (XMLNamespaces.XSLNSpaceIndex, "single-page-master-reference"),
  -new UriLocalName
  - (XMLNamespaces.XSLNSpaceIndex, "repeatable-page-master-reference"),
  -new UriLocalName
  - (XMLNamespaces.XSLNSpaceIndex, "repeatable-page-master-alternatives")
  +private static final int[] singleOrRepeatableMasterRefs = {
  +FObjectNames.SINGLE_PAGE_MASTER_REFERENCE,
  +FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
  +FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES
   };
   
  -/**
  - * A UriLocalName object identifying a
  - * conditional-page-master-reference,
  - */
  -private static final UriLocalName conditionalPageMasterRef =
  - new UriLocalName(XMLNamespaces.XSLNSpaceIndex,
  - "conditional-page-master-reference");
  -
   private String masterName;
   
   //privat

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoSimplePageMaster.java

2002-10-24 Thread pbwest 
pbwest  2002/10/24 07:58:14

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
  Log:
  Changed XMLEvent to FoXMLEvent throughout.
  Account for the fact that 'expect' methods returning FoXMLEvents return null on 
failure.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.10  +13 -8 
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- FoLayoutMasterSet.java21 Oct 2002 16:12:53 -  1.1.2.9
  +++ FoLayoutMasterSet.java24 Oct 2002 14:58:14 -  1.1.2.10
  @@ -12,10 +12,11 @@
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.expr.PropertyException;
  +import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.UriLocalName;
   import org.apache.fop.xml.XMLNamespaces;
  -import org.apache.fop.xml.SyncedXmlEventsBuffer;
  +import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.fo.pagination.FoPageSequenceMaster;
   import org.apache.fop.fo.pagination.PageSequenceMaster;
  @@ -78,7 +79,7 @@
* this node
*/
   public FoLayoutMasterSet
  -(FOTree foTree, FONode parent, XMLEvent event)
  +(FOTree foTree, FONode parent, FoXMLEvent event)
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
  @@ -93,7 +94,7 @@
* @param event - the layout page-master-set STARTELEMENT event.
* @throws FOPException.
*/
  -public void setupPageMasters(XMLEvent event)
  +public void setupPageMasters(FoXMLEvent event)
throws FOPException, PropertyException
   {
FoSimplePageMaster simple;
  @@ -102,9 +103,10 @@
FoPageSequenceMaster foPageSeq;
   try {
   do {
  -XMLEvent ev =
  +FoXMLEvent ev =
   xmlevents.expectStartElement
   (simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
  +if (ev == null) break; // No instance of these elements found
   localName = ev.getLocalName();
   if (localName.equals("simple-page-master")) {
   //System.out.println("Found simple-page-master");
  @@ -145,7 +147,8 @@
   ("Aargh! expectStartElement(events, list)");
   } while (true);
   } catch (NoSuchElementException e) {
  -// Masters exhausted
  +// Unexpected end of file
  +throw new FOPException("layout-master-set: unexpected EOF.");
   }
   catch (PropertyException e) {
   throw new FOPException(e);
  @@ -153,6 +156,8 @@
   catch (Tree.TreeException e) {
   throw new FOPException(e);
   }
  +if (pageMasters.size() == 0)
  +throw new FOPException("No pageg masters defined in 
layout-master-set.");
// Create the master set structures.
// Scan the page-sequence-masters
// N.B. Processing of the page-sequence-masters must be deferred until
  
  
  
  1.1.2.10  +21 -15
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- FoPageSequenceMaster.java 21 Oct 2002 16:12:54 -  1.1.2.9
  +++ FoPageSequenceMaster.java 24 Oct 2002 14:58:14 -  1.1.2.10
  @@ -15,6 +15,7 @@
   
   // FOP
   import org.apache.fop.fo.FOAttributes;
  +import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
   import org.apache.fop.xml.UriLocalName;
  @@ -68,7 +69,7 @@
   
   //private ArrayList subSequenceList = new ArrayList(1);
   
  -public FoPageSequenceMaster(FOTree foTree, FONode parent, XMLEvent event)
  +public FoPageSequenceMaster(FOTree foTree, FONode parent, FoXMLEvent event)
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
  @@ -76,8 +77,9 @@
   // Process sequence members here
   try {
   do {
  -

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java

2002-10-21 Thread pbwest 
pbwest  2002/10/21 09:12:54

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
  Log:
  UriLocalName separated from XMLEvent.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.9   +10 -10
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- FoLayoutMasterSet.java12 Oct 2002 03:50:43 -  1.1.2.8
  +++ FoLayoutMasterSet.java21 Oct 2002 16:12:53 -  1.1.2.9
  @@ -7,13 +7,13 @@
   import java.util.NoSuchElementException;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.fo.FOPropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.xml.XMLEvent;
  +import org.apache.fop.xml.UriLocalName;
   import org.apache.fop.xml.XMLNamespaces;
   import org.apache.fop.xml.SyncedXmlEventsBuffer;
   import org.apache.fop.datastructs.Tree;
  @@ -41,14 +41,14 @@
   private static final String revision = "$Revision$";
   
   /**
  - * An array with XMLEvent.UriLocalName objects identifying
  + * An array with UriLocalName objects identifying
* simple-page-master and page-sequence-master
* XML events.
*/
  -private static final XMLEvent.UriLocalName[] simpleOrSequenceMaster = {
  -new XMLEvent.UriLocalName
  +private static final UriLocalName[] simpleOrSequenceMaster = {
  +new UriLocalName
 (XMLNamespaces.XSLNSpaceIndex, "simple-page-master"),
  -new XMLEvent.UriLocalName
  +new UriLocalName
(XMLNamespaces.XSLNSpaceIndex, "page-sequence-master")
   };
   
  @@ -107,7 +107,7 @@
   (simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
   localName = ev.getLocalName();
   if (localName.equals("simple-page-master")) {
  -System.out.println("Found simple-page-master");
  +//System.out.println("Found simple-page-master");
   simple = new FoSimplePageMaster(foTree, this, ev);
   masterName = simple.getMasterName();
   if (pageMasters.get(masterName) != null)
  @@ -122,7 +122,7 @@
+ "simplePageMasters: " + masterName);
   simplePageMasters.put(masterName, simple);
   } else if (localName.equals("page-sequence-master")) {
  -System.out.println("Found page-sequence-master");
  +//System.out.println("Found page-sequence-master");
   try {
   foPageSeq =
new FoPageSequenceMaster(foTree, this, ev);
  
  
  
  1.1.2.9   +22 -19
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- FoPageSequenceMaster.java 12 Oct 2002 03:55:30 -  1.1.2.8
  +++ FoPageSequenceMaster.java 21 Oct 2002 16:12:54 -  1.1.2.9
  @@ -17,9 +17,10 @@
   import org.apache.fop.fo.FOAttributes;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
  +import org.apache.fop.xml.UriLocalName;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.fo.expr.PropertyException;
  -import org.apache.fop.fo.Properties;
  +import org.apache.fop.fo.properties.Property;
   import org.apache.fop.fo.PropNames;
   import org.apache.fop.fo.FOPropertySets;
   import org.apache.fop.fo.FObjectNames;
  @@ -28,7 +29,6 @@
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.datatypes.PropertyValue;
   import org.apache.fop.datatypes.NCName;
  -import org.apache.fop.xml.XMLEvent;
   
   /**
* Implements the fo:page-sequence-master flow object.  These Fos are
  @@ -42,23 +42,26 @@
   private static final String revision = "$Revision$";
   
   /**
  - * An array with XMLEvent.UriLocalName objects identifying
  + * An array with UriLocalName objects identifying
* single-page-master-reference,
* repeatable-page-master-reference and
* repeatable-page-master-alternatives XML events.
*/
  -pr

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java

2002-10-12 Thread pbwest 

pbwest  2002/10/11 20:50:43

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
  Log:
  Added processing of simple-page-masters into PageSequenceMasters.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.8   +68 -29
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- FoLayoutMasterSet.java10 Oct 2002 17:06:59 -  1.1.2.7
  +++ FoLayoutMasterSet.java12 Oct 2002 03:50:43 -  1.1.2.8
  @@ -1,7 +1,9 @@
   package org.apache.fop.fo.pagination;
   
  +import java.util.Set;
   import java.util.HashMap;
   import java.util.LinkedList;
  +import java.util.Iterator;
   import java.util.NoSuchElementException;
   
   import org.apache.fop.apps.FOPException;
  @@ -16,6 +18,7 @@
   import org.apache.fop.xml.SyncedXmlEventsBuffer;
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.fo.pagination.FoPageSequenceMaster;
  +import org.apache.fop.fo.pagination.PageSequenceMaster;
   
   /*
* $Id$
  @@ -62,6 +65,13 @@
   private HashMap simplePageMasters = new HashMap();
   
   /**
  + * Hash of the set of PageSequenceMaster objects derived from the set of
  + * FoSimplePageMasters and the set of
  + * FoPageSequenceMasters.
  + */
  +private HashMap pageSequenceMasters = new HashMap();
  +
  +/**
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
* @param event the XMLEvent that triggered the creation of
  @@ -73,21 +83,25 @@
   {
   super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
 FOPropertySets.LAYOUT_SET);
  + setupPageMasters(event);
   }
   
   /**
* Set up all the page masters.
* fo:layout-master-set contents are
* (simple-page-master|page-sequence-master)+
  + * @param event - the layout page-master-set STARTELEMENT event.
  + * @throws FOPException.
*/
  -public void setupPageMasters() throws FOPException {
  -// Use an array with the two possibilities
  +public void setupPageMasters(XMLEvent event)
  + throws FOPException, PropertyException
  +{
  + FoSimplePageMaster simple;
  + String masterName;
  + String localName;
  + FoPageSequenceMaster foPageSeq;
   try {
   do {
  -FoSimplePageMaster simple;
  -String simpleName;
  -String localName;
  -FoPageSequenceMaster pageSeq;
   XMLEvent ev =
   xmlevents.expectStartElement
   (simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
  @@ -95,39 +109,37 @@
   if (localName.equals("simple-page-master")) {
   System.out.println("Found simple-page-master");
   simple = new FoSimplePageMaster(foTree, this, ev);
  -simpleName = simple.getMasterName();
  -if (pageMasters.get
  -((Object)(simpleName)) != null)
  +masterName = simple.getMasterName();
  +if (pageMasters.get(masterName) != null)
   throw new FOPException
   ("simple-page-master master-name clash in"
+ "pageMasters: "
  - + simpleName);
  -//pageMasters.put(simpleName, simple);
  -if (simplePageMasters == null)
  -simplePageMasters = new HashMap();
  -if (simplePageMasters.get
  -((Object)(simpleName)) != null)
  + + masterName);
  +//pageMasters.put(masterName, simple);
  +if (simplePageMasters.get(masterName) != null)
   throw new FOPException
   ("simple-page-master master-name clash in "
  - + "simplePageMasters: " + simpleName);
  -simplePageMasters.put(simpleName, simple);
  + + "simplePageMasters: " + masterName);
  +simplePageMasters.put(masterName, simple);
   } else if (localName.equals("page-sequence-master")) {
   System.out.println("Found page-sequence-master");
   try {
  -pageSeq = new FoPageSequenceMaster(foTree, this, ev);
  +f

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java

2002-10-10 Thread pbwest 

pbwest  2002/10/10 10:07:00

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
  Log:
  Immediate initialisation of pageMasters and simplePageMasters.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.7   +5 -7  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- FoLayoutMasterSet.java9 Oct 2002 06:00:49 -   1.1.2.6
  +++ FoLayoutMasterSet.java10 Oct 2002 17:06:59 -  1.1.2.7
  @@ -53,13 +53,13 @@
* Hash of SimplePageMaster and PageSequenceMaster objects,
* indexed by master-name of the object.
*/
  -private HashMap pageMasters;
  +private HashMap pageMasters = new HashMap();
   
   /**
* Hash of SimplePageMaster objects,
* indexed by master-name of the object.
*/
  -private HashMap simplePageMasters;
  +private HashMap simplePageMasters = new HashMap();
   
   /**
* @param foTree the FO tree being built
  @@ -96,8 +96,6 @@
   System.out.println("Found simple-page-master");
   simple = new FoSimplePageMaster(foTree, this, ev);
   simpleName = simple.getMasterName();
  -if (pageMasters == null)
  -pageMasters = new HashMap();
   if (pageMasters.get
   ((Object)(simpleName)) != null)
   throw new FOPException
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java

2002-10-08 Thread pbwest 

pbwest  2002/10/08 23:00:49

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
  Log:
  Use array argument for multiple choice expectStartElement() calls.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.6   +20 -10
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- FoLayoutMasterSet.java6 Oct 2002 14:18:05 -   1.1.2.5
  +++ FoLayoutMasterSet.java9 Oct 2002 06:00:49 -   1.1.2.6
  @@ -11,6 +11,7 @@
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.expr.PropertyException;
  +import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
   import org.apache.fop.xml.SyncedXmlEventsBuffer;
   import org.apache.fop.datastructs.Tree;
  @@ -37,6 +38,18 @@
   private static final String revision = "$Revision$";
   
   /**
  + * An array with XMLEvent.UriLocalName objects identifying
  + * simple-page-master and page-sequence-master
  + * XML events.
  + */
  +private static final XMLEvent.UriLocalName[] simpleOrSequenceMaster = {
  +new XMLEvent.UriLocalName
  +  (XMLNamespaces.XSLNSpaceIndex, "simple-page-master"),
  +new XMLEvent.UriLocalName
  + (XMLNamespaces.XSLNSpaceIndex, "page-sequence-master")
  +};
  +
  +/**
* Hash of SimplePageMaster and PageSequenceMaster objects,
* indexed by master-name of the object.
*/
  @@ -68,19 +81,16 @@
* (simple-page-master|page-sequence-master)+
*/
   public void setupPageMasters() throws FOPException {
  -// Set up a list with the two possibilities
  -LinkedList list = new LinkedList();
  -list.add((Object)(new XMLEvent.UriLocalName
  -  (XMLNamespaces.XSLNSpaceIndex, "simple-page-master")));
  -list.add((Object)(new XMLEvent.UriLocalName
  - (XMLNamespaces.XSLNSpaceIndex, "page-sequence-master")));
  +// Use an array with the two possibilities
   try {
   do {
   FoSimplePageMaster simple;
   String simpleName;
   String localName;
   FoPageSequenceMaster pageSeq;
  -XMLEvent ev = xmlevents.expectStartElement(list);
  +XMLEvent ev =
  +xmlevents.expectStartElement
  +(simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
   localName = ev.getLocalName();
   if (localName.equals("simple-page-master")) {
   System.out.println("Found simple-page-master");
  
  
  
  1.1.2.6   +21 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- FoPageSequenceMaster.java 6 Oct 2002 14:15:11 -   1.1.2.5
  +++ FoPageSequenceMaster.java 9 Oct 2002 06:00:49 -   1.1.2.6
  @@ -28,6 +28,7 @@
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.datatypes.PropertyValue;
   import org.apache.fop.datatypes.NCName;
  +import org.apache.fop.xml.XMLEvent;
   
   /**
* Implements the fo:page-sequence-master flow object.  These Fos are
  @@ -41,6 +42,22 @@
   private static final String tag = "$Name$";
   private static final String revision = "$Revision$";
   
  +/**
  + * An array with XMLEvent.UriLocalName objects identifying
  + * single-page-master-reference,
  + * repeatable-page-master-reference and
  + * repeatable-page-master-alternatives XML events.
  + */
  +private static final XMLEvent.UriLocalName[]
  +singleOrRepeatableMasterRefs = {
  +new XMLEvent.UriLocalName
  +  (XMLNamespaces.XSLNSpaceIndex, "single-page-master-reference"),
  +new XMLEvent.UriLocalName
  + (XMLNamespaces.XSLNSpaceIndex, "repeatable-page-master-reference"),
  +new XMLEvent.UriLocalName
  + (XMLNamespaces.XSLNSpaceIndex, "repeatable-page-master-alternatives")
  +};
  +
   private String masterName;
   
   private ArrayList subSequenceList = new ArrayList(1);
  @@ -59,19 +76,10 @@
   ("master-name property

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java

2002-10-06 Thread pbwest 

pbwest  2002/10/06 07:18:05

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
  Log:
  Removed SubSequenceSpecifier references.
  Simplified exception catching and handling.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.5   +9 -31 
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- FoLayoutMasterSet.java2 Oct 2002 15:19:59 -   1.1.2.4
  +++ FoLayoutMasterSet.java6 Oct 2002 14:18:05 -   1.1.2.5
  @@ -15,9 +15,6 @@
   import org.apache.fop.xml.SyncedXmlEventsBuffer;
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.fo.pagination.FoPageSequenceMaster;
  -import org.apache.fop.fo.pagination.FoPageSequenceMaster.SubSequenceSpecifier;
  -import org.apache.fop.fo.pagination
  -.FoPageSequenceMaster.SubSequenceSpecifier.ConditionalPageMasterReference;
   
   /*
* $Id$
  @@ -66,8 +63,7 @@
   }
   
   /**
  - * Set up all the page masters.  !!!Note that the masters are not entered
  - * in the FO tree.!!!
  + * Set up all the page masters.
* fo:layout-master-set contents are
* (simple-page-master|page-sequence-master)+
*/
  @@ -88,12 +84,7 @@
   localName = ev.getLocalName();
   if (localName.equals("simple-page-master")) {
   System.out.println("Found simple-page-master");
  -try {
  -simple = new FoSimplePageMaster(foTree, this, ev);
  -} catch (Tree.TreeException e) {
  -throw new FOPException
  -("TreeException: " + e.getMessage());
  -}
  +simple = new FoSimplePageMaster(foTree, this, ev);
   simpleName = simple.getMasterName();
   if (pageMasters == null)
   pageMasters = new HashMap();
  @@ -112,22 +103,6 @@
   ("simple-page-master master-name clash in "
+ "simplePageMasters: " + simpleName);
   simplePageMasters.put(simpleName, simple);
  -FoPageSequenceMaster seqMaster;
  -try {
  -// Construct a new PageSequenceMaster
  -seqMaster = new FoPageSequenceMaster
  -(foTree, this, simpleName);
  -} catch(Tree.TreeException e) {
  -throw new FOPException
  -("TreeException: " + e.getMessage());
  -}
  -// Construct a SubSequence
  -SubSequenceSpecifier subSeq =
  -seqMaster.new SubSequenceSpecifier();
  -// Construct a default ConditionalPageMasterReference
  -ConditionalPageMasterReference cond = subSeq.new
  -ConditionalPageMasterReference(simpleName);
  -pageMasters.put(simpleName, seqMaster);
   } else if (localName.equals("page-sequence-master")) {
   System.out.println("Found page-sequence-master");
   try {
  @@ -153,7 +128,10 @@
   // Masters exhausted
   }
   catch (PropertyException e) {
  -throw new FOPException("PropertyException: " + e.getMessage());
  +throw new FOPException(e);
  +}
  +catch (Tree.TreeException e) {
  +throw new FOPException(e);
   }
   }
   
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoSimplePageMaster.java

2002-10-01 Thread pbwest 

pbwest  2002/10/01 18:30:59

  Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
  Log:
  attrSet constants now in FObjects.java
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.3   +5 -4  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- FoLayoutMasterSet.java16 Sep 2002 05:31:16 -  1.1.2.2
  +++ FoLayoutMasterSet.java2 Oct 2002 01:30:59 -   1.1.2.3
  @@ -6,6 +6,7 @@
   
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.xml.XMLEvent;
  +import org.apache.fop.fo.FObjects;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
  @@ -61,7 +62,7 @@
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
  -  FONode.LAYOUT);
  +  FObjects.LAYOUT_SET);
   }
   
   /**
  
  
  
  1.1.2.3   +5 -4  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- FoPageSequenceMaster.java 16 Sep 2002 05:31:16 -  1.1.2.2
  +++ FoPageSequenceMaster.java 2 Oct 2002 01:30:59 -   1.1.2.3
  @@ -20,6 +20,7 @@
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.Properties;
  +import org.apache.fop.fo.FObjects;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FONode;
  @@ -46,7 +47,7 @@
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, null,
  -  FONode.LAYOUT);
  +  FObjects.LAYOUT_SET);
   this.masterName = masterName;
   }
   
  @@ -54,7 +55,7 @@
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
  -  FONode.LAYOUT);
  +  FObjects.LAYOUT_SET);
   if (event == null) {
   System.out.println("Null event; throwing FOPException");
   throw new FOPException
  
  
  
  1.1.2.3   +4 -3  
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
  
  Index: FoSimplePageMaster.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- FoSimplePageMaster.java   16 Sep 2002 05:31:16 -  1.1.2.2
  +++ FoSimplePageMaster.java   2 Oct 2002 01:30:59 -   1.1.2.3
  @@ -13,6 +13,7 @@
   import org.apache.fop.fo.FOAttributes;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.fo.FObjects;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTree;
  @@ -39,7 +40,7 @@
   throws Tree.TreeException, FOPException, PropertyException
   {
   super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
  -  FONode.LAYOUT);
  +  FObjects.LAYOUT_SET);
   System.out.println("FOAttributes: " + event);
   try {
   masterName = foAttributes.getFoAttrValue("master-name");
  
  
  

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