cvs commit: xml-fop/src/java/org/apache/fop/area AreaTree.java Area.java

2004-01-27 Thread pbwest 
pbwest  2004/01/27 22:16:31

  Added:   src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaTree.java Area.java
  Log:
  Stubs for these classes.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.7.2.1   +26 -277   xml-fop/src/java/org/apache/fop/area/AreaTree.java
  
  Index: AreaTree.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTree.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- AreaTree.java 20 Dec 2003 06:53:22 -  1.7
  +++ AreaTree.java 28 Jan 2004 06:16:31 -  1.7.2.1
  @@ -1,290 +1,39 @@
   /*
  +   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.
  +
  + * Created on 26/01/2004
* $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 .
*/
   package org.apache.fop.area;
   
  -import org.apache.fop.area.extensions.BookmarkData;
  -import org.apache.fop.fo.extensions.Outline;
  -
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Set;
  -import java.util.HashSet;
  -import java.util.Iterator;
  +import org.apache.fop.datastructs.Tree;
   
   /**
  - * Area tree for formatting objects.
  - *
  - * Concepts:
  - * The area tree is to be as small as possible. With minimal classes
  - * and data to fully represent an area tree for formatting objects.
  - * The area tree needs to be s

cvs commit: xml-fop/src/java/org/apache/fop/area AreaTree.java

2003-10-06 Thread vmote 
vmote   2003/10/06 09:06:11

  Modified:src/java/org/apache/fop/area AreaTree.java
  Log:
  cleanup bookmark logic and doc a bit
  
  Revision  ChangesPath
  1.4   +5 -7  xml-fop/src/java/org/apache/fop/area/AreaTree.java
  
  Index: AreaTree.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTree.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AreaTree.java 6 Oct 2003 15:52:46 -   1.3
  +++ AreaTree.java 6 Oct 2003 16:06:11 -   1.4
  @@ -239,9 +239,7 @@
   }
   
   /**
  - * When this element is finished then it can create
  - * the bookmark data from the child elements and add
  - * the extension to the area tree.
  + * Create the bookmark data in the area tree.
*/
   public void addBookmarksToAreaTree(Document document) {
   if (document.getBookmarks() == null) {
  @@ -253,10 +251,8 @@
   Outline out = 
(Outline)(document.getBookmarks().getOutlines()).get(count);
   data.addSubData(createBookmarkData(out));
   }
  -// add data to area tree for resolving and handling
  -AreaTree at = document.getAreaTree();
  -at.addTreeExtension(data);
  -data.setAreaTree(at);
  +addTreeExtension(data);
  +data.setAreaTree(this);
   }
   
   /**
  @@ -264,6 +260,8 @@
* This creates a bookmark data with the destination
* and adds all the data from child outlines.
*
  + * @param outline the Outline object for which a bookmark entry should be
  + * created
* @return the new bookmark data
*/
   public BookmarkData createBookmarkData(Outline outline) {
  
  
  

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

cvs commit: xml-fop/src/java/org/apache/fop/area AreaTree.java

2003-09-09 Thread vmote 
vmote   2003/09/09 23:25:36

  Modified:src/java/org/apache/fop/apps Driver.java
   src/java/org/apache/fop/area AreaTree.java
  Log:
  remove unneeded reference to Renderer from within the area package
  
  Revision  ChangesPath
  1.39  +2 -1  xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Driver.java   2 Sep 2003 13:56:40 -   1.38
  +++ Driver.java   10 Sep 2003 06:25:36 -  1.39
  @@ -52,6 +52,7 @@
   
   // FOP
   import org.apache.fop.area.AreaTree;
  +import org.apache.fop.area.RenderPagesModel;
   
   import org.apache.fop.fo.ElementMapping;
   import org.apache.fop.fo.FOTreeBuilder;
  @@ -588,7 +589,7 @@
   FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
   foTreeHandler.addFOTreeListener(currentDocument);
   currentDocument.areaTree = new AreaTree();
  -currentDocument.atModel = AreaTree.createRenderPagesModel(renderer);
  +currentDocument.atModel = new RenderPagesModel(renderer);
   //this.atModel = new CachedRenderPagesModel(renderer);
   currentDocument.areaTree.setTreeModel(currentDocument.atModel);
   try {
  
  
  
  1.2   +10 -21xml-fop/src/java/org/apache/fop/area/AreaTree.java
  
  Index: AreaTree.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTree.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AreaTree.java 11 Mar 2003 13:05:27 -  1.1
  +++ AreaTree.java 10 Sep 2003 06:25:36 -  1.2
  @@ -3,34 +3,34 @@
* 
*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
  @@ -42,16 +42,14 @@
* (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 .
  - */ 
  + */
   package org.apache.fop.area;
   
  -import org.apache.fop.render.Renderer;
  -
   import java.util.ArrayList;
   import java.util.List;
   import java.util.Map;
  @@ -87,15 +85,6 @@
   // list of id's yet to be resolved and arraylists of pages
   private Map resolve = new HashMap();
   private List treeExtensions = new ArrayList();
  -
  -/**
  - * Create a render pages area tree model.
  - * @pa