gmazza      2004/08/04 15:21:04

  Modified:    src/java/org/apache/fop/fo FObj.java
                        ToBeImplementedElement.java Unknown.java
                        UnknownXMLObj.java XMLElement.java XMLObj.java
               src/java/org/apache/fop/fo/extensions/svg SVGElement.java
                        SVGObj.java
               src/java/org/apache/fop/fo/flow Float.java
                        InitialPropertySet.java MultiCase.java
                        MultiProperties.java MultiPropertySet.java
                        MultiSwitch.java MultiToggle.java
                        TableAndCaption.java TableCaption.java
               src/java/org/apache/fop/layoutmgr AddLMVisitor.java
  Log:
  Start of conversion of AddLMVisitor to FObj.AddLayoutManager():  removed
  acceptVisitor() methods from FO's that don't need LM's
  (e.g., those FO's not yet implemented or those that don't return areas anyway).
  
  Revision  Changes    Path
  1.60      +9 -1      xml-fop/src/java/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- FObj.java 3 Aug 2004 05:22:43 -0000       1.59
  +++ FObj.java 4 Aug 2004 22:21:02 -0000       1.60
  @@ -21,6 +21,7 @@
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.List;
   import java.util.ListIterator;
   import java.util.Map;
   import java.util.Set;
  @@ -434,6 +435,14 @@
       }
   
       /**
  +     * Return a LayoutManager responsible for laying out this FObj's content.
  +     * Must override in subclasses if their content can be laid out.
  +     * @param list the list to which the layout manager(s) should be added
  +     */
  +    public void addLayoutManager(List list) {
  +    }
  +
  +    /**
        * This is a hook for the AddLMVisitor class to be able to access
        * this object.
        * @param aLMV the AddLMVisitor object that can access this object.
  @@ -442,7 +451,6 @@
           aLMV.serveFObj(this);
       }
       
  -
       /*
        * Return a string representation of the fo element.
        * Deactivated in order to see precise ID of each fo element created
  
  
  
  1.9       +0 -12     xml-fop/src/java/org/apache/fop/fo/ToBeImplementedElement.java
  
  Index: ToBeImplementedElement.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/ToBeImplementedElement.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ToBeImplementedElement.java       31 Jul 2004 00:44:21 -0000      1.8
  +++ ToBeImplementedElement.java       4 Aug 2004 22:21:02 -0000       1.9
  @@ -18,8 +18,6 @@
   
   package org.apache.fop.fo;
   
  -import org.apache.fop.layoutmgr.AddLMVisitor;
  -
   /**
    * This class is a placeholder for elements that have not been implemented.
    */
  @@ -31,14 +29,4 @@
       protected ToBeImplementedElement(FONode parent) {
           super(parent);
       }
  -
  -    /**
  -     * This is a hook for the AddLMVisitor class to be able to access
  -     * this object.
  -     * @param aLMV the AddLMVisitor object that can access this object.
  -     */
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveToBeImplementedElement(this);
  -    }
  -
   }
  
  
  
  1.8       +0 -12     xml-fop/src/java/org/apache/fop/fo/Unknown.java
  
  Index: Unknown.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Unknown.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Unknown.java      27 Jul 2004 23:57:10 -0000      1.7
  +++ Unknown.java      4 Aug 2004 22:21:02 -0000       1.8
  @@ -18,8 +18,6 @@
   
   package org.apache.fop.fo;
   
  -import org.apache.fop.layoutmgr.AddLMVisitor;
  -
   /**
    * Class for handling an unknown element, for example one from an unsupported
    * namespace.
  @@ -53,14 +51,4 @@
       private void setup() {
           getLogger().debug("Layout Unknown element");
       }
  -
  -    /**
  -     * This is a hook for the AddLMVisitor class to be able to access
  -     * this object.
  -     * @param aLMV the AddLMVisitor object that can access this object.
  -     */
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveUnknown(this);
  -    }
  -
   }
  
  
  
  1.10      +0 -11     xml-fop/src/java/org/apache/fop/fo/UnknownXMLObj.java
  
  Index: UnknownXMLObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/UnknownXMLObj.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- UnknownXMLObj.java        27 Jul 2004 23:57:10 -0000      1.9
  +++ UnknownXMLObj.java        4 Aug 2004 22:21:02 -0000       1.10
  @@ -19,7 +19,6 @@
   package org.apache.fop.fo;
   
   import org.xml.sax.Locator;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   
   /**
    * Class for handling generic XML from a namespace not recognized by FOP
  @@ -89,15 +88,5 @@
           }
           super.addCharacters(data, start, length, locator);
       }
  -
  -    /**
  -     * This is a hook for the AddLMVisitor class to be able to access
  -     * this object.
  -     * @param aLMV the AddLMVisitor object that can access this object.
  -     */
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveUnknownXMLObj(this);
  -    }
  -
   }
   
  
  
  
  1.10      +0 -13     xml-fop/src/java/org/apache/fop/fo/XMLElement.java
  
  Index: XMLElement.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/XMLElement.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLElement.java   1 Aug 2004 04:20:48 -0000       1.9
  +++ XMLElement.java   4 Aug 2004 22:21:02 -0000       1.10
  @@ -23,9 +23,6 @@
   import org.xml.sax.Locator;
   import org.xml.sax.SAXParseException;
   
  -// FOP
  -import org.apache.fop.layoutmgr.AddLMVisitor;
  -
   /**
    * class representing svg:svg pseudo flow object.
    */
  @@ -62,14 +59,4 @@
       public String getNameSpace() {
           return namespace;
       }
  -
  -    /**
  -     * This is a hook for the AddLMVisitor class to be able to access
  -     * this object.
  -     * @param aLMV the AddLMVisitor object that can access this object.
  -     */
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveXMLElement(this);
  -    }
  -
   }
  
  
  
  1.15      +0 -13     xml-fop/src/java/org/apache/fop/fo/XMLObj.java
  
  Index: XMLObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/XMLObj.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XMLObj.java       1 Aug 2004 04:20:48 -0000       1.14
  +++ XMLObj.java       4 Aug 2004 22:21:02 -0000       1.15
  @@ -29,9 +29,6 @@
   import org.xml.sax.SAXParseException;
   import javax.xml.parsers.DocumentBuilderFactory;
   
  -// FOP
  -import org.apache.fop.layoutmgr.AddLMVisitor;
  -
   /**
    * Abstract class modelling generic, non-XSL-FO XML objects. Such objects are
    * stored in a DOM.
  @@ -209,15 +206,5 @@
           org.w3c.dom.Text text = doc.createTextNode(str);
           element.appendChild(text);
       }
  -
  -    /**
  -     * This is a hook for the AddLMVisitor class to be able to access
  -     * this object.
  -     * @param aLMV the AddLMVisitor object that can access this object.
  -     */
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveXMLObj(this);
  -    }
  -
   }
   
  
  
  
  1.11      +1 -7      
xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
  
  Index: SVGElement.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SVGElement.java   3 Aug 2004 22:36:26 -0000       1.10
  +++ SVGElement.java   4 Aug 2004 22:21:03 -0000       1.11
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   
   import org.apache.batik.dom.svg.SVGOMDocument;
   import org.apache.batik.dom.svg.SVGOMElement;
  @@ -282,10 +281,5 @@
               return 100;
           }
       }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveSVGElement(this);
  -    }
  -
   }
   
  
  
  
  1.5       +1 -7      xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java
  
  Index: SVGObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGObj.java       27 Jul 2004 23:57:11 -0000      1.4
  +++ SVGObj.java       4 Aug 2004 22:21:03 -0000       1.5
  @@ -20,7 +20,6 @@
   
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.XMLObj;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   
   /**
    * Class for SVG element objects.
  @@ -43,10 +42,5 @@
       public String getNameSpace() {
           return "http://www.w3.org/2000/svg";;
       }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveSVGObj(this);
  -    }
  -
   }
   
  
  
  
  1.10      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/Float.java
  
  Index: Float.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Float.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Float.java        31 Jul 2004 00:44:22 -0000      1.9
  +++ Float.java        4 Aug 2004 22:21:03 -0000       1.10
  @@ -21,7 +21,6 @@
   // FOP
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.ToBeImplementedElement;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   
   /**
    * fo:float element.
  @@ -40,10 +39,6 @@
           // this.propertyList.get("float");
           // this.propertyList.get("clear");
   
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveFloat(this);
       }
   
       public String getName() {
  
  
  
  1.11      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
  
  Index: InitialPropertySet.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- InitialPropertySet.java   27 Jul 2004 23:57:12 -0000      1.10
  +++ InitialPropertySet.java   4 Aug 2004 22:21:03 -0000       1.11
  @@ -25,7 +25,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
  @@ -84,10 +83,6 @@
           // this.propertyList.get("text-transform");
           // this.propertyList.get("word-spacing");
   
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveInitialPropertySet(this);
       }
   
       public String getName() {
  
  
  
  1.10      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java
  
  Index: MultiCase.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MultiCase.java    27 Jul 2004 23:57:12 -0000      1.9
  +++ MultiCase.java    4 Aug 2004 22:21:03 -0000       1.10
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   
  @@ -47,10 +46,6 @@
           // this.propertyList.get("case-name");
           // this.propertyList.get("case-title");
   
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveMultiCase(this);
       }
   
       public String getName() {
  
  
  
  1.9       +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java
  
  Index: MultiProperties.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MultiProperties.java      27 Jul 2004 23:57:12 -0000      1.8
  +++ MultiProperties.java      4 Aug 2004 22:21:03 -0000       1.9
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   
  @@ -44,10 +43,6 @@
   
           setupID();
   
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveMultiProperties(this);
       }
   
       public String getName() {
  
  
  
  1.10      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
  
  Index: MultiPropertySet.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiPropertySet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MultiPropertySet.java     27 Jul 2004 23:57:12 -0000      1.9
  +++ MultiPropertySet.java     4 Aug 2004 22:21:03 -0000       1.10
  @@ -25,7 +25,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   
   /**
  @@ -53,10 +52,6 @@
       private void setup() {
           setupID();
           // this.propertyList.get("active-state");
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveMultiPropertySet(this);
       }
   
       public String getName() {
  
  
  
  1.10      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/MultiSwitch.java
  
  Index: MultiSwitch.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiSwitch.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MultiSwitch.java  27 Jul 2004 23:57:12 -0000      1.9
  +++ MultiSwitch.java  4 Aug 2004 22:21:03 -0000       1.10
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   
  @@ -45,10 +44,6 @@
           // this.propertyList.get("auto-restore");
           setupID();
   
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveMultiSwitch(this);
       }
   
       public String getName() {
  
  
  
  1.10      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/MultiToggle.java
  
  Index: MultiToggle.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiToggle.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MultiToggle.java  27 Jul 2004 23:57:12 -0000      1.9
  +++ MultiToggle.java  4 Aug 2004 22:21:03 -0000       1.10
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   
  @@ -45,10 +44,6 @@
           setupID();
           // this.propertyList.get("switch-to");
   
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveMultiToggle(this);
       }
   
       public String getName() {
  
  
  
  1.10      +0 -6      xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java
  
  Index: TableAndCaption.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TableAndCaption.java      27 Jul 2004 23:57:12 -0000      1.9
  +++ TableAndCaption.java      4 Aug 2004 22:21:03 -0000       1.10
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
  @@ -82,13 +81,8 @@
           return true;
       }
   
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveTableAndCaption(this);
  -    }
  -
       public String getName() {
           return "fo:table-and-caption";
       }
  -
   }
   
  
  
  
  1.11      +0 -5      xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java
  
  Index: TableCaption.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TableCaption.java 31 Jul 2004 00:44:22 -0000      1.10
  +++ TableCaption.java 4 Aug 2004 22:21:04 -0000       1.11
  @@ -20,7 +20,6 @@
   
   // FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.layoutmgr.AddLMVisitor;
   import org.apache.fop.fo.ToBeImplementedElement;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
  @@ -73,10 +72,6 @@
        */
       protected boolean containsMarkers() {
           return true;
  -    }
  -
  -    public void acceptVisitor(AddLMVisitor aLMV) {
  -        aLMV.serveTableCaption(this);
       }
   
       public String getName() {
  
  
  
  1.46      +24 -150   xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
  
  Index: AddLMVisitor.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- AddLMVisitor.java 1 Aug 2004 15:26:53 -0000       1.45
  +++ AddLMVisitor.java 4 Aug 2004 22:21:04 -0000       1.46
  @@ -47,26 +47,19 @@
   import org.apache.fop.fo.FObjMixed;
   import org.apache.fop.fo.TextInfo;
   import org.apache.fop.fo.ToBeImplementedElement;
  -import org.apache.fop.fo.Unknown;
  -import org.apache.fop.fo.UnknownXMLObj;
  -import org.apache.fop.fo.XMLElement;
   import org.apache.fop.fo.XMLObj;
   import org.apache.fop.fo.extensions.Bookmarks;
   import org.apache.fop.fo.extensions.ExtensionObj;
   import org.apache.fop.fo.extensions.Label;
   import org.apache.fop.fo.extensions.Outline;
  -import org.apache.fop.fo.extensions.svg.SVGElement;
  -import org.apache.fop.fo.extensions.svg.SVGObj;
   import org.apache.fop.fo.flow.BasicLink;
   import org.apache.fop.fo.flow.BidiOverride;
   import org.apache.fop.fo.flow.Block;
   import org.apache.fop.fo.flow.BlockContainer;
   import org.apache.fop.fo.flow.Character;
   import org.apache.fop.fo.flow.ExternalGraphic;
  -import org.apache.fop.fo.flow.Float;
   import org.apache.fop.fo.flow.Footnote;
   import org.apache.fop.fo.flow.FootnoteBody;
  -import org.apache.fop.fo.flow.InitialPropertySet;
   import org.apache.fop.fo.flow.Inline;
   import org.apache.fop.fo.flow.InlineContainer;
   import org.apache.fop.fo.flow.InstreamForeignObject;
  @@ -76,18 +69,12 @@
   import org.apache.fop.fo.flow.ListItemBody;
   import org.apache.fop.fo.flow.ListItemLabel;
   import org.apache.fop.fo.flow.Marker;
  -import org.apache.fop.fo.flow.MultiCase;
  -import org.apache.fop.fo.flow.MultiProperties;
  -import org.apache.fop.fo.flow.MultiPropertySet;
  -import org.apache.fop.fo.flow.MultiSwitch;
  -import org.apache.fop.fo.flow.MultiToggle;
   import org.apache.fop.fo.flow.PageNumber;
   import org.apache.fop.fo.flow.PageNumberCitation;
   import org.apache.fop.fo.flow.RetrieveMarker;
   import org.apache.fop.fo.flow.Table;
   import org.apache.fop.fo.flow.TableAndCaption;
   import org.apache.fop.fo.flow.TableBody;
  -import org.apache.fop.fo.flow.TableCaption;
   import org.apache.fop.fo.flow.TableCell;
   import org.apache.fop.fo.flow.TableColumn;
   import org.apache.fop.fo.flow.TableFooter;
  @@ -174,6 +161,19 @@
           return saveLMList;
       }
   
  +    /**
  +     * @param node FONode object to process
  +     */
  +    public void serveFONode(FONode node) {
  +    }
  +
  +    /**
  +     * @param node FObj object to process
  +     */
  +    public void serveFObj(FObj node) {
  +        serveFONode((FONode)node);
  +    }
  +
       public void serveFOText(FOText foText) {
           if (foText.endIndex - foText.startIndex > 0) {
               currentLMList.add(new TextLayoutManager(foText));
  @@ -798,18 +798,18 @@
        }
   
       /**
  -     * @param node FONode object to process
  -     */
  -    public void serveFONode(FONode node) {
  -    }
  -
  -    /**
  -     * @param node FObj object to process
  +     * @param node Wrapper object to process
        */
  -    public void serveFObj(FObj node) {
  -        serveFONode((FONode)node);
  +    public void serveWrapper(Wrapper node) {
  +        ListIterator baseIter;
  +        baseIter = node.getChildNodes();
  +        if (baseIter == null) return;
  +        while (baseIter.hasNext()) {
  +            FObj child = (FObj) baseIter.next();
  +            child.acceptVisitor(this);
  +        }
       }
  -
  +    
       /**
        * @param node ColorProfile object to process
        */
  @@ -881,19 +881,6 @@
       }
   
       /**
  -     * @param node Wrapper object to process
  -     */
  -    public void serveWrapper(Wrapper node) {
  -        ListIterator baseIter;
  -        baseIter = node.getChildNodes();
  -        if (baseIter == null) return;
  -        while (baseIter.hasNext()) {
  -            FObj child = (FObj) baseIter.next();
  -            child.acceptVisitor(this);
  -        }
  -    }
  -    
  -    /**
        * @param node FootnoteBody object to process
        */
       public void serveFootnoteBody(FootnoteBody node) {
  @@ -1053,117 +1040,4 @@
       public void serveTableColumn(TableColumn node) {
           serveFObj((FObj)node);
       }
  -
  -    /**
  -     * @param node ToBeImplementedElement object to process
  -     */
  -    public void serveToBeImplementedElement(ToBeImplementedElement node) {
  -        serveFObj((FObj)node);
  -    }
  -
  -    /**
  -     * @param node Float object to process
  -     */
  -    public void serveFloat(Float node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node InitialPropertySet object to process
  -     */
  -    public void serveInitialPropertySet(InitialPropertySet node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node MultiCase object to process
  -     */
  -    public void serveMultiCase(MultiCase node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node MultiProperties object to process
  -     */
  -    public void serveMultiProperties(MultiProperties node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node MultiPropertySet object to process
  -     */
  -    public void serveMultiPropertySet(MultiPropertySet node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node MultiSwitch object to process
  -     */
  -    public void serveMultiSwitch(MultiSwitch node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node MultiToggle object to process
  -     */
  -    public void serveMultiToggle(MultiToggle node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node TableAndCaption object to process
  -     */
  -    public void serveTableAndCaption(TableAndCaption node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node TableCaption object to process
  -     */
  -    public void serveTableCaption(TableCaption node) {
  -        serveToBeImplementedElement((ToBeImplementedElement)node);
  -    }
  -
  -    /**
  -     * @param node Unknown object to process
  -     */
  -    public void serveUnknown(Unknown node) {
  -        serveFONode((FONode)node);
  -    }
  -
  -    /**
  -     * @param node XMLObj object to process
  -     */
  -    public void serveXMLObj(XMLObj node) {
  -        serveFONode((FONode)node);
  -    }
  -
  -    /**
  -     * @param node SVGObj object to process
  -     */
  -    public void serveSVGObj(SVGObj node) {
  -        serveXMLObj((XMLObj)node);
  -    }
  -
  -    /**
  -     * @param node SVGElement object to process
  -     */
  -    public void serveSVGElement(SVGElement node) {
  -        serveSVGObj((SVGObj)node);
  -    }
  -
  -    /**
  -     * @param node UnknownXMLObj object to process
  -     */
  -    public void serveUnknownXMLObj(UnknownXMLObj node) {
  -        serveXMLObj((XMLObj)node);
  -    }
  -
  -    /**
  -     * @param node XMLElement object to process
  -     */
  -    public void serveXMLElement(XMLElement node) {
  -        serveXMLObj((XMLObj)node);
  -    }
  -
   }
  
  
  

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

Reply via email to