gmazza 2004/07/03 21:50:54
Modified: src/java/org/apache/fop/fo FONode.java FObj.java
src/java/org/apache/fop/fo/flow Marker.java
Log:
Removed isMarker() method in favor of getName() (may eventually switch to an ID
system for element names for better performance.)
Revision Changes Path
1.26 +0 -11 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FONode.java 19 Jun 2004 13:35:33 -0000 1.25
+++ FONode.java 4 Jul 2004 04:50:54 -0000 1.26
@@ -204,17 +204,6 @@
}
/**
- * 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.
1.48 +1 -1 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- FObj.java 26 Jun 2004 19:37:13 -0000 1.47
+++ FObj.java 4 Jul 2004 04:50:54 -0000 1.48
@@ -256,7 +256,7 @@
* @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) {
1.10 +0 -7 xml-fop/src/java/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Marker.java 12 Jun 2004 23:18:52 -0000 1.9
+++ Marker.java 4 Jul 2004 04:50:54 -0000 1.10
@@ -55,13 +55,6 @@
}
/**
- * @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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
