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

2004-02-25 Thread pbwest 
pbwest  2004/02/25 15:54:47

  Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
  Log:
  Cleaned up Javadoc link to inaccessible method.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.11  +4 -5  xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
  
  Index: FoRoot.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- FoRoot.java   28 Jan 2004 06:24:30 -  1.1.2.10
  +++ FoRoot.java   25 Feb 2004 23:54:47 -  1.1.2.11
  @@ -51,8 +51,7 @@
   
   /** 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
  -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet 
FONode.sparsePropsSet}.
  +position in the sparsePropsSet array.
*/
   private static final int[] sparsePropsMap;
   
  
  
  

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

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

2004-01-26 Thread pbwest 
pbwest  2004/01/26 17:59:10

  Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
  Log:
  Updated license to 2.0.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.9   +17 -49xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
  
  Index: FoRoot.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- FoRoot.java   23 Jan 2004 12:47:58 -  1.1.2.8
  +++ FoRoot.java   27 Jan 2004 01:59:10 -  1.1.2.9
  @@ -1,50 +1,18 @@
   /*
  - * 
  - *   The Apache Software License, Version 1.1
  - * 
  - * 
  - * Copyright (C) 1999-2004 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 .
  +   Copyright 2004 The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +   http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License.
  +
*  
* $Id$
*/
  
  
  

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

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

2004-01-23 Thread pbwest 
pbwest  2004/01/23 04:47:58

  Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
  Log:
  Remove pageSequenceMasters HashMap.
  Add LayoutMasterSet to FoPageSequence constructor.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.8   +9 -17 xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
  
  Index: FoRoot.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- FoRoot.java   20 Jan 2004 05:45:55 -  1.1.2.7
  +++ FoRoot.java   23 Jan 2004 12:47:58 -  1.1.2.8
  @@ -1,6 +1,4 @@
   /*
  - * $Id$
  - * 
* 
*   The Apache Software License, Version 1.1
* 
  @@ -48,15 +46,12 @@
* James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
* Software Foundation, please see .
*  
  - *
  - * @author mailto:[EMAIL PROTECTED]">Peter B. West
  - * @version $Revision$ $Name$
  + * $Id$
*/
   
   package org.apache.fop.fo;
   
   import java.util.Arrays;
  -import java.util.HashMap;
   import java.util.NoSuchElementException;
   
   import org.apache.fop.apps.FOPException;
  @@ -73,10 +68,12 @@
   /**
* FoRoot is the class which processes the fo:root start element
* XML event.
  - * 
* The building of all of the fo tree, and the forwarding of FO tree events
* on to further stages of processing, will all take place within the
* buildFoTree() method of this class instance.
  + * 
  + * @author mailto:[EMAIL PROTECTED]">Peter B. West
  + * @version $Revision$ $Name$
*/
   
   public class FoRoot extends FONode {
  @@ -111,12 +108,6 @@
   [PropNames.MEDIA_USAGE] = 0;
   }
   
  -/** 
  - * The HashMap of PageSequenceMaster objects produced from the
  - * layout-master-set.
  - */
  -private HashMap pageSequenceMasters;
  -
   /** Offset of declarations child node. */
   private int declarations = -1;
   
  @@ -174,7 +165,6 @@
   FoLayoutMasterSet layoutMasters =
   new FoLayoutMasterSet(getFOTree(), this, ev);
   // Clean up the fo:layout-master-set event
  -pageSequenceMasters = layoutMasters.getPageSequenceMasters();
   ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
   namespaces.relinquishEvent(ev);
   layoutMasters.deleteSubTree();
  @@ -199,14 +189,16 @@
   if (ev == null)
   throw new FOPException("No page-sequence found.");
   firstPageSeq = numChildren();
  -new FoPageSequence(getFOTree(), this, (FoXmlEvent)ev);
  +new FoPageSequence(
  +getFOTree(), this, (FoXmlEvent)ev, layoutMasters);
   ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
   namespaces.relinquishEvent(ev);
   while ((ev = xmlevents.expectStartElement
   (FObjectNames.PAGE_SEQUENCE, XmlEvent.DISCARD_W_SPACE))
  != null) {
   // Loop over remaining fo:page-sequences
  -new FoPageSequence(getFOTree(), this, (FoXmlEvent)ev);
  +new FoPageSequence(
  +getFOTree(), this, (FoXmlEvent)ev, layoutMasters);
   ev = xmlevents.getEndElement(XmlEventReader.DISCARD_EV, ev);
   namespaces.relinquishEvent(ev);
   }
  
  
  

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

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

