svg renderer now basically works, pages, text, leader, svg

some other misc updates to areas


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194534 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 7 insertions, 20 deletions

diff --git a/src/org/apache/fop/fo/FOTreeBuilder.java b/src/org/apache/fop/fo/FOTreeBuilder.java
index 4e4cefafe..e4ac25758 100644
--- a/src/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/org/apache/fop/fo/FOTreeBuilder.java
@@ -27,7 +27,7 @@ import org.xml.sax.Attributes;
 // Java
 import java.util.HashMap;
 import java.util.Stack;
-import java.util.Vector;
+import java.util.ArrayList;
 import java.io.IOException;
 
 /**
@@ -49,7 +49,7 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder {
      */
     protected HashMap fobjTable = new HashMap();
 
-    protected Vector namespaces = new Vector();
+    protected ArrayList namespaces = new ArrayList();
 
     /**
      * class that builds a property list for each formatting object
@@ -101,7 +101,7 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder {
      */
     public void addMapping(String namespaceURI, HashMap table) {
         this.fobjTable.put(namespaceURI, table);
-        this.namespaces.addElement(namespaceURI.intern());
+        this.namespaces.add(namespaceURI.intern());
     }
 
     /**
@@ -212,8 +212,6 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder {
         /* the maker for the formatting object started */
         FObj.Maker fobjMaker = null;
 
-        // String fullName = mapName(rawName);
-        //String fullName = uri + "^" + localName;
         HashMap table = (HashMap)fobjTable.get(uri);
         if(table != null) {
             fobjMaker = (FObj.Maker)table.get(localName);
@@ -275,17 +273,6 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder {
         currentFObj = fobj;
     }
 
-    /**
-     * format this formatting object tree
-     *
-     * @param areaTree the area tree to format into
-     */
-/*    public void format(AreaTree areaTree) throws FOPException {
-        log.info("formatting FOs into areas");
-        this.bufferManager.readComplete();
-        ((Root)this.rootFObj).format(areaTree);
-    }
-*/
     public void reset() {
         currentFObj = null;
         rootFObj = null;
diff --git a/src/org/apache/fop/fo/FOUserAgent.java b/src/org/apache/fop/fo/FOUserAgent.java
index 05ae93456..d89f308e4 100644
--- a/src/org/apache/fop/fo/FOUserAgent.java
+++ b/src/org/apache/fop/fo/FOUserAgent.java
@@ -73,7 +73,7 @@ public class FOUserAgent {
                 handler.handleXML(ctx, doc, namespace);
             } catch (Throwable t) {
                 // could not handle document
-                //t.printStackTrace();
+                t.printStackTrace();
             }
         } else {
             // no handler found for document
diff --git a/src/org/apache/fop/fo/pagination/PageSequence.java b/src/org/apache/fop/fo/pagination/PageSequence.java
index 290f19454..5b957d8a8 100644
--- a/src/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/org/apache/fop/fo/pagination/PageSequence.java
@@ -28,10 +28,10 @@ import org.apache.fop.apps.FOPException;
 // Java
 import java.util.*;
 
-
 /**
- * This provides pagination of flows onto pages. Much of the logic for paginating
- * flows is contained in this class. The main entry point is the format method.
+ * This provides pagination of flows onto pages. Much of the
+ * logic for paginating flows is contained in this class.
+ * The main entry point is the format method.
  */
 public class PageSequence extends FObj {
     //