More detaching from AddLMVisitor those FO's which don't/don't currently

generate areas.

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

diff --git a/src/java/org/apache/fop/fo/extensions/Bookmarks.java b/src/java/org/apache/fop/fo/extensions/Bookmarks.java
index d84066402a7cdfac644a56179f15140ab9ea406f..a9273fccc34892864a75c57dbcb0afdbbce2a055 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/Bookmarks.java
+++ b/src/java/org/apache/fop/fo/extensions/Bookmarks.java
@@ -26,7 +26,6 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.pagination.Root;
 
 /**
@@ -64,12 +63,7 @@ public class Bookmarks extends ExtensionObj {
         ((Root) parent).setBookmarks(this);
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveBookmarks(this);
-    }
-
     public ArrayList getOutlines() {
         return outlines;
     }
-
 }

diff --git a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
index 3db4c835540b6dca7cc33058672cd2028a16897c..8e77419d4fbdf61109fe22872cf8a9fe9bd834f3 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
+++ b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
@@ -20,7 +20,6 @@ package org.apache.fop.fo.extensions;
 
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Base class for pdf bookmark extension objects.
@@ -35,10 +34,5 @@ public abstract class ExtensionObj extends FObj {
     public ExtensionObj(FONode parent) {
         super(parent);
     }
-
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveExtensionObj(this);
-    }
-
 }
 

diff --git a/src/java/org/apache/fop/fo/extensions/Label.java b/src/java/org/apache/fop/fo/extensions/Label.java
index e8c2ed0a4f2d57381d46281759b34781c3fd7f3e..eb56d65689aabc0fec1873f8ec77f40d546d152c 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/Label.java
+++ b/src/java/org/apache/fop/fo/extensions/Label.java
@@ -21,8 +21,6 @@ package org.apache.fop.fo.extensions;
 import org.xml.sax.Locator;
 
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
-
 
 /**
  * Labal for PDF bookmark extension.
@@ -62,10 +60,6 @@ public class Label extends ExtensionObj {
     public String toString() {
         return label;
     }
-
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveLabel(this);
-    }
     
     public String getName() {
         return "(http://xml.apache.org/fop/extensions) label";

diff --git a/src/java/org/apache/fop/fo/extensions/Outline.java b/src/java/org/apache/fop/fo/extensions/Outline.java
index d3e293306daac36b4a40d465d6078034bee824e6..ae0ef523e6168334caf927a7dc7598d25a5fd75e 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/Outline.java
+++ b/src/java/org/apache/fop/fo/extensions/Outline.java
@@ -19,7 +19,6 @@
 package org.apache.fop.fo.extensions;
 
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 import java.util.ArrayList;
 
@@ -89,10 +88,6 @@ public class Outline extends ExtensionObj {
         return label == null ? "" : label.toString();
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveOutline(this);
-    }
-
     public String getInternalDestination() {
         return internalDestination;
     }

diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
index 1674ecc31d1a1d7acc71a95135cf07e9a3004e80..0b131896d82b28c5dc42d3bfde0824371c455a83 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
@@ -26,7 +26,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Class modelling the fo:footnote-body object. See Sec. 6.10.4 of the XSL-FO
@@ -56,10 +55,6 @@ public class FootnoteBody extends FObj {
         getFOInputHandler().startFootnoteBody(this);
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveFootnoteBody(this);
-    }
-
     protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endFootnoteBody(this);

diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java
index 6044ef20cfadea2faceded7bb4a89566a5beb6cf..59847758a880baef8d8951ed50b2968c813699f3 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ListItemBody.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java
@@ -21,7 +21,6 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
 /**
@@ -61,15 +60,6 @@ public class ListItemBody extends FObj {
         return true;
     }
 
-    /**
-     * 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.serveListItemBody(this);
-    }
-
     public String getName() {
         return "fo:list-item-body";
     }

diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
index 81b631282786606bb5fe94a48cb5517287230040..13fd0058ba6bd6703adf8a0b0619a212e8be928a 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
@@ -25,7 +25,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.properties.CommonAccessibility;
 
 /**
@@ -73,15 +72,6 @@ public class ListItemLabel extends FObj {
         return true;
     }
 
-    /**
-     * 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.serveListItemLabel(this);
-    }
-
     protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endListLabel();

diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java
index a090d78fc3d84103c609b39e922f288ca9299d29..767dfbb8be0567fb8ddc393d488508a23e391283 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Marker.java
+++ b/src/java/org/apache/fop/fo/flow/Marker.java
@@ -25,7 +25,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Marker formatting object.
@@ -63,10 +62,6 @@ public class Marker extends FObjMixed {
         return markerClassName;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveMarker(this);
-    }
-
     public String getName() {
         return "fo:marker";
     }

diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index 172b15475a291ce6cc65a37f176a73e7aa49e274..d7ff1dbcf786fe885fa42e3c2ff784a86572e3c0 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -28,7 +28,6 @@ import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -123,15 +122,6 @@ public class TableColumn extends FObj {
         initialized = true;
     }
 
-    /**
-     * 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.serveTableColumn(this);
-    }
-
     protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endColumn(this);
     }

diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java
index 9abccc13243ca4fd304dcccf41367d9484791f1a..4694fca7546f4836c91bcb7bca1897d3d11971d4 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java
+++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java
@@ -33,7 +33,6 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * The fo:color-profile formatting object.
@@ -112,10 +111,6 @@ public class ColorProfile extends FObj {
         }
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveColorProfile(this);
-    }
-
     public String getName() {
         return "fo:color-profile";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
index 3d3c42576ee11b795011c32cd581e188a57a55f9..7b30535aafb48f300139b510266ab56270e06967 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
@@ -26,7 +26,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A conditional-page-master-reference formatting object.
@@ -173,10 +172,6 @@ public class ConditionalPageMasterReference extends FObj {
         }
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveConditionalPageMasterReference(this);
-    }
-
     public String getName() {
         return "fo:conditional-page-master-reference";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java
index 11b1ad406321150ca88b7671a0bff1e2d7083d9a..f16b4fb823b956a37528e94dccade5658a5d8ffa 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Declarations.java
+++ b/src/java/org/apache/fop/fo/pagination/Declarations.java
@@ -32,7 +32,6 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.XMLObj;
 
 
@@ -106,10 +105,6 @@ public class Declarations extends FObj {
         childNodes = null;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveDeclarations(this);
-    }
-
     public String getName() {
         return "fo:declarations";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
index 356ecc71d7e3b97abca07c6d8052e3f010d92178..21e2b123cc69de79473f8bdc61c5b325297226a9 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
+++ b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
@@ -31,7 +31,6 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -217,10 +216,6 @@ public class LayoutMasterSet extends FObj {
         return false;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveLayoutMasterSet(this);
-    }
-
     public String getName() {
         return "fo:layout-master-set";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/PageMasterReference.java b/src/java/org/apache/fop/fo/pagination/PageMasterReference.java
index 3e7c971a303c565274a204cda4bea6ae495bfc85..390477043fec668102ea6cbc9c915ccaa4588d34 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/PageMasterReference.java
@@ -25,7 +25,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Base PageMasterReference class. Provides implementation for handling the
@@ -86,10 +85,6 @@ public abstract class PageMasterReference extends FObj
         }
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.servePageMasterReference(this);
-    }
-
     public String getName() {
         return "fo:page-master-reference";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 9f1a7ee3d2f9f8b64bdf6a8f9b1828b9ecb1b970..8e26a2dbb5b67554319ce36190a8351d09f645b7 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -31,7 +31,6 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -692,14 +691,6 @@ public class PageSequence extends FObj {
         return titleFO;
     }
 
-    /**
-     * Hook for Visitor objects accessing the FO Tree.
-     * @param aLMV the AddLMVisitor object that can access this object.
-     */
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.servePageSequence(this);
-    }
-
     /**
      * Public accessor for getting the MainFlow to which this PageSequence is
      * attached.

diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
index cc746780d51261bff825e946fe57a7ff10210b4d..7e2ee40df6398209d7953584f8b5440157a0b029 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -31,7 +31,6 @@ import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.apps.FOPException;
 
 /**
@@ -200,10 +199,6 @@ public class PageSequenceMaster extends FObj {
         return pageMaster;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.servePageSequenceMaster(this);
-    }
-
     public String getName() {
         return "fo:page-sequence-master";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index b6838bd768293d8516a56579d885f15756405688..ffc16940fe292f2b4d6cab32f50d2107c4bda303 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -28,7 +28,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 
 /**

diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
index ba44c74756d6bdacb0f09ebb5d5b0b005113e50b..71d03643051bac8acefed30520434d7693a4a47f 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
@@ -23,7 +23,6 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.datatypes.FODimension;
 
 /**
@@ -69,15 +68,6 @@ public class RegionAfter extends RegionBA {
         return Region.AFTER_CODE;
     }
 
-    /**
-     * 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.serveRegionAfter(this);
-    }
-
     public String getName() {
         return "fo:region-after";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java
index b0da0abe48c945c34b0795112355292e02211980..c78fc5d62662b4e9ef34d2b1f925fcb9fc76d81b 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBA.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java
@@ -27,8 +27,6 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
-
 
 /**
  * Abstract base class for fo:region-before and fo:region-after.

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
index e9e59201afbff4cb3f6656ff2e195614a8f2e22b..42cf4910f0ffe8d288f1af308435df06b6ab45e4 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
@@ -24,7 +24,6 @@ import java.awt.Rectangle;
 // FOP
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * The fo:region-before element.
@@ -74,15 +73,6 @@ public class RegionBefore extends RegionBA {
         return vpRect;
     }
 
-    /**
-     * 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.serveRegionBefore(this);
-    }
-
     public String getName() {
         return "fo:region-before";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index aae53d8632b5a4f459a84379e8fb2a51291e15d5..002c8e6623a41a6c37919beedbdf9453705a5acd 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -28,7 +28,6 @@ import org.xml.sax.Attributes;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.properties.CommonMarginBlock;
@@ -107,15 +106,6 @@ public class RegionBody extends Region {
         return Region.BODY_CODE;
     }
 
-    /**
-     * 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.serveRegionBody(this);
-    }
-
     public String getName() {
         return "fo:region-body";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
index 818386362090d177725b6be1f8e5882953147e52..3254fd3b6a15b76ec3dc333147b7081264dc2bc3 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
@@ -23,7 +23,6 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.datatypes.FODimension;
 
 /**
@@ -70,15 +69,6 @@ public class RegionEnd extends RegionSE {
         return Region.END_CODE;
     }
 
-    /**
-     * 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.serveRegionEnd(this);
-    }
-
     public String getName() {
         return "fo:region-end";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java
index 53976210c9ae8970ca4e607f7020973df0ded30a..454742dac8fe684652c6934041d4e7a2f4af4d27 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionSE.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionSE.java
@@ -27,7 +27,6 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * Abstract base class for fo:region-start and fo:region-end.

diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java
index aa8feeef9a5ebd3eb482fcc35c2b3d4facafb575..f58750505fbdf53533762c9876014bcb2076a9ab 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionStart.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java
@@ -23,7 +23,6 @@ import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.datatypes.FODimension;
 
 /**
@@ -69,15 +68,6 @@ public class RegionStart extends RegionSE {
         return Region.START_CODE;
     }
 
-    /**
-     * 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.serveRegionStart(this);
-    }
-
     public String getName() {
         return "fo:region-start";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
index 9dde9b90fbb4d7bac571168438317c706d23d5f6..cc929aec928f173f556482e6be5827ef7eb2ca1c 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
@@ -30,7 +30,6 @@ import org.xml.sax.SAXParseException;
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A repeatable-page-master-alternatives formatting object.
@@ -156,10 +155,6 @@ public class RepeatablePageMasterAlternatives extends FObj
         this.numberConsumed = 0;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveRepeatablePageMasterAlternatives(this);
-    }
-
     public String getName() {
         return "fo:repeatable-page-master-alternatives";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
index 8c0267b84f4fa567bb223ec400d398c2322e77e5..060a19d2f60ab5a13a84b63dc42dff086ef05575 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
@@ -25,7 +25,6 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A repeatable-page-master-reference formatting object.
@@ -104,10 +103,6 @@ public class RepeatablePageMasterReference extends PageMasterReference
         this.numberConsumed = 0;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveRepeatablePageMasterReference(this);
-    }
-
     public String getName() {
         return "fo:repeatable-page-master-reference";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index c255e13264a4c91b22c739a57e6600c9b857b1ed..5b02c41362d85f63fcfbd024b5b66398091be146 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -224,14 +224,6 @@ public class Root extends FObj {
         return foInputHandler;
     }
 
-    /**
-     * Hook for Visitor objects accessing the FO Tree.
-     * @param aLMV the AddLMVisitor object that can access this object.
-     */
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveRoot(this);
-    }
-
     public String getName() {
         return "fo:root";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
index 76b422ad673530a07a628adc59bc6600e065cd8b..07171a7cf79720c229b9f6c8afe16cfd75883ee2 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -30,7 +30,6 @@ import org.xml.sax.SAXParseException;
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A simple-page-master formatting object.
@@ -157,15 +156,6 @@ public class SimplePageMaster extends FObj {
         return false;
     }
 
-    /**
-     * 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.serveSimplePageMaster(this);
-    }
-
     public String getName() {
         return "fo:simple-page-master";
     }

diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
index ff43bdb56ee52832c9189bdfcf0aac63a77cd1d3..c1b60079004b6aa54121531453da36d66a954071 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
@@ -25,7 +25,6 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.AddLMVisitor;
 
 /**
  * A single-page-master-reference formatting object.
@@ -78,10 +77,6 @@ public class SinglePageMasterReference extends PageMasterReference
         this.state = FIRST;
     }
 
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveSinglePageMasterReference(this);
-    }
-
     public String getName() {
         return "fo:single-page-master-reference";
     }

diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
index 372c62d491ecad62dc84934cc0f016702c0aad9c..fa0aeaf166569c150eb89aff14686c598b7475a1 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
-
 import org.apache.fop.area.LinkResolver;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.Resolveable;
@@ -48,10 +47,6 @@ import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.TextInfo;
 import org.apache.fop.fo.ToBeImplementedElement;
 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.flow.BasicLink;
 import org.apache.fop.fo.flow.BidiOverride;
 import org.apache.fop.fo.flow.Block;
@@ -59,7 +54,6 @@ 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.Footnote;
-import org.apache.fop.fo.flow.FootnoteBody;
 import org.apache.fop.fo.flow.Inline;
 import org.apache.fop.fo.flow.InlineContainer;
 import org.apache.fop.fo.flow.InstreamForeignObject;
@@ -68,7 +62,6 @@ import org.apache.fop.fo.flow.ListBlock;
 import org.apache.fop.fo.flow.ListItem;
 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.PageNumber;
 import org.apache.fop.fo.flow.PageNumberCitation;
 import org.apache.fop.fo.flow.RetrieveMarker;
@@ -81,27 +74,7 @@ import org.apache.fop.fo.flow.TableFooter;
 import org.apache.fop.fo.flow.TableHeader;
 import org.apache.fop.fo.flow.TableRow;
 import org.apache.fop.fo.flow.Wrapper;
-import org.apache.fop.fo.pagination.ColorProfile;
-import org.apache.fop.fo.pagination.ConditionalPageMasterReference;
-import org.apache.fop.fo.pagination.Declarations;
 import org.apache.fop.fo.pagination.Flow;
-import org.apache.fop.fo.pagination.LayoutMasterSet;
-import org.apache.fop.fo.pagination.PageMasterReference;
-import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.fo.pagination.PageSequenceMaster;
-import org.apache.fop.fo.pagination.Region;
-import org.apache.fop.fo.pagination.RegionAfter;
-import org.apache.fop.fo.pagination.RegionBA;
-import org.apache.fop.fo.pagination.RegionBefore;
-import org.apache.fop.fo.pagination.RegionBody;
-import org.apache.fop.fo.pagination.RegionEnd;
-import org.apache.fop.fo.pagination.RegionSE;
-import org.apache.fop.fo.pagination.RegionStart;
-import org.apache.fop.fo.pagination.RepeatablePageMasterAlternatives;
-import org.apache.fop.fo.pagination.RepeatablePageMasterReference;
-import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.fo.pagination.SimplePageMaster;
-import org.apache.fop.fo.pagination.SinglePageMasterReference;
 import org.apache.fop.fo.pagination.StaticContent;
 import org.apache.fop.fo.pagination.Title;
 import org.apache.fop.fo.properties.CommonBackground;
@@ -810,55 +783,6 @@ public class AddLMVisitor {
         }
     }
     
-    /**
-     * @param node ColorProfile object to process
-     */
-    public void serveColorProfile(ColorProfile node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node ConditionalPageMasterReference object to process
-     */
-    public void serveConditionalPageMasterReference(ConditionalPageMasterReference node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node Declarations object to process
-     */
-    public void serveDeclarations(Declarations node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node ExtensionObj object to process
-     */
-    public void serveExtensionObj(ExtensionObj node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node Bookmarks object to process
-     */
-    public void serveBookmarks(Bookmarks node) {
-        serveExtensionObj((ExtensionObj)node);
-    }
-
-    /**
-     * @param node Label object to process
-     */
-    public void serveLabel(Label node) {
-        serveExtensionObj((ExtensionObj)node);
-    }
-
-    /**
-     * @param node Outline object to process
-     */
-    public void serveOutline(Outline node) {
-        serveExtensionObj((ExtensionObj)node);
-    }
-
     /**
      * @param node StaticContent object to process
      */
@@ -866,13 +790,6 @@ public class AddLMVisitor {
         serveFlow((Flow)node);
     }
 
-    /**
-     * @param node Marker object to process
-     */
-    public void serveMarker(Marker node) {
-        serveFObjMixed((FObjMixed)node);
-    }
-
     /**
      * @param node Title object to process
      */
@@ -880,146 +797,6 @@ public class AddLMVisitor {
         serveFObjMixed((FObjMixed)node);
     }
 
-    /**
-     * @param node FootnoteBody object to process
-     */
-    public void serveFootnoteBody(FootnoteBody node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node LayoutMasterSet object to process
-     */
-    public void serveLayoutMasterSet(LayoutMasterSet node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node ListItemBody object to process
-     */
-    public void serveListItemBody(ListItemBody node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node ListItemLabel object to process
-     */
-    public void serveListItemLabel(ListItemLabel node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node PageMasterReference object to process
-     */
-    public void servePageMasterReference(PageMasterReference node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node RepeatablePageMasterReference object to process
-     */
-    public void serveRepeatablePageMasterReference(RepeatablePageMasterReference node) {
-        servePageMasterReference((PageMasterReference)node);
-    }
-
-    /**
-     * @param node SinglePageMasterReference object to process
-     */
-    public void serveSinglePageMasterReference(SinglePageMasterReference node) {
-        servePageMasterReference((PageMasterReference)node);
-    }
-
-    /**
-     * @param node PageSequence object to process
-     */
-    public void servePageSequence(PageSequence node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node PageSequenceMaster object to process
-     */
-    public void servePageSequenceMaster(PageSequenceMaster node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node Region object to process
-     */
-    public void serveRegion(Region node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node RegionBA object to process
-     */
-    public void serveRegionBA(RegionBA node) {
-        serveRegion((Region)node);
-    }
-
-    /**
-     * @param node RegionAfter object to process
-     */
-    public void serveRegionAfter(RegionAfter node) {
-        serveRegionBA((RegionBA)node);
-    }
-
-    /**
-     * @param node RegionBefore object to process
-     */
-    public void serveRegionBefore(RegionBefore node) {
-        serveRegionBA((RegionBA)node);
-    }
-
-    /**
-     * @param node RegionSE object to process
-     */
-    public void serveRegionSE(RegionSE node) {
-        serveRegion((Region)node);
-    }
-
-    /**
-     * @param node RegionEnd object to process
-     */
-    public void serveRegionEnd(RegionEnd node) {
-        serveRegionSE((RegionSE)node);
-    }
-
-    /**
-     * @param node RegionStart object to process
-     */
-    public void serveRegionStart(RegionStart node) {
-        serveRegionSE((RegionSE)node);
-    }
-
-    /**
-     * @param node RegionBody object to process
-     */
-    public void serveRegionBody(RegionBody node) {
-        serveRegion((Region)node);
-    }
-
-    /**
-     * @param node RepeatablePageMasterAlternatives object to process
-     */
-    public void serveRepeatablePageMasterAlternatives(RepeatablePageMasterAlternatives node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node Root object to process
-     */
-    public void serveRoot(Root node) {
-        serveFObj((FObj)node);
-    }
-
-    /**
-     * @param node SimplePageMaster object to process
-     */
-    public void serveSimplePageMaster(SimplePageMaster node) {
-        serveFObj((FObj)node);
-    }
-
     /**
      * @param node TableFooter object to process
      */
@@ -1033,11 +810,4 @@ public class AddLMVisitor {
     public void serveTableHeader(TableHeader node) {
         serveTableBody((TableBody)node);
     }
-
-    /**
-     * @param node TableColumn object to process
-     */
-    public void serveTableColumn(TableColumn node) {
-        serveFObj((FObj)node);
-    }
 }