2004-01-14 Thread pbwest 
pbwest  2004/01/14 07:19:25

  Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
  Log:
  SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
  Some instances of FoXMLEvent changed to XMLEvent
  Changes to signatures of FO constructors reflected here
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.3   +14 -14xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
  
  Index: FoRoot.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- FoRoot.java   10 Jan 2004 06:29:50 -  1.1.2.2
  +++ FoRoot.java   14 Jan 2004 15:19:25 -  1.1.2.3
  @@ -66,7 +66,7 @@
   import org.apache.fop.fo.flow.FoPageSequence;
   import org.apache.fop.fo.pagination.FoLayoutMasterSet;
   import org.apache.fop.xml.FoXMLEvent;
  -import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
  +import org.apache.fop.xml.SyncedXmlEventsBuffer;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
   
  @@ -125,11 +125,11 @@
   
   /**
* @param foTree the FO tree being built
  - * @param event the FoXMLEvent that triggered the creation of this
  + * @param event the XMLEvent that triggered the creation of this
* node
*/
   public FoRoot
  -(FOTree foTree, FoXMLEvent event)
  +(FOTree foTree, XMLEvent event)
   throws TreeException, FOPException, PropertyException
   {
   // This is the root node of the tree; hence the null argument
  @@ -162,7 +162,7 @@
* in the page-sequence-sequence.
*/
   public void buildFoTree() throws FOPException{
  -FoXMLEvent ev;
  +XMLEvent ev;
   String nowProcessing;
   //System.out.println("buildFoTree: " + event);
   nowProcessing = "layout-master-set";
  @@ -175,7 +175,7 @@
   new FoLayoutMasterSet(getFOTree(), this, ev);
   // Clean up the fo:layout-master-set event
   pageSequenceMasters = layoutMasters.getPageSequenceMasters();
  -ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
  +ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
   namespaces.surrenderEvent(ev);
   layoutMasters.deleteSubTree();
   
  @@ -187,7 +187,7 @@
   // process the declarations
   declarations = numChildren();
   new FoDeclarations(getFOTree(), this, ev);
  -ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, 
ev);
  +ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
   namespaces.surrenderEvent(ev);
   }
   
  @@ -199,15 +199,15 @@
   if (ev == null)
   throw new FOPException("No page-sequence found.");
   firstPageSeq = numChildren();
  -new FoPageSequence(getFOTree(), this, ev);
  -ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
  +new FoPageSequence(getFOTree(), this, (FoXMLEvent)ev);
  +ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
   namespaces.surrenderEvent(ev);
   while ((ev = xmlevents.expectStartElement
   (FObjectNames.PAGE_SEQUENCE, XMLEvent.DISCARD_W_SPACE))
  != null) {
   // Loop over remaining fo:page-sequences
  -new FoPageSequence(getFOTree(), this, ev);
  -ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, 
ev);
  +new FoPageSequence(getFOTree(), this, (FoXMLEvent)ev);
  +ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
   namespaces.surrenderEvent(ev);
   }
   } catch (NoSuchElementException e) {
  @@ -224,7 +224,7 @@
   for (int i = 0; i <= XMLNamespaces.LAST_NS_INDEX; i++) {
   System.out.println("Namespace " + namespaces.getIndexURI(i));
   System.out.println("Size of event pool: " + 
  -namespaces.getPoolSize(i));
  +namespaces.getNSPoolSize(i));
   System.out.println("Next event id : " + 
   namespaces.getSequenceValue(i));
   }
  
  
  

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

cvs commit: xml-fop/src/java/org/apache/fop/fo FoRoot.java FONode.java

2004-01-09 Thread pbwest 
pbwest  2004/01/09 22:29:50

  Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoSimplePageMaster.java
FoPageSequenceMaster.java FoLayoutMasterSet.java
   src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoFootnote.java FoTableBody.java FoMultiCase.java
FoListBlock.java FoListItem.java FoTable.java
FoPageSequence.java FoFloat.java
FoStaticContent.java FoTitle.java FoFlow.java
FoBasicLink.java FoBidiOverride.java FoLeader.java
FoTableCell.java FoBlockContainer.java
FoMultiToggle.java FoTableRow.java
FoMultiProperties.java FoMultiSwitch.java
FoWrapper.java FoMarker.java FoTableAndCaption.java
FoListItemLabel.java FoTableHeader.java
FoFootnoteBody.java FoBlock.java
FoListItemBody.java FoInline.java
FoTableCaption.java FoTableFooter.java
FoInlineContainer.java
   src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
XMLEventPool.java XMLEvent.java XMLNamespaces.java
FoXMLSerialHandler.java
SyncedFoXmlEventsBuffer.java FoXMLEvent.java
   src/java/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoDeclarations.java
   src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java FONode.java
  Log:
  Switched to namespaces for control of pool.
  XMLNamespaces contains pools, sequence ids and
  masks for each known namespace.
  Discriminate DefAttrNSpace and XSLNSpace for
  FoMXLEvents.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.2   +18 -17
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.3   +8 -7  
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java.diff?r1=1.1.2.2&r2=1.1.2.3
  
  
  1.1.2.3   +5 -5  
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java.diff?r1=1.1.2.2&r2=1.1.2.3
  
  
  No   revision
  No   revision
  1.1.2.2   +5 -5  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +6 -6  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +5 -5  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +5 -5  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +6 -6  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +9 -9  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +7 -7  
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +5 -5  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +5 -5  
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +5 -5  xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java
  
  
http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java.diff?r1=1.1.2.1&r2=1.1.2.2
  
  
  1.1.2.2   +5 -5  xm