santiagopg 2002/08/12 12:25:46
Modified: java/src/org/apache/xalan/xsltc/runtime/output
SAXHTMLOutput.java
Log:
1. Report attributes with non-empty local names.
2. Ignore attributes reported as content.
Revision Changes Path
1.9 +17 -19
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXHTMLOutput.java
Index: SAXHTMLOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXHTMLOutput.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXHTMLOutput.java 19 Jun 2002 19:24:49 -0000 1.8
+++ SAXHTMLOutput.java 12 Aug 2002 19:25:46 -0000 1.9
@@ -140,7 +140,7 @@
if (_startTagOpen) {
closeStartTag();
}
- _saxHandler.endElement(EMPTYSTRING, EMPTYSTRING, elementName);
+ _saxHandler.endElement(EMPTYSTRING, elementName, elementName);
}
catch (SAXException e) {
throw new TransletException(e);
@@ -151,22 +151,20 @@
public void attribute(String name, final String value)
throws TransletException
{
- final String patchedName = patchName(name);
- final String localName = getLocalName(patchedName);
- final int index = _attributes.getIndex(name);
-
- if (!_startTagOpen) {
- BasisLibrary.runTimeError(BasisLibrary.STRAY_ATTRIBUTE_ERR,name);
- }
-
- if (index >= 0) {
- _attributes.setAttribute(index, EMPTYSTRING, EMPTYSTRING,
- name, "CDATA", value);
- }
- else {
- _attributes.addAttribute(EMPTYSTRING, EMPTYSTRING,
+ if (_startTagOpen) {
+ final String patchedName = patchName(name);
+ final String localName = getLocalName(patchedName);
+ final int index = _attributes.getIndex(name);
+
+ if (index >= 0) {
+ _attributes.setAttribute(index, EMPTYSTRING, localName,
+ name, "CDATA", value);
+ }
+ else {
+ _attributes.addAttribute(EMPTYSTRING, localName,
name, "CDATA", value);
- }
+ }
+ }
}
/**
@@ -194,8 +192,8 @@
_startTagOpen = false;
// Now is time to send the startElement event
- _saxHandler.startElement(null, _elementName, _elementName,
- _attributes);
+ _saxHandler.startElement(EMPTYSTRING, _elementName,
+ _elementName, _attributes);
}
catch (SAXException e) {
throw new TransletException(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
