Thread: [FOray-commit] SF.net SVN: foray: [7176] trunk/foray/foray-areatree/src/java/org/foray/area (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7176
Author:   victormote
Date:     2006-05-07 12:54:28 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7176&view=rev

Log Message:
-----------
Conform to new axsl factory methods.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================

--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-05-07 19:00:17 UTC (rev 7175)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-05-07 19:54:28 UTC (rev 7176)
@@ -24,6 +24,7 @@
 
 package org.foray.area;
 
+import org.axsl.areaW.Area;
 import org.axsl.areaW.LayoutStrategy;
 
 import org.axsl.areaW.AreaWException;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-07 19:00:17 UTC (rev 7175)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-07 19:54:28 UTC (rev 7176)
@@ -26,8 +26,17 @@
 
 import org.axsl.areaW.AreaWException;
 import org.axsl.common.Constants;
+import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
 import org.axsl.foR.WritingMode;
+import org.axsl.foR.fo.BasicLink;
+import org.axsl.foR.fo.Block;
+import org.axsl.foR.fo.ExternalGraphic;
+import org.axsl.foR.fo.Inline;
+import org.axsl.foR.fo.InstreamForeignObject;
+import org.axsl.foR.fo.Leader;
+import org.axsl.foR.fo.PageNumber;
+import org.axsl.foR.fo.PageNumberCitation;
 import org.axsl.text.line.LineOutput;
 
 import java.util.List;
@@ -770,4 +779,57 @@
         return this.children.size() > 0;
     }
 
+    public org.axsl.areaW.ForeignObjectArea makeForeignObjectArea(
+            InstreamForeignObject ifo, int ipd) {
+        Area parentArea = findParentArea(ifo);
+        return new ForeignObjectArea(ifo, parentArea, ipd);
+    }
+
+    public org.axsl.areaW.ExternalGraphicArea makeExternalGraphicArea(
+            ExternalGraphic ifo, int ipd) {
+        Area parentArea = findParentArea(ifo);
+        return new ExternalGraphicArea(ifo, parentArea, ipd);
+    }
+
+    public org.axsl.areaW.LeaderArea makeLeaderArea(
+            Leader leader, int ipd) {
+        Area parentArea = findParentArea(leader);
+        return new LeaderArea(leader, parentArea, ipd);
+    }
+
+    public org.axsl.areaW.PageNumberArea makePageNumberArea(
+            PageNumber pageNumber, int ipd) {
+        Area parentArea = findParentArea(pageNumber);
+        return new PageNumberArea(pageNumber, parentArea, ipd);
+    }
+
+    public org.axsl.areaW.PageNumberCitationArea makePageNumberCitationArea(
+            PageNumberCitation citation, int ipd) {
+        Area parentArea = findParentArea(citation);
+        return new PageNumberCitationArea(citation, parentArea, ipd);
+    }
+
+    private AreaFlexible findParentArea(FONode node) {
+        // This is the easy and probably most frequent case
+        if (node.parentFO() instanceof Block) {
+            return this;
+        }
+        /*
+         * TODO: A test needs to be
+         * added to see whether the last child of LineArea should be a parent
+         * or other ancestor of node. If so, as much of that hierarchy as is
+         * common to node should be preserved.
+         */
+        if (node.parentFO() instanceof BasicLink) {
+            BasicLink bl = (BasicLink) node.parentFO();
+            return new BasicLinkArea(bl, findParentArea(bl));
+        }
+        if (node.parentFO() instanceof Inline) {
+            Inline inline = (Inline) node.parentFO();
+            return new InlineArea(inline, findParentArea(inline));
+        }
+        // Default if nothing else works.
+        return this;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2006-05-07 19:00:17 UTC (rev 7175)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2006-05-07 19:54:28 UTC (rev 7176)
@@ -37,7 +37,7 @@
     }
 
     public String resolve() {
-        Area area = getAreaTree().firstNormalAreaReturned(traitRefId());
+        Area area = (Area) getAreaTree().firstNormalAreaReturned(traitRefId());
         String text = null;
         if (area == null) {
             text = "???";


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





Thread: [FOray-commit] SF.net SVN: foray: [7176] trunk/foray/foray-areatree/src/java/org/foray/area (Page 2)

Modular XSL-FO Implementation for Java.

foray-commit