gmazza 2004/08/08 11:39:27
Modified: src/java/org/apache/fop/fo Constants.java FObj.java
PropertySets.java
src/java/org/apache/fop/fo/flow BasicLink.java
BidiOverride.java Block.java BlockContainer.java
Character.java ExternalGraphic.java Float.java
Footnote.java FootnoteBody.java
InitialPropertySet.java Inline.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java Marker.java
MultiCase.java MultiProperties.java
MultiPropertySet.java MultiSwitch.java
MultiToggle.java PageNumber.java
PageNumberCitation.java RetrieveMarker.java
Table.java TableAndCaption.java TableBody.java
TableCaption.java TableCell.java TableColumn.java
TableFooter.java TableHeader.java TableRow.java
Wrapper.java
src/java/org/apache/fop/fo/pagination ColorProfile.java
ConditionalPageMasterReference.java
Declarations.java Flow.java LayoutMasterSet.java
PageSequence.java PageSequenceMaster.java
RegionAfter.java RegionBefore.java RegionBody.java
RegionEnd.java RegionStart.java
RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java Root.java
SimplePageMaster.java
SinglePageMasterReference.java StaticContent.java
Title.java
Log:
Implemented getNameId() which returns the Constants enumeration ID
for the FO. For future array work or to reduce the amount of string comparisons
being done.
Revision Changes Path
1.10 +3 -2 xml-fop/src/java/org/apache/fop/fo/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Constants.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Constants.java 24 Jul 2004 05:47:45 -0000 1.9
+++ Constants.java 8 Aug 2004 18:39:22 -0000 1.10
@@ -56,6 +56,7 @@
int RENDER_RTF = 10;
// element constants
+ int FO_UNKNOWN = 0; // FObj base class
int FO_BASIC_LINK = 1;
int FO_BIDI_OVERRIDE = 2;
int FO_BLOCK = 3;
@@ -63,7 +64,7 @@
int FO_CHARACTER = 5;
int FO_COLOR_PROFILE = 6;
int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 7;
- int FO_DECLARATION = 8;
+ int FO_DECLARATIONS = 8;
int FO_EXTERNAL_GRAPHIC = 9;
int FO_FLOAT = 10;
int FO_FLOW = 11;
1.62 +8 -0 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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- FObj.java 6 Aug 2004 04:22:15 -0000 1.61
+++ FObj.java 8 Aug 2004 18:39:22 -0000 1.62
@@ -548,5 +548,13 @@
}
return -1;
}
+
+ /**
+ * Returns the Constants class integer value of this formatting object
+ * @return the integer enumeration of this FO
+ */
+ public int getNameId() {
+ return FO_UNKNOWN;
+ }
}
1.8 +3 -3 xml-fop/src/java/org/apache/fop/fo/PropertySets.java
Index: PropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertySets.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertySets.java 25 Jul 2004 01:00:35 -0000 1.7
+++ PropertySets.java 8 Aug 2004 18:39:22 -0000 1.8
@@ -187,10 +187,10 @@
elem = elements[Constants.FO_ROOT];
elem.addProperty(Constants.PR_MEDIA_USAGE);
elem.addContent(Constants.FO_LAYOUT_MASTER_SET);
- elem.addContent(Constants.FO_DECLARATION);
+ elem.addContent(Constants.FO_DECLARATIONS);
elem.addContent(Constants.FO_PAGE_SEQUENCE);
- elem = elements[Constants.FO_DECLARATION];
+ elem = elements[Constants.FO_DECLARATIONS];
elem.addContent(Constants.FO_COLOR_PROFILE);
elem = elements[Constants.FO_COLOR_PROFILE];
1.24 +7 -0 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- BasicLink.java 7 Aug 2004 13:01:15 -0000 1.23
+++ BasicLink.java 8 Aug 2004 18:39:22 -0000 1.24
@@ -136,6 +136,13 @@
}
/**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_BASIC_LINK;
+ }
+
+ /**
* @return true (BasicLink can contain Markers)
* @todo see if can remove in favor of a BitSet for all FO's
*/
1.15 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BidiOverride.java 7 Aug 2004 13:01:15 -0000 1.14
+++ BidiOverride.java 8 Aug 2004 18:39:22 -0000 1.15
@@ -141,6 +141,13 @@
}
/**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_BIDI_OVERRIDE;
+ }
+
+ /**
* @return true (BidiOverride can contain Markers)
*/
protected boolean containsMarkers() {
1.30 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Block.java 7 Aug 2004 13:01:15 -0000 1.29
+++ Block.java 8 Aug 2004 18:39:22 -0000 1.30
@@ -345,6 +345,13 @@
}
/**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_BLOCK;
+ }
+
+ /**
* @return true (Block can contain Markers)
*/
protected boolean containsMarkers() {
1.16 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BlockContainer.java 6 Aug 2004 15:41:10 -0000 1.15
+++ BlockContainer.java 8 Aug 2004 18:39:22 -0000 1.16
@@ -145,5 +145,12 @@
public String getName() {
return "fo:block-container";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_BLOCK_CONTAINER;
+ }
}
1.15 +10 -0 xml-fop/src/java/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Character.java 6 Aug 2004 04:22:15 -0000 1.14
+++ Character.java 8 Aug 2004 18:39:22 -0000 1.15
@@ -140,7 +140,17 @@
aLMV.serveCharacter(this);
}
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:character";
+ }
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_CHARACTER;
}
}
1.34 +7 -1 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ExternalGraphic.java 6 Aug 2004 15:41:10 -0000 1.33
+++ ExternalGraphic.java 8 Aug 2004 18:39:22 -0000 1.34
@@ -298,5 +298,11 @@
return vp;
}
-
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_EXTERNAL_GRAPHIC;
+ }
}
1.11 +7 -0 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Float.java 4 Aug 2004 22:21:03 -0000 1.10
+++ Float.java 8 Aug 2004 18:39:22 -0000 1.11
@@ -44,4 +44,11 @@
public String getName() {
return "fo:float";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_FLOAT;
+ }
}
1.20 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Footnote.java 6 Aug 2004 15:41:10 -0000 1.19
+++ Footnote.java 8 Aug 2004 18:39:22 -0000 1.20
@@ -95,5 +95,12 @@
public String getName() {
return "fo:footnote";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_FOOTNOTE;
+ }
}
1.17 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FootnoteBody.java 4 Aug 2004 22:50:57 -0000 1.16
+++ FootnoteBody.java 8 Aug 2004 18:39:22 -0000 1.17
@@ -63,4 +63,11 @@
public String getName() {
return "fo:footnote-body";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_FOOTNOTE_BODY;
+ }
}
1.12 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InitialPropertySet.java 4 Aug 2004 22:21:03 -0000 1.11
+++ InitialPropertySet.java 8 Aug 2004 18:39:22 -0000 1.12
@@ -88,4 +88,11 @@
public String getName() {
return "fo:initial-property-set";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_INITIAL_PROPERTY_SET;
+ }
}
1.22 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Inline.java 6 Aug 2004 04:22:15 -0000 1.21
+++ Inline.java 8 Aug 2004 18:39:22 -0000 1.22
@@ -110,4 +110,11 @@
public String getName() {
return "fo:inline";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_INLINE;
+ }
}
1.15 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- InlineContainer.java 6 Aug 2004 15:41:10 -0000 1.14
+++ InlineContainer.java 8 Aug 2004 18:39:22 -0000 1.15
@@ -106,4 +106,11 @@
public String getName() {
return "fo:inline-container";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_INLINE_CONTAINER;
+ }
}
1.19 +7 -0
xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- InstreamForeignObject.java 7 Aug 2004 13:01:15 -0000 1.18
+++ InstreamForeignObject.java 8 Aug 2004 18:39:23 -0000 1.19
@@ -132,4 +132,11 @@
public String getName() {
return "fo:instream-foreign-object";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_INSTREAM_FOREIGN_OBJECT;
+ }
}
1.31 +7 -0 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Leader.java 6 Aug 2004 04:22:16 -0000 1.30
+++ Leader.java 8 Aug 2004 18:39:23 -0000 1.31
@@ -176,4 +176,11 @@
setup();
aLMV.serveLeader(this);
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_LEADER;
+ }
}
1.21 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ListBlock.java 6 Aug 2004 15:41:10 -0000 1.20
+++ ListBlock.java 8 Aug 2004 18:39:23 -0000 1.21
@@ -117,5 +117,12 @@
public String getName() {
return "fo:list-block";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_LIST_BLOCK;
+ }
}
1.23 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ListItem.java 7 Aug 2004 13:01:15 -0000 1.22
+++ ListItem.java 8 Aug 2004 18:39:23 -0000 1.23
@@ -134,5 +134,12 @@
public String getName() {
return "fo:list-item";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_LIST_ITEM;
+ }
}
1.15 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ListItemBody.java 4 Aug 2004 22:50:57 -0000 1.14
+++ ListItemBody.java 8 Aug 2004 18:39:23 -0000 1.15
@@ -63,5 +63,12 @@
public String getName() {
return "fo:list-item-body";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_LIST_ITEM_BODY;
+ }
}
1.23 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ListItemLabel.java 4 Aug 2004 22:50:57 -0000 1.22
+++ ListItemLabel.java 8 Aug 2004 18:39:23 -0000 1.23
@@ -80,5 +80,12 @@
public String getName() {
return "fo:list-item-label";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_LIST_ITEM_LABEL;
+ }
}
1.14 +7 -0 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Marker.java 4 Aug 2004 22:50:57 -0000 1.13
+++ Marker.java 8 Aug 2004 18:39:23 -0000 1.14
@@ -65,4 +65,11 @@
public String getName() {
return "fo:marker";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_MARKER;
+ }
}
1.11 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiCase.java 4 Aug 2004 22:21:03 -0000 1.10
+++ MultiCase.java 8 Aug 2004 18:39:23 -0000 1.11
@@ -51,4 +51,11 @@
public String getName() {
return "fo:multi-case";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_MULTI_CASE;
+ }
}
1.10 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MultiProperties.java 4 Aug 2004 22:21:03 -0000 1.9
+++ MultiProperties.java 8 Aug 2004 18:39:23 -0000 1.10
@@ -48,4 +48,11 @@
public String getName() {
return "fo:multi-properties";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_MULTI_PROPERTIES;
+ }
}
1.11 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiPropertySet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiPropertySet.java 4 Aug 2004 22:21:03 -0000 1.10
+++ MultiPropertySet.java 8 Aug 2004 18:39:23 -0000 1.11
@@ -57,4 +57,11 @@
public String getName() {
return "fo:multi-property-set";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_MULTI_PROPERTY_SET;
+ }
}
1.11 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiSwitch.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiSwitch.java 4 Aug 2004 22:21:03 -0000 1.10
+++ MultiSwitch.java 8 Aug 2004 18:39:23 -0000 1.11
@@ -49,4 +49,11 @@
public String getName() {
return "fo:multi-switch";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_MULTI_SWITCH;
+ }
}
1.11 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiToggle.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiToggle.java 4 Aug 2004 22:21:03 -0000 1.10
+++ MultiToggle.java 8 Aug 2004 18:39:23 -0000 1.11
@@ -49,4 +49,11 @@
public String getName() {
return "fo:multi-toggle";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_MULTI_TOGGLE;
+ }
}
1.33 +4 -0 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- PageNumber.java 8 Aug 2004 17:52:35 -0000 1.32
+++ PageNumber.java 8 Aug 2004 18:39:23 -0000 1.33
@@ -107,4 +107,8 @@
public String getName() {
return "fo:page-number";
}
+
+ public int getNameId() {
+ return FO_PAGE_NUMBER;
+ }
}
1.30 +7 -0 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- PageNumberCitation.java 6 Aug 2004 15:41:11 -0000 1.29
+++ PageNumberCitation.java 8 Aug 2004 18:39:23 -0000 1.30
@@ -223,4 +223,11 @@
}
return inline;
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_PAGE_NUMBER_CITATION;
+ }
}
1.14 +8 -0 xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RetrieveMarker.java 6 Aug 2004 04:22:16 -0000 1.13
+++ RetrieveMarker.java 8 Aug 2004 18:39:23 -0000 1.14
@@ -96,4 +96,12 @@
public String getName() {
return "fo:retrieve-marker";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_RETRIEVE_MARKER;
+ }
+
}
1.25 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Table.java 6 Aug 2004 04:22:16 -0000 1.24
+++ Table.java 8 Aug 2004 18:39:23 -0000 1.25
@@ -208,4 +208,11 @@
public String getName() {
return "fo:table";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE;
+ }
}
1.11 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TableAndCaption.java 4 Aug 2004 22:21:03 -0000 1.10
+++ TableAndCaption.java 8 Aug 2004 18:39:23 -0000 1.11
@@ -84,5 +84,12 @@
public String getName() {
return "fo:table-and-caption";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_AND_CAPTION;
+ }
}
1.21 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TableBody.java 6 Aug 2004 04:22:16 -0000 1.20
+++ TableBody.java 8 Aug 2004 18:39:23 -0000 1.21
@@ -112,5 +112,12 @@
public String getName() {
return "fo:table-body";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_BODY;
+ }
}
1.12 +7 -0 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TableCaption.java 4 Aug 2004 22:21:04 -0000 1.11
+++ TableCaption.java 8 Aug 2004 18:39:23 -0000 1.12
@@ -77,5 +77,12 @@
public String getName() {
return "fo:table-caption";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_CAPTION;
+ }
}
1.24 +7 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TableCell.java 6 Aug 2004 15:41:11 -0000 1.23
+++ TableCell.java 8 Aug 2004 18:39:23 -0000 1.24
@@ -356,5 +356,11 @@
public String getName() {
return "fo:table-cell";
}
-
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_CELL;
+ }
}
1.26 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TableColumn.java 4 Aug 2004 22:50:57 -0000 1.25
+++ TableColumn.java 8 Aug 2004 18:39:23 -0000 1.26
@@ -129,5 +129,12 @@
public String getName() {
return "fo:table-column";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_COLUMN;
+ }
}
1.9 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableFooter.java
Index: TableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableFooter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TableFooter.java 6 Aug 2004 04:22:16 -0000 1.8
+++ TableFooter.java 8 Aug 2004 18:39:23 -0000 1.9
@@ -43,4 +43,11 @@
public String getName() {
return "fo:table-footer";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_FOOTER;
+ }
}
1.9 +7 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableHeader.java
Index: TableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableHeader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TableHeader.java 6 Aug 2004 04:22:16 -0000 1.8
+++ TableHeader.java 8 Aug 2004 18:39:23 -0000 1.9
@@ -43,4 +43,11 @@
public String getName() {
return "fo:table-header";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_HEADER;
+ }
}
1.26 +6 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TableRow.java 6 Aug 2004 15:41:11 -0000 1.25
+++ TableRow.java 8 Aug 2004 18:39:23 -0000 1.26
@@ -153,4 +153,10 @@
return "fo:table-row";
}
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TABLE_ROW;
+ }
}
1.10 +6 -0 xml-fop/src/java/org/apache/fop/fo/flow/Wrapper.java
Index: Wrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Wrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Wrapper.java 6 Aug 2004 04:22:16 -0000 1.9
+++ Wrapper.java 8 Aug 2004 18:39:23 -0000 1.10
@@ -56,5 +56,11 @@
return "fo:wrapper";
}
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_WRAPPER;
+ }
}
1.15 +11 -1 xml-fop/src/java/org/apache/fop/fo/pagination/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ColorProfile.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ColorProfile.java 4 Aug 2004 22:50:57 -0000 1.14
+++ ColorProfile.java 8 Aug 2004 18:39:25 -0000 1.15
@@ -111,7 +111,17 @@
}
}
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:color-profile";
+ }
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_COLOR_PROFILE;
}
}
1.17 +10 -0
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConditionalPageMasterReference.java 4 Aug 2004 22:50:57 -0000 1.16
+++ ConditionalPageMasterReference.java 8 Aug 2004 18:39:25 -0000 1.17
@@ -172,7 +172,17 @@
}
}
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:conditional-page-master-reference";
+ }
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_CONDITIONAL_PAGE_MASTER_REFERENCE;
}
}
1.17 +11 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Declarations.java
Index: Declarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Declarations.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Declarations.java 7 Aug 2004 13:01:16 -0000 1.16
+++ Declarations.java 8 Aug 2004 18:39:25 -0000 1.17
@@ -104,7 +104,17 @@
childNodes = null;
}
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:declarations";
+ }
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_DECLARATIONS;
}
}
1.26 +8 -1 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Flow.java 7 Aug 2004 13:01:16 -0000 1.25
+++ Flow.java 8 Aug 2004 18:39:25 -0000 1.26
@@ -181,4 +181,11 @@
public String getName() {
return "fo:flow";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_FLOW;
+ }
}
1.21 +7 -0
xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LayoutMasterSet.java 7 Aug 2004 13:01:16 -0000 1.20
+++ LayoutMasterSet.java 8 Aug 2004 18:39:25 -0000 1.21
@@ -218,5 +218,12 @@
public String getName() {
return "fo:layout-master-set";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_LAYOUT_MASTER_SET;
+ }
}
1.36 +7 -0 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PageSequence.java 7 Aug 2004 13:01:16 -0000 1.35
+++ PageSequence.java 8 Aug 2004 18:39:25 -0000 1.36
@@ -746,4 +746,11 @@
public String getName() {
return "fo:page-sequence";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_PAGE_SEQUENCE;
+ }
}
1.18 +7 -0
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PageSequenceMaster.java 7 Aug 2004 13:01:16 -0000 1.17
+++ PageSequenceMaster.java 8 Aug 2004 18:39:25 -0000 1.18
@@ -201,5 +201,12 @@
public String getName() {
return "fo:page-sequence-master";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_PAGE_SEQUENCE_MASTER;
+ }
}
1.13 +7 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegionAfter.java 4 Aug 2004 22:50:58 -0000 1.12
+++ RegionAfter.java 8 Aug 2004 18:39:25 -0000 1.13
@@ -71,5 +71,12 @@
public String getName() {
return "fo:region-after";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REGION_AFTER;
+ }
}
1.14 +7 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RegionBefore.java 4 Aug 2004 22:50:58 -0000 1.13
+++ RegionBefore.java 8 Aug 2004 18:39:25 -0000 1.14
@@ -76,5 +76,12 @@
public String getName() {
return "fo:region-before";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REGION_BEFORE;
+ }
}
1.26 +7 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- RegionBody.java 4 Aug 2004 22:50:58 -0000 1.25
+++ RegionBody.java 8 Aug 2004 18:39:25 -0000 1.26
@@ -109,4 +109,11 @@
public String getName() {
return "fo:region-body";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REGION_BODY;
+ }
}
1.13 +7 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegionEnd.java 4 Aug 2004 22:50:58 -0000 1.12
+++ RegionEnd.java 8 Aug 2004 18:39:25 -0000 1.13
@@ -72,5 +72,12 @@
public String getName() {
return "fo:region-end";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REGION_END;
+ }
}
1.13 +7 -0 xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegionStart.java 4 Aug 2004 22:50:58 -0000 1.12
+++ RegionStart.java 8 Aug 2004 18:39:25 -0000 1.13
@@ -71,5 +71,12 @@
public String getName() {
return "fo:region-start";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REGION_START;
+ }
}
1.16 +7 -0
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RepeatablePageMasterAlternatives.java 7 Aug 2004 13:01:16 -0000 1.15
+++ RepeatablePageMasterAlternatives.java 8 Aug 2004 18:39:25 -0000 1.16
@@ -157,4 +157,11 @@
public String getName() {
return "fo:repeatable-page-master-alternatives";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES;
+ }
}
1.14 +7 -0
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RepeatablePageMasterReference.java 4 Aug 2004 22:50:58 -0000 1.13
+++ RepeatablePageMasterReference.java 8 Aug 2004 18:39:25 -0000 1.14
@@ -106,4 +106,11 @@
public String getName() {
return "fo:repeatable-page-master-reference";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_REPEATABLE_PAGE_MASTER_REFERENCE;
+ }
}
1.22 +8 -0 xml-fop/src/java/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Root.java 7 Aug 2004 13:01:16 -0000 1.21
+++ Root.java 8 Aug 2004 18:39:25 -0000 1.22
@@ -226,4 +226,12 @@
public String getName() {
return "fo:root";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_ROOT;
+ }
+
}
1.22 +7 -0
xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SimplePageMaster.java 4 Aug 2004 22:50:58 -0000 1.21
+++ SimplePageMaster.java 8 Aug 2004 18:39:25 -0000 1.22
@@ -159,4 +159,11 @@
public String getName() {
return "fo:simple-page-master";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_SIMPLE_PAGE_MASTER;
+ }
}
1.11 +7 -0
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SinglePageMasterReference.java 4 Aug 2004 22:50:58 -0000 1.10
+++ SinglePageMasterReference.java 8 Aug 2004 18:39:25 -0000 1.11
@@ -80,5 +80,12 @@
public String getName() {
return "fo:single-page-master-reference";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_SINGLE_PAGE_MASTER_REFERENCE;
+ }
}
1.20 +8 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StaticContent.java 7 Aug 2004 13:01:16 -0000 1.19
+++ StaticContent.java 8 Aug 2004 18:39:26 -0000 1.20
@@ -83,4 +83,11 @@
public String getName() {
return "fo:static-content";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_STATIC_CONTENT;
+ }
}
1.24 +8 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Title.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Title.java 6 Aug 2004 04:22:18 -0000 1.23
+++ Title.java 8 Aug 2004 18:39:26 -0000 1.24
@@ -98,5 +98,12 @@
public String getName() {
return "fo:title";
}
+
+ /**
+ * @see org.apache.fop.fo.FObj#getNameId()
+ */
+ public int getNameId() {
+ return FO_TITLE;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
