PatchSet 5540
Date: 2004/12/04 23:01:56
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Small JAXP fix for Axis
2004-12-04 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/javax/xml/namespace/QName.java:
(getLocalName) renamed to
(getLocalPart) to match the specification.
* libraries/javalib/gnu/xml/transform/KeyFunction.java,
libraries/javalib/gnu/xml/transform/Stylesheet.java,
libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java,
libraries/javalib/gnu/xml/xpath/NameTest.java,
libraries/javalib/gnu/xml/xpath/NamespaceTest.java,
libraries/javalib/gnu/xml/xpath/XPathParser.java:
Adapted accordingly.
Members:
ChangeLog:1.3086->1.3087
libraries/javalib/gnu/xml/transform/KeyFunction.java:1.1->1.2
libraries/javalib/gnu/xml/transform/Stylesheet.java:1.3->1.4
libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/NameTest.java:1.5->1.6
libraries/javalib/gnu/xml/xpath/NamespaceTest.java:1.1->1.2
libraries/javalib/gnu/xml/xpath/XPathParser.java:1.5->1.6
libraries/javalib/javax/xml/namespace/QName.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3086 kaffe/ChangeLog:1.3087
--- kaffe/ChangeLog:1.3086 Sat Dec 4 21:12:15 2004
+++ kaffe/ChangeLog Sat Dec 4 23:01:56 2004
@@ -1,5 +1,19 @@
2004-12-04 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/javax/xml/namespace/QName.java:
+ (getLocalName) renamed to
+ (getLocalPart) to match the specification.
+
+ * libraries/javalib/gnu/xml/transform/KeyFunction.java,
+ libraries/javalib/gnu/xml/transform/Stylesheet.java,
+ libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java,
+ libraries/javalib/gnu/xml/xpath/NameTest.java,
+ libraries/javalib/gnu/xml/xpath/NamespaceTest.java,
+ libraries/javalib/gnu/xml/xpath/XPathParser.java:
+ Adapted accordingly.
+
+2004-12-04 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in,
libraries/javalib/all.files:
Index: kaffe/libraries/javalib/gnu/xml/transform/KeyFunction.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/KeyFunction.java:1.1
kaffe/libraries/javalib/gnu/xml/transform/KeyFunction.java:1.2
--- kaffe/libraries/javalib/gnu/xml/transform/KeyFunction.java:1.1 Sat Dec
4 21:12:30 2004
+++ kaffe/libraries/javalib/gnu/xml/transform/KeyFunction.java Sat Dec 4
23:02:03 2004
@@ -111,7 +111,7 @@
uri = stylesheet.getNamespaceURI(prefix);
if (uri != null && uri.length() > 0)
{
- String localName = keyName.getLocalName();
+ String localName = keyName.getLocalPart();
keyName = new QName(uri, localName, prefix);
}
}
Index: kaffe/libraries/javalib/gnu/xml/transform/Stylesheet.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/Stylesheet.java:1.3
kaffe/libraries/javalib/gnu/xml/transform/Stylesheet.java:1.4
--- kaffe/libraries/javalib/gnu/xml/transform/Stylesheet.java:1.3 Sat Dec
4 21:12:30 2004
+++ kaffe/libraries/javalib/gnu/xml/transform/Stylesheet.java Sat Dec 4
23:02:03 2004
@@ -859,7 +859,7 @@
if (prefix != null && (uri == null || uri.length() == 0))
{
uri = getNamespaceURI(prefix);
- String localName = qName.getLocalName();
+ String localName = qName.getLocalPart();
qName = new QName(uri, localName, prefix);
}
return qName;
@@ -1046,7 +1046,7 @@
String uri = name.getNamespaceURI();
if (XSL_NS.equals(uri) || uri == null || uri.length() == 0)
{
- String localName = name.getLocalName();
+ String localName = name.getLocalPart();
if ("document".equals(localName) && (arity == 1 || arity == 2))
{
if (current == null)
Index: kaffe/libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java
diff -u
kaffe/libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java:1.1
kaffe/libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java:1.2
--- kaffe/libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java:1.1
Sat Dec 4 21:12:30 2004
+++ kaffe/libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java
Sat Dec 4 23:02:03 2004
@@ -87,7 +87,7 @@
Object systemProperty(QName name)
{
- String localName = name.getLocalName();
+ String localName = name.getLocalPart();
String prefix = name.getPrefix();
String uri = name.getNamespaceURI();
if (Stylesheet.XSL_NS.equals(uri) ||
Index: kaffe/libraries/javalib/gnu/xml/xpath/NameTest.java
diff -u kaffe/libraries/javalib/gnu/xml/xpath/NameTest.java:1.5
kaffe/libraries/javalib/gnu/xml/xpath/NameTest.java:1.6
--- kaffe/libraries/javalib/gnu/xml/xpath/NameTest.java:1.5 Sat Dec 4
21:12:30 2004
+++ kaffe/libraries/javalib/gnu/xml/xpath/NameTest.java Sat Dec 4 23:02:04 2004
@@ -104,7 +104,7 @@
{
return true;
}
- String localName = qName.getLocalName();
+ String localName = qName.getLocalPart();
return (localName.equals(node.getLocalName()));
}
Index: kaffe/libraries/javalib/gnu/xml/xpath/NamespaceTest.java
diff -u kaffe/libraries/javalib/gnu/xml/xpath/NamespaceTest.java:1.1
kaffe/libraries/javalib/gnu/xml/xpath/NamespaceTest.java:1.2
--- kaffe/libraries/javalib/gnu/xml/xpath/NamespaceTest.java:1.1 Sat Dec
4 21:12:30 2004
+++ kaffe/libraries/javalib/gnu/xml/xpath/NamespaceTest.java Sat Dec 4
23:02:04 2004
@@ -98,7 +98,7 @@
{
return true;
}
- String localName = qName.getLocalName();
+ String localName = qName.getLocalPart();
return (localName.equals(node.getLocalName()));
}
Index: kaffe/libraries/javalib/gnu/xml/xpath/XPathParser.java
diff -u kaffe/libraries/javalib/gnu/xml/xpath/XPathParser.java:1.5
kaffe/libraries/javalib/gnu/xml/xpath/XPathParser.java:1.6
--- kaffe/libraries/javalib/gnu/xml/xpath/XPathParser.java:1.5 Sat Dec 4
21:12:31 2004
+++ kaffe/libraries/javalib/gnu/xml/xpath/XPathParser.java Sat Dec 4
23:02:04 2004
@@ -73,7 +73,7 @@
if (prefix != null && (uri == null || uri.length() == 0))
{
uri = namespaceContext.getNamespaceURI(prefix);
- String localName = qName.getLocalName();
+ String localName = qName.getLocalPart();
qName = new QName(uri, localName, prefix);
}
}
Index: kaffe/libraries/javalib/javax/xml/namespace/QName.java
diff -u kaffe/libraries/javalib/javax/xml/namespace/QName.java:1.4
kaffe/libraries/javalib/javax/xml/namespace/QName.java:1.5
--- kaffe/libraries/javalib/javax/xml/namespace/QName.java:1.4 Sat Dec 4
21:12:31 2004
+++ kaffe/libraries/javalib/javax/xml/namespace/QName.java Sat Dec 4
23:02:05 2004
@@ -51,7 +51,7 @@
{
private final String namespaceURI;
- private final String localName;
+ private final String localPart;
private final String prefix;
public QName(String namespaceURI, String localPart)
@@ -74,7 +74,7 @@
prefix = XMLConstants.DEFAULT_NS_PREFIX;
}
this.namespaceURI = namespaceURI;
- this.localName = localPart;
+ this.localPart = localPart;
this.prefix = prefix;
}
@@ -88,9 +88,9 @@
return namespaceURI;
}
- public String getLocalName()
+ public String getLocalPart()
{
- return localName;
+ return localPart;
}
public String getPrefix()
@@ -103,7 +103,7 @@
if (obj instanceof QName)
{
QName qname = (QName) obj;
- return qname.getLocalName().equals(localName) &&
+ return qname.getLocalPart().equals(localPart) &&
qname.getNamespaceURI().equals(namespaceURI);
}
return false;
@@ -128,7 +128,7 @@
buf.append(prefix);
buf.append(':');
}
- buf.append(localName);
+ buf.append(localPart);
return buf.toString();
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
