morten 01/08/14 04:51:26
Modified: java/src/org/apache/xalan/xsltc/compiler LiteralElement.java
Parser.java
Log:
Fix for outputting all necessary namespace declarations with LREs.
PR: bugzilla 2863
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
Index: LiteralElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LiteralElement.java 2001/08/08 09:17:09 1.9
+++ LiteralElement.java 2001/08/14 11:51:26 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LiteralElement.java,v 1.9 2001/08/08 09:17:09 morten Exp $
+ * @(#)$Id: LiteralElement.java,v 1.10 2001/08/14 11:51:26 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -377,7 +377,7 @@
final String prefix = (String)e.nextElement();
final String uri = (String)_accessedPrefixes.get(prefix);
if ((uri != Constants.EMPTYSTRING) ||
- (prefix != Constants.EMPTYSTRING)) {
+ (prefix == Constants.EMPTYSTRING)) {
il.append(methodGen.loadHandler());
il.append(new PUSH(cpg,prefix));
il.append(new PUSH(cpg,uri));
1.22 +13 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Parser.java 2001/08/13 13:33:14 1.21
+++ Parser.java 2001/08/14 11:51:26 1.22
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Parser.java,v 1.21 2001/08/13 13:33:14 morten Exp $
+ * @(#)$Id: Parser.java,v 1.22 2001/08/14 11:51:26 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -1019,7 +1019,7 @@
public void startPrefixMapping(String prefix, String uri) {
if (_prefixMapping == null) _prefixMapping = new Hashtable();
_prefixMapping.put(prefix, uri);
- //System.err.println("starting mapping for "+prefix+"="+uri);
+ //System.err.println("starting mapping for \""+prefix+"\"=\""+uri+"\"");
}
/**
@@ -1027,7 +1027,7 @@
* This has to be passed on to the symbol table!
*/
public void endPrefixMapping(String prefix) {
- //System.err.println("ending mapping for "+prefix);
+ //System.err.println("ending mapping for \""+prefix+"\"");
}
/**
@@ -1038,7 +1038,11 @@
public void startElement(String uri, String localname,
String qname, Attributes attributes)
throws SAXException {
-
+ /*
+ System.err.println("start element uri=\""+uri+
+ "\", local=\""+localname+
+ "\", qname=\""+qname+"\"");
+ */
final int col = qname.lastIndexOf(':');
final String prefix;
if (col == -1)
@@ -1085,6 +1089,11 @@
* SAX2: Receive notification of the end of an element.
*/
public void endElement(String uri, String localname, String qname) {
+ /*
+ System.err.println("end element uri=\""+uri+
+ "\", local=\""+localname+
+ "\", qname=\""+qname+"\"");
+ */
_parentStack.pop();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
