PR:

Obtained from:
Submitted by:
Reviewed by:
Some simplifications allowed as a result of having FOText extend FONode directly.

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

diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 4bdc0c5b42b340da5a9fe6f64cc2d89ec74953ea..3c4f70b293f69fb2c79d11cf5e7f3b52e3d2f0cf 100644 (file)
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -28,7 +28,7 @@ import org.apache.fop.fo.pagination.Root;
 import org.apache.fop.layoutmgr.TextLayoutManager;
 
 /**
- * A text node in the formatting object tree.
+ * A text node (PCDATA) in the formatting object tree.
  *
  * Unfortunately the BufferManager implementatation holds
  * onto references to the character data in this object
@@ -488,14 +488,6 @@ public class FOText extends FONode {
 
     }
 
-    /**
-     * @todo rename somehow, there isn't an fo:text.
-     * @todo see if should still be a subclass of FObj
-     */
-    public String getName() {
-        return "fo:text";
-    }
-
     /**
      * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */

diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index 86d171792c56e8d06fac0b9120393e718c9b371b..1f6b4dd5a4b5c7e921d4ea32661070b03575df22 100644 (file)
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -54,9 +54,6 @@ public class FObj extends FONode implements Constants {
     */
     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;
 
@@ -135,19 +132,15 @@ public class FObj extends FONode implements Constants {
      * fo and sets the id attribute of this object.
      */
     private void setupID() throws SAXParseException {
-        Property prop = this.propertyList.get(PR_ID);
-        if (prop != null) {
-            String str = prop.getString();
-            if (str != null && !str.equals("")) {
-                Set idrefs = getFOEventHandler().getIDReferences();
-                if (!idrefs.contains(str)) {
-                    id = str;
-                    idrefs.add(id);
-                } else {
-                    throw new SAXParseException("Property id \"" + str + 
-                        "\" previously used; id values must be unique" +
-                        " in document.", locator);
-                }
+        String str = getPropString(PR_ID);
+        if (str != null && !str.equals("")) {
+            Set idrefs = getFOEventHandler().getIDReferences();
+            if (!idrefs.contains(str)) {
+                idrefs.add(str);
+            } else {
+                throw new SAXParseException("Property id \"" + str + 
+                    "\" previously used; id values must be unique" +
+                    " in document.", locator);
             }
         }
     }
@@ -349,16 +342,6 @@ public class FObj extends FONode implements Constants {
         return new Integer(0);
     }
 
-    /**
-     * Get the id string for this formatting object.
-     * This will be unique for the fo document.
-     *
-     * @return the id string or null if not set
-     */
-    public String getID() {
-        return id;
-    }
-
     /**
      * Check if this formatting object generates reference areas.
      * @return true if generates reference areas

diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java
index 5c72cbc6bdada1378691012fe3c853acef582dab..bd3c7e2e95a2be0960b442c75d365bcedd93f7aa 100644 (file)
--- a/src/java/org/apache/fop/fo/FObjMixed.java
+++ b/src/java/org/apache/fop/fo/FObjMixed.java
@@ -25,8 +25,7 @@ import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
 
 /**
  * Base class for representation of mixed content formatting objects
- * and their processing
- * @todo define what a "mixed content formatting object" is
+ * (i.e., those that can contain both child FO's and text nodes/PCDATA)
  */
 public class FObjMixed extends FObj {
     /** TextInfo for this object */

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index d8a624e1d502889eb1553a06b14d24b22217977d..1770bc196fbeba9211734d6316f3e5dfaaef3afc 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -86,7 +86,7 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
      */
     public void setFObj(FObj fo) {
         this.fobj = fo;
-        foID = fobj.getID();
+        foID = fobj.getPropString(PR_ID);
         markers = fobj.getMarkers();
         fobjIter = fobj.getChildNodes();
         childLMiter = new LMiter(this);