vmote 2003/08/21 23:27:35
Modified: src/java/org/apache/fop/fo FObjMixed.java
PropertyManager.java
src/java/org/apache/fop/fo/flow BasicLink.java
BidiOverride.java Block.java BlockContainer.java
Character.java ExternalGraphic.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItemBody.java
ListItemLabel.java PageNumber.java
PageNumberCitation.java RetrieveMarker.java
Table.java TableBody.java TableCell.java
TableColumn.java TableRow.java
src/java/org/apache/fop/fo/pagination Flow.java Region.java
RegionAfter.java RegionBefore.java RegionBody.java
RegionEnd.java RegionStart.java
SimplePageMaster.java StaticContent.java Title.java
Log:
style changes only
Revision Changes Path
1.10 +6 -6 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FObjMixed.java 19 Aug 2003 05:19:21 -0000 1.9
+++ FObjMixed.java 22 Aug 2003 06:27:34 -0000 1.10
@@ -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 @@
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);
}
1.9 +6 -4 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PropertyManager.java 19 Aug 2003 05:19:21 -0000 1.8
+++ PropertyManager.java 22 Aug 2003 06:27:34 -0000 1.9
@@ -58,7 +58,6 @@
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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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) {
1.5 +12 -12 xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLink.java 19 Aug 2003 00:53:53 -0000 1.4
+++ BasicLink.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
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);
}
1.5 +6 -7 xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BidiOverride.java 19 Aug 2003 00:53:53 -0000 1.4
+++ BidiOverride.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -57,13 +57,6 @@
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 @@
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);
}
1.6 +6 -5 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Block.java 19 Aug 2003 00:53:53 -0000 1.5
+++ Block.java 22 Aug 2003 06:27:34 -0000 1.6
@@ -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.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.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 @@
}
}
+ /**
+ * 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);
}
1.5 +6 -3 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BlockContainer.java 19 Aug 2003 00:53:53 -0000 1.4
+++ BlockContainer.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -60,12 +60,9 @@
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 @@
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);
}
1.5 +6 -4 xml-fop/src/java/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Character.java 19 Aug 2003 00:53:53 -0000 1.4
+++ Character.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
// 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);
}
1.5 +9 -2 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExternalGraphic.java 19 Aug 2003 00:53:53 -0000 1.4
+++ ExternalGraphic.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -63,14 +63,12 @@
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 @@
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);
}
1.5 +6 -7 xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InlineContainer.java 19 Aug 2003 00:53:53 -0000 1.4
+++ InlineContainer.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
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);
}
1.6 +6 -2
xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstreamForeignObject.java 19 Aug 2003 00:53:53 -0000 1.5
+++ InstreamForeignObject.java 22 Aug 2003 06:27:34 -0000 1.6
@@ -53,7 +53,6 @@
// 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.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 @@
*/
+/**
+ * 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);
}
1.10 +7 -13 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Leader.java 19 Aug 2003 06:54:31 -0000 1.9
+++ Leader.java 22 Aug 2003 06:27:34 -0000 1.10
@@ -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.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 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);
}
1.5 +6 -4 xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListBlock.java 19 Aug 2003 00:53:53 -0000 1.4
+++ ListBlock.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
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);
}
1.5 +6 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListItemBody.java 19 Aug 2003 00:53:53 -0000 1.4
+++ ListItemBody.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -104,6 +104,12 @@
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);
}
1.5 +6 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListItemLabel.java 19 Aug 2003 00:53:53 -0000 1.4
+++ ListItemLabel.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -104,6 +104,12 @@
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);
}
1.11 +9 -10 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageNumber.java 19 Aug 2003 06:54:31 -0000 1.10
+++ PageNumber.java 22 Aug 2003 06:27:34 -0000 1.11
@@ -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.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 @@
}
+ /**
+ * @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);
}
1.11 +1 -9 xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageNumberCitation.java 19 Aug 2003 06:54:31 -0000 1.10
+++ PageNumberCitation.java 22 Aug 2003 06:27:34 -0000 1.11
@@ -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.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 @@
}
/**
- * @param st StuctureHandler object to set
+ * @param foih the FOInputHandler object to set
*/
public void setFOInputHandler(FOInputHandler foih) {
super.setFOInputHandler(foih);
1.3 +7 -4 xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RetrieveMarker.java 19 Aug 2003 00:53:53 -0000 1.2
+++ RetrieveMarker.java 22 Aug 2003 06:27:34 -0000 1.3
@@ -55,10 +55,7 @@
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 @@
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);
}
1.5 +6 -2 xml-fop/src/java/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Table.java 19 Aug 2003 00:53:53 -0000 1.4
+++ Table.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -52,7 +52,6 @@
// 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.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 @@
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);
}
1.5 +6 -4 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableBody.java 19 Aug 2003 00:53:53 -0000 1.4
+++ TableBody.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
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);
}
1.5 +6 -4 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableCell.java 19 Aug 2003 00:53:53 -0000 1.4
+++ TableCell.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
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);
}
1.5 +6 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableColumn.java 19 Aug 2003 00:53:53 -0000 1.4
+++ TableColumn.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -168,6 +168,12 @@
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);
}
1.5 +6 -4 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableRow.java 19 Aug 2003 00:53:53 -0000 1.4
+++ TableRow.java 22 Aug 2003 06:27:34 -0000 1.5
@@ -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.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 @@
}
}
+ /**
+ * 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);
}
1.4 +7 -3 xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Flow.java 19 Aug 2003 00:53:54 -0000 1.3
+++ Flow.java 22 Aug 2003 06:27:34 -0000 1.4
@@ -52,7 +52,6 @@
// Java
import java.util.ArrayList;
-import java.util.List;
// XML
import org.xml.sax.Attributes;
@@ -62,7 +61,6 @@
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 @@
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);
}
1.4 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Region.java 19 Aug 2003 00:53:54 -0000 1.3
+++ Region.java 22 Aug 2003 06:27:34 -0000 1.4
@@ -288,6 +288,12 @@
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);
}
1.3 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegionAfter.java 19 Aug 2003 00:53:54 -0000 1.2
+++ RegionAfter.java 22 Aug 2003 06:27:34 -0000 1.3
@@ -110,6 +110,12 @@
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);
}
1.3 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegionBefore.java 19 Aug 2003 00:53:54 -0000 1.2
+++ RegionBefore.java 22 Aug 2003 06:27:34 -0000 1.3
@@ -115,6 +115,12 @@
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);
}
1.4 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RegionBody.java 19 Aug 2003 00:53:54 -0000 1.3
+++ RegionBody.java 22 Aug 2003 06:27:34 -0000 1.4
@@ -171,6 +171,12 @@
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);
}
1.3 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegionEnd.java 19 Aug 2003 00:53:54 -0000 1.2
+++ RegionEnd.java 22 Aug 2003 06:27:34 -0000 1.3
@@ -111,6 +111,12 @@
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);
}
1.3 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegionStart.java 19 Aug 2003 00:53:54 -0000 1.2
+++ RegionStart.java 22 Aug 2003 06:27:34 -0000 1.3
@@ -110,6 +110,12 @@
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);
}
1.4 +6 -0
xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimplePageMaster.java 19 Aug 2003 00:53:54 -0000 1.3
+++ SimplePageMaster.java 22 Aug 2003 06:27:34 -0000 1.4
@@ -271,6 +271,12 @@
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);
}
1.3 +7 -1 xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StaticContent.java 19 Aug 2003 00:53:54 -0000 1.2
+++ StaticContent.java 22 Aug 2003 06:27:34 -0000 1.3
@@ -101,6 +101,12 @@
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);
}
1.6 +7 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Title.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Title.java 19 Aug 2003 00:53:54 -0000 1.5
+++ Title.java 22 Aug 2003 06:27:34 -0000 1.6
@@ -142,6 +142,12 @@
}
+ /**
+ * 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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
