From 325d7e5440da01011621b5e8aa8c86e9d59a166a Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Fri, 22 Aug 2003 06:27:34 +0000 Subject: [PATCH] style changes only git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196825 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/FObjMixed.java | 12 +++++----- .../org/apache/fop/fo/PropertyManager.java | 10 ++++---- .../org/apache/fop/fo/flow/BasicLink.java | 24 +++++++++---------- .../org/apache/fop/fo/flow/BidiOverride.java | 13 +++++----- src/java/org/apache/fop/fo/flow/Block.java | 11 +++++---- .../apache/fop/fo/flow/BlockContainer.java | 9 ++++--- .../org/apache/fop/fo/flow/Character.java | 10 ++++---- .../apache/fop/fo/flow/ExternalGraphic.java | 11 +++++++-- .../apache/fop/fo/flow/InlineContainer.java | 13 +++++----- .../fop/fo/flow/InstreamForeignObject.java | 8 +++++-- src/java/org/apache/fop/fo/flow/Leader.java | 20 ++++++---------- .../org/apache/fop/fo/flow/ListBlock.java | 10 ++++---- .../org/apache/fop/fo/flow/ListItemBody.java | 6 +++++ .../org/apache/fop/fo/flow/ListItemLabel.java | 6 +++++ .../org/apache/fop/fo/flow/PageNumber.java | 19 +++++++-------- .../fop/fo/flow/PageNumberCitation.java | 10 +------- .../apache/fop/fo/flow/RetrieveMarker.java | 11 +++++---- src/java/org/apache/fop/fo/flow/Table.java | 8 +++++-- .../org/apache/fop/fo/flow/TableBody.java | 10 ++++---- .../org/apache/fop/fo/flow/TableCell.java | 10 ++++---- .../org/apache/fop/fo/flow/TableColumn.java | 6 +++++ src/java/org/apache/fop/fo/flow/TableRow.java | 10 ++++---- .../org/apache/fop/fo/pagination/Flow.java | 8 +++++-- .../org/apache/fop/fo/pagination/Region.java | 6 +++++ .../apache/fop/fo/pagination/RegionAfter.java | 6 +++++ .../fop/fo/pagination/RegionBefore.java | 6 +++++ .../apache/fop/fo/pagination/RegionBody.java | 6 +++++ .../apache/fop/fo/pagination/RegionEnd.java | 6 +++++ .../apache/fop/fo/pagination/RegionStart.java | 6 +++++ .../fop/fo/pagination/SimplePageMaster.java | 6 +++++ .../fop/fo/pagination/StaticContent.java | 6 +++++ .../org/apache/fop/fo/pagination/Title.java | 6 +++++ 32 files changed, 201 insertions(+), 108 deletions(-) diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index f7a4921a3..179f2fe91 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -50,12 +50,6 @@ */ package org.apache.fop.fo; -import org.apache.fop.fo.FOTreeControl; -import org.apache.fop.layoutmgr.InlineStackingLayoutManager; -import org.apache.fop.layoutmgr.LMiter; - -import java.util.List; - /** * Base class for representation of mixed content formatting objects * and their processing @@ -113,6 +107,12 @@ public class FObjMixed extends FObj { return new RecursiveCharIterator(this); } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java index ac0099a58..4f1d73e03 100644 --- a/src/java/org/apache/fop/fo/PropertyManager.java +++ b/src/java/org/apache/fop/fo/PropertyManager.java @@ -58,7 +58,6 @@ import java.awt.geom.Rectangle2D; import org.apache.fop.area.CTM; import org.apache.fop.datatypes.FODimension; import org.apache.fop.fonts.Font; -import org.apache.fop.fo.FOTreeControl; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginBlock; import org.apache.fop.fo.properties.CommonMarginInline; @@ -120,7 +119,8 @@ public class PropertyManager { /** * Sets the Document object telling the property manager which fonts are * available. - * @param doc Document containing font information + * @param foTreeControl foTreeControl implementation containing font + * information */ public void setFontInfo(FOTreeControl foTreeControl) { this.foTreeControl = foTreeControl; @@ -130,7 +130,8 @@ public class PropertyManager { /** * Constructs a FontState object. If it was constructed before it is * reused. - * @param doc Document containing the font information + * @param foTreeControl FOTreeControl implementation containing the font + * information * @return a FontState object */ public Font getFontState(FOTreeControl foTreeControl) { @@ -476,7 +477,8 @@ public class PropertyManager { /** * Constructs a TextInfo objects. If it was constructed before it is * reused. - * @param doc Document containing list of available fonts + * @param foTreeControl FOTreeControl implementation containing list of + * available fonts * @return a TextInfo object */ public TextInfo getTextLayoutProps(FOTreeControl foTreeControl) { diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java index 477674f12..319ef6f52 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/src/java/org/apache/fop/fo/flow/BasicLink.java @@ -50,10 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; -import java.io.Serializable; - // FOP import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; @@ -63,14 +59,6 @@ import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.area.inline.InlineParent; -import org.apache.fop.area.Trait; -import org.apache.fop.area.Resolveable; -import org.apache.fop.area.PageViewport; -import org.apache.fop.area.Area; -import org.apache.fop.layoutmgr.InlineStackingLayoutManager; -import org.apache.fop.layoutmgr.LMiter; -import org.apache.fop.layoutmgr.LayoutProcessor; /** * The basic link. @@ -145,14 +133,26 @@ public class BasicLink extends Inline { return true; } + /** + * @return the String value of the link + */ public String getLink() { return link; } + /** + * @return true if the link is external, false otherwise + */ public boolean getExternal() { return external; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java index a037d5a58..202e34bc6 100644 --- a/src/java/org/apache/fop/fo/flow/BidiOverride.java +++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java @@ -57,13 +57,6 @@ import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.CommonAural; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; -import org.apache.fop.layoutmgr.LayoutProcessor; -import org.apache.fop.area.inline.InlineArea; - -import java.util.List; -import java.util.ArrayList; - /** * fo:bidi-override element. */ @@ -108,6 +101,12 @@ public class BidiOverride extends FObjMixed { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index 7019889e6..994da7ccb 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // XML import org.xml.sax.Attributes; @@ -64,7 +61,6 @@ import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.RecursiveCharIterator; -import org.apache.fop.fo.TextInfo; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.Constants; import org.apache.fop.fo.properties.CommonAccessibility; @@ -74,7 +70,6 @@ import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonHyphenation; import org.apache.fop.fo.properties.CommonMarginBlock; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.BlockLayoutManager; import org.apache.fop.util.CharUtilities; /* @@ -398,6 +393,12 @@ public class Block extends FObjMixed { } } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index 4b2a83639..0bc317910 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java @@ -60,12 +60,9 @@ import org.apache.fop.fo.properties.CommonAbsolutePosition; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginBlock; -import org.apache.fop.layoutmgr.BlockContainerLayoutManager; import org.xml.sax.Attributes; -import java.util.List; - /** * Class modelling the fo:block-container object. See Sec. 6.5.3 of the XSL-FO * Standard. @@ -165,6 +162,12 @@ public class BlockContainer extends FObj { return this.span; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java index 02bf291e1..12a21e022 100644 --- a/src/java/org/apache/fop/fo/flow/Character.java +++ b/src/java/org/apache/fop/fo/flow/Character.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP import org.apache.fop.fo.CharIterator; import org.apache.fop.fo.FONode; @@ -67,7 +64,6 @@ import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; import org.apache.fop.apps.FOPException; import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; /** * This class represents the flow object 'fo:character'. Its use is defined by @@ -164,6 +160,12 @@ public class Character extends FObj { // But what it the character is ignored due to white space handling? } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index 668fc794e..a5fafe7a9 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -63,14 +63,12 @@ import org.apache.fop.fo.properties.Scaling; import org.apache.fop.image.ImageFactory; import org.apache.fop.image.FopImage; import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; import org.apache.fop.layoutmgr.TraitSetter; import org.apache.fop.area.inline.Image; import org.apache.fop.area.inline.Viewport; import org.apache.fop.datatypes.Length; // Java -import java.util.List; import java.awt.geom.Rectangle2D; /** @@ -270,10 +268,19 @@ public class ExternalGraphic extends FObj { placement = new Rectangle2D.Float(xoffset, yoffset, cwidth, cheight); } + /** + * @return the ViewHeight (in millipoints??) + */ public int getViewHeight() { return viewHeight; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java index 8ee72fd61..9bb2356f7 100644 --- a/src/java/org/apache/fop/fo/flow/InlineContainer.java +++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java @@ -50,10 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; -import java.util.ArrayList; - // XML import org.xml.sax.Attributes; @@ -66,9 +62,6 @@ import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.LayoutManager; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; -import org.apache.fop.area.inline.InlineArea; /** * Class modelling the fo:inline-container object. See Sec. 6.6.8 of the XSL-FO @@ -127,6 +120,12 @@ public class InlineContainer extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java index e04c1abdc..b8c9f77e1 100644 --- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java @@ -53,7 +53,6 @@ package org.apache.fop.fo.flow; // FOP import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; -import java.util.List; import org.apache.fop.area.inline.ForeignObject; import org.apache.fop.area.inline.Viewport; @@ -66,7 +65,6 @@ import org.apache.fop.fo.properties.DisplayAlign; import org.apache.fop.fo.properties.Overflow; import org.apache.fop.fo.properties.Scaling; import org.apache.fop.fo.properties.TextAlign; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; import org.w3c.dom.Document; /** @@ -357,6 +355,12 @@ public class InstreamForeignObject extends FObj { */ +/** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 4e672d14a..945b8eb1e 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -50,15 +50,8 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP -import org.apache.fop.area.Trait; -import org.apache.fop.area.inline.FilledArea; import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.area.inline.Space; -import org.apache.fop.area.inline.Word; import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.PercentLength; @@ -75,13 +68,7 @@ import org.apache.fop.fo.FOTreeControl; import org.apache.fop.fonts.Font; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.ContentLayoutManager; -import org.apache.fop.layoutmgr.InlineStackingLayoutManager; -import org.apache.fop.layoutmgr.LMiter; -import org.apache.fop.layoutmgr.LayoutContext; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; import org.apache.fop.layoutmgr.MinOptMax; -import org.apache.fop.util.CharUtilities; /** * Class modelling fo:leader object. See Sec. 6.6.9 of the XSL-FO Standard. @@ -233,6 +220,13 @@ public class Leader extends FObjMixed { public int getPatternWidth() { return patternWidth; } + + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index c33b1ae88..af495be98 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/src/java/org/apache/fop/fo/flow/ListBlock.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.ColorType; @@ -65,7 +62,6 @@ import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginBlock; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.list.ListBlockLayoutManager; /** * Class modelling the fo:list-block object. See Sec. 6.8.2 of the XSL-FO @@ -151,6 +147,12 @@ public class ListBlock extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java index 29998730a..f45e47a0e 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemBody.java +++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java @@ -104,6 +104,12 @@ public class ListItemBody extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index e3bfb1cfa..a0dea63b9 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java @@ -104,6 +104,12 @@ public class ListItemLabel extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index 3e0b2484d..e62a38f0f 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.fo.properties.CommonAccessibility; @@ -64,18 +61,11 @@ import org.apache.fop.fonts.Font; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; import org.apache.fop.layout.TextState; -import org.apache.fop.util.CharUtilities; -import org.apache.fop.layoutmgr.LayoutManager; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; -import org.apache.fop.layoutmgr.LayoutContext; -import org.apache.fop.area.inline.InlineArea; -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.FOInputHandler; -import org.apache.fop.area.Trait; /** * Class modelling the fo:page-number object. See Sec. 6.6.10 of the XSL-FO @@ -156,10 +146,19 @@ public class PageNumber extends FObj { } + /** + * @return the FontState object for this PageNumber + */ public Font getFontState() { return fontState; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java index cbde1b202..3bd69a79b 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java @@ -50,12 +50,8 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP import org.apache.fop.area.PageViewport; -import org.apache.fop.area.Resolveable; import org.apache.fop.area.Trait; import org.apache.fop.area.inline.InlineArea; import org.apache.fop.area.inline.UnresolvedPageNumber; @@ -74,11 +70,7 @@ import org.apache.fop.fonts.Font; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; import org.apache.fop.layout.TextState; -import org.apache.fop.layoutmgr.LayoutContext; -import org.apache.fop.layoutmgr.LayoutManager; import org.apache.fop.layoutmgr.LayoutProcessor; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; -import org.apache.fop.layoutmgr.PositionIterator; import org.apache.fop.util.CharUtilities; /** @@ -112,7 +104,7 @@ public class PageNumberCitation extends FObj { } /** - * @param st StuctureHandler object to set + * @param foih the FOInputHandler object to set */ public void setFOInputHandler(FOInputHandler foih) { super.setFOInputHandler(foih); diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index 5a3c65d5f..93e102143 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -55,10 +55,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.FOTreeVisitor; -import org.apache.fop.layoutmgr.RetrieveMarkerLayoutManager; -import org.xml.sax.Attributes; - -import java.util.List; + import org.xml.sax.Attributes; /** * The retrieve-marker formatting object. @@ -107,6 +104,12 @@ public class RetrieveMarker extends FObjMixed { return retrieveBoundary; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index d1a658504..12be61d95 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.flow; // Java import java.util.ArrayList; -import java.util.List; // FOP import org.apache.fop.datatypes.ColorType; @@ -69,7 +68,6 @@ import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginBlock; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.table.TableLayoutManager; /** * Class modelling the fo:table object. See Sec. 6.7.3 of the XSL-FO Standard. @@ -216,6 +214,12 @@ public class Table extends FObj { return tableFooter; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index af9d0a379..a1588c249 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.ColorType; @@ -65,7 +62,6 @@ import org.apache.fop.fo.properties.CommonAural; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.table.Body; /** * Class modelling the fo:table-body object. See Sec. 6.7.8 of the XSL-FO @@ -117,6 +113,12 @@ public class TableBody extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index df32f212a..fb568967e 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/TableCell.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // XML import org.xml.sax.Attributes; @@ -70,7 +67,6 @@ import org.apache.fop.fo.properties.CommonAural; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.table.Cell; /** * Class modelling the fo:table-cell object. See Sec. 6.7.10 of the XSL-FO @@ -380,6 +376,12 @@ public class TableCell extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index 39d573441..bf3ea4410 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -168,6 +168,12 @@ public class TableColumn extends FObj { setup = true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index f8c9fc0d8..ddb91afce 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -50,9 +50,6 @@ */ package org.apache.fop.fo.flow; -// Java -import java.util.List; - // FOP import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.KeepValue; @@ -67,7 +64,6 @@ import org.apache.fop.fo.properties.CommonAural; import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.table.Row; /** * Class modelling the fo:table-row object. See Sec. 6.7.9 of the XSL-FO @@ -156,6 +152,12 @@ public class TableRow extends FObj { } } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java index 3f5f5e798..15b156e87 100644 --- a/src/java/org/apache/fop/fo/pagination/Flow.java +++ b/src/java/org/apache/fop/fo/pagination/Flow.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.pagination; // Java import java.util.ArrayList; -import java.util.List; // XML import org.xml.sax.Attributes; @@ -62,7 +61,6 @@ import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.apps.FOPException; -import org.apache.fop.layoutmgr.FlowLayoutManager; /** * Class modelling the fo:flow object. See Sec. 6.4.18 in the XSL-FO Standard. @@ -179,6 +177,12 @@ public class Flow extends FObj { return true; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java index a75c793ae..10079df20 100644 --- a/src/java/org/apache/fop/fo/pagination/Region.java +++ b/src/java/org/apache/fop/fo/pagination/Region.java @@ -288,6 +288,12 @@ public abstract class Region extends FObj { return 0; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java index 133e14e89..02a1ef6a8 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java +++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java @@ -110,6 +110,12 @@ public class RegionAfter extends RegionBA { return Region.AFTER; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java index dae61c0f9..ddeed18f9 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java @@ -115,6 +115,12 @@ public class RegionBefore extends RegionBA { return vpRect; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index 6c56b964e..056d22ee2 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -171,6 +171,12 @@ public class RegionBody extends Region { return body; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java index 6034ec3c6..760873a99 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java +++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java @@ -111,6 +111,12 @@ public class RegionEnd extends RegionSE { return RegionReference.END; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java index a8cf4d89d..66b1e55af 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionStart.java +++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java @@ -110,6 +110,12 @@ public class RegionStart extends RegionSE { return RegionReference.START; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java index fcbb659c5..2d73df727 100644 --- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java +++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java @@ -271,6 +271,12 @@ public class SimplePageMaster extends FObj { return false; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java index af5e59bf3..39c5d3117 100644 --- a/src/java/org/apache/fop/fo/pagination/StaticContent.java +++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java @@ -101,6 +101,12 @@ public class StaticContent extends Flow { return lm; } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index 917f30ac6..94591c151 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -142,6 +142,12 @@ public class Title extends FObjMixed { } + /** + * This is a hook for an FOTreeVisitor subclass to be able to access + * this object. + * @param fotv the FOTreeVisitor subclass that can access this object. + * @see org.apache.fop.fo.FOTreeVisitor + */ public void acceptVisitor(FOTreeVisitor fotv) { fotv.serveVisitor(this); } -- 2.39.5