mmidy 00/10/02 08:33:17
Modified: java/src/org/apache/xalan/templates ElemElement.java
Log:
start element before processing namespace attribute
Revision Changes Path
1.3 +7 -3
xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java
Index: ElemElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemElement.java 2000/07/05 14:40:06 1.2
+++ ElemElement.java 2000/10/02 15:33:15 1.3
@@ -215,6 +215,7 @@
}
// Only do this if name is valid
String elemNameSpace = null;
+ String prefix = null;
if(null != elemName && null != ns)
{
if(null != m_namespace_avt)
@@ -225,14 +226,13 @@
if(null != elemNameSpace && elemNameSpace.length()>0)
{
// Get the prefix for that attribute in the result namespace.
- String prefix = rhandler.getPrefix(elemNameSpace);
+ prefix = rhandler.getPrefix(elemNameSpace);
// If we didn't find the prefix mapping, make up a prefix
// and have it declared in the result tree.
if(null == prefix)
{
- prefix = rhandler.getNewUniqueNSPrefix();
- rhandler.startPrefixMapping(prefix, elemNameSpace);
+ prefix = rhandler.getNewUniqueNSPrefix();
}
// add the prefix to the attribute name.
elemName = (prefix + ":"+QName.getLocalPart(elemName));
@@ -240,6 +240,10 @@
}
rhandler.startElement(elemNameSpace, QName.getLocalPart(elemName),
elemName);
+ if(null != prefix)
+ {
+ rhandler.startPrefixMapping(prefix, elemNameSpace);
+ }
}
// Instantiate content of xsl:element. Note that if startElement was not
// called(ie: if invalid element name, the element's attributes will be
