[FOray-commit] SF.net SVN: foray: [7430] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7430
Author:   victormote
Date:     2006-06-06 13:17:53 -0700 (Tue, 06 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7430&view=rev

Log Message:
-----------
Allow any FONode to generate Areas. If they really don't generate them (as per the XSL-FO standard), then one of their ancestors does.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-06 19:35:12 UTC (rev 7429)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-06 20:17:53 UTC (rev 7430)
@@ -29,6 +29,7 @@
 import org.axsl.areaW.FOLinkage;
 import org.axsl.areaW.PageArea;
 import org.axsl.common.Constants;
+import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
 import org.axsl.fontR.FontConsumer;
 import org.axsl.text.TextServer;
@@ -56,7 +57,7 @@
      * @param parentArea The Area instance that is the newly-constructed Area's
      * parent in the AreaTree.
      */
-    public AreaNode(FObj generatedBy, AreaNode parentArea) {
+    public AreaNode(FONode generatedBy, AreaNode parentArea) {
         super(parentArea);
         if (! (this instanceof AreaTree)) {
             // AreaTree has no parent with which to register
@@ -89,7 +90,7 @@
         this.children.remove(areaNode);
     }
 
-    protected FOrayFOLinkage getFObjProxy(FObj fobj) {
+    protected FOrayFOLinkage getFObjProxy(FONode fobj) {
         if (fobj == null) {
             return null;
         }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-06-06 19:35:12 UTC (rev 7429)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-06-06 20:17:53 UTC (rev 7430)
@@ -28,18 +28,17 @@
 import org.axsl.areaW.AreaNode;
 import org.axsl.areaW.FOLinkage;
 import org.axsl.foR.FONode;
-import org.axsl.foR.FObj;
 
 import java.util.ArrayList;
 
 /**
  * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
- * with FOray.</p>
+ * with the FOray AreaTree.</p>
  */
 public class FOrayFOLinkage implements FOLinkage {
 
     /** The FONode which generated the Areas in {@link #generatedAreas}. */
-    private FObj realFONode;
+    private FONode realFONode;
 
     /**
      * The ordered list of Area instances generated by {@link #realFONode}.
@@ -49,7 +48,7 @@
      */
     private ArrayList generatedAreas = new ArrayList();
 
-    public FOrayFOLinkage(FObj realFObj) {
+    public FOrayFOLinkage(FONode realFObj) {
         this.realFONode = realFObj;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.