stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8169011: Resizing XML parse trees

Browse Source 
Reviewed-by: dfuchs, lancea, skoivu
This commit is contained in:
Joe Wang 2016-11-22 14:49:33 -08:00
parent d59ed7d863
commit 8af0f26252
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
View File

@ -136,7 +136,7 @@ public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
if (DEBUG_START_END_ELEMENT) if (DEBUG_START_END_ELEMENT)
System.out.println(">>> scanStartElementNS()"); System.out.println(">>> scanStartElementNS()");
// Note: namespace processing is on by default // Note: namespace processing is on by default
fEntityScanner.scanQName(fElementQName, NameType.ATTRIBUTE); fEntityScanner.scanQName(fElementQName, NameType.ELEMENTSTART);
// REVISIT - [Q] Why do we need this local variable? -- mrglavas // REVISIT - [Q] Why do we need this local variable? -- mrglavas
String rawname = fElementQName.rawname; String rawname = fElementQName.rawname;
if (fBindNamespaces) { if (fBindNamespaces) {
@ -346,7 +346,7 @@ public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
protected void scanStartElementName () protected void scanStartElementName ()
throws IOException, XNIException { throws IOException, XNIException {
// Note: namespace processing is on by default // Note: namespace processing is on by default
fEntityScanner.scanQName(fElementQName, NameType.ATTRIBUTE); fEntityScanner.scanQName(fElementQName, NameType.ELEMENTSTART);
// Must skip spaces here because the DTD scanner // Must skip spaces here because the DTD scanner
// would consume them at the end of the external subset. // would consume them at the end of the external subset.
fSawSpace = fEntityScanner.skipSpaces(); fSawSpace = fEntityScanner.skipSpaces();
@ -572,7 +572,7 @@ public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
System.out.println(">>> scanAttribute()"); System.out.println(">>> scanAttribute()");
// name // name
fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTE); fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTENAME);
// equals // equals
fEntityScanner.skipSpaces(); fEntityScanner.skipSpaces();

4
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
View File

@ -1215,7 +1215,7 @@ implements XMLDTDScanner, XMLComponent, XMLEntityHandler {
// definitions // definitions
while (!fEntityScanner.skipChar('>', null)) { while (!fEntityScanner.skipChar('>', null)) {
String name = fEntityScanner.scanName(NameType.ATTRIBUTE); String name = fEntityScanner.scanName(NameType.ATTRIBUTENAME);
if (name == null) { if (name == null) {
reportFatalError("AttNameRequiredInAttDef", reportFatalError("AttNameRequiredInAttDef",
new Object[]{elName}); new Object[]{elName});
@ -1359,7 +1359,7 @@ implements XMLDTDScanner, XMLComponent, XMLEntityHandler {
fMarkUpDepth++; fMarkUpDepth++;
do { do {
skipSeparator(false, !scanningInternalSubset()); skipSeparator(false, !scanningInternalSubset());
String aName = fEntityScanner.scanName(NameType.ATTRIBUTE); String aName = fEntityScanner.scanName(NameType.ATTRIBUTENAME);
if (aName == null) { if (aName == null) {
reportFatalError("MSG_NAME_REQUIRED_IN_NOTATIONTYPE", reportFatalError("MSG_NAME_REQUIRED_IN_NOTATIONTYPE",
new Object[]{elName, atName}); new Object[]{elName, atName});

2
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
View File

@ -405,7 +405,7 @@ public class XMLNSDocumentScannerImpl
if (DEBUG_START_END_ELEMENT) System.out.println(this.getClass().toString() +">>> scanAttribute()"); if (DEBUG_START_END_ELEMENT) System.out.println(this.getClass().toString() +">>> scanAttribute()");
// name // name
fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTE); fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTENAME);
// equals // equals
fEntityScanner.skipSpaces(); fEntityScanner.skipSpaces();