From: Glen Mazza <gmazza@apache.org>
Date: Sun, 8 Aug 2004 18:39:26 +0000 (+0000)
Subject: Implemented getNameId() which returns the Constants enumeration ID
X-Git-Tag: Root_Temp_KnuthStylePageBreaking~628
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4e8a44140791a7565d4b7ae3983f9a594e300b49;p=xmlgraphics-fop.git

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.


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

diff --git a/src/java/org/apache/fop/fo/Constants.java b/src/java/org/apache/fop/fo/Constants.java
index 496776b1f..3c8638c16 100644
--- a/src/java/org/apache/fop/fo/Constants.java
+++ b/src/java/org/apache/fop/fo/Constants.java
@@ -56,6 +56,7 @@ public interface Constants {
     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 @@ public interface Constants {
     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;
diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index 6d176819e..bfb97398c 100644
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -548,5 +548,13 @@ public class FObj extends FONode implements Constants {
         }
         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;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/PropertySets.java b/src/java/org/apache/fop/fo/PropertySets.java
index 8f4c12ef4..2494d25b5 100644
--- a/src/java/org/apache/fop/fo/PropertySets.java
+++ b/src/java/org/apache/fop/fo/PropertySets.java
@@ -187,10 +187,10 @@ public class PropertySets {
         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];
diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java
index e26eb3484..63784aebc 100644
--- a/src/java/org/apache/fop/fo/flow/BasicLink.java
+++ b/src/java/org/apache/fop/fo/flow/BasicLink.java
@@ -135,6 +135,13 @@ public class BasicLink extends Inline {
         return "fo:basic-link";
     }
     
+    /**
+     * @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
diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java
index ebd29f34f..de1cd83dc 100644
--- a/src/java/org/apache/fop/fo/flow/BidiOverride.java
+++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java
@@ -140,6 +140,13 @@ public class BidiOverride extends FObjMixed {
         return "fo:bidi-override";
     }
 
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_BIDI_OVERRIDE;
+    }
+
     /**
      * @return true (BidiOverride can contain Markers)
      */
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index bdcf7c61d..b45b97782 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -344,6 +344,13 @@ public class Block extends FObjMixed {
         return "fo:block";
     }
 
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_BLOCK;
+    }
+
     /**
      * @return true (Block can contain Markers)
      */
diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java
index c05033d84..7c6aeccfe 100644
--- a/src/java/org/apache/fop/fo/flow/BlockContainer.java
+++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java
@@ -145,5 +145,12 @@ public class BlockContainer extends FObj {
     public String getName() {
         return "fo:block-container";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_BLOCK_CONTAINER;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java
index 381b883cf..f3c76f504 100644
--- a/src/java/org/apache/fop/fo/flow/Character.java
+++ b/src/java/org/apache/fop/fo/flow/Character.java
@@ -140,7 +140,17 @@ public class Character extends FObj implements LMVisited {
         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;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
index a023c21c0..53dcc67c6 100644
--- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -298,5 +298,11 @@ public class ExternalGraphic extends FObj {
 
          return vp;
      }
-    
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_EXTERNAL_GRAPHIC;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/Float.java b/src/java/org/apache/fop/fo/flow/Float.java
index a428e86ca..403f0adc0 100644
--- a/src/java/org/apache/fop/fo/flow/Float.java
+++ b/src/java/org/apache/fop/fo/flow/Float.java
@@ -44,4 +44,11 @@ public class Float extends ToBeImplementedElement {
     public String getName() {
         return "fo:float";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_FLOAT;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index 1c16e12cb..515755fd8 100644
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -95,5 +95,12 @@ public class Footnote extends FObj {
     public String getName() {
         return "fo:footnote";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_FOOTNOTE;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
index 0b131896d..9e35352b1 100644
--- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
@@ -63,4 +63,11 @@ public class FootnoteBody extends FObj {
     public String getName() {
         return "fo:footnote-body";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_FOOTNOTE_BODY;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
index 2972491ca..e27399b8c 100644
--- a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
+++ b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
@@ -88,4 +88,11 @@ public class InitialPropertySet extends ToBeImplementedElement {
     public String getName() {
         return "fo:initial-property-set";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_INITIAL_PROPERTY_SET;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java
index 2be77db77..d23aea29d 100644
--- a/src/java/org/apache/fop/fo/flow/Inline.java
+++ b/src/java/org/apache/fop/fo/flow/Inline.java
@@ -110,4 +110,11 @@ public class Inline extends FObjMixed {
     public String getName() {
         return "fo:inline";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_INLINE;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java
index 753d6253d..c96fd6afe 100644
--- a/src/java/org/apache/fop/fo/flow/InlineContainer.java
+++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java
@@ -106,4 +106,11 @@ public class InlineContainer extends FObj {
     public String getName() {
         return "fo:inline-container";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_INLINE_CONTAINER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
index 1a763844d..f11a7ece3 100644
--- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
+++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
@@ -132,4 +132,11 @@ public class InstreamForeignObject extends FObj implements LMVisited {
     public String getName() {
         return "fo:instream-foreign-object";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_INSTREAM_FOREIGN_OBJECT;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index 522ce8c89..da38974c5 100644
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -176,4 +176,11 @@ public class Leader extends FObjMixed implements LMVisited {
         setup();
         aLMV.serveLeader(this);
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_LEADER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java
index d3dbf77f1..147ac5ab3 100644
--- a/src/java/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/ListBlock.java
@@ -117,5 +117,12 @@ public class ListBlock extends FObj {
     public String getName() {
         return "fo:list-block";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_LIST_BLOCK;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index 4ccde913a..af7cc7e56 100644
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -134,5 +134,12 @@ public class ListItem extends FObj {
     public String getName() {
         return "fo:list-item";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_LIST_ITEM;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java
index 59847758a..db7431a04 100644
--- a/src/java/org/apache/fop/fo/flow/ListItemBody.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java
@@ -63,5 +63,12 @@ public class ListItemBody extends FObj {
     public String getName() {
         return "fo:list-item-body";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_LIST_ITEM_BODY;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
index 13fd0058b..50b1d227c 100644
--- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
@@ -80,5 +80,12 @@ public class ListItemLabel extends FObj {
     public String getName() {
         return "fo:list-item-label";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_LIST_ITEM_LABEL;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java
index 767dfbb8b..61fe5e04c 100644
--- a/src/java/org/apache/fop/fo/flow/Marker.java
+++ b/src/java/org/apache/fop/fo/flow/Marker.java
@@ -65,4 +65,11 @@ public class Marker extends FObjMixed {
     public String getName() {
         return "fo:marker";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_MARKER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java
index efac25394..d15e31120 100644
--- a/src/java/org/apache/fop/fo/flow/MultiCase.java
+++ b/src/java/org/apache/fop/fo/flow/MultiCase.java
@@ -51,4 +51,11 @@ public class MultiCase extends ToBeImplementedElement {
     public String getName() {
         return "fo:multi-case";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_MULTI_CASE;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/MultiProperties.java b/src/java/org/apache/fop/fo/flow/MultiProperties.java
index a2a2c04e5..f241a5902 100644
--- a/src/java/org/apache/fop/fo/flow/MultiProperties.java
+++ b/src/java/org/apache/fop/fo/flow/MultiProperties.java
@@ -48,4 +48,11 @@ public class MultiProperties extends ToBeImplementedElement {
     public String getName() {
         return "fo:multi-properties";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_MULTI_PROPERTIES;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
index 05edd6e01..f4ebb7407 100644
--- a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
+++ b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
@@ -57,4 +57,11 @@ public class MultiPropertySet extends ToBeImplementedElement {
     public String getName() {
         return "fo:multi-property-set";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_MULTI_PROPERTY_SET;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java
index 61420201a..f14a155e9 100644
--- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java
+++ b/src/java/org/apache/fop/fo/flow/MultiSwitch.java
@@ -49,4 +49,11 @@ public class MultiSwitch extends ToBeImplementedElement {
     public String getName() {
         return "fo:multi-switch";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_MULTI_SWITCH;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/MultiToggle.java b/src/java/org/apache/fop/fo/flow/MultiToggle.java
index 06e129c26..25034ca26 100644
--- a/src/java/org/apache/fop/fo/flow/MultiToggle.java
+++ b/src/java/org/apache/fop/fo/flow/MultiToggle.java
@@ -49,4 +49,11 @@ public class MultiToggle extends ToBeImplementedElement {
     public String getName() {
         return "fo:multi-toggle";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_MULTI_TOGGLE;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index 678c77205..dfee543bd 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -107,4 +107,8 @@ public class PageNumber extends FObj {
     public String getName() {
         return "fo:page-number";
     }
+    
+    public int getNameId() {
+        return FO_PAGE_NUMBER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
index 514891031..6195bf3bd 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
@@ -223,4 +223,11 @@ public class PageNumberCitation extends FObj {
          }
          return inline;
      }
+     
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_PAGE_NUMBER_CITATION;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
index b151f6068..d3f1cc96d 100644
--- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -96,4 +96,12 @@ public class RetrieveMarker extends FObjMixed implements LMVisited {
     public String getName() {
         return "fo:retrieve-marker";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_RETRIEVE_MARKER;
+    }
+
 }
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index 8524e162c..6778f01aa 100644
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -208,4 +208,11 @@ public class Table extends FObj implements LMVisited {
     public String getName() {
         return "fo:table";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/TableAndCaption.java
index b87b23c8c..872eb99bd 100644
--- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java
+++ b/src/java/org/apache/fop/fo/flow/TableAndCaption.java
@@ -84,5 +84,12 @@ public class TableAndCaption extends ToBeImplementedElement {
     public String getName() {
         return "fo:table-and-caption";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_AND_CAPTION;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java
index 739a4277e..4bf3e1e82 100644
--- a/src/java/org/apache/fop/fo/flow/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/TableBody.java
@@ -112,5 +112,12 @@ public class TableBody extends FObj implements LMVisited {
     public String getName() {
         return "fo:table-body";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_BODY;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/TableCaption.java
index ec8cacfe4..650de9b08 100644
--- a/src/java/org/apache/fop/fo/flow/TableCaption.java
+++ b/src/java/org/apache/fop/fo/flow/TableCaption.java
@@ -77,5 +77,12 @@ public class TableCaption extends ToBeImplementedElement {
     public String getName() {
         return "fo:table-caption";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_CAPTION;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java
index 6157de628..041901aa4 100644
--- a/src/java/org/apache/fop/fo/flow/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/TableCell.java
@@ -356,5 +356,11 @@ public class TableCell extends FObj {
     public String getName() {
         return "fo:table-cell";
     }
-    
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_CELL;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index d7ff1dbcf..9350eaa7d 100644
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -129,5 +129,12 @@ public class TableColumn extends FObj {
     public String getName() {
         return "fo:table-column";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_COLUMN;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/flow/TableFooter.java b/src/java/org/apache/fop/fo/flow/TableFooter.java
index 411349da1..b2816df9c 100644
--- a/src/java/org/apache/fop/fo/flow/TableFooter.java
+++ b/src/java/org/apache/fop/fo/flow/TableFooter.java
@@ -43,4 +43,11 @@ public class TableFooter extends TableBody implements LMVisited {
     public String getName() {
         return "fo:table-footer";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_FOOTER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/TableHeader.java b/src/java/org/apache/fop/fo/flow/TableHeader.java
index b9698d3d3..f2960147c 100644
--- a/src/java/org/apache/fop/fo/flow/TableHeader.java
+++ b/src/java/org/apache/fop/fo/flow/TableHeader.java
@@ -43,4 +43,11 @@ public class TableHeader extends TableBody implements LMVisited {
     public String getName() {
         return "fo:table-header";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_HEADER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 7ddf4d9d1..d45be3bc8 100644
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -153,4 +153,10 @@ public class TableRow extends FObj {
         return "fo:table-row";
     }
 
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TABLE_ROW;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/flow/Wrapper.java b/src/java/org/apache/fop/fo/flow/Wrapper.java
index 81c48649c..bf7eee07b 100644
--- a/src/java/org/apache/fop/fo/flow/Wrapper.java
+++ b/src/java/org/apache/fop/fo/flow/Wrapper.java
@@ -56,5 +56,11 @@ public class Wrapper extends FObjMixed implements LMVisited {
         return "fo:wrapper";
     }
 
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_WRAPPER;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java
index 4694fca75..eedfabc32 100644
--- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java
+++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java
@@ -111,7 +111,17 @@ public class ColorProfile extends FObj {
         }
     }
 
+    /**
+     * @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;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
index 7b30535aa..8793f957b 100644
--- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
@@ -172,7 +172,17 @@ public class ConditionalPageMasterReference extends FObj {
         }
     }
 
+    /**
+     * @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;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java
index 7cc553385..fa815a284 100644
--- a/src/java/org/apache/fop/fo/pagination/Declarations.java
+++ b/src/java/org/apache/fop/fo/pagination/Declarations.java
@@ -104,7 +104,17 @@ public class Declarations extends FObj {
         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;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java
index 88d4f1d8b..b659d1e5b 100644
--- a/src/java/org/apache/fop/fo/pagination/Flow.java
+++ b/src/java/org/apache/fop/fo/pagination/Flow.java
@@ -181,4 +181,11 @@ public class Flow extends FObj {
     public String getName() {
         return "fo:flow";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_FLOW;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
index ec5c5fff7..2d143e421 100644
--- a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
+++ b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
@@ -218,5 +218,12 @@ public class LayoutMasterSet extends FObj {
     public String getName() {
         return "fo:layout-master-set";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_LAYOUT_MASTER_SET;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 7802a63c7..f29708d4c 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -746,4 +746,11 @@ public class PageSequence extends FObj {
     public String getName() {
         return "fo:page-sequence";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_PAGE_SEQUENCE;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
index 6d87d5315..043ca8176 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -201,5 +201,12 @@ public class PageSequenceMaster extends FObj {
     public String getName() {
         return "fo:page-sequence-master";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_PAGE_SEQUENCE_MASTER;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
index 71d036430..b5e4ea5de 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java
@@ -71,5 +71,12 @@ public class RegionAfter extends RegionBA {
     public String getName() {
         return "fo:region-after";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_REGION_AFTER;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
index 42cf4910f..d70f2c0d2 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java
@@ -76,5 +76,12 @@ public class RegionBefore extends RegionBA {
     public String getName() {
         return "fo:region-before";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_REGION_BEFORE;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index 002c8e662..52a491b74 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -109,4 +109,11 @@ public class RegionBody extends Region {
     public String getName() {
         return "fo:region-body";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_REGION_BODY;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
index 3254fd3b6..8e07eaccc 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java
@@ -72,5 +72,12 @@ public class RegionEnd extends RegionSE {
     public String getName() {
         return "fo:region-end";
     }
+    
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_REGION_END;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java
index f58750505..b02626ea6 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionStart.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java
@@ -71,5 +71,12 @@ public class RegionStart extends RegionSE {
     public String getName() {
         return "fo:region-start";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_REGION_START;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
index f7f37757b..300d8d8d3 100644
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
@@ -157,4 +157,11 @@ public class RepeatablePageMasterAlternatives extends FObj
     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;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
index 060a19d2f..8f6ae241a 100644
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
@@ -106,4 +106,11 @@ public class RepeatablePageMasterReference extends PageMasterReference
     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;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index 5b7d0b5b9..4c81da5c8 100644
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -226,4 +226,12 @@ public class Root extends FObj {
     public String getName() {
         return "fo:root";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_ROOT;
+    }
+
 }
diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
index 07171a7cf..e334988b2 100644
--- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -159,4 +159,11 @@ public class SimplePageMaster extends FObj {
     public String getName() {
         return "fo:simple-page-master";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_SIMPLE_PAGE_MASTER;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
index c1b600790..f90e5c584 100644
--- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
@@ -80,5 +80,12 @@ public class SinglePageMasterReference extends PageMasterReference
     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;
+    }
 }
 
diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java
index 06ab42bc9..3a1b96820 100644
--- a/src/java/org/apache/fop/fo/pagination/StaticContent.java
+++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java
@@ -83,4 +83,11 @@ public class StaticContent extends Flow {
     public String getName() {
         return "fo:static-content";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_STATIC_CONTENT;
+    }
 }
diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java
index 9365c14a2..f887db91b 100644
--- a/src/java/org/apache/fop/fo/pagination/Title.java
+++ b/src/java/org/apache/fop/fo/pagination/Title.java
@@ -98,5 +98,12 @@ public class Title extends FObjMixed {
     public String getName() {
         return "fo:title";
     }
+
+    /**
+     * @see org.apache.fop.fo.FObj#getNameId()
+     */
+    public int getNameId() {
+        return FO_TITLE;
+    }
 }