[FOray-commit] SF.net SVN: foray: [9003] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [9003] trunk/foray
|
From: <vic...@us...> - 2007-03-25 00:51:47
|
Revision: 9003
http://svn.sourceforge.net/foray/?rev=9003&view=rev
Author: victormote
Date: 2007-03-24 17:51:47 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
Conform to axsl changes removing the FONodeProxy interface.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.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/fo/obj/BasicLink.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.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/Declarations.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.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/RegionAfter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -35,8 +35,8 @@
import java.util.List;
/**
- * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
- * with the FOray AreaTree.</p>
+ * <p>A "normal" linkage manager, that is, one that simply matches an FONode
+ * to the Areas that it has created.</p>
*/
public class FOLinkageNormal extends FOLinkage {
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-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.fo.obj.Root;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.fo.RetrieveMarker;
@@ -57,8 +56,6 @@
* of this number. */
private int sequentialIndex;
- private FONodeProxy proxy;
-
/**
* Constructor.
* @param parent The parent of this node.
@@ -143,34 +140,6 @@
/**
* {@inheritDoc}
*/
- public void setProxy(final FONodeProxy proxy) {
- this.proxy = proxy;
- }
-
- /**
- * {@inheritDoc}
- */
- public FONodeProxy getProxy() {
- return this.proxy;
- }
-
- /**
- * {@inheritDoc}
- */
- public void reset() {
- this.proxy = null;
- if (this.getChildren() == null) {
- return;
- }
- for (int i = 0; i < this.getChildren().size(); i++) {
- final FONode node = this.getChildren().get(i);
- node.reset();
- }
- }
-
- /**
- * {@inheritDoc}
- */
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-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -35,7 +35,6 @@
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
import org.axsl.foR.FOLineText;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.Block;
import org.axsl.foR.fo.Leader;
@@ -1017,7 +1016,7 @@
return this.getParent().getColumn();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -35,7 +35,6 @@
import org.axsl.common.LinkType;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -158,7 +157,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -94,7 +93,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -36,7 +36,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -186,7 +185,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -103,7 +102,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -141,7 +140,7 @@
return traitInternalDestination();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -109,7 +108,7 @@
return false;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -97,7 +96,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -109,7 +108,7 @@
return text.getAreaTreeText(context);
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -90,7 +89,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
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-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,11 +33,9 @@
import org.foray.fotree.PropertyList;
import org.axsl.common.FoValue;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
-
/**
* A "conditional-page-master-reference" object in XSL-FO.
*/
@@ -214,7 +212,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -90,7 +89,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -36,7 +36,6 @@
import org.axsl.foR.FOContext;
import org.axsl.foR.FOLineNonText;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.RetrieveMarker;
@@ -172,7 +171,7 @@
}
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -101,7 +100,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -115,7 +114,7 @@
return this;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -113,7 +112,7 @@
return (FootnoteBody) this.getChildren().get(1);
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -90,7 +89,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -91,7 +90,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -96,7 +95,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -99,7 +98,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -36,7 +36,6 @@
import org.axsl.foR.FOContext;
import org.axsl.foR.FOLineNonText;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.RetrieveMarker;
@@ -125,7 +124,7 @@
return ((ForeignXML) getForeignXML()).intrinsicContentHeight();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -201,7 +200,7 @@
regionMap.put(region.traitRegionName(), region.getName());
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -35,7 +35,6 @@
import org.axsl.foR.FOContext;
import org.axsl.foR.FOLineNonText;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.RetrieveMarker;
@@ -175,7 +174,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -99,7 +98,7 @@
return;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -105,7 +104,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -100,7 +99,7 @@
return this;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -100,7 +99,7 @@
return this;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -35,7 +35,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -129,7 +128,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -90,7 +89,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -102,7 +101,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -90,7 +89,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -102,7 +101,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -95,7 +94,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.axsl.foR.FOContext;
import org.axsl.foR.FOLineNonText;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.RetrieveMarker;
@@ -159,7 +158,7 @@
return this.getNextSibling() == null;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.axsl.foR.FOContext;
import org.axsl.foR.FOLineNonText;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.RetrieveMarker;
@@ -169,7 +168,7 @@
return this.getNextSibling() == null;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.Flow;
@@ -230,7 +229,7 @@
/**
* {@inheritDoc}
*/
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
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-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -129,7 +128,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,11 +32,9 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
-
/**
* A "region-after" object in XSL-FO.
*/
@@ -109,7 +107,7 @@
return traitExtent();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -116,7 +115,7 @@
/**
* {@inheritDoc}
*/
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,11 +32,9 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
-
/**
* A "region-body" object in XSL-FO.
*/
@@ -120,7 +118,7 @@
/**
* {@inheritDoc}
*/
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,11 +32,9 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
-
/**
* A "region-end" object in XSL-FO.
*/
@@ -113,7 +111,7 @@
/**
* {@inheritDoc}
*/
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -118,7 +117,7 @@
/**
* {@inheritDoc}
*/
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -81,7 +80,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -81,7 +80,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -102,7 +101,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -264,7 +263,7 @@
return null;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -281,7 +280,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -81,7 +80,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -31,7 +31,6 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -83,7 +82,7 @@
return "static-content";
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -248,7 +247,7 @@
/**
* {@inheritDoc}
*/
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -94,7 +93,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -31,7 +31,6 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.ProxyFactory;
/**
@@ -49,7 +48,7 @@
return "table-body";
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,11 +32,9 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
-
/**
* A "table-caption" object in XSL-FO.
*/
@@ -96,7 +94,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -33,7 +33,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -154,7 +153,7 @@
public void end() throws FOTreeException {
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -144,7 +143,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -31,7 +31,6 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.ProxyFactory;
/**
@@ -49,7 +48,7 @@
return "table-footer";
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -31,7 +31,6 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.ProxyFactory;
/**
@@ -49,7 +48,7 @@
return "table-header";
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -92,7 +91,7 @@
return this.getFOTreeBuilder().getFONamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,11 +32,9 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
-
/**
* A "title" object in XSL-FO.
*/
@@ -95,7 +93,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -34,7 +34,6 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -139,7 +138,7 @@
return true;
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -32,7 +32,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -91,7 +90,7 @@
return this.getFOTreeBuilder().getExtensionNamespace();
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -36,7 +36,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyListUnparsed;
-import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -166,7 +165,7 @@
FOrayConstants.DEFAULT_SCREEN_RESOLUTION);
}
- public FONodeProxy makeProxy(final ProxyFactory factory) {
+ public Object makeProxy(final ProxyFactory factory) {
return factory.makeProxy(this);
}
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-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -139,7 +139,8 @@
}
if (rowSpanMgr == null) {
- rowSpanMgr = new RowSpanMgr(table.getTableColumns().length);
+ rowSpanMgr = new RowSpanMgr(table.getTableColumns().length,
+ this.getLayout());
}
// if (this.isInListBody) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-03-24 23:34:32 UTC (rev 9002)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-03-25 00:51:47 UTC (rev 9003)
@@ -51,7 +51,7 @@
/**
* Abstract Pio...
[truncated message content] |
