You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by rp...@locus.apache.org on 2000/01/05 02:36:33 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/framework XMLDTDScanner.java XMLParser.java
rpfeiffe 00/01/04 17:36:33
Modified: java/src/org/apache/xerces/framework XMLDTDScanner.java
XMLParser.java
Log:
Update the Namespaces impl and added support for all DOM Level 2 core
We should now match the match the W3C CR from 991210.
-rip
Revision Changes Path
1.2 +16 -0 xml-xerces/java/src/org/apache/xerces/framework/XMLDTDScanner.java
Index: XMLDTDScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLDTDScanner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLDTDScanner.java 1999/11/09 01:12:56 1.1
+++ XMLDTDScanner.java 2000/01/05 01:36:33 1.2
@@ -648,6 +648,12 @@
* @exception java.lang.Exception
*/
public int scanDefaultAttValue(int elementType, int attrName, int attType, int enumeration) throws Exception;
+
+ /**
+ * Supports DOM Level 2 internalSubset additions.
+ * Called when the internal subset is completely scanned.
+ */
+ public void internalSubset(int internalSubset);
}
//
//
@@ -1335,6 +1341,7 @@
*/
public void scanDecls(boolean extSubset) throws Exception
{
+ int subsetOffset = fEntityReader.currentOffset();
if (extSubset)
fExternalSubsetReader = fReaderId;
fIncludeSectDepth = 0;
@@ -1343,6 +1350,10 @@
while (fScannerState == SCANNER_STATE_MARKUP_DECL) {
boolean newParseTextDecl = false;
if (!extSubset && fEntityReader.lookingAtChar(']', true)) {
+ fEventHandler.internalSubset(
+ fEntityReader.addString(subsetOffset,
+ (fEntityReader.currentOffset()-subsetOffset)-1));
+
restoreScannerState(prevState);
return;
}
@@ -1466,6 +1477,11 @@
}
if (extSubset)
fEventHandler.stopReadingFromExternalSubset();
+ else
+ fEventHandler.internalSubset(
+ fEntityReader.addString(subsetOffset,
+ (fEntityReader.currentOffset()-subsetOffset)));
+
}
//
1.4 +7 -0 xml-xerces/java/src/org/apache/xerces/framework/XMLParser.java
Index: XMLParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLParser.java 1999/12/09 22:36:10 1.3
+++ XMLParser.java 2000/01/05 01:36:33 1.4
@@ -468,6 +468,13 @@
* @exception java.lang.Exception
*/
public abstract void endNamespaceDeclScope(int prefix) throws Exception;
+
+ /**
+ * Supports DOM Level 2 internalSubset additions.
+ * Called when the internal subset is completely scanned.
+ */
+ public abstract void internalSubset(int internalSubset);
+
/**
* callback for the start of element.