keiron 2003/03/03 19:50:54
Modified: src/org/apache/fop/fo/flow BasicLink.java BidiOverride.java
PageNumberCitation.java
Log:
updated for LayoutProcessor
Revision Changes Path
1.20 +9 -3 xml-fop/src/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BasicLink.java 14 Feb 2003 04:15:03 -0000 1.19
+++ BasicLink.java 4 Mar 2003 03:50:54 -0000 1.20
@@ -22,7 +22,7 @@
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 @@
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 @@
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;
1.13 +6 -9 xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BidiOverride.java 14 Feb 2003 04:15:03 -0000 1.12
+++ BidiOverride.java 4 Mar 2003 03:50:54 -0000 1.13
@@ -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 @@
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 {
1.29 +25 -19 xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PageNumberCitation.java 14 Feb 2003 04:15:04 -0000 1.28
+++ PageNumberCitation.java 4 Mar 2003 03:50:54 -0000 1.29
@@ -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 @@
// 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
