diff options
author | Glen Mazza <gmazza@apache.org> | 2004-07-04 04:50:54 +0000 |
---|---|---|
committer | Glen Mazza <gmazza@apache.org> | 2004-07-04 04:50:54 +0000 |
commit | 969ceeeb4c8c9c5bf45285792e70bba4fb62374a (patch) | |
tree | 41fb714654e0545be0a7bbfbfeedc31106d8384e /src/java | |
parent | dc2bf18ece928114fab1c159c1265042a4798f36 (diff) | |
download | xmlgraphics-fop-969ceeeb4c8c9c5bf45285792e70bba4fb62374a.tar.gz xmlgraphics-fop-969ceeeb4c8c9c5bf45285792e70bba4fb62374a.zip |
Removed isMarker() method in favor of getName() (may eventually switch to an ID system for element names for better performance.)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
-rw-r--r-- | src/java/org/apache/fop/fo/FONode.java | 11 | ||||
-rw-r--r-- | src/java/org/apache/fop/fo/FObj.java | 2 | ||||
-rw-r--r-- | src/java/org/apache/fop/fo/flow/Marker.java | 7 |
3 files changed, 1 insertions, 19 deletions
diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index eb186a08b..a542706a5 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/src/java/org/apache/fop/fo/FONode.java @@ -204,17 +204,6 @@ public abstract class FONode { } /** - * 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. * @param fotv the FOTreeVisitor subclass that can access this object. diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index ec4864fac..64a681326 100644 --- 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 215557bfc..cbc6a55fd 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -55,13 +55,6 @@ public class Marker extends FObjMixed { } /** - * @see org.apache.fop.fo.FONode#isMarker() - */ - protected boolean isMarker() { - return true; - } - - /** * Get the marker class name for this marker. * * @return the marker class name |