mrglavas 2003/07/25 12:41:10
Modified: java/src/org/apache/xerces/impl XML11DTDScannerImpl.java
XML11DocumentScannerImpl.java XMLScanner.java
Log:
Added a VersionNotSupported message key for XML 1.1.
Revision Changes Path
1.7 +8 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XML11DTDScannerImpl.java 8 May 2003 20:11:54 -0000 1.6
+++ XML11DTDScannerImpl.java 25 Jul 2003 19:41:10 -0000 1.7
@@ -230,5 +230,12 @@
protected boolean versionSupported(String version) {
return version.equals("1.1") || version.equals ("1.0");
} // versionSupported(String): boolean
+
+ // returns the error message key for unsupported
+ // versions of XML with respect to the version of
+ // XML understood by this scanner.
+ protected String getVersionNotSupportedKey () {
+ return "VersionNotSupported11";
+ } // getVersionNotSupportedKey: String
} // class XML11DTDScannerImpl
1.12 +8 -1
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XML11DocumentScannerImpl.java 25 Jul 2003 17:22:58 -0000 1.11
+++ XML11DocumentScannerImpl.java 25 Jul 2003 19:41:10 -0000 1.12
@@ -677,5 +677,12 @@
protected boolean versionSupported(String version) {
return (version.equals("1.1") || version.equals("1.0"));
} // versionSupported(String): boolean
+
+ // returns the error message key for unsupported
+ // versions of XML with respect to the version of
+ // XML understood by this scanner.
+ protected String getVersionNotSupportedKey () {
+ return "VersionNotSupported11";
+ } // getVersionNotSupportedKey: String
} // class XML11DocumentScannerImpl
1.35 +9 -2 xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XMLScanner.java 13 Jul 2003 21:24:28 -0000 1.34
+++ XMLScanner.java 25 Jul 2003 19:41:10 -0000 1.35
@@ -410,7 +410,7 @@
version = fString.toString();
state = STATE_ENCODING;
if (!versionSupported(version)) {
- reportFatalError("VersionNotSupported",
+ reportFatalError(getVersionNotSupportedKey(),
new Object[]{version});
}
}
@@ -1320,6 +1320,13 @@
protected boolean versionSupported(String version ) {
return version.equals("1.0");
} // version Supported
+
+ // returns the error message key for unsupported
+ // versions of XML with respect to the version of
+ // XML understood by this scanner.
+ protected String getVersionNotSupportedKey () {
+ return "VersionNotSupported";
+ } // getVersionNotSupportedKey: String
/**
* Scans surrogates and append them to the specified buffer.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
