[prev in list] [next in list] [prev in thread] [next in thread]
List: fop-cvs
Subject: cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
From: gmazza () apache ! org
Date: 2004-07-31 0:44:24
Message-ID: 20040731004424.40816.qmail () minotaur ! apache ! org
[Download RAW message or body]
gmazza 2004/07/30 17:44:24
Modified: src/java/org/apache/fop/fo FONode.java FOText.java FObj.java
FObjMixed.java ToBeImplementedElement.java
XMLObj.java
src/java/org/apache/fop/fo/flow BasicLink.java
ExternalGraphic.java Float.java Leader.java
PageNumber.java PageNumberCitation.java
TableCaption.java
src/java/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java Flow.java
PageSequence.java Region.java
RepeatablePageMasterReference.java
SinglePageMasterReference.java StaticContent.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
1. validation for fo:basic-link added
2. "name" data element removed from FONode, added to its XMLObj subclass (FObj \
subclasses' getName() uses a string constant instead.)
3. isBlockOrInlineItem() convenience method added to FObj
4. setup() methods within FO's switched to private access.
Revision Changes Path
1.34 +1 -5 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FONode.java 27 Jul 2004 23:57:10 -0000 1.33
+++ FONode.java 31 Jul 2004 00:44:21 -0000 1.34
@@ -47,9 +47,6 @@
/** Parent FO node */
protected FONode parent;
- /** Name of the node */
- protected String name;
-
/** Marks input file containing this object **/
public String systemId;
@@ -118,7 +115,6 @@
*/
public void processNode(String elementName, Locator locator, Attributes \
attlist) throws FOPException { System.out.println("name = " + elementName);
- this.name = elementName;
}
/**
@@ -126,7 +122,7 @@
* @return the name of this object
*/
public String getName() {
- return this.name;
+ return null;
}
/**
1.21 +13 -11 xml-fop/src/java/org/apache/fop/fo/FOText.java
Index: FOText.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOText.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FOText.java 27 Jul 2004 23:57:10 -0000 1.20
+++ FOText.java 31 Jul 2004 00:44:21 -0000 1.21
@@ -431,16 +431,6 @@
}
}
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveFOText(this);
- }
-
-
private class TextCharIterator extends AbstractCharIterator {
private int curIndex = 0;
@@ -496,5 +486,17 @@
}
}
-
+
+ public String getName() {
+ return "fo:text";
+ }
+
+ /**
+ * This is a hook for the AddLMVisitor class to be able to access
+ * this object.
+ * @param aLMV the AddLMVisitor object that can access this object.
+ */
+ public void acceptVisitor(AddLMVisitor aLMV) {
+ aLMV.serveFOText(this);
+ }
}
1.57 +33 -32 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- FObj.java 27 Jul 2004 23:57:10 -0000 1.56
+++ FObj.java 31 Jul 2004 00:44:21 -0000 1.57
@@ -45,31 +45,30 @@
/** Property manager for providing refined properties/traits. */
protected PropertyManager propMgr;
- /** Id of this fo element of null if no id. */
- protected String id = null;
-
/** The immediate child nodes of this node. */
public ArrayList childNodes = null;
+ /** Used to indicate if this FO is either an Out Of Line FO (see rec)
+ or a descendant of one. Used during validateChildNode() FO
+ validation.
+ */
+ private boolean isOutOfLineFODescendant = false;
+
+ /** Id of this fo element or null if no id. */
+ protected String id = null;
+
/** Markers added to this element. */
protected Map markers = null;
/** Dynamic layout dimension. Used to resolve relative lengths. */
protected Map layoutDimension = null;
- /** 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 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;
-
/**
* Create a new formatting object.
* All formatting object classes extend this class.
*
* @param parent the parent node
+ * @todo move propertyListTable initialization someplace else?
*/
public FObj(FONode parent) {
super(parent);
@@ -96,16 +95,6 @@
}
/**
- * Used to indicate if this FO is the descendant of an out-of-line
- * formatting object (From Sect. 6.10, fo:float, fo:footnote,
- * fo:footnote-body). Important for validating child nodes.
- * @return true if descendant, false otherwise
- */
- public boolean getIsOutOfLineFODescendant() {
- return isOutOfLineFODescendant;
- }
-
- /**
* @see org.apache.fop.fo.FONode#processNode
*/
public void processNode(String elementName, Locator locator,
@@ -115,15 +104,6 @@
}
/**
- * Set the name of this element.
- * The prepends "fo:" to the name to indicate it is in the fo namespace.
- * @param str the xml element name
- */
- public void setName(String str) {
- name = "fo:" + str;
- }
-
- /**
* Set properties for this FO based on node attributes
* @param attlist Collection of attributes passed to us from the parser.
*/
@@ -142,6 +122,14 @@
}
/**
+ * Returns Out Of Line FO Descendant indicator.
+ * @return true if Out of Line FO or Out Of Line descendant, false otherwise
+ */
+ public boolean getIsOutOfLineFODescendant() {
+ return isOutOfLineFODescendant;
+ }
+
+ /**
* Return the PropertyManager object for this FO. PropertyManager
* tends to hold the traits for this FO, and is primarily used in layout.
* @return the property manager for this FO
@@ -174,7 +162,7 @@
*/
protected void addChildNode(FONode child) {
if (containsMarkers() && "fo:marker".equals(child.getName())) {
- addMarker((Marker)child);
+ addMarker((Marker) child);
} else {
if (childNodes == null) {
childNodes = new ArrayList();
@@ -347,7 +335,8 @@
/**
* Check if this formatting object may contain markers.
*
- * @return true if this can contian markers
+ * @return true if this can contain markers
+ * @todo confirm if still needed after validateChildNode() fully implemented
*/
protected boolean containsMarkers() {
return false;
@@ -509,6 +498,18 @@
|| lName.equals("multi-toggle")
|| (!isOutOfLineFODescendant && lName.equals("footnote"))
|| isNeutralItem(nsURI, lName)));
+ }
+
+ /**
+ * Convenience method for validity checking. Checks if the
+ * incoming node is a member of the "%block;" parameter entity
+ * or "%inline;" parameter entity
+ * @param nsURI namespace URI of incoming node
+ * @param lName local name (i.e., no prefix) of incoming node
+ * @return true if a member, false if not
+ */
+ protected boolean isBlockOrInlineItem(String nsURI, String lName) {
+ return (isBlockItem(nsURI, lName) || isInlineItem(nsURI, lName));
}
/**
1.29 +0 -1 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FObjMixed.java 27 Jul 2004 23:57:10 -0000 1.28
+++ FObjMixed.java 31 Jul 2004 00:44:21 -0000 1.29
@@ -53,7 +53,6 @@
FOText ft = new FOText(data, start, length, textInfo, this);
ft.setLocation(locator);
- ft.setName("text");
/* characters() processing empty for FOTreeHandler, not empty for RTF & \
MIFHandlers */
getFOInputHandler().characters(ft.ca, ft.startIndex, ft.endIndex);
1.8 +0 -5 xml-fop/src/java/org/apache/fop/fo/ToBeImplementedElement.java
Index: ToBeImplementedElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/ToBeImplementedElement.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ToBeImplementedElement.java 27 Jul 2004 23:57:10 -0000 1.7
+++ ToBeImplementedElement.java 31 Jul 2004 00:44:21 -0000 1.8
@@ -32,11 +32,6 @@
super(parent);
}
- private void setup() {
- getLogger().debug("This element \"" + this.name
- + "\" is not yet implemented.");
- }
-
/**
* This is a hook for the AddLMVisitor class to be able to access
* this object.
1.13 +11 -0 xml-fop/src/java/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLObj.java 27 Jul 2004 23:57:10 -0000 1.12
+++ XMLObj.java 31 Jul 2004 00:44:21 -0000 1.13
@@ -47,6 +47,9 @@
/** DOM document containing this node */
protected Document doc;
+ /** Name of the node */
+ protected String name;
+
/**
*
* @param parent the parent formatting object
@@ -73,6 +76,14 @@
public Point2D getDimension(Point2D view) {
return null;
+ }
+
+ /**
+ * Returns the name of the object
+ * @return the name of this object
+ */
+ public String getName() {
+ return name;
}
/**
1.19 +56 -45 xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BasicLink.java 27 Jul 2004 23:57:12 -0000 1.18
+++ BasicLink.java 31 Jul 2004 00:44:21 -0000 1.19
@@ -20,10 +20,12 @@
// XML
import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
// FOP
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FOElementMapping;
import org.apache.fop.fo.FONode;
import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.properties.CommonAccessibility;
@@ -39,10 +41,12 @@
* that are created by the fo element.
*/
public class BasicLink extends Inline {
-
private String link = null;
private boolean external = false;
+ // used for FO validation
+ private boolean blockOrInlineItemFound = false;
+
/**
* @param parent FONode that is the parent of this object
*/
@@ -58,7 +62,53 @@
getFOInputHandler().startLink(this);
}
- public void setup() {
+ /**
+ * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
+ */
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
+ throws SAXParseException {
+ if (nsURI == FOElementMapping.URI && localName.equals("marker")) {
+ if (blockOrInlineItemFound) {
+ nodesOutOfOrderError(loc, "fo:marker", \
"(#PCDATA|%inline;|%block;)"); + }
+ } else if (!isBlockOrInlineItem(nsURI, localName)) {
+ invalidChildError(loc, nsURI, localName);
+ } else {
+ blockOrInlineItemFound = true;
+ }
+ }
+
+ /**
+ * @see org.apache.fop.fo.FONode#end
+ */
+ protected void endOfNode() throws SAXParseException {
+ super.endOfNode();
+ getFOInputHandler().endLink();
+ }
+
+ /**
+ * @return the String value of the link
+ */
+ public String getLink() {
+ return link;
+ }
+
+ /**
+ * @return true if the link is external, false otherwise
+ */
+ public boolean getExternal() {
+ return external;
+ }
+
+ public String getName() {
+ return "fo:basic-link";
+ }
+
+ /**
+ * @todo check if needed; not being called currently
+ */
+ private void setup() {
String destination;
int linkType;
@@ -78,15 +128,11 @@
// Common Relative Position Properties
CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
- // this.propertyList.get("alignment-adjust");
- // this.propertyList.get("alignment-baseline");
- // this.propertyList.get("baseline-shift");
- // this.propertyList.get("destination-place-offset");
- // this.propertyList.get("dominant-baseline");
String ext = propertyList.get(PR_EXTERNAL_DESTINATION).getString();
setupID();
- // this.propertyList.get("indicate-destination");
+
String internal = propertyList.get(PR_INTERNAL_DESTINATION).getString();
+
if (ext.length() > 0) {
link = ext;
external = true;
@@ -95,57 +141,22 @@
} else {
getLogger().error("basic-link requires an internal or external \
destination"); }
- // this.propertyList.get("keep-together");
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
- // this.propertyList.get("line-height");
- // this.propertyList.get("line-height-shift-adjustment");
- // this.propertyList.get("show-destination");
- // this.propertyList.get("target-processing-context");
- // this.propertyList.get("target-presentation-context");
- // this.propertyList.get("target-stylesheet");
-
}
/**
* @return true (BasicLink can contain Markers)
- */
+ */
protected boolean containsMarkers() {
return true;
}
/**
- * @return the String value of the link
- */
- public String getLink() {
- return link;
- }
-
- /**
- * @return true if the link is external, false otherwise
- */
- public boolean getExternal() {
- return external;
- }
-
- /**
* This is a hook for the AddLMVisitor class to be able to access
* this object.
* @param aLMV the AddLMVisitor object that can access this object.
*/
public void acceptVisitor(AddLMVisitor aLMV) {
+ setup();
aLMV.serveBasicLink(this);
- }
-
- /**
- * @see org.apache.fop.fo.FONode#end
- */
- protected void endOfNode() throws SAXParseException {
- super.endOfNode();
- getFOInputHandler().endLink();
- }
-
- public String getName() {
- return "fo:basic-link";
}
}
1.30 +10 -10 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ExternalGraphic.java 27 Jul 2004 23:57:12 -0000 1.29
+++ ExternalGraphic.java 31 Jul 2004 00:44:22 -0000 1.30
@@ -84,7 +84,7 @@
* Setup this image.
* This gets the sizes for the image and the dimensions and clipping.
*/
- public void setup() {
+ private void setup() {
url = this.propertyList.get(PR_SRC).getString();
if (url == null) {
return;
@@ -230,15 +230,6 @@
return viewHeight;
}
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.serveExternalGraphic(this);
- }
-
public String getURL() {
return url;
}
@@ -259,4 +250,13 @@
return "fo:external-graphic";
}
+ /**
+ * This is a hook for the AddLMVisitor class to be able to access
+ * this object.
+ * @param aLMV the AddLMVisitor object that can access this object.
+ */
+ public void acceptVisitor(AddLMVisitor aLMV) {
+ setup();
+ aLMV.serveExternalGraphic(this);
+ }
}
1.9 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Float.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Float.java 27 Jul 2004 23:57:12 -0000 1.8
+++ Float.java 31 Jul 2004 00:44:22 -0000 1.9
@@ -33,7 +33,6 @@
*/
public Float(FONode parent) {
super(parent);
- this.name = "fo:float";
}
private void setup() {
1.29 +6 -5 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Leader.java 27 Jul 2004 23:57:12 -0000 1.28
+++ Leader.java 31 Jul 2004 00:44:22 -0000 1.29
@@ -53,7 +53,7 @@
super(parent);
}
- public void setup() {
+ private void setup() {
// Common Accessibility Properties
CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
@@ -162,16 +162,17 @@
return patternWidth;
}
+ public String getName() {
+ return "fo:leader";
+ }
+
/**
* This is a hook for the AddLMVisitor class to be able to access
* this object.
* @param aLMV the AddLMVisitor object that can access this object.
*/
public void acceptVisitor(AddLMVisitor aLMV) {
+ setup();
aLMV.serveLeader(this);
- }
-
- public String getName() {
- return "fo:leader";
}
}
1.29 +11 -10 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PageNumber.java 27 Jul 2004 23:57:12 -0000 1.28
+++ PageNumber.java 31 Jul 2004 00:44:22 -0000 1.29
@@ -75,7 +75,7 @@
getFOInputHandler().startPageNumber(this);
}
- public void setup() {
+ private void setup() {
// Common Accessibility Properties
CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
@@ -129,20 +129,21 @@
return fontState;
}
- /**
- * This is a hook for the AddLMVisitor class to be able to access
- * this object.
- * @param aLMV the AddLMVisitor object that can access this object.
- */
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.servePageNumber(this);
- }
-
protected void endOfNode() throws SAXParseException {
getFOInputHandler().endPageNumber(this);
}
public String getName() {
return "fo:page-number";
+ }
+
+ /**
+ * This is a hook for the AddLMVisitor class to be able to access
+ * this object.
+ * @param aLMV the AddLMVisitor object that can access this object.
+ */
+ public void acceptVisitor(AddLMVisitor aLMV) {
+ setup();
+ aLMV.servePageNumber(this);
}
}
1.27 +6 -5 \
xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PageNumberCitation.java 27 Jul 2004 23:57:12 -0000 1.26
+++ PageNumberCitation.java 31 Jul 2004 00:44:22 -0000 1.27
@@ -83,7 +83,7 @@
return width;
}
- public void setup() {
+ private void setup() {
// Common Accessibility Properties
CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
@@ -148,15 +148,16 @@
unresolved = isUnresolved;
}
- public void acceptVisitor(AddLMVisitor aLMV) {
- aLMV.servePageNumberCitation(this);
- }
-
public Font getFontState() {
return fontState;
}
public String getName() {
return "fo:page-number-citation";
+ }
+
+ public void acceptVisitor(AddLMVisitor aLMV) {
+ setup();
+ aLMV.servePageNumberCitation(this);
}
}
1.10 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java
Index: TableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TableCaption.java 27 Jul 2004 23:57:12 -0000 1.9
+++ TableCaption.java 31 Jul 2004 00:44:22 -0000 1.10
@@ -44,7 +44,7 @@
/**
* Initialize property values.
*/
- public void setup() {
+ private void setup() {
// Common Accessibility Properties
CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
1.14 +1 -1 \
xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConditionalPageMasterReference.java 27 Jul 2004 23:57:15 -0000 1.13
+++ ConditionalPageMasterReference.java 31 Jul 2004 00:44:23 -0000 1.14
@@ -56,7 +56,7 @@
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- * XSL/FOP Content Model: empty
+ * XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
1.21 +3 -5 xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Flow.java 27 Jul 2004 23:57:15 -0000 1.20
+++ Flow.java 31 Jul 2004 00:44:23 -0000 1.21
@@ -58,9 +58,7 @@
*/
private int contentWidth;
- /**
- * Content-width of current column area during layout
- */
+ /** used for FO validation */
private boolean blockItemFound = false;
/**
@@ -72,7 +70,7 @@
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- * XSL/FOP Content Model: marker* (%block;)+
+ * XSL Content Model: marker* (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
1.32 +1 -1 \
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PageSequence.java 27 Jul 2004 23:57:15 -0000 1.31
+++ PageSequence.java 31 Jul 2004 00:44:23 -0000 1.32
@@ -135,7 +135,7 @@
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- XSL/FOP Content Model: (title?,static-content*,flow)
+ XSL Content Model: (title?,static-content*,flow)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
1.24 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Region.java 27 Jul 2004 23:57:16 -0000 1.23
+++ Region.java 31 Jul 2004 00:44:23 -0000 1.24
@@ -92,7 +92,7 @@
if (isReserved(getRegionName())
&& !getRegionName().equals(getDefaultRegionName())) {
throw new FOPException("region-name '" + regionName
- + "' for " + this.name
+ + "' for " + this.getName()
+ " not permitted.");
}
}
@@ -100,7 +100,7 @@
if (parent instanceof SimplePageMaster) {
layoutMaster = (SimplePageMaster)parent;
} else {
- throw new FOPException(this.name + " must be child "
+ throw new FOPException(this.getName() + " must be child "
+ "of simple-page-master, not "
+ parent.getName());
}
1.11 +1 -1 \
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
Index: RepeatablePageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RepeatablePageMasterReference.java 27 Jul 2004 23:57:16 -0000 1.10
+++ RepeatablePageMasterReference.java 31 Jul 2004 00:44:23 -0000 1.11
@@ -52,7 +52,7 @@
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- * XSL/FOP Content Model: empty
+ * XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
1.9 +1 -1 \
xml-fop/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
Index: SinglePageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SinglePageMasterReference.java 27 Jul 2004 23:57:16 -0000 1.8
+++ SinglePageMasterReference.java 31 Jul 2004 00:44:23 -0000 1.9
@@ -50,7 +50,7 @@
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- * XSL/FOP Content Model: empty
+ * XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
1.16 +2 -2 \
xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StaticContent.java 27 Jul 2004 23:57:16 -0000 1.15
+++ StaticContent.java 31 Jul 2004 00:44:23 -0000 1.16
@@ -47,7 +47,7 @@
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- * XSL/FOP Content Model: (%block;)+
+ * XSL Content Model: (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
1.44 +1 -6 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- AddLMVisitor.java 27 Jul 2004 23:57:18 -0000 1.43
+++ AddLMVisitor.java 31 Jul 2004 00:44:23 -0000 1.44
@@ -241,7 +241,6 @@
* Add start and end properties for the link
*/
public void serveBasicLink(final BasicLink node) {
- node.setup();
InlineStackingLayoutManager lm;
lm = new InlineStackingLayoutManager(node) {
protected InlineParent createArea() {
@@ -307,7 +306,6 @@
}
private InlineArea getLeaderInlineArea(Leader node, LayoutManager parentLM) {
- node.setup();
InlineArea leaderArea = null;
if (node.getLeaderPattern() == Constants.LeaderPattern.RULE) {
@@ -427,7 +425,6 @@
* @return the viewport containing the image area
*/
public InlineArea getExternalGraphicInlineArea(ExternalGraphic node) {
- node.setup();
if (node.getURL() == null) {
return null;
}
@@ -652,7 +649,6 @@
* @param lms the list to which the layout manager(s) should be added
*/
public void servePageNumber(final PageNumber node) {
- node.setup();
LayoutManager lm;
lm = new LeafNodeLayoutManager(node) {
public InlineArea get(LayoutContext context) {
@@ -686,7 +682,6 @@
}
public void servePageNumberCitation(final PageNumberCitation node) {
- node.setup();
LayoutManager lm;
lm = new LeafNodeLayoutManager(node) {
public InlineArea get(LayoutContext context) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic