venu 2003/11/14 03:19:37
Modified: java/src/org/apache/xerces/dom ElementNSImpl.java
AttrNSImpl.java CoreDocumentImpl.java
Log:
CleanUp.
Revision Changes Path
1.40 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/ElementNSImpl.java
Index: ElementNSImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/ElementNSImpl.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ElementNSImpl.java 13 Nov 2003 22:47:15 -0000 1.39
+++ ElementNSImpl.java 14 Nov 2003 11:19:37 -0000 1.40
@@ -328,7 +328,7 @@
msg);
}
if (prefix != null && prefix.length() != 0) {
- if
(!CoreDocumentImpl.isXMLName(prefix,ownerDocument().isXML11Version())) {
+ if
(!ownerDocument().isXMLName(prefix,ownerDocument().isXML11Version())) {
String msg =
DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN,
"INVALID_CHARACTER_ERR", null);
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, msg);
}
1.38 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java
Index: AttrNSImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AttrNSImpl.java 13 Nov 2003 22:47:14 -0000 1.37
+++ AttrNSImpl.java 14 Nov 2003 11:19:37 -0000 1.38
@@ -278,7 +278,7 @@
}
if (prefix != null && prefix.length() != 0) {
- if
(!CoreDocumentImpl.isXMLName(prefix,ownerDocument().isXML11Version())) {
+ if
(!ownerDocument().isXMLName(prefix,ownerDocument().isXML11Version())) {
String msg =
DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN,
"INVALID_CHARACTER_ERR", null);
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, msg);
}
1.57 +8 -18 xml-xerces/java/src/org/apache/xerces/dom/CoreDocumentImpl.java
Index: CoreDocumentImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/CoreDocumentImpl.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- CoreDocumentImpl.java 13 Nov 2003 22:47:14 -0000 1.56
+++ CoreDocumentImpl.java 14 Nov 2003 11:19:37 -0000 1.57
@@ -116,13 +116,16 @@
* @since PR-DOM-Level-1-19980818.
*/
-/**TODO:: Change XML11Char method names similar to XMLChar. That will prevent lot
- * of dirty version checking code.
- */
public class CoreDocumentImpl
extends ParentNode implements Document, DocumentLS {
+ /**TODO::
+ * 1. Change XML11Char method names similar to XMLChar. That will prevent lot
+ * of dirty version checking code.
+ *
+ * 2. IMO during cloneNode qname/isXMLName check should not be made.
+ */
//
// Constants
//
@@ -1274,13 +1277,6 @@
String systemID)
throws DOMException {
- //TODO:: should we be checking qualified name as NCName
- //TODO:: will be fixing in next checkin
-
- if (errorChecking && !isXMLName(qualifiedName,xml11Version)) {
- String msg =
DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN,
"INVALID_CHARACTER_ERR", null);
- throw new DOMException(DOMException.INVALID_CHARACTER_ERR, msg);
- }
return new DocumentTypeImpl(this, qualifiedName, publicID, systemID);
} // createDocumentType(String):DocumentType
@@ -2016,14 +2012,8 @@
* elements and attributes and so on using the XMLCharacterProperties
* utility class
*/
- public static boolean isXMLName(String s) {
- if (s == null) {
- return false;
- }
- return XMLChar.isValidName(s);
- }
- public static boolean isXMLName(String s, boolean xml11Version) {
+ protected boolean isXMLName(String s, boolean xml11Version) {
if (s == null) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
