[FOray-commit] SF.net SVN: foray: [7894] trunk/foray/foray-pioneer/src/java/org/foray/ pioneer/FONodePL.java

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

Revision: 7894
          http://svn.sourceforge.net/foray/?rev=7894&view=rev
Author:   victormote
Date:     2006-09-04 17:12:08 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Use the more generic FOContext instead of RetrieveMarker.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-05 00:11:03 UTC (rev 7893)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-05 00:12:08 UTC (rev 7894)
@@ -30,6 +30,7 @@
 import org.axsl.areaW.NormalBlockArea;
 import org.axsl.areaW.TableCellArea;
 import org.axsl.areaW.TableRowContainer;
+import org.axsl.foR.FOContext;
 import org.axsl.foR.FOLineNonText;
 import org.axsl.foR.FOLineText;
 import org.axsl.foR.FONode;
@@ -156,7 +157,7 @@
      */
     protected int addTextItemToLine(final LineArea lineArea,
             final FOLineText lineText, final int start, final int end,
-            final RetrieveMarker retrieveMarker) throws AreaWException {
+            final FOContext foContext) throws AreaWException {
         EagerLineBreaker lb = layout.getLineBreaker();
         if (lb == null) {
             lb = lineArea.getTextServer().provideEagerLineBreaker(null, layout,
@@ -164,7 +165,7 @@
         }
         int status = 0;
         final FOLineText contextAware = lineText.getContextWrapper(
-                retrieveMarker);
+                foContext);
         try {
             status = lb.processLineContent(contextAware, start, end,
                     lineArea.asLineOutput());
@@ -185,7 +186,7 @@
      * not fit onto the current line.
      */
     protected int addNonTextItemToLine(final LineArea lineArea,
-            final FOLineNonText nonText, final RetrieveMarker retrieveMarker)
+            final FOLineNonText nonText, final FOContext foContext)
             throws AreaWException {
         EagerLineBreaker lb = layout.getLineBreaker();
         if (lb == null) {
@@ -194,7 +195,7 @@
         }
         int status = 0;
         final FOLineNonText contextAware = nonText.getContextWrapper(
-                retrieveMarker);
+                foContext);
         try {
             status = lb.processLineContent(contextAware, -1, -1,
                     lineArea.asLineOutput());
@@ -208,7 +209,7 @@
     }
 
     protected int layoutInlineContent(final FObj node, LineArea lineArea,
-            final RetrieveMarker retrieveMarker) throws AreaWException {
+            final FOContext foContext) throws AreaWException {
         if (! (node instanceof FOLineNonText)) {
             return -1000;
         }
@@ -217,7 +218,7 @@
         if (lineArea == null) {
             return Status.AREA_FULL_SOME;
         }
-        if (addNonTextItemToLine(lineArea, nonText, retrieveMarker) == 1) {
+        if (addNonTextItemToLine(lineArea, nonText, foContext) == 1) {
             // It fit on the line.
             return Status.OK;
         }
@@ -231,7 +232,7 @@
         if (lineArea == null) {
             return Status.AREA_FULL_SOME;
         }
-        if (addNonTextItemToLine(lineArea, nonText, retrieveMarker) == 1) {
+        if (addNonTextItemToLine(lineArea, nonText, foContext) == 1) {
             return Status.OK;
         }
         getLogger().error(node.getName() + " does not fit on line:\n"


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