mrglavas 2003/06/17 21:15:25
Modified: java/src/org/apache/xerces/impl/dtd XML11DTDValidator.java
Log:
Fixing 2 bugs:
1) Bugzilla# 18429, NPE thrown validating NMTOKEN. Thanks to Neil Delima for the
patch.
2) S production is unchanged in XML 1.1, so shouldn't override isSpace()
Revision Changes Path
1.4 +4 -10
xml-xerces/java/src/org/apache/xerces/impl/dtd/XML11DTDValidator.java
Index: XML11DTDValidator.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/XML11DTDValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XML11DTDValidator.java 3 Mar 2003 21:58:50 -0000 1.3
+++ XML11DTDValidator.java 18 Jun 2003 04:15:25 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation.
+ * Copyright (c) 1999-2003 The Apache Software Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -99,12 +99,6 @@
super.reset(manager);
} //reset(XMLComponentManager)
- // returns whether a character is space according to the
- // version of XML this validator supports.
- protected boolean isSpace(int c) {
- return XML11Char.isXML11Space(c);
- } // isSpace(int): boolean
-
protected void init() {
if(fValidation || fDynamicValidation) {
super.init();
@@ -112,9 +106,9 @@
try {
fValID = fDatatypeValidatorFactory.getBuiltInDV("XML11ID");
- fValIDRef =
fDatatypeValidatorFactory.getBuiltInDV("XML11IDREFS");
+ fValIDRef = fDatatypeValidatorFactory.getBuiltInDV("XML11IDREF");
fValIDRefs =
fDatatypeValidatorFactory.getBuiltInDV("XML11IDREFS");
- fValNMTOKEN =
fDatatypeValidatorFactory.getBuiltInDV("XML11NMTOKENSymbol");
+ fValNMTOKEN =
fDatatypeValidatorFactory.getBuiltInDV("XML11NMTOKEN");
fValNMTOKENS =
fDatatypeValidatorFactory.getBuiltInDV("XML11NMTOKENS");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
