You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sa...@apache.org on 2002/05/30 19:47:40 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler LiteralElement.java Parser.java
santiagopg 02/05/30 10:47:40
Modified: java/src/org/apache/xalan/xsltc/compiler LiteralElement.java
Parser.java
Log:
Fixed problem with 'xmlns' reported as attribute.
Revision Changes Path
1.18 +6 -4 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LiteralElement.java 24 Apr 2002 17:03:15 -0000 1.17
+++ LiteralElement.java 30 May 2002 17:47:40 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LiteralElement.java,v 1.17 2002/04/24 17:03:15 santiagopg Exp $
+ * @(#)$Id: LiteralElement.java,v 1.18 2002/05/30 17:47:40 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -292,10 +292,12 @@
stable.excludeNamespaces(val);
}
else {
- // Ignore special attributes
+ // Ignore special attributes (e.g. xmlns:prefix and xmlns)
final String prefix = qname.getPrefix();
- if (uri != null && uri.equals(XSLT_URI) ||
- prefix != null && prefix.equals(XMLNS_STRING)) {
+ if (prefix != null && prefix.equals(XMLNS_PREFIX) ||
+ prefix == null && qname.getLocalPart().equals("xmlns") ||
+ uri != null && uri.equals(XSLT_URI))
+ {
continue;
}
1.44 +8 -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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Parser.java 10 May 2002 15:40:02 -0000 1.43
+++ Parser.java 30 May 2002 17:47:40 -0000 1.44
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Parser.java,v 1.43 2002/05/10 15:40:02 santiagopg Exp $
+ * @(#)$Id: Parser.java,v 1.44 2002/05/30 17:47:40 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -252,14 +252,15 @@
String namespace = null;
// Get the namespace uri from the symbol table
- if (prefix.equals("xmlns") == false) {
+ if (prefix.equals(XMLNS_PREFIX) == false) {
namespace = _symbolTable.lookupNamespace(prefix);
if (namespace == null) namespace = EMPTYSTRING;
}
return getQName(namespace, prefix, localname);
}
else {
- final String uri = _symbolTable.lookupNamespace(EMPTYSTRING);
+ final String uri = stringRep.equals(XMLNS_PREFIX) ? null
+ : _symbolTable.lookupNamespace(EMPTYSTRING);
return getQName(uri, null, stringRep);
}
}
@@ -287,7 +288,7 @@
String namespace = null;
// Get the namespace uri from the symbol table
- if (prefix.equals("xmlns") == false) {
+ if (prefix.equals(XMLNS_PREFIX) == false) {
namespace = _symbolTable.lookupNamespace(prefix);
if (namespace == null && reportError) {
final int line = _locator.getLineNumber();
@@ -299,6 +300,9 @@
return getQName(namespace, prefix, localname);
}
else {
+ if (stringRep.equals(XMLNS_PREFIX)) {
+ ignoreDefaultNs = true;
+ }
final String defURI = ignoreDefaultNs ? null
: _symbolTable.lookupNamespace(EMPTYSTRING);
return getQName(defURI, null, stringRep);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org