gmazza 2004/07/26 20:01:33
Modified: src/java/org/apache/fop/fo FObj.java
Log:
Redefining "isOutOfLineFODescendant" to include cases where FObj itself
is and O-o-L FO.
Revision Changes Path
1.55 +6 -5 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- FObj.java 25 Jul 2004 17:04:44 -0000 1.54
+++ FObj.java 27 Jul 2004 03:01:33 -0000 1.55
@@ -58,8 +58,9 @@
/** During input FO validation, certain FO's are not valid as
child nodes if they would be a descendant of an Out Of Line
- Formatting Object as defined in specification.
- See Section 6.2 of 1.0/1.2 spec for more information.
+ Formatting Object as defined in specification (See Sect. 6.2
+ of spec.) This value is also set to true if this object
+ itself is an Out Of Line FO.
*/
protected boolean isOutOfLineFODescendant = false;
@@ -76,9 +77,9 @@
if (parent != null && parent instanceof FObj) {
if (((FObj)parent).getIsOutOfLineFODescendant() == true) {
isOutOfLineFODescendant = true;
- } else if (parent.getName().equals("fo:float")
- || parent.getName().equals("fo:footnote")
- || parent.getName().equals("fo:footnote-body")) {
+ } else if ("fo:float".equals(getName())
+ || "fo:footnote".equals(getName())
+ || "fo:footnote-body".equals(getName())) {
isOutOfLineFODescendant = true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
