neilg 2002/12/06 16:32:21
Modified: java/src/org/apache/xerces/impl Constants.java
XMLDTDScannerImpl.java
Log:
support for XML 1.1
Revision Changes Path
1.25 +4 -1 xml-xerces/java/src/org/apache/xerces/impl/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Constants.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Constants.java 2 Dec 2002 19:28:45 -0000 1.24
+++ Constants.java 7 Dec 2002 00:32:21 -0000 1.25
@@ -320,6 +320,9 @@
/* Attribute PSVI is stored in augmentations using string "ATTRIBUTE_PSVI" */
public final static String ATTRIBUTE_PSVI = "ATTRIBUTE_PSVI";
+ // XML version constants
+ public final static short XML_VERSION_1_0 = 1;
+ public final static short XML_VERSION_1_1 = 2;
// private
1.34 +23 -5
xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
Index: XMLDTDScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XMLDTDScannerImpl.java 6 Dec 2002 14:47:57 -0000 1.33
+++ XMLDTDScannerImpl.java 7 Dec 2002 00:32:21 -0000 1.34
@@ -473,7 +473,16 @@
*/
public void setDTDHandler(XMLDTDHandler dtdHandler) {
fDTDHandler = dtdHandler;
- } // setDTDHandler
+ } // setDTDHandler(XMLDTDHandler)
+
+ /**
+ * getDTDHandler
+ *
+ * @return the XMLDTDHandler
+ */
+ public XMLDTDHandler getDTDHandler() {
+ return fDTDHandler;
+ } // getDTDHandler(): XMLDTDHandler
//
// XMLDTDContentModelSource methods
@@ -489,6 +498,15 @@
fDTDContentModelHandler = dtdContentModelHandler;
} // setDTDContentModelHandler
+ /**
+ * getDTDContentModelHandler
+ *
+ * @return XMLDTDContentModelHandler
+ */
+ public XMLDTDContentModelHandler getDTDContentModelHandler() {
+ return fDTDContentModelHandler ;
+ } // setDTDContentModelHandler
+
//
// XMLEntityHandler methods
//
@@ -696,10 +714,10 @@
fMarkUpDepth++;
// NOTE: special case where document starts with a PI
// whose name starts with "xml" (e.g. "xmlfoo")
- if (XMLChar.isName(fEntityScanner.peekChar())) {
+ if (isValidNameChar(fEntityScanner.peekChar())) {
fStringBuffer.clear();
fStringBuffer.append("xml");
- while (XMLChar.isName(fEntityScanner.peekChar())) {
+ while (isValidNameChar(fEntityScanner.peekChar())) {
fStringBuffer.append((char)fEntityScanner.scanChar());
}
String target =
@@ -1647,7 +1665,7 @@
if (XMLChar.isHighSurrogate(c)) {
scanSurrogates(fStringBuffer2);
}
- else if (XMLChar.isInvalid(c)) {
+ else if (isInvalidLiteral(c)) {
reportFatalError("InvalidCharInLiteral",
new Object[]{Integer.toHexString(c)});
fEntityScanner.scanChar();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
