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

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

Revision: 7550
Author:   victormote
Date:     2006-06-12 17:23:54 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7550&view=rev

Log Message:
-----------
Fix to the factory method for FOLinkage items.

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/PageCollection.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.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-13 00:13:20 UTC (rev 7549)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-13 00:23:54 UTC (rev 7550)
@@ -32,7 +32,6 @@
 import org.axsl.foR.FOContext;
 import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
-import org.axsl.foR.fo.Marker;
 import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.fontR.FontConsumer;
 import org.axsl.text.TextServer;
@@ -68,7 +67,7 @@
             // AreaTree has no parent with which to register
             getAreaNodeParent().getChildren().add(this);
             // Root can't do this because the AreaTreeControl isn't registered.
-            this.generatedBy = linkage(generatedBy);
+            this.generatedBy = linkage(generatedBy, retrieveMarker);
             FOLinkageNormal normalLinkage = this.getNormalLinkage();
             normalLinkage.registerGeneratedArea(this);
         }
@@ -96,7 +95,8 @@
         this.children.remove(areaNode);
     }
 
-    public static FOLinkage linkage(FONode foNode) {
+    public static FOLinkage linkage(FONode foNode,
+            RetrieveMarker retrieveMarker) {
         if (foNode == null) {
             return null;
         }
@@ -104,12 +104,12 @@
         if (linkage != null) {
             return linkage;
         }
-        Marker marker = foNode.ancestorMarker();
-        if (marker == null) {
+        if (retrieveMarker == null) {
             linkage = new FOLinkageNormal(foNode);
         } else {
             try {
-                linkage = new FOLinkageMarker(foNode);
+                FOLinkageMarker markerLinkage = new FOLinkageMarker(foNode);
+                markerLinkage.getNormalLinkage(retrieveMarker);
             } catch (AreaWException e) {
                 /* Ignore this. It should never happen as we have already tested
                  * for the condition that causes the exception, i.e. that foNode

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-13 00:13:20 UTC (rev 7549)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-13 00:23:54 UTC (rev 7550)
@@ -80,7 +80,7 @@
          * These registration steps must take place after the AreaTreeControl
          * has been stored.
          */
-        this.generatedBy = linkage(root);
+        this.generatedBy = linkage(root, null);
         this.getNormalLinkage().registerGeneratedArea(this);
     }
 
@@ -178,7 +178,7 @@
      */
     public Area firstNormalAreaReturned(String id) {
         FObj fobj = retrieveId(id);
-        FOLinkage linkage = linkage(fobj);
+        FOLinkage linkage = linkage(fobj, null);
         if (linkage instanceof FOLinkageNormal) {
             FOLinkageNormal normalLinkage = (FOLinkageNormal) linkage;
             return normalLinkage.firstNormalAreaReturned();

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-06-13 00:13:20 UTC (rev 7549)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-06-13 00:23:54 UTC (rev 7550)
@@ -332,7 +332,7 @@
     public org.axsl.areaW.SpanRA startingReferenceArea(FObj lastFObj,
             FObj nextFObj) throws AreaWException {
         if (lastFObj != null) {
-            FOLinkage linkage = linkage(lastFObj);
+            FOLinkage linkage = linkage(lastFObj, null);
             FOLinkageNormal normalLinkage = null;
             if (linkage instanceof FOLinkageNormal) {
                 normalLinkage = (FOLinkageNormal) linkage;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-13 00:13:20 UTC (rev 7549)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-13 00:23:54 UTC (rev 7550)
@@ -565,7 +565,7 @@
 
     private FOLinkageNormal markerParentLinkage(Marker marker) {
         FObj parent = marker.parentFO();
-        FOLinkage proxy = linkage(parent);
+        FOLinkage proxy = linkage(parent, null);
         if (proxy instanceof FOLinkageNormal) {
             return (FOLinkageNormal) proxy;
         }


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