mrglavas 2004/01/05 13:54:05
Modified: java/src/org/apache/xerces/impl XML11DTDScannerImpl.java
XML11DocumentScannerImpl.java
Log:
Fixing an edge case. We should reject PIs at the start of an entity
whose targets are of the form 'xml:foo' when namespace support
is enabled.
Revision Changes Path
1.9 +9 -2
xml-xerces/java/src/org/apache/xerces/impl/XML11DTDScannerImpl.java
Index: XML11DTDScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DTDScannerImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XML11DTDScannerImpl.java 16 Dec 2003 21:37:10 -0000 1.8
+++ XML11DTDScannerImpl.java 5 Jan 2004 21:54:05 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation.
+ * Copyright (c) 1999-2004 The Apache Software Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -223,6 +223,13 @@
protected boolean isValidNameStartChar(int value) {
return (XML11Char.isXML11NameStart(value));
} // isValidNameStartChar(int): boolean
+
+ // returns true if the given character is
+ // a valid NCName character with respect to the version of
+ // XML understood by this scanner.
+ protected boolean isValidNCName(int value) {
+ return (XML11Char.isXML11NCName(value));
+ } // isValidNCName(int): boolean
// returns true if the given character is
// a valid high surrogate for a nameStartChar
1.15 +9 -2
xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
Index: XML11DocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XML11DocumentScannerImpl.java 16 Dec 2003 21:37:10 -0000 1.14
+++ XML11DocumentScannerImpl.java 5 Jan 2004 21:54:05 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation.
+ * Copyright (c) 1999-2004 The Apache Software Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -503,6 +503,13 @@
protected boolean isValidNameStartChar(int value) {
return (XML11Char.isXML11NameStart(value));
} // isValidNameStartChar(int): boolean
+
+ // returns true if the given character is
+ // a valid NCName character with respect to the version of
+ // XML understood by this scanner.
+ protected boolean isValidNCName(int value) {
+ return (XML11Char.isXML11NCName(value));
+ } // isValidNCName(int): boolean
// returns true if the given character is
// a valid high surrogate for a nameStartChar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
