updated for LayoutProcessor

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196011 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/flow/BasicLink.java b/src/org/apache/fop/fo/flow/BasicLink.java
index 701c7b3de93fe142cb3e062128bb89a6f752b632..95c13bf580d1afaac70d99ee2e39a9ee1f5b1c75 100644 (file)
--- a/src/org/apache/fop/fo/flow/BasicLink.java
+++ b/src/org/apache/fop/fo/flow/BasicLink.java
@@ -22,7 +22,7 @@ import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.Area;
 import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
 import org.apache.fop.layoutmgr.LMiter;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
 
 // Java
 import java.util.List;
@@ -58,7 +58,7 @@ public class BasicLink extends Inline {
         lms.add(lm);
     }
 
-    protected void setupLinkArea(LayoutManager parentLM, InlineParent area) {
+    protected void setupLinkArea(LayoutProcessor parentLM, InlineParent area) {
         if (link == null) {
             return;
         }
@@ -137,6 +137,12 @@ public class BasicLink extends Inline {
         private String idRef;
         private Area area;
 
+        /**
+         * Create a new link resolver.
+         *
+         * @param id the id to resolve
+         * @param a the area that will have the link attribute
+         */
         public LinkResolver(String id, Area a) {
             idRef = id;
             area = a;

diff --git a/src/org/apache/fop/fo/flow/BidiOverride.java b/src/org/apache/fop/fo/flow/BidiOverride.java
index 1a9d91af2e1d946babdb8784f3c5830f58b09231..cab6fff20b4b0d90e8cf3b1ac46b3d91a488ae7a 100644 (file)
--- a/src/org/apache/fop/fo/flow/BidiOverride.java
+++ b/src/org/apache/fop/fo/flow/BidiOverride.java
@@ -8,17 +8,14 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.*;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.layout.AuralProps;
 import org.apache.fop.layout.RelativePositionProps;
-import org.apache.fop.fo.flow.*;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.apps.FOPException;
 
 import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
-import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
 import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.area.inline.Word;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -38,9 +35,9 @@ public class BidiOverride extends FObjMixed {
             ArrayList childList = new ArrayList();
             super.addLayoutManager(childList);
             for (int count = childList.size() - 1; count >= 0; count--) {
-                LayoutManager lm = (LayoutManager) childList.get(count);
+                LayoutProcessor lm = (LayoutProcessor) childList.get(count);
                 if (lm.generatesInlineAreas()) {
-                    LayoutManager blm = new BidiLayoutManager((LeafNodeLayoutManager) lm);
+                    LayoutProcessor blm = new BidiLayoutManager((LeafNodeLayoutManager) lm);
                     blm.setFObj(this);
                     list.add(blm);
                 } else {

diff --git a/src/org/apache/fop/fo/flow/PageNumberCitation.java b/src/org/apache/fop/fo/flow/PageNumberCitation.java
index c66977d0355e9cee1f3a4e11e42bfe16a3fb6266..4e96dcce0c5ab41431eabaababb8a66edfb34d42 100644 (file)
--- a/src/org/apache/fop/fo/flow/PageNumberCitation.java
+++ b/src/org/apache/fop/fo/flow/PageNumberCitation.java
@@ -8,27 +8,33 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.*;
-import org.apache.fop.fo.pagination.*;
-import org.apache.fop.datatypes.*;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.*;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
-import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.area.PageViewport;
-import org.apache.fop.util.CharUtilities;
+import java.util.List;
+
 import org.apache.fop.apps.StructureHandler;
+import org.apache.fop.area.PageViewport;
+import org.apache.fop.area.Resolveable;
+import org.apache.fop.area.Trait;
+import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.UnresolvedPageNumber;
+import org.apache.fop.area.inline.Word;
+import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FObj;
+import org.apache.fop.layout.AccessibilityProps;
+import org.apache.fop.layout.AuralProps;
+import org.apache.fop.layout.BackgroundProps;
+import org.apache.fop.layout.BorderAndPadding;
+import org.apache.fop.layout.FontInfo;
+import org.apache.fop.layout.FontState;
+import org.apache.fop.layout.MarginInlineProps;
+import org.apache.fop.layout.RelativePositionProps;
+import org.apache.fop.layout.TextState;
 import org.apache.fop.layoutmgr.LayoutContext;
 import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.LayoutProcessor;
+import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
 import org.apache.fop.layoutmgr.PositionIterator;
-import org.apache.fop.area.inline.Word;
-import org.apache.fop.area.inline.UnresolvedPageNumber;
-import org.apache.fop.area.Resolveable;
-import org.apache.fop.area.Trait;
-
-import java.util.List;
-import java.util.ArrayList;
+import org.apache.fop.util.CharUtilities;
 
 /**
  * Page number citation.
@@ -88,7 +94,7 @@ public class PageNumberCitation extends FObj {
 
     // if id can be resolved then simply return a word, otherwise
     // return a resolveable area
-    private InlineArea getInlineArea(LayoutManager parentLM) {
+    private InlineArea getInlineArea(LayoutProcessor parentLM) {
         if (refId.equals("")) {
             getLogger().error("page-number-citation must contain \"ref-id\"");
             return null;