Bug #20397: Move StructureHandler.java to fo package and LayoutHandler.java to layoutmgr package.

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

src/java/org/apache/fop/apps/Driver.java

@@ -54,11 +54,14 @@ package org.apache.fop.apps;
 import org.apache.fop.fo.ElementMapping;
 import org.apache.fop.fo.FOTreeBuilder;
 import org.apache.fop.fo.FOUserAgent;
+import org.apache.fop.fo.StructureHandler;
+import org.apache.fop.layoutmgr.LayoutHandler;
+import org.apache.fop.mif.MIFHandler;
 import org.apache.fop.render.Renderer;
+import org.apache.fop.rtf.renderer.RTFHandler;
 import org.apache.fop.tools.DocumentInputSource;
 import org.apache.fop.tools.DocumentReader;
 
-
 // Avalon
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.avalon.framework.logger.LogEnabled;
@@ -582,9 +585,9 @@ public class Driver implements LogEnabled {
         // TODO: - do this stuff in a better way
         // PIJ: I guess the structure handler should be created by the renderer.
         if (rendererType == RENDER_MIF) {
-            structHandler = new org.apache.fop.mif.MIFHandler(stream);
+            structHandler = new MIFHandler(stream);
         } else if (rendererType == RENDER_RTF) {
-            structHandler = new org.apache.fop.rtf.renderer.RTFHandler(stream);
+            structHandler = new RTFHandler(stream);
         } else {
             if (renderer == null) {
                 throw new IllegalStateException(

src/java/org/apache/fop/extensions/Bookmarks.java

@@ -50,7 +50,7 @@
  */ 
 package org.apache.fop.extensions;
 
-import org.apache.fop.apps.LayoutHandler;
+import org.apache.fop.layoutmgr.LayoutHandler;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.area.AreaTree;
 

src/java/org/apache/fop/fo/FONode.java

@@ -61,7 +61,6 @@ import org.apache.avalon.framework.logger.Logger;
 
 // FOP
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.util.CharUtilities;
 
 /**

src/java/org/apache/fop/fo/FOText.java

@@ -58,7 +58,6 @@ import java.util.List;
 import org.apache.fop.layout.TextState;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.TextLayoutManager;
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.fo.properties.WhiteSpaceCollapse;
 import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.pagination.Root;

src/java/org/apache/fop/fo/FOTreeBuilder.java

@@ -52,7 +52,6 @@ package org.apache.fop.fo;
 
 // FOP
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.StructureHandler;
 
 // Java
 import java.util.HashMap;

src/java/org/apache/fop/fo/FObj.java

@@ -62,7 +62,6 @@ import org.xml.sax.Attributes;
 
 // FOP
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.apache.fop.fo.flow.Marker;
 

src/java/org/apache/fop/fo/FObjMixed.java

@@ -51,7 +51,6 @@
 package org.apache.fop.fo;
 
 import org.apache.fop.layout.FontInfo;
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
 import org.apache.fop.layoutmgr.LMiter;
 

src/java/org/apache/fop/apps/StructureHandler.java → src/java/org/apache/fop/fo/StructureHandler.java

@@ -1,5 +1,5 @@
 /*
- * $Id: StructureHandler.java,v 1.7 2003/02/27 10:13:07 jeremias Exp $
+ * $Id$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -48,7 +48,7 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.apps;
+package org.apache.fop.fo;
 
 // Java
 import java.util.Set;
@@ -58,6 +58,7 @@ import java.util.HashSet;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 
 // FOP
+import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.flow.ExternalGraphic;
 import org.apache.fop.fo.flow.Flow;

src/java/org/apache/fop/fo/flow/Leader.java

@@ -54,7 +54,6 @@ package org.apache.fop.fo.flow;
 import java.util.List;
 
 // FOP
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.area.Trait;
 import org.apache.fop.area.inline.FilledArea;
 import org.apache.fop.area.inline.InlineArea;
@@ -65,6 +64,7 @@ import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.PercentLength;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
+import org.apache.fop.fo.StructureHandler;
 import org.apache.fop.fo.properties.LeaderPattern;
 import org.apache.fop.layout.AccessibilityProps;
 import org.apache.fop.layout.AuralProps;

src/java/org/apache/fop/fo/flow/PageNumber.java

@@ -65,7 +65,6 @@ import org.apache.fop.layout.RelativePositionProps;
 import org.apache.fop.layout.TextState;
 import org.apache.fop.util.CharUtilities;
 
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
 import org.apache.fop.layoutmgr.LayoutContext;
@@ -74,6 +73,7 @@ import org.apache.fop.area.inline.Word;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.StructureHandler;
 import org.apache.fop.area.Trait;
 
 public class PageNumber extends FObj {

src/java/org/apache/fop/fo/flow/PageNumberCitation.java

@@ -54,7 +54,6 @@ package org.apache.fop.fo.flow;
 import java.util.List;
 
 // FOP
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.Resolveable;
 import org.apache.fop.area.Trait;
@@ -64,6 +63,7 @@ import org.apache.fop.area.inline.Word;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.StructureHandler;
 import org.apache.fop.layout.AccessibilityProps;
 import org.apache.fop.layout.AuralProps;
 import org.apache.fop.layout.BackgroundProps;

src/java/org/apache/fop/apps/LayoutHandler.java → src/java/org/apache/fop/layoutmgr/LayoutHandler.java

@@ -1,5 +1,5 @@
 /*
- * $Id: LayoutHandler.java,v 1.12 2003/02/27 10:13:06 jeremias Exp $
+ * $Id$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -48,7 +48,7 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.apps;
+package org.apache.fop.layoutmgr;
 
 // Java
 import java.io.IOException;
@@ -59,11 +59,13 @@ import java.util.List;
 import org.xml.sax.SAXException;
 
 // FOP
+import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.AreaTree;
 import org.apache.fop.area.AreaTreeModel;
 import org.apache.fop.area.StorePagesModel;
 import org.apache.fop.area.Title;
 import org.apache.fop.area.TreeExt;
+import org.apache.fop.fo.StructureHandler;
 import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.render.Renderer;

src/java/org/apache/fop/mif/MIFHandler.java

@@ -58,7 +58,7 @@ import java.io.OutputStream;
 import org.xml.sax.SAXException;
 
 // FOP
-import org.apache.fop.apps.StructureHandler;
+import org.apache.fop.fo.StructureHandler;
 import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.flow.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
@@ -107,14 +107,14 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#getFontInfo()
+     * @see org.apache.fop.fo.StructureHandler#getFontInfo()
      */
     public FontInfo getFontInfo() {
         return fontInfo;
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startDocument()
+     * @see org.apache.fop.fo.StructureHandler#startDocument()
      */
     public void startDocument() throws SAXException {
         mifFile = new MIFFile();
@@ -126,7 +126,7 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endDocument()
+     * @see org.apache.fop.fo.StructureHandler#endDocument()
      */
     public void endDocument() throws SAXException {
         // finish all open elements
@@ -143,7 +143,7 @@ public class MIFHandler extends StructureHandler {
      * Start the page sequence.
      * This creates the pages in the MIF document that will be used
      * by the following flows and static areas.
-     * @see org.apache.fop.apps.StructureHandler
+     * @see org.apache.fop.fo.StructureHandler
      */
     public void startPageSequence(PageSequence pageSeq) {
         // get the layout master set
@@ -190,14 +190,14 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endPageSequence(PageSequence)
+     * @see org.apache.fop.fo.StructureHandler#endPageSequence(PageSequence)
      */
     public void endPageSequence(PageSequence pageSeq) throws FOPException {
 
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startFlow(Flow)
+     * @see org.apache.fop.fo.StructureHandler#startFlow(Flow)
      */
     public void startFlow(Flow fl) {
         // start text flow in body region
@@ -205,7 +205,7 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endFlow(Flow)
+     * @see org.apache.fop.fo.StructureHandler#endFlow(Flow)
      */
     public void endFlow(Flow fl) {
         textFlow.finish(true);
@@ -214,7 +214,7 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startBlock(Block)
+     * @see org.apache.fop.fo.StructureHandler#startBlock(Block)
      */
     public void startBlock(Block bl) {
         para = new MIFElement("Para");
@@ -223,7 +223,7 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endBlock(Block)
+     * @see org.apache.fop.fo.StructureHandler#endBlock(Block)
      */
     public void endBlock(Block bl) {
         para.finish(true);
@@ -231,195 +231,195 @@ public class MIFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startTable(Table)
+     * @see org.apache.fop.fo.StructureHandler#startTable(Table)
      */
     public void startTable(Table tbl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endTable(Table)
+     * @see org.apache.fop.fo.StructureHandler#endTable(Table)
      */
     public void endTable(Table tbl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startHeader(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#startHeader(TableBody)
      */
     public void startHeader(TableBody th) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endHeader(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#endHeader(TableBody)
      */
     public void endHeader(TableBody th) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startFooter(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#startFooter(TableBody)
      */
     public void startFooter(TableBody tf) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endFooter(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#endFooter(TableBody)
      */
     public void endFooter(TableBody tf) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startBody(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#startBody(TableBody)
      */
     public void startBody(TableBody tb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endBody(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#endBody(TableBody)
      */
     public void endBody(TableBody tb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startRow(TableRow)
+     * @see org.apache.fop.fo.StructureHandler#startRow(TableRow)
      */
     public void startRow(TableRow tr) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endRow(TableRow)
+     * @see org.apache.fop.fo.StructureHandler#endRow(TableRow)
      */
     public void endRow(TableRow tr) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startCell(TableCell)
+     * @see org.apache.fop.fo.StructureHandler#startCell(TableCell)
      */
     public void startCell(TableCell tc) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endCell(TableCell)
+     * @see org.apache.fop.fo.StructureHandler#endCell(TableCell)
      */
     public void endCell(TableCell tc) {
     }
 
     // Lists
     /**
-     * @see org.apache.fop.apps.StructureHandler#startList(ListBlock)
+     * @see org.apache.fop.fo.StructureHandler#startList(ListBlock)
      */
     public void startList(ListBlock lb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endList(ListBlock)
+     * @see org.apache.fop.fo.StructureHandler#endList(ListBlock)
      */
     public void endList(ListBlock lb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startListItem(ListItem)
+     * @see org.apache.fop.fo.StructureHandler#startListItem(ListItem)
      */
     public void startListItem(ListItem li) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endListItem(ListItem)
+     * @see org.apache.fop.fo.StructureHandler#endListItem(ListItem)
      */
     public void endListItem(ListItem li) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startListLabel()
+     * @see org.apache.fop.fo.StructureHandler#startListLabel()
      */
     public void startListLabel() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endListLabel()
+     * @see org.apache.fop.fo.StructureHandler#endListLabel()
      */
     public void endListLabel() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startListBody()
+     * @see org.apache.fop.fo.StructureHandler#startListBody()
      */
     public void startListBody() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endListBody()
+     * @see org.apache.fop.fo.StructureHandler#endListBody()
      */
     public void endListBody() {
     }
 
     // Static Regions
     /**
-     * @see org.apache.fop.apps.StructureHandler#startStatic()
+     * @see org.apache.fop.fo.StructureHandler#startStatic()
      */
     public void startStatic() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endStatic()
+     * @see org.apache.fop.fo.StructureHandler#endStatic()
      */
     public void endStatic() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startMarkup()
+     * @see org.apache.fop.fo.StructureHandler#startMarkup()
      */
     public void startMarkup() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endMarkup()
+     * @see org.apache.fop.fo.StructureHandler#endMarkup()
      */
     public void endMarkup() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startLink()
+     * @see org.apache.fop.fo.StructureHandler#startLink()
      */
     public void startLink() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endLink()
+     * @see org.apache.fop.fo.StructureHandler#endLink()
      */
     public void endLink() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#image(ExternalGraphic)
+     * @see org.apache.fop.fo.StructureHandler#image(ExternalGraphic)
      */
     public void image(ExternalGraphic eg) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#pageRef()
+     * @see org.apache.fop.fo.StructureHandler#pageRef()
      */
     public void pageRef() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#foreignObject(InstreamForeignObject)
+     * @see org.apache.fop.fo.StructureHandler#foreignObject(InstreamForeignObject)
      */
     public void foreignObject(InstreamForeignObject ifo) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#footnote()
+     * @see org.apache.fop.fo.StructureHandler#footnote()
      */
     public void footnote() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#leader(Leader)
+     * @see org.apache.fop.fo.StructureHandler#leader(Leader)
      */
     public void leader(Leader l) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#characters(char[], int, int)
+     * @see org.apache.fop.fo.StructureHandler#characters(char[], int, int)
      */
     public void characters(char data[], int start, int length) {
         if (para != null) {

src/java/org/apache/fop/rtf/renderer/RTFHandler.java

@@ -59,11 +59,10 @@ import java.io.IOException;
 import org.xml.sax.SAXException;
 
 // FOP
-import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.apps.FOPException;
-
 import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.StructureHandler;
 import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.fo.properties.Constants;
 import org.apache.fop.fo.flow.Block;
@@ -117,14 +116,14 @@ public class RTFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#getFontInfo()
+     * @see org.apache.fop.fo.StructureHandler#getFontInfo()
      */
     public FontInfo getFontInfo() {
         return this.fontInfo;
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startDocument()
+     * @see org.apache.fop.fo.StructureHandler#startDocument()
      */
     public void startDocument() throws SAXException {
         // FIXME sections should be created
@@ -138,7 +137,7 @@ public class RTFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endDocument()
+     * @see org.apache.fop.fo.StructureHandler#endDocument()
      */
     public void endDocument() throws SAXException {
         try {
@@ -150,7 +149,7 @@ public class RTFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler
+     * @see org.apache.fop.fo.StructureHandler
      */
     public void startPageSequence(PageSequence pageSeq)  {
         try {
@@ -166,25 +165,25 @@ public class RTFHandler extends StructureHandler {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endPageSequence(PageSequence)
+     * @see org.apache.fop.fo.StructureHandler#endPageSequence(PageSequence)
      */
     public void endPageSequence(PageSequence pageSeq) throws FOPException {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startFlow(Flow)
+     * @see org.apache.fop.fo.StructureHandler#startFlow(Flow)
      */
     public void startFlow(Flow fl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endFlow(Flow)
+     * @see org.apache.fop.fo.StructureHandler#endFlow(Flow)
      */
     public void endFlow(Flow fl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startBlock(Block)
+     * @see org.apache.fop.fo.StructureHandler#startBlock(Block)
      */
     public void startBlock(Block bl) {
         try {
@@ -199,201 +198,201 @@ public class RTFHandler extends StructureHandler {
 
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endBlock(Block)
+     * @see org.apache.fop.fo.StructureHandler#endBlock(Block)
      */
     public void endBlock(Block bl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startTable(Table)
+     * @see org.apache.fop.fo.StructureHandler#startTable(Table)
      */
     public void startTable(Table tbl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endTable(Table)
+     * @see org.apache.fop.fo.StructureHandler#endTable(Table)
      */
     public void endTable(Table tbl) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startHeader(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#startHeader(TableBody)
      */
     public void startHeader(TableBody th) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endHeader(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#endHeader(TableBody)
      */
     public void endHeader(TableBody th) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startFooter(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#startFooter(TableBody)
      */
     public void startFooter(TableBody tf) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endFooter(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#endFooter(TableBody)
      */
     public void endFooter(TableBody tf) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startBody(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#startBody(TableBody)
      */
     public void startBody(TableBody tb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endBody(TableBody)
+     * @see org.apache.fop.fo.StructureHandler#endBody(TableBody)
      */
     public void endBody(TableBody tb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startRow(TableRow)
+     * @see org.apache.fop.fo.StructureHandler#startRow(TableRow)
      */
     public void startRow(TableRow tr) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endRow(TableRow)
+     * @see org.apache.fop.fo.StructureHandler#endRow(TableRow)
      */
     public void endRow(TableRow tr) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startCell(TableCell)
+     * @see org.apache.fop.fo.StructureHandler#startCell(TableCell)
      */
     public void startCell(TableCell tc) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endCell(TableCell)
+     * @see org.apache.fop.fo.StructureHandler#endCell(TableCell)
      */
     public void endCell(TableCell tc) {
     }
 
     // Lists
     /**
-     * @see org.apache.fop.apps.StructureHandler#startList(ListBlock)
+     * @see org.apache.fop.fo.StructureHandler#startList(ListBlock)
      */
     public void startList(ListBlock lb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endList(ListBlock)
+     * @see org.apache.fop.fo.StructureHandler#endList(ListBlock)
      */
     public void endList(ListBlock lb) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startListItem(ListItem)
+     * @see org.apache.fop.fo.StructureHandler#startListItem(ListItem)
      */
     public void startListItem(ListItem li) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endListItem(ListItem)
+     * @see org.apache.fop.fo.StructureHandler#endListItem(ListItem)
      */
     public void endListItem(ListItem li) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startListLabel()
+     * @see org.apache.fop.fo.StructureHandler#startListLabel()
      */
     public void startListLabel() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endListLabel()
+     * @see org.apache.fop.fo.StructureHandler#endListLabel()
      */
     public void endListLabel() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startListBody()
+     * @see org.apache.fop.fo.StructureHandler#startListBody()
      */
     public void startListBody() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endListBody()
+     * @see org.apache.fop.fo.StructureHandler#endListBody()
      */
     public void endListBody() {
     }
 
     // Static Regions
     /**
-     * @see org.apache.fop.apps.StructureHandler#startStatic()
+     * @see org.apache.fop.fo.StructureHandler#startStatic()
      */
     public void startStatic() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endStatic()
+     * @see org.apache.fop.fo.StructureHandler#endStatic()
      */
     public void endStatic() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startMarkup()
+     * @see org.apache.fop.fo.StructureHandler#startMarkup()
      */
     public void startMarkup() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endMarkup()
+     * @see org.apache.fop.fo.StructureHandler#endMarkup()
      */
     public void endMarkup() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#startLink()
+     * @see org.apache.fop.fo.StructureHandler#startLink()
      */
     public void startLink() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#endLink()
+     * @see org.apache.fop.fo.StructureHandler#endLink()
      */
     public void endLink() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#image(ExternalGraphic)
+     * @see org.apache.fop.fo.StructureHandler#image(ExternalGraphic)
      */
     public void image(ExternalGraphic eg) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#pageRef()
+     * @see org.apache.fop.fo.StructureHandler#pageRef()
      */
     public void pageRef() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#foreignObject(InstreamForeignObject)
+     * @see org.apache.fop.fo.StructureHandler#foreignObject(InstreamForeignObject)
      */
     public void foreignObject(InstreamForeignObject ifo) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#footnote()
+     * @see org.apache.fop.fo.StructureHandler#footnote()
      */
     public void footnote() {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#leader(Leader)
+     * @see org.apache.fop.fo.StructureHandler#leader(Leader)
      */
     public void leader(Leader l) {
     }
 
     /**
-     * @see org.apache.fop.apps.StructureHandler#characters(char[], int, int)
+     * @see org.apache.fop.fo.StructureHandler#characters(char[], int, int)
      */
     public void characters(char data[], int start, int length) {
         try {