[FOray-commit] SF.net SVN: foray: [8778] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8778] trunk/foray
|
From: <vic...@us...> - 2007-03-10 03:38:24
|
Revision: 8778
http://svn.sourceforge.net/foray/?rev=8778&view=rev
Author: victormote
Date: 2007-03-09 19:38:10 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
Conform to axsl changes renaming methods.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.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-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.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/FObjMixedPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.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/ListItemPL.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/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -582,7 +582,7 @@
}
private FOLinkageNormal markerParentLinkage(final Marker marker) {
- final FObj parent = marker.parentFO();
+ final FObj parent = marker.getParent();
final FOLinkage proxy = linkage(parent, null);
if (proxy instanceof FOLinkageNormal) {
return (FOLinkageNormal) proxy;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -595,7 +595,7 @@
return (FObj) generatedBy;
}
/* If generated by FOText. */
- return generatedBy.parentFO();
+ return generatedBy.getParent();
}
public void render(final RenderVisitor visitor) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -67,6 +67,11 @@
}
/**
+ * {@inheritDoc}
+ */
+ public abstract List<FONode> getChildren();
+
+ /**
* Return this node's effective parent, cast as an FObj.
* This differs from the value returned by
* @param context An object that knows how to resolve FO Tree context
@@ -109,10 +114,6 @@
return forayRetrieve.getParent();
}
- public org.axsl.foR.FObj parentFO() {
- return this.getParent();
- }
-
/**
* {@inheritDoc}
*/
@@ -169,7 +170,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FONode getFONodeChildAt(final int childIndex) {
+ public FONode getChildAt(final int childIndex) {
return (FONode) super.getChildAt(childIndex);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -28,7 +28,6 @@
package org.foray.fotree;
-import org.foray.common.OrderedTreeNode;
import org.foray.common.WKConstants;
import org.foray.common.XMLCharacter;
import org.foray.fotree.fo.obj.BookmarkTitle;
@@ -101,7 +100,7 @@
* Store the text raw and process it one-the-fly. */
return;
}
- if (this.parentFO() instanceof BookmarkTitle) {
+ if (this.getParent() instanceof BookmarkTitle) {
/* BookmarkTitle keeps its text raw always. */
return;
}
@@ -112,14 +111,10 @@
this.filterStatus = FILTER_PRE_TRANSFORM;
}
- public List<? extends OrderedTreeNode> getChildren() {
+ public List<FONode> getChildren() {
return null;
}
- public List<FONode> childrenFO() {
- return null;
- }
-
public boolean getAllowsChildren() {
return false;
}
@@ -1011,15 +1006,15 @@
}
public String getSystemId() {
- return this.parentFO().getSystemId();
+ return this.getParent().getSystemId();
}
public int getLine() {
- return this.parentFO().getLine();
+ return this.getParent().getLine();
}
public int getColumn() {
- return this.parentFO().getColumn();
+ return this.getParent().getColumn();
}
public FONodeProxy makeProxy(final ProxyFactory factory) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -360,13 +360,6 @@
/**
* {@inheritDoc}
*/
- public List<FONode> childrenFO() {
- return children;
- }
-
- /**
- * {@inheritDoc}
- */
public boolean getAllowsChildren() {
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -104,7 +104,7 @@
*/
public RepeatablePMAlternatives repeatablePMAlternatives() {
/* Cast verified at construction. */
- return (RepeatablePMAlternatives) this.parentFO();
+ return (RepeatablePMAlternatives) this.getParent();
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -118,7 +118,7 @@
*/
public LayoutMasterSet layoutMasterSet() {
/* Cast verified at construction. */
- return (LayoutMasterSet) this.parentFO();
+ return (LayoutMasterSet) this.getParent();
}
public String getName() {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -78,7 +78,7 @@
*/
public PageSequenceMaster pageSequenceMaster() {
/* Cast verified at validateAncestry(). */
- return (PageSequenceMaster) this.parentFO();
+ return (PageSequenceMaster) this.getParent();
}
/**
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -174,11 +174,11 @@
areaContainerRef = new WeakReference<ContainerRA>(areaContainer);
List<TableRow> keepWith = new ArrayList<TableRow>();
- final int numChildren = node.childrenFO().size();
+ final int numChildren = node.getChildren().size();
TableRow lastRow = null;
boolean endKeepGroup = true;
for (int i = getProgress(); i < numChildren; i++) {
- final Object child = node.childrenFO().get(i);
+ final Object child = node.getChildren().get(i);
if (child instanceof Marker) {
final MarkerPL markerPL = (MarkerPL) getLayoutProxy(
(FONode) child);
@@ -217,7 +217,7 @@
*/
boolean bRowStartsArea = i == getProgress();
if (bRowStartsArea == false && keepWith.size() > 0) {
- if (node.childrenFO().indexOf(keepWith.get(0))
+ if (node.getChildren().indexOf(keepWith.get(0))
== getProgress()) {
bRowStartsArea = true;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -59,7 +59,7 @@
this.node, retrieveMarker);
for (int i = this.getProgress(); i < this.node.getChildCount(); i++) {
- final FONode fo = this.node.getFONodeChildAt(i);
+ final FONode fo = this.node.getChildAt(i);
final FObjPL fobjPL = (FObjPL) getLayoutProxy(fo);
fobjPL.layout(blockContainer, retrieveMarker);
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -108,7 +108,7 @@
blockArea = area.makeNormalBlockArea(node, retrieveMarker);
for (int i = getProgress(); i < node.getChildCount(); i++) {
- final FONode fo = node.getFONodeChildAt(i);
+ final FONode fo = node.getChildAt(i);
final FONodePL nodePL = this.getLayoutProxy(fo);
final int status = nodePL.layout(blockArea, retrieveMarker);
if (Status.isIncomplete(status)) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -53,8 +53,8 @@
if (getProgress() == FONodePL.START) {
setProgress(0);
}
- for (int i = getProgress(); i < node.childrenFO().size(); i++) {
- final FONode fo = node.childrenFO().get(i);
+ for (int i = getProgress(); i < node.getChildren().size(); i++) {
+ final FONode fo = node.getChildren().get(i);
final int status = getLayoutProxy(fo).layout(area, retrieveMarker);
if (Status.isIncomplete(status)) {
setProgress(i);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -89,7 +89,7 @@
}
List<? extends FONode> getChildren() {
- return ((FObj) this.getFONode()).childrenFO();
+ return ((FObj) this.getFONode()).getChildren();
}
protected int layoutChildren(final Area area,
@@ -99,8 +99,8 @@
if (start == FONodePL.START) {
start = 0;
}
- for (int i = start; i < node.childrenFO().size(); i++) {
- final FONode fo = node.childrenFO().get(i);
+ for (int i = start; i < node.getChildren().size(); i++) {
+ final FONode fo = node.getChildren().get(i);
final FONodePL nodePL = this.getLayoutProxy(fo);
final int status = nodePL.layout(area, retrieveMarker);
if (Status.isIncomplete(status)) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -60,9 +60,9 @@
}
final FootnoteRA referenceArea = (FootnoteRA) area;
- final int numChildren = this.node.childrenFO().size();
+ final int numChildren = this.node.getChildren().size();
for (int i = getProgress(); i < numChildren; i++) {
- final FONode fo = this.node.getFONodeChildAt(i);
+ final FONode fo = this.node.getChildAt(i);
final FONodePL foNodePL = getLayoutProxy(fo);
final int status = foNodePL.layout(referenceArea, retrieveMarker);
if (Status.isIncomplete(status)) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -63,9 +63,9 @@
final ListBlockArea blockArea = area.makeListBlockArea(this.node,
retrieveMarker);
- final int numChildren = this.node.childrenFO().size();
+ final int numChildren = this.node.getChildren().size();
for (int i = listBlockPL.getProgress(); i < numChildren; i++) {
- final ListItem listItem = (ListItem) this.node.childrenFO().get(i);
+ final ListItem listItem = (ListItem) this.node.getChildren().get(i);
final ListItemPL listItemPL = (ListItemPL) getLayoutProxy(
listItem);
int status = listItemPL.layout(blockArea, retrieveMarker);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -62,9 +62,9 @@
* of areas returned by each of the children of the fo:list-item-body.
*/
- final int numChildren = this.node.childrenFO().size();
+ final int numChildren = this.node.getChildren().size();
for (int i = getProgress(); i < numChildren; i++) {
- final FObj fo = (FObj) this.node.childrenFO().get(i);
+ final FObj fo = (FObj) this.node.getChildren().get(i);
final int status = getLayoutProxy(fo).layout(area, retrieveMarker);
if (Status.isIncomplete(status)) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -51,14 +51,14 @@
public int layout(final Area area, final RetrieveMarker retrieveMarker)
throws AreaWException {
- final int numChildren = this.node.childrenFO().size();
+ final int numChildren = this.node.getChildren().size();
if (numChildren != 1) {
throw new AreaWException("Non-standard restriction: "
+ "list-item-label must have exactly one block.");
}
- final Block block = (Block) this.node.childrenFO().get(0);
+ final Block block = (Block) this.node.getChildren().get(0);
/*
* For calculating the lineage - The fo:list-item-label formatting
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -70,7 +70,7 @@
/* Now lay out the list-item-label inside the new block-area. */
final ListItemLabel label =
- (ListItemLabel) this.node.childrenFO().get(0);
+ (ListItemLabel) this.node.getChildren().get(0);
int status;
// what follows doesn't yet take into account whether the
// body failed completely or only got some text in
@@ -84,7 +84,7 @@
}
/* Now create a BlockArea to contain the list-item-body. */
- final ListItemBody body = (ListItemBody) this.node.childrenFO().get(1);
+ final ListItemBody body = (ListItemBody) this.node.getChildren().get(1);
final ListItemBodyPL bodyPL = (ListItemBodyPL) getLayoutProxy(body);
status = bodyPL.layout(group, retrieveMarker);
if (Status.isIncomplete(status)) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -50,10 +50,10 @@
public int layout(final Area area, final RetrieveMarker retrieveMarker)
throws AreaWException {
- final int numChildren = this.node.childrenFO().size();
+ final int numChildren = this.node.getChildren().size();
for (int i = 0; i < numChildren; i++) {
- final FObj fo = (FObj) this.node.childrenFO().get(i);
+ final FObj fo = (FObj) this.node.getChildren().get(i);
int status = getLayoutProxy(fo).layout(area, retrieveMarker);
if (Status.isIncomplete(status)) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2007-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -110,9 +110,9 @@
areaContainer = cellArea;
- final int numChildren = this.node.childrenFO().size();
+ final int numChildren = this.node.getChildren().size();
for (int i = getProgress(); bDone == false && i < numChildren; i++) {
- final FObj fo = (FObj) this.node.childrenFO().get(i);
+ final FObj fo = (FObj) this.node.getChildren().get(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-03-10 03:05:46 UTC (rev 8777)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-10 03:38:10 UTC (rev 8778)
@@ -100,8 +100,8 @@
+ "indicating column-width");
}
- for (int i = getProgress(); i < node.childrenFO().size(); i++) {
- final FONode fo = node.childrenFO().get(i);
+ for (int i = getProgress(); i < node.getChildren().size(); i++) {
+ final FONode fo = node.getChildren().get(i);
if (fo instanceof Marker) {
final MarkerPL markerPL = (MarkerPL) getLayoutProxy(fo);
markerPL.layout(area, retrieveMarker);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
