Removed isMarker() method in favor of getName() (may eventually switch to an ID syste...

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

diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index eb186a08bca18bf845176ae1140302c2db3d74b2..a542706a57d162e02ace16ca6625396e97c05d98 100644 (file)
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -203,17 +203,6 @@ public abstract class FONode {
         return new OneCharIterator(CharUtilities.CODE_EOT);
     }
 
-    /**
-     * This is a quick check to see if it is a marker.
-     * This is needed since there is no other quick way of checking
-     * for a marker and not adding to the child list.
-     *
-     * @return true if this is a marker
-     */
-    protected boolean isMarker() {
-        return false;
-    }
-
     /**
      * This is a hook for an FOTreeVisitor subclass to be able to access
      * this object.

diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index ec4864fac37802dce21695872128021e64056e7d..64a6813269cf6dcd8d84992605566eee97b9a2ba 100644 (file)
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -256,7 +256,7 @@ public class FObj extends FONode implements Constants {
      * @param child the child node to add
      */
     protected void addChild(FONode child) {
-        if (containsMarkers() && child.isMarker()) {
+        if (containsMarkers() && "fo:marker".equals(child.getName())) {
             addMarker((Marker)child);
         } else {
             if (children == null) {

diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java
index 215557bfcab7f8a104466934cc7e94f5ca008ef0..cbc6a55fdb3a63f60162304bbde2c23a3a9238eb 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Marker.java
+++ b/src/java/org/apache/fop/fo/flow/Marker.java
@@ -54,13 +54,6 @@ public class Marker extends FObjMixed {
             this.propertyList.get(PR_MARKER_CLASS_NAME).getString();
     }
 
-    /**
-     * @see org.apache.fop.fo.FONode#isMarker()
-     */
-    protected boolean isMarker() {
-        return true;
-    }
-
     /**
      * Get the marker class name for this marker.
      *