[FOray-commit] SF.net SVN: foray: [10039] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2007-07-18 20:25:20
|
Revision: 10039
http://svn.sourceforge.net/foray/?rev=10039&view=rev
Author: victormote
Date: 2007-07-18 13:25:19 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
Conform to axsl changes rolling FoNode into Fo.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTablePartPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -33,7 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.fo.Fo;
-import org.axsl.fo.FoNode;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.Table;
import org.axsl.font.FontConsumer;
@@ -139,7 +138,7 @@
* @param graftingPoint The ancestor RetrieveMarker, if any.
* @return The linkage item.
*/
- public FOLinkage linkage(final FoNode foNode,
+ public FOLinkage linkage(final Fo foNode,
final GraftingPoint graftingPoint) {
if (foNode == null) {
return null;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,10 +29,9 @@
package org.foray.area;
import org.axsl.area.AreaTreeEvent;
-import org.axsl.area.AreaTreeListener;
import org.axsl.area.AreaTreeException;
+import org.axsl.area.AreaTreeListener;
import org.axsl.fo.Fo;
-import org.axsl.fo.FoNode;
import org.axsl.fo.fo.Bookmark;
import org.axsl.fo.fo.BookmarkTree;
import org.axsl.fo.fo.Marker;
@@ -410,7 +409,7 @@
* @param node The FONode whose linkage is needed.
* @return The FOLinkage for <code>node</code>, or null if there is none.
*/
- protected FOLinkage getFONodeLinkage(final FoNode node) {
+ protected FOLinkage getFONodeLinkage(final Fo node) {
final int index = node.getSequentialIndex();
if (index < 0) {
throw new IndexOutOfBoundsException("FONode has a negative "
@@ -427,7 +426,7 @@
* @param node The node whose linkage is to be set.
* @param linkage The linkage for <code>node</code>.
*/
- protected void setFONodeLinkage(final FoNode node,
+ protected void setFONodeLinkage(final Fo node,
final FOLinkage linkage) {
final int index = node.getSequentialIndex();
if (index < 0) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -198,7 +198,7 @@
* {@inheritDoc}
*/
public Fo traitGeneratedBy() {
- return (Fo) this.getLinkage().getFONode();
+ return this.getLinkage().getFONode();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -108,7 +108,7 @@
*/
public void makeChildren(final Bookmark bookmark) {
for (int i = 0; i < bookmark.getChildCount(); i++) {
- final Fo child = (Fo) bookmark.getChildAt(i);
+ final Fo child = bookmark.getChildAt(i);
if (child instanceof Bookmark) {
this.makeBookmarkArea((Bookmark) child);
} else if (child instanceof BookmarkTitle) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.GraftingPoint;
/**
@@ -38,13 +38,13 @@
public abstract class FOLinkage {
/** The FONode for which this linkage tracks Area generation. */
- private FoNode foGenerator;
+ private Fo foGenerator;
/**
* Constructor.
* @param foGenerator The FO node generating this linkage.
*/
- public FOLinkage(final FoNode foGenerator) {
+ public FOLinkage(final Fo foGenerator) {
this.foGenerator = foGenerator;
}
@@ -52,7 +52,7 @@
* Returns the FONode that generated this linkage.
* @return The node that generated this linkage.
*/
- public FoNode getFONode() {
+ public Fo getFONode() {
return this.foGenerator;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -28,9 +28,9 @@
package org.foray.area;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.PageArea;
-import org.axsl.area.AreaTreeException;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.Marker;
import org.axsl.fo.fo.RetrieveMarker;
@@ -86,7 +86,7 @@
* @throws AreaTreeException If the <code>foGenerator</code> has no
* ancestor marker.
*/
- public FOLinkageMarker(final FoNode foGenerator)
+ public FOLinkageMarker(final Fo foGenerator)
throws AreaTreeException {
super(foGenerator);
final Marker marker = foGenerator.ancestorMarker();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.RetrieveMarker;
import java.util.ArrayList;
@@ -53,7 +53,7 @@
* Constructor.
* @param foGenerator The FO node generating this linkage.
*/
- public FOLinkageNormal(final FoNode foGenerator) {
+ public FOLinkageNormal(final Fo foGenerator) {
super(foGenerator);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -209,7 +209,7 @@
* {@inheritDoc}
*/
public Fo traitGeneratedBy() {
- return (Fo) this.getLinkage().getFONode();
+ return this.getLinkage().getFONode();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -296,7 +296,7 @@
* {@inheritDoc}
*/
public Fo traitGeneratedBy() {
- return (Fo) this.getLinkage().getFONode();
+ return this.getLinkage().getFONode();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -35,7 +35,6 @@
import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.fo.Fo;
import org.axsl.fo.FoContext;
-import org.axsl.fo.FoNode;
import org.axsl.fo.FoTextContent;
import org.axsl.fo.fo.Block;
import org.axsl.fo.fo.GraftingPoint;
@@ -333,7 +332,7 @@
public FoTextContent getTextContent() {
/* Do NOT use the traitGeneratedBy() method here, because we need the
* raw value, and this class overrides that method. */
- final FoNode foNode = this.getLinkage().getFONode();
+ final Fo foNode = this.getLinkage().getFONode();
/* Cast verified at construction. */
return (FoTextContent) foNode;
}
@@ -752,17 +751,9 @@
/**
* {@inheritDoc}
- * Override the standard method so that, if this is not an FObj, an ancestor
- * FObj can be used instead.
*/
public Fo traitGeneratedBy() {
- final FoNode generatedBy = this.getLinkage().getFONode();
- if (generatedBy instanceof Fo) {
- /* If generated by Character. */
- return (Fo) generatedBy;
- }
- /* If generated by FOText. */
- return generatedBy.getParent();
+ return this.getLinkage().getFONode();
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -33,8 +33,8 @@
import org.foray.fotree.fo.obj.Marker;
import org.foray.fotree.fo.obj.Root;
+import org.axsl.fo.Fo;
import org.axsl.fo.FoContext;
-import org.axsl.fo.FoNode;
import org.axsl.fo.FoTreeException;
import org.axsl.fo.fo.GraftingPoint;
@@ -50,7 +50,7 @@
* Base class for nodes in the formatting object tree.
*/
public abstract class FONode extends AbstractOrderedTreeNode
- implements org.axsl.fo.FoNode {
+ implements org.axsl.fo.Fo {
/** The unique sequential index for this node.
* @see {@link org.axsl.fo.FONode#getSequentialIndex()} for a discussion
@@ -258,14 +258,14 @@
/**
* {@inheritDoc}
*/
- public Iterator<FoNode> iterator() {
+ public Iterator<Fo> iterator() {
return new ChildIterator();
}
/**
* Private inner class to provide an iterator over the children.
*/
- private class ChildIterator implements Iterator<FoNode> {
+ private class ChildIterator implements Iterator<Fo> {
/** Index to the next child element to be returned. */
private int nextIndex = 0;
@@ -280,7 +280,7 @@
/**
* {@inheritDoc}
*/
- public FoNode next() {
+ public Fo next() {
if (! hasNext()) {
throw new NoSuchElementException();
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTablePartPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTablePartPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTablePartPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -32,7 +32,7 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
import org.axsl.area.TableArea;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.Marker;
import org.axsl.fo.fo.Table;
@@ -87,7 +87,7 @@
*/
public Status layout(final AreaNode areaNode,
final GraftingPoint graftingPoint) throws AreaTreeException {
- final FoNode node = getFONode();
+ final Fo node = getFONode();
final TableArea tableArea = (TableArea) areaNode;
final Table table = tableArea.traitGeneratedBy();
if (getProgress() == FONodePL.BREAK_AFTER) {
@@ -131,10 +131,9 @@
TableRow lastRow = null;
boolean endKeepGroup = true;
for (int i = getProgress(); i < numChildren; i++) {
- final Object child = node.getChildAt(i);
+ final Fo child = node.getChildAt(i);
if (child instanceof Marker) {
- final MarkerPL markerPL = (MarkerPL) getLayoutProxy(
- (FoNode) child);
+ final MarkerPL markerPL = (MarkerPL) getLayoutProxy(child);
markerPL.layout(tableArea, graftingPoint);
continue;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,10 +29,10 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.BlockContainerRefArea;
import org.axsl.area.BlockContentFactory;
-import org.axsl.area.AreaTreeException;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.BlockContainer;
import org.axsl.fo.fo.GraftingPoint;
@@ -74,7 +74,7 @@
bcArea.makeBlockContainerArea(this.node, graftingPoint);
for (int i = this.getProgress(); i < this.node.getChildCount(); i++) {
- final FoNode fo = this.node.getChildAt(i);
+ final Fo fo = this.node.getChildAt(i);
final FObjPL fobjPL = (FObjPL) getLayoutProxy(fo);
fobjPL.layout(blockContainer, graftingPoint);
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,11 +29,11 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.BlockContentFactory;
import org.axsl.area.LineArea;
import org.axsl.area.NormalBlockArea;
-import org.axsl.area.AreaTreeException;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.Block;
import org.axsl.fo.fo.GraftingPoint;
@@ -136,7 +136,7 @@
blockArea = bcArea.makeNormalBlockArea(node, graftingPoint);
for (int i = getProgress(); i < node.getChildCount(); i++) {
- final FoNode fo = node.getChildAt(i);
+ final Fo fo = node.getChildAt(i);
final FONodePL nodePL = this.getLayoutProxy(fo);
Status status = null;
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,9 +29,9 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.TableArea;
-import org.axsl.area.AreaTreeException;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.extension.ContinuedLabel;
import org.axsl.fo.fo.GraftingPoint;
@@ -74,7 +74,7 @@
if (tableArea != null && tableArea.siblingIndex() != 0) {
final int numChildren = this.label.getChildCount();
for (int i = getProgress(); i < numChildren; i++) {
- final FoNode fo = this.label.getChildAt(i);
+ final Fo fo = this.label.getChildAt(i);
final Status status = getLayoutProxy(fo).layout(areaNode,
graftingPoint);
if (status.isIncomplete()) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,16 +29,15 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.LineArea;
import org.axsl.area.NormalBlockArea;
import org.axsl.area.TableCellArea;
import org.axsl.area.TableRowContainer;
-import org.axsl.area.AreaTreeException;
import org.axsl.fo.Fo;
import org.axsl.fo.FoContext;
import org.axsl.fo.FoLineNonText;
import org.axsl.fo.FoLineText;
-import org.axsl.fo.FoNode;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.TableCell;
import org.axsl.text.TextException;
@@ -49,7 +48,7 @@
import java.util.List;
/**
- * Abstract Pioneer Layout superclass for all {@link FoNode} instances.
+ * Abstract Pioneer Layout superclass for all {@link Fo} instances.
*/
public abstract class FONodePL {
@@ -74,7 +73,7 @@
* @param realFObj The FO Tree object which is being laid out.
* @param layout The ancestor layout system.
*/
- public FONodePL(final FoNode realFObj, final PioneerLS layout) {
+ public FONodePL(final Fo realFObj, final PioneerLS layout) {
this.layout = layout;
this.layout.setLayoutProxy(realFObj, this);
}
@@ -134,7 +133,7 @@
* @param node The node for which the layout proxy is needed.
* @return The layout proxy for <code>node</code>
*/
- protected FONodePL getLayoutProxy(final FoNode node) {
+ protected FONodePL getLayoutProxy(final Fo node) {
return this.layout.getLayoutProxy(node);
}
@@ -173,12 +172,12 @@
*/
protected Status standardLayout(final AreaNode areaNode,
final GraftingPoint graftingPoint) throws AreaTreeException {
- final FoNode foNode = getFONode();
+ final Fo foNode = getFONode();
if (getProgress() == FONodePL.START) {
setProgress(0);
}
for (int i = getProgress(); i < foNode.getChildCount(); i++) {
- final FoNode fo = foNode.getChildAt(i);
+ final Fo fo = foNode.getChildAt(i);
final Status status = getLayoutProxy(fo).layout(areaNode,
graftingPoint);
if (status.isIncomplete()) {
@@ -288,12 +287,11 @@
foContext = new OverrideGraftingContext(inputLineArea,
graftingPoint);
}
- final FoNode node = this.getFONode();
+ final Fo node = this.getFONode();
LineArea lineArea = inputLineArea;
if (! (node instanceof FoLineNonText)) {
return Status.UNKNOWN;
}
- final Fo fobj = (Fo) node;
final FoLineNonText nonText = (FoLineNonText) node;
// this should start a new page
if (lineArea == null) {
@@ -316,7 +314,7 @@
if (addNonTextItemToLine(lineArea, nonText, foContext) == 1) {
return Status.OK;
}
- getLogger().error(fobj.getName() + " does not fit on line:\n"
+ getLogger().error(node.getName() + " does not fit on line:\n"
+ node.getContextMessage());
return Status.OK;
}
@@ -342,7 +340,7 @@
blockArea = areaNode.ancestorNormalBlockArea();
}
if (blockArea == null) {
- final FoNode foNode = this.getFONode();
+ final Fo foNode = this.getFONode();
throw new AreaTreeException("Layout of inline objects must be "
+ "inside a block:\n" + foNode.getContextMessage());
}
@@ -354,7 +352,7 @@
* Returns the FO Tree node that is being laid out by this layout item.
* @return The FO Tree node that is being laid out.
*/
- public abstract FoNode getFONode();
+ public abstract Fo getFONode();
/**
* Returns the layout strategy.
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -31,7 +31,6 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
import org.axsl.fo.Fo;
-import org.axsl.fo.FoNode;
import org.axsl.fo.fo.GraftingPoint;
import java.util.List;
@@ -55,9 +54,9 @@
*/
public void resetProgress() {
super.resetProgress();
- final FoNode thisNode = this.getFONode();
+ final Fo thisNode = this.getFONode();
for (int i = 0; i < thisNode.getChildCount(); i++) {
- final FoNode node = thisNode.getChildAt(i);
+ final Fo node = thisNode.getChildAt(i);
final FONodePL nodePL = getLayoutProxy(node);
nodePL.resetProgress();
}
@@ -77,11 +76,11 @@
if (getProgress() < 0) {
return snapshot;
}
- final FoNode thisNode = this.getFONode();
+ final Fo thisNode = this.getFONode();
if (thisNode.getChildCount() < 1) {
return snapshot;
}
- final FoNode node = thisNode.getChildAt(getProgress());
+ final Fo node = thisNode.getChildAt(getProgress());
final FONodePL proxy = getLayoutProxy(node);
return proxy.getProgressSnapshot(snapshot);
}
@@ -92,17 +91,17 @@
*/
public void rollback(final List<Integer> snapshot) {
super.rollback(snapshot);
- final FoNode thisNode = this.getFONode();
+ final Fo thisNode = this.getFONode();
if ((getProgress() == -1)
|| thisNode.getChildCount() < 1
|| getProgress() <= START) {
return;
}
for (int i = getProgress() + 1; i < thisNode.getChildCount(); i++) {
- final FoNode fo = thisNode.getChildAt(i);
+ final Fo fo = thisNode.getChildAt(i);
getLayoutProxy(fo).resetProgress();
}
- final FoNode node = thisNode.getChildAt(getProgress());
+ final Fo node = thisNode.getChildAt(getProgress());
getLayoutProxy(node).rollback(snapshot);
}
@@ -115,13 +114,13 @@
*/
protected Status layoutChildren(final AreaNode areaNode,
final GraftingPoint graftingPoint) throws AreaTreeException {
- final FoNode node = this.getFONode();
+ final Fo node = this.getFONode();
int start = getProgress();
if (start == FONodePL.START) {
start = 0;
}
for (int i = start; i < node.getChildCount(); i++) {
- final FoNode fo = node.getChildAt(i);
+ final Fo fo = node.getChildAt(i);
final FONodePL nodePL = this.getLayoutProxy(fo);
final Status status = nodePL.layout(areaNode, graftingPoint);
if (status.isIncomplete()) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -78,7 +78,7 @@
boolean prevChildMustKeepWithNext = false;
final int numChildren = getFONode().getChildCount();
for (int i = getProgress(); i < numChildren; i++) {
- final Fo fo = (Fo) getFONode().getChildAt(i);
+ final Fo fo = getFONode().getChildAt(i);
if (bac.getMainRefArea().isBalancingRequired(fo)) {
// reset the the just-done span area in preparation
@@ -104,8 +104,7 @@
if (prevChildMustKeepWithNext
&& (getStatus().laidOutNone())) {
setProgress(i - 1);
- final Fo prevChild =
- (Fo) getFONode().getChildAt(getProgress());
+ final Fo prevChild = getFONode().getChildAt(getProgress());
final FObjPL prevChildPL = (FObjPL) getLayoutProxy(
prevChild);
prevChildPL.resetProgress();
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,12 +29,11 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.FootnoteRefArea;
import org.axsl.area.PageArea;
import org.axsl.area.RegionBodyRefArea;
-import org.axsl.area.AreaTreeException;
-
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.FootnoteBody;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.PageSequence;
@@ -70,7 +69,7 @@
final int numChildren = this.node.getChildCount();
for (int i = getProgress(); i < numChildren; i++) {
- final FoNode fo = this.node.getChildAt(i);
+ final Fo fo = this.node.getChildAt(i);
final FONodePL foNodePL = getLayoutProxy(fo);
final Status status = foNodePL.layout(referenceArea,
graftingPoint);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -75,7 +75,7 @@
final int numChildren = this.node.getChildCount();
for (int i = getProgress(); i < numChildren; i++) {
- final Fo fo = (Fo) this.node.getChildAt(i);
+ final Fo fo = this.node.getChildAt(i);
final Status status = getLayoutProxy(fo).layout(container,
graftingPoint);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -74,7 +74,7 @@
}
final int numChildren = this.node.getChildCount();
for (int i = getProgress(); i < numChildren; i++) {
- final Fo fo = (Fo) this.node.getChildAt(i);
+ final Fo fo = this.node.getChildAt(i);
final Status status = getLayoutProxy(fo).layout(container,
graftingPoint);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -30,7 +30,7 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.GraftingPoint;
/**
@@ -39,14 +39,14 @@
public class NoLayoutPL extends FONodePL {
/** The real FoNode which this proxy represents. */
- private FoNode realFoNode;
+ private Fo realFoNode;
/**
* Constructor.
* @param realFObj The FO Tree object which is being laid out.
* @param layout The ancestor layout system.
*/
- public NoLayoutPL(final FoNode realFObj, final PioneerLS layout) {
+ public NoLayoutPL(final Fo realFObj, final PioneerLS layout) {
super(realFObj, layout);
this.realFoNode = realFObj;
}
@@ -62,7 +62,7 @@
/**
* {@inheritDoc}
*/
- public FoNode getFONode() {
+ public Fo getFONode() {
return this.realFoNode;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -39,7 +39,6 @@
import org.axsl.area.RegionRefArea;
import org.axsl.area.AreaTreeException;
import org.axsl.fo.Fo;
-import org.axsl.fo.FoNode;
import org.axsl.fo.FoText;
import org.axsl.fo.ProxyFactory;
import org.axsl.fo.extension.ContinuedLabel;
@@ -340,14 +339,14 @@
* @param node The FOTree node for which a proxy needs to be created.
* @return The newly-created proxy.
*/
- public Object makeFObjProxy(final FoNode node) {
+ public Object makeFObjProxy(final Fo node) {
return node.acceptProxyFactory(this);
}
/**
* {@inheritDoc}
*/
- public NoLayoutPL makeProxy(final FoNode node) {
+ public NoLayoutPL makeProxy(final Fo node) {
return new NoLayoutPL(node, this);
}
@@ -757,7 +756,7 @@
* @param node The node for which the proxy is needed.
* @return The proxy.
*/
- protected FONodePL getLayoutProxy(final FoNode node) {
+ protected FONodePL getLayoutProxy(final Fo node) {
final int index = node.getSequentialIndex();
if (index < 0) {
throw new IndexOutOfBoundsException("FoNode has a negative "
@@ -787,7 +786,7 @@
* @param node The node whose linkage is to be set.
* @param layoutProxy The layout proxy for <code>node</code>.
*/
- protected void setLayoutProxy(final FoNode node,
+ protected void setLayoutProxy(final Fo node,
final FONodePL layoutProxy) {
final int index = node.getSequentialIndex();
if (index < 0) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,9 +29,9 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.PageArea;
-import org.axsl.area.AreaTreeException;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.Marker;
import org.axsl.fo.fo.RetrieveMarker;
@@ -73,7 +73,7 @@
markerPL.resetProgress();
markerPL.setProgress(0);
for (int i = 0; i < bestMarker.getChildCount(); i++) {
- final FoNode fo = bestMarker.getChildAt(i);
+ final Fo fo = bestMarker.getChildAt(i);
getLayoutProxy(fo).layout(areaNode, this.node);
}
return Status.OK;
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -61,7 +61,7 @@
final int numChildren = this.node.getChildCount();
for (int i = 0; i < numChildren; i++) {
- final Fo fo = (Fo) this.node.getChildAt(i);
+ final Fo fo = this.node.getChildAt(i);
Status status = getLayoutProxy(fo).layout(areaNode, graftingPoint);
if (status.isIncomplete()) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -107,7 +107,7 @@
final int numChildren = this.node.getChildCount();
for (int i = getProgress(); bDone == false && i < numChildren; i++) {
- final Fo fo = (Fo) this.node.getChildAt(i);
+ final Fo fo = this.node.getChildAt(i);
// Overflows may cause a row to be re-layedout,
// need to pass already processed content.
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-07-18 19:40:19 UTC (rev 10038)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-07-18 20:25:19 UTC (rev 10039)
@@ -29,14 +29,14 @@
package org.foray.pioneer;
import org.axsl.area.AreaNode;
+import org.axsl.area.AreaTreeException;
import org.axsl.area.BlockContentFactory;
import org.axsl.area.NormalBlockArea;
import org.axsl.area.TableArea;
import org.axsl.area.TableFooterContainer;
import org.axsl.area.TableHeaderContainer;
-import org.axsl.area.AreaTreeException;
import org.axsl.common.value.Break;
-import org.axsl.fo.FoNode;
+import org.axsl.fo.Fo;
import org.axsl.fo.fo.GraftingPoint;
import org.axsl.fo.fo.Marker;
import org.axsl.fo.fo.Table;
@@ -102,7 +102,7 @@
/* Process the marker children. */
for (int i = getProgress(); i < table.qtyMarkerChildren(); i++) {
- final FoNode fo = table.getChildAt(i);
+ final Fo fo = table.getChildAt(i);
if (fo instanceof Marker) {
final MarkerPL markerPL = (MarkerPL) getLayoutProxy(fo);
markerPL.layout(areaNode, graftingPoint);
@@ -150,7 +150,7 @@
/* Process the table body(s). */
for (int i = getProgress(); i < table.getChildCount(); i++) {
- final FoNode fo = table.getChildAt(i);
+ final Fo fo = table.getChildAt(i);
if (fo instanceof TableBody) {
status = getLayoutProxy(fo).layout(tableArea,
graftingPoint);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|