pbwest 2004/01/14 18:56:18
Modified: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
UriLocalName.java XMLEvent.java FoXMLEvent.java
SyncedXmlEventsBuffer.java NameSpaceType.java
FoXmlSerialHandler.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java FoRoot.java FONode.java
src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design
XMLEventPool.java
Added: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
Namespaces.java
Log:
XMLNamespaces renamed to Namespaces
Revision Changes Path
No revision
No revision
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/xml/Attic/UriLocalName.java
Index: UriLocalName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/UriLocalName.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- UriLocalName.java 14 Jan 2004 15:42:29 -0000 1.1.2.2
+++ UriLocalName.java 15 Jan 2004 02:56:18 -0000 1.1.2.3
@@ -67,7 +67,7 @@
/**
* @param uriIndex - the index of the namespace URI maintained in
- * the associated <tt>XMLNamespaces</tt> object.
+ * the associated <tt>Namespaces</tt> object.
* @param localName - the local name of the event.
*/
public UriLocalName(int uriIndex, String localName, int sequence) {
@@ -77,7 +77,7 @@
}
public Poolable clear() {
- uriIndex = XMLNamespaces.NO_NAMESPACE;
+ uriIndex = Namespaces.NO_NAMESPACE;
localName = "";
return this;
}
1.1.2.5 +14 -14 xml-fop/src/java/org/apache/fop/xml/Attic/XMLEvent.java
Index: XMLEvent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/XMLEvent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLEvent.java 14 Jan 2004 16:22:12 -0000 1.1.2.4
+++ XMLEvent.java 15 Jan 2004 02:56:18 -0000 1.1.2.5
@@ -106,11 +106,11 @@
// the basic XML events are unlikely to change.
protected int type = NOEVENT;
protected String chars;
- protected int uriIndex = XMLNamespaces.DefAttrNSIndex;
+ protected int uriIndex = Namespaces.DefAttrNSIndex;
protected String localName;
protected String qName;
protected AttributesImpl attributes;
- protected XMLNamespaces namespaces;
+ protected Namespaces namespaces;
/**
* The one-argument constructor uses the default initialization values:
@@ -121,7 +121,7 @@
* namespace
* @param uriIndex the namespace index
*/
- public XMLEvent (XMLNamespaces namespaces, int sequence, int uriIndex ) {
+ public XMLEvent (Namespaces namespaces, int sequence, int uriIndex ) {
super(sequence);
this.namespaces = namespaces;
this.uriIndex = uriIndex;
@@ -140,7 +140,7 @@
* @param attributes the AttributesImpl containing the element
* attributes, if any
*/
- public XMLEvent(XMLNamespaces namespaces, int sequence,
+ public XMLEvent(Namespaces namespaces, int sequence,
int type, String chars, int uriIndex,
String localName, String qName,
AttributesImpl attributes)
@@ -179,7 +179,7 @@
* @param chars in this event, if any
* @param namespaces the object maintaing URIs and their indices
*/
- public XMLEvent(XMLNamespaces namespaces, int sequence,
+ public XMLEvent(Namespaces namespaces, int sequence,
int uriIndex, int type, String chars) {
super(sequence);
this.namespaces = namespaces;
@@ -341,18 +341,18 @@
}
/**
- * Set the <tt>XMLNamespaces</tt> object associated with this event.
- * @param namespaces the XMLNamespaces
+ * Set the <tt>Namespaces</tt> object associated with this event.
+ * @param namespaces the Namespaces
*/
- public void setNamespaces(XMLNamespaces namespaces) {
+ public void setNamespaces(Namespaces namespaces) {
this.namespaces = namespaces;
}
/**
- * Get the <tt>XMLNamespaces</tt> object associated with this event.
- * @return the <tt>XMLNamespaces</tt> object.
+ * Get the <tt>Namespaces</tt> object associated with this event.
+ * @return the <tt>Namespaces</tt> object.
*/
- public XMLNamespaces getNamespaces() { return namespaces; }
+ public Namespaces getNamespaces() { return namespaces; }
/**
* Illegal operation in superclass
1.1.2.4 +8 -8 xml-fop/src/java/org/apache/fop/xml/Attic/FoXMLEvent.java
Index: FoXMLEvent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXMLEvent.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoXMLEvent.java 14 Jan 2004 16:27:19 -0000 1.1.2.3
+++ FoXMLEvent.java 15 Jan 2004 02:56:18 -0000 1.1.2.4
@@ -75,12 +75,12 @@
private int foType = FObjectNames.NO_FO;
/**
- * @param namespaces the <code>XMLNamespaces</code> object
+ * @param namespaces the <code>Namespaces</code> object
* @param sequence the sequence number of the event within its
* namespace
* @param uriIndex the namesopace index
*/
- public FoXMLEvent (XMLNamespaces namespaces, int sequence, int uriIndex) {
+ public FoXMLEvent (Namespaces namespaces, int sequence, int uriIndex) {
super(namespaces, sequence, uriIndex);
}
@@ -88,7 +88,7 @@
* The fully defined constructor takes values for each of the data
* elements.
*/
- public FoXMLEvent(XMLNamespaces namespaces, int sequence,
+ public FoXMLEvent(Namespaces namespaces, int sequence,
int type, String chars, int uriIndex,
String localName, String qName,
AttributesImpl attributes,
@@ -110,12 +110,12 @@
foType = ev.foType;
}
- public FoXMLEvent(XMLNamespaces namespaces, int sequence,
+ public FoXMLEvent(Namespaces namespaces, int sequence,
int uriIndex, int type, String chars) {
super(namespaces, sequence, uriIndex, type, chars);
}
- public FoXMLEvent(XMLNamespaces namespaces, int sequence,
+ public FoXMLEvent(Namespaces namespaces, int sequence,
int type, int uriIndex, AttributesImpl attributes, int foType) {
super(namespaces, sequence, uriIndex);
this.type = type;
1.1.2.2 +18 -18
xml-fop/src/java/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java
Index: SyncedXmlEventsBuffer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SyncedXmlEventsBuffer.java 14 Jan 2004 15:36:39 -0000 1.1.2.1
+++ SyncedXmlEventsBuffer.java 15 Jan 2004 02:56:18 -0000 1.1.2.2
@@ -82,7 +82,7 @@
* Maintains an index of namespace URIs. These can then be referred to
* by an <tt>int</tt> index.
*/
- private XMLNamespaces namespaces;
+ private Namespaces namespaces;
/**
* No-argument constructor sets up a buffer with the default number of
@@ -94,7 +94,7 @@
throws IllegalArgumentException
{
super();
- namespaces = new XMLNamespaces();
+ namespaces = new Namespaces();
}
/**
@@ -105,14 +105,14 @@
throws IllegalArgumentException
{
super(size);
- namespaces = new XMLNamespaces();
+ namespaces = new Namespaces();
}
/**
- * Get the <tt>XMLNamespaces</tt> from this buffer.
+ * Get the <tt>Namespaces</tt> from this buffer.
* @return - the namespaces object.
*/
- public XMLNamespaces getNamespaces() { return namespaces; }
+ public Namespaces getNamespaces() { return namespaces; }
/**
* @return next event from the SyncedCircularBuffer
@@ -182,7 +182,7 @@
* Discard intervening events.
* @param eventType the SAX event type.
* @param uriIndex the URI index maintained in the
- * <tt>XMLNamespaces</tt> object.
+ * <tt>Namespaces</tt> object.
* @param localName of the required element.
* @return an event of the given type.
* @exception FOPException if buffer errors or interrupts occur.
@@ -225,22 +225,22 @@
while (ev != null) {
if (ev.type == eventType && ev.uriIndex == uriIndex) {
switch (uriIndex) {
- case XMLNamespaces.DefAttrNSIndex:
+ case Namespaces.DefAttrNSIndex:
throw new NoSuchElementException
("No special types for default attribute namespace");
- case XMLNamespaces.XSLNSpaceIndex:
+ case Namespaces.XSLNSpaceIndex:
// The FO namespace
if (ev.getFoType() == nsType) {
return ev;
}
break;
- case XMLNamespaces.FOXNSpaceIndex:
+ case Namespaces.FOXNSpaceIndex:
// The FOX namespace
if (ev.getFoxType() == nsType) {
return ev;
}
break;
- case XMLNamespaces.SVGNSpaceIndex:
+ case Namespaces.SVGNSpaceIndex:
// The SVG namespace
if (ev.getSvgType() == nsType) {
return ev;
@@ -270,7 +270,7 @@
throws FOPException
{
return getSaxUriTypedEvent(
- eventType, XMLNamespaces.XSLNSpaceIndex, foType);
+ eventType, Namespaces.XSLNSpaceIndex, foType);
}
/**
@@ -421,22 +421,22 @@
}
if (ev != null && ev.type == eventType) {
switch (uriIndex) {
- case XMLNamespaces.DefAttrNSIndex:
+ case Namespaces.DefAttrNSIndex:
throw new NoSuchElementException
("No special types for default attribute namespace");
- case XMLNamespaces.XSLNSpaceIndex:
+ case Namespaces.XSLNSpaceIndex:
// The FO namespace
if (ev.getFoType() == nsType) {
return ev;
}
break;
- case XMLNamespaces.FOXNSpaceIndex:
+ case Namespaces.FOXNSpaceIndex:
// The FOX namespace
if (ev.getFoxType() == nsType) {
return ev;
}
break;
- case XMLNamespaces.SVGNSpaceIndex:
+ case Namespaces.SVGNSpaceIndex:
// The SVG namespace
if (ev.getSvgType() == nsType) {
return ev;
@@ -472,7 +472,7 @@
throws FOPException
{
return expectSaxUriTypedEvent(
- eventType, XMLNamespaces.XSLNSpaceIndex,
+ eventType, Namespaces.XSLNSpaceIndex,
foType, discardWhiteSpace);
}
1.1.2.2 +3 -3 xml-fop/src/java/org/apache/fop/xml/Attic/NameSpaceType.java
Index: NameSpaceType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/NameSpaceType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NameSpaceType.java 14 Jan 2004 15:47:13 -0000 1.1.2.1
+++ NameSpaceType.java 15 Jan 2004 02:56:18 -0000 1.1.2.2
@@ -70,7 +70,7 @@
}
public Poolable clear() {
- nsType = XMLNamespaces.NO_NS_TYPE;
+ nsType = Namespaces.NO_NS_TYPE;
return super.clear();
}
}
1.1.2.2 +10 -10
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
Index: FoXmlSerialHandler.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoXmlSerialHandler.java 15 Jan 2004 02:00:20 -0000 1.1.2.1
+++ FoXmlSerialHandler.java 15 Jan 2004 02:56:18 -0000 1.1.2.2
@@ -66,7 +66,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.Namespaces;
/**
* <tt>FoXmlSerialHandler</tt> is the <tt>ContentHandler</tt> for the
@@ -80,7 +80,7 @@
private SyncedXmlEventsBuffer events;
private XMLReader parser;
- private XMLNamespaces namespaces;
+ private Namespaces namespaces;
private InputSource source;
private Thread foThread;
private boolean errorDump;
@@ -145,7 +145,7 @@
*/
public void startDocument() throws NoSuchElementException {
synchronized (events) {
- XMLEvent event = acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ XMLEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("StartDocument thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.STARTDOCUMENT;
@@ -159,7 +159,7 @@
*/
public void endDocument() throws NoSuchElementException {
synchronized (events) {
- XMLEvent event = acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ XMLEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("EndDocument thread "
//+ Thread.currentThread().getName());
event.type = XMLEvent.ENDDOCUMENT;
@@ -200,7 +200,7 @@
try {
int uriIndex = namespaces.getURIIndex(uri);
XMLEvent event = acquireXMLEvent(uriIndex);
- if (uriIndex == XMLNamespaces.XSLNSpaceIndex) {
+ if (uriIndex == Namespaces.XSLNSpaceIndex) {
event.setFoType(FObjectNames.getFOIndex(localName));
}
//System.out.println("startElement: acquired " + event.id);
@@ -240,7 +240,7 @@
//+ Thread.currentThread().getName());
event.type = XMLEvent.ENDELEMENT;
event.uriIndex = uriIndex;
- if (uriIndex == XMLNamespaces.XSLNSpaceIndex) {
+ if (uriIndex == Namespaces.XSLNSpaceIndex) {
event.setFoType(FObjectNames.getFOIndex(localName));
}
event.localName = localName;
@@ -271,7 +271,7 @@
// downstream processing to determine the environment in
// which the characters belong.
XMLEvent event
- = namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ = namespaces.acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("characters thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.CHARACTERS;
No revision
Index: FoXmlSerialHandler.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoXmlSerialHandler.java 15 Jan 2004 02:00:20 -0000 1.1.2.1
+++ FoXmlSerialHandler.java 15 Jan 2004 02:56:18 -0000 1.1.2.2
@@ -66,7 +66,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.Namespaces;
/**
* <tt>FoXmlSerialHandler</tt> is the <tt>ContentHandler</tt> for the
@@ -80,7 +80,7 @@
private SyncedXmlEventsBuffer events;
private XMLReader parser;
- private XMLNamespaces namespaces;
+ private Namespaces namespaces;
private InputSource source;
private Thread foThread;
private boolean errorDump;
@@ -145,7 +145,7 @@
*/
public void startDocument() throws NoSuchElementException {
synchronized (events) {
- XMLEvent event = acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ XMLEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("StartDocument thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.STARTDOCUMENT;
@@ -159,7 +159,7 @@
*/
public void endDocument() throws NoSuchElementException {
synchronized (events) {
- XMLEvent event = acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ XMLEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("EndDocument thread "
//+ Thread.currentThread().getName());
event.type = XMLEvent.ENDDOCUMENT;
@@ -200,7 +200,7 @@
try {
int uriIndex = namespaces.getURIIndex(uri);
XMLEvent event = acquireXMLEvent(uriIndex);
- if (uriIndex == XMLNamespaces.XSLNSpaceIndex) {
+ if (uriIndex == Namespaces.XSLNSpaceIndex) {
event.setFoType(FObjectNames.getFOIndex(localName));
}
//System.out.println("startElement: acquired " + event.id);
@@ -240,7 +240,7 @@
//+ Thread.currentThread().getName());
event.type = XMLEvent.ENDELEMENT;
event.uriIndex = uriIndex;
- if (uriIndex == XMLNamespaces.XSLNSpaceIndex) {
+ if (uriIndex == Namespaces.XSLNSpaceIndex) {
event.setFoType(FObjectNames.getFOIndex(localName));
}
event.localName = localName;
@@ -271,7 +271,7 @@
// downstream processing to determine the environment in
// which the characters belong.
XMLEvent event
- = namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ = namespaces.acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("characters thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.CHARACTERS;
No revision
Index: FoXmlSerialHandler.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoXmlSerialHandler.java 15 Jan 2004 02:00:20 -0000 1.1.2.1
+++ FoXmlSerialHandler.java 15 Jan 2004 02:56:18 -0000 1.1.2.2
@@ -66,7 +66,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.Namespaces;
/**
* <tt>FoXmlSerialHandler</tt> is the <tt>ContentHandler</tt> for the
@@ -80,7 +80,7 @@
private SyncedXmlEventsBuffer events;
private XMLReader parser;
- private XMLNamespaces namespaces;
+ private Namespaces namespaces;
private InputSource source;
private Thread foThread;
private boolean errorDump;
@@ -145,7 +145,7 @@
*/
public void startDocument() throws NoSuchElementException {
synchronized (events) {
- XMLEvent event = acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ XMLEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("StartDocument thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.STARTDOCUMENT;
@@ -159,7 +159,7 @@
*/
public void endDocument() throws NoSuchElementException {
synchronized (events) {
- XMLEvent event = acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ XMLEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("EndDocument thread "
//+ Thread.currentThread().getName());
event.type = XMLEvent.ENDDOCUMENT;
@@ -200,7 +200,7 @@
try {
int uriIndex = namespaces.getURIIndex(uri);
XMLEvent event = acquireXMLEvent(uriIndex);
- if (uriIndex == XMLNamespaces.XSLNSpaceIndex) {
+ if (uriIndex == Namespaces.XSLNSpaceIndex) {
event.setFoType(FObjectNames.getFOIndex(localName));
}
//System.out.println("startElement: acquired " + event.id);
@@ -240,7 +240,7 @@
//+ Thread.currentThread().getName());
event.type = XMLEvent.ENDELEMENT;
event.uriIndex = uriIndex;
- if (uriIndex == XMLNamespaces.XSLNSpaceIndex) {
+ if (uriIndex == Namespaces.XSLNSpaceIndex) {
event.setFoType(FObjectNames.getFOIndex(localName));
}
event.localName = localName;
@@ -271,7 +271,7 @@
// downstream processing to determine the environment in
// which the characters belong.
XMLEvent event
- = namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ = namespaces.acquireXMLEvent(Namespaces.DefAttrNSIndex);
//System.out.println("characters thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.CHARACTERS;
1.1.2.1 +383 -0 xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java
No revision
No revision
1.1.2.6 +10 -10 xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FOAttributes.java 14 Jan 2004 15:07:46 -0000 1.1.2.5
+++ FOAttributes.java 15 Jan 2004 02:56:18 -0000 1.1.2.6
@@ -69,7 +69,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.Namespaces;
/**
* The FO Attributes data structures and methods needed to manage the
@@ -86,7 +86,7 @@
* <tt>HashMap</tt>s which contain the attribute lists for each
* namespace which may be active for a particular FO element. The
* <tt>ArrayList</tt> is indexed by the URIIndex for this namespace
- * which is maintained in an <tt>XMLNamespaces</tt> object by the
+ * which is maintained in an <tt>Namespaces</tt> object by the
* <tt>FOTree</tt> object which is processing the FO input. The
* values in the <tt>HashMap</tt>s are indexed by the local name of the
* attribute.
@@ -157,7 +157,7 @@
int attrUriIndex = foNode.namespaces.getURIIndex(attrUri);
//System.out.println("FONode:" + event);
- if (attrUriIndex == XMLNamespaces.DefAttrNSIndex) {
+ if (attrUriIndex == Namespaces.DefAttrNSIndex) {
// Standard attribute namespace
// Is this a known (valid) property?
int propIndex = PropNames.getPropertyIndex(attrLocalname);
@@ -169,7 +169,7 @@
System.out.println("Creating nSpaceAttrMaps");
nSpaceAttrMaps = new ArrayList(attrUriIndex + 1);
// Add the fo list
- for (int j = 0; j < XMLNamespaces.DefAttrNSIndex; j++)
+ for (int j = 0; j < Namespaces.DefAttrNSIndex; j++)
nSpaceAttrMaps.add(new HashMap(0));
System.out.println("Adding foAttrMap");
@@ -273,7 +273,7 @@
* derived from the one maintained in <i>nSpaceAttrMaps</i>.
*/
public Map getAttrMap(int uriIndex) {
- if (uriIndex == XMLNamespaces.DefAttrNSIndex)
+ if (uriIndex == Namespaces.DefAttrNSIndex)
return Collections.unmodifiableMap(foAttrMap);
if (nSpaceAttrMaps != null) {
if (uriIndex >= nSpaceAttrMaps.size()) return null;
@@ -296,7 +296,7 @@
public String getUriAttrValue(int uriIndex, String localName)
throws PropertyException
{
- if (uriIndex == XMLNamespaces.DefAttrNSIndex)
+ if (uriIndex == Namespaces.DefAttrNSIndex)
return getFoAttrValue(PropNames.getPropertyIndex(localName));
return (String)
(((HashMap)nSpaceAttrMaps.get(uriIndex)).get(localName));
@@ -347,7 +347,7 @@
// the entries from the merging foAttrs
for (int i = 0; i < attrLen; i++) {
// skip foAttrMap
- if (i == XMLNamespaces.DefAttrNSIndex) continue;
+ if (i == Namespaces.DefAttrNSIndex) continue;
((HashMap) nSpaceAttrMaps.get(i))
.putAll(foAttrs.getAttrMap(i));
}
1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoRoot.java 14 Jan 2004 15:19:25 -0000 1.1.2.3
+++ FoRoot.java 15 Jan 2004 02:56:18 -0000 1.1.2.4
@@ -68,7 +68,7 @@
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.Namespaces;
/**
* <tt>FoRoot</tt> is the class which processes the fo:root start element
@@ -221,7 +221,7 @@
// Clean up root's FO tree build environment
makeSparsePropsSet();
// Provide some stats
- for (int i = 0; i <= XMLNamespaces.LAST_NS_INDEX; i++) {
+ for (int i = 0; i <= Namespaces.LAST_NS_INDEX; i++) {
System.out.println("Namespace " + namespaces.getIndexURI(i));
System.out.println("Size of event pool: " +
namespaces.getNSPoolSize(i));
1.2.2.5 +2 -2 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.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- FONode.java 14 Jan 2004 15:02:36 -0000 1.2.2.4
+++ FONode.java 15 Jan 2004 02:56:18 -0000 1.2.2.5
@@ -75,7 +75,7 @@
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
-import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.Namespaces;
/**
* Class for nodes in the FO tree.
@@ -142,7 +142,7 @@
protected final SyncedXmlEventsBuffer xmlevents;
/** The namespaces object associated with <i>xmlevents</i>. */
- protected XMLNamespaces namespaces;
+ protected Namespaces namespaces;
/** The FO type. */
public final int type;
No revision
No revision
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/pool/Attic/XMLEventPool.java
Index: XMLEventPool.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pool/Attic/XMLEventPool.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLEventPool.java 14 Jan 2004 15:38:03 -0000 1.1.2.1
+++ XMLEventPool.java 15 Jan 2004 02:56:18 -0000 1.1.2.2
@@ -65,7 +65,7 @@
private static final String revision = "$Revision$";
/** Required argument for constructing new <tt>XMLEvent</tt>s. */
- //protected final XMLNamespaces namespaces;
+ //protected final Namespaces namespaces;
/**
* The zero-argument constructor
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
