diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2006-01-17 18:09:40 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-01-17 18:09:40 +0000 |
| commit | 2127637945ea6b763966398130e0770fa993c860 (patch) | |
| tree | c976ca91e3ef0bda3b34b37c0195145638d8d08e /libjava/classpath/javax/xml | |
| parent | bcb36c3e02e3bd2843aad1b9888513dfb5d6e337 (diff) | |
| download | gcc-2127637945ea6b763966398130e0770fa993c860.tar.gz | |
Imported GNU Classpath 0.20
Imported GNU Classpath 0.20
* Makefile.am (AM_CPPFLAGS): Add classpath/include.
* java/nio/charset/spi/CharsetProvider.java: New override file.
* java/security/Security.java: Likewise.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r109831
Diffstat (limited to 'libjava/classpath/javax/xml')
| -rw-r--r-- | libjava/classpath/javax/xml/namespace/QName.java | 21 | ||||
| -rw-r--r-- | libjava/classpath/javax/xml/parsers/SAXParserFactory.java | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/libjava/classpath/javax/xml/namespace/QName.java b/libjava/classpath/javax/xml/namespace/QName.java index 19700b32e41..edc6678e350 100644 --- a/libjava/classpath/javax/xml/namespace/QName.java +++ b/libjava/classpath/javax/xml/namespace/QName.java @@ -1,5 +1,5 @@ /* QName.java - An XML qualified name. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004,2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,16 +67,17 @@ public class QName implements Serializable public QName(String namespaceURI, String localPart, String prefix) { if (namespaceURI == null) - { - namespaceURI = XMLConstants.NULL_NS_URI; - } + namespaceURI = XMLConstants.NULL_NS_URI; if (localPart == null) - { - throw new IllegalArgumentException(); - } + throw new IllegalArgumentException(); if (prefix == null) + prefix = XMLConstants.DEFAULT_NS_PREFIX; + else { - prefix = XMLConstants.DEFAULT_NS_PREFIX; + if (XMLConstants.XML_NS_PREFIX.equals(prefix)) + namespaceURI = XMLConstants.XML_NS_URI; + else if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix)) + namespaceURI = XMLConstants.XMLNS_ATTRIBUTE_NS_URI; } this.namespaceURI = namespaceURI; this.localPart = localPart; @@ -151,9 +152,7 @@ public class QName implements Serializable if (start != -1) { if (end < start) - { - throw new IllegalArgumentException(qNameAsString); - } + throw new IllegalArgumentException(qNameAsString); namespaceUri = qNameAsString.substring(start + 1, end); qNameAsString = qNameAsString.substring(end + 1); } diff --git a/libjava/classpath/javax/xml/parsers/SAXParserFactory.java b/libjava/classpath/javax/xml/parsers/SAXParserFactory.java index 8a89fdd92b5..549fe4b5409 100644 --- a/libjava/classpath/javax/xml/parsers/SAXParserFactory.java +++ b/libjava/classpath/javax/xml/parsers/SAXParserFactory.java @@ -115,7 +115,7 @@ public abstract class SAXParserFactory } } while (className == null && count < 3); - return new gnu.xml.aelfred2.JAXPFactory(); + return new gnu.xml.stream.SAXParserFactory(); } private static String getFactoryClassName(ClassLoader loader, int attempt) |