You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@locus.apache.org on 2000/10/19 02:16:45 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLDTDScanner.java XMLDocumentScanner.java XMLEntityManager.java XMLEntityScanner.java XMLScanner.java
lehors 00/10/18 17:16:44
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLDTDScanner.java XMLDocumentScanner.java
XMLEntityManager.java XMLEntityScanner.java
XMLScanner.java
Log:
renamed scanAttContent to scanLiteral
Revision Changes Path
No revision
No revision
1.1.2.32 +15 -15 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScanner.java
Index: XMLDTDScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScanner.java,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- XMLDTDScanner.java 2000/10/19 00:13:25 1.1.2.31
+++ XMLDTDScanner.java 2000/10/19 00:16:34 1.1.2.32
@@ -87,7 +87,7 @@
* @author Andy Clark, IBM
* @author Glenn Marcy, IBM
*
- * @version $Id: XMLDTDScanner.java,v 1.1.2.31 2000/10/19 00:13:25 lehors Exp $
+ * @version $Id: XMLDTDScanner.java,v 1.1.2.32 2000/10/19 00:16:34 lehors Exp $
*/
public class XMLDTDScanner
extends XMLScanner
@@ -1076,11 +1076,11 @@
}
// REVISIT: fix this
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -1168,11 +1168,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -1201,11 +1201,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -1244,7 +1244,7 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer2.clear();
do {
fStringBuffer2.append(fString);
@@ -1275,7 +1275,7 @@
break;
}
}
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer2.append(fString);
value = fStringBuffer2;
}
@@ -1376,11 +1376,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -1406,11 +1406,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -1435,11 +1435,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
1.1.2.31 +9 -9 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java
Index: XMLDocumentScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- XMLDocumentScanner.java 2000/10/18 22:12:59 1.1.2.30
+++ XMLDocumentScanner.java 2000/10/19 00:16:36 1.1.2.31
@@ -101,7 +101,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLDocumentScanner.java,v 1.1.2.30 2000/10/18 22:12:59 andyc Exp $
+ * @version $Id: XMLDocumentScanner.java,v 1.1.2.31 2000/10/19 00:16:36 lehors Exp $
*/
public class XMLDocumentScanner
extends XMLScanner
@@ -642,11 +642,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -672,11 +672,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -700,11 +700,11 @@
fEntityScanner.scanChar();
// REVISIT: do right
value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
@@ -913,7 +913,7 @@
final String CDATA = fSymbolTable.addSymbol("CDATA");
attributes.setAttribute(fAttributeQName, CDATA, null);
XMLString value = fString;
- if (fEntityScanner.scanAttContent(quote, fString) != quote) {
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
fStringBuffer.clear();
do {
fStringBuffer.append(fString);
@@ -922,7 +922,7 @@
// TODO: handle entities in value
}
/***/
- } while (fEntityScanner.scanAttContent(quote, fString) != quote);
+ } while (fEntityScanner.scanLiteral(quote, fString) != quote);
fStringBuffer.append(fString);
value = fStringBuffer;
}
1.1.2.25 +5 -5 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityManager.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- XMLEntityManager.java 2000/10/18 22:23:40 1.1.2.24
+++ XMLEntityManager.java 2000/10/19 00:16:37 1.1.2.25
@@ -112,7 +112,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 18 18:23:16 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLEntityManager.java,v 1.1.2.24 2000/10/18 22:23:40 andyc Exp $
+ * @version $Id: XMLEntityManager.java,v 1.1.2.25 2000/10/19 00:16:37 lehors Exp $
*/
public class XMLEntityManager
implements XMLComponent {
@@ -1706,7 +1706,7 @@
* @throws SAXException Thrown by entity handler to signal an error
* when the end of an entity is reached.
*/
- public int scanAttContent(int quote, XMLString content)
+ public int scanLiteral(int quote, XMLString content)
throws IOException, SAXException {
if (fCurrentEntity.position == fCurrentEntity.count) {
@@ -1717,7 +1717,7 @@
load(1, true);
}
if (DEBUG_PRINT) {
- System.out.print("(scanAttContent, '"+(char)quote+"': ");
+ System.out.print("(scanLiteral, '"+(char)quote+"': ");
print();
System.out.println();
}
@@ -1741,13 +1741,13 @@
c = fCurrentEntity.ch[fCurrentEntity.position];
}
if (DEBUG_PRINT) {
- System.out.print(")scanAttContent, '"+(char)quote+"': ");
+ System.out.print(")scanLiteral, '"+(char)quote+"': ");
print();
System.out.println(" -> '"+(char)c+"'");
}
return c;
- } // scanAttContent(int,XMLString):int
+ } // scanLiteral(int,XMLString):int
/**
* Scans a range of character data up to the specicied delimiter,
1.1.2.6 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityScanner.java
Index: XMLEntityScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityScanner.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XMLEntityScanner.java 2000/10/18 18:19:11 1.1.2.5
+++ XMLEntityScanner.java 2000/10/19 00:16:37 1.1.2.6
@@ -79,7 +79,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 18 18:23:16 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLEntityScanner.java,v 1.1.2.5 2000/10/18 18:19:11 andyc Exp $
+ * @version $Id: XMLEntityScanner.java,v 1.1.2.6 2000/10/19 00:16:37 lehors Exp $
*
* @see XMLEntityHandler
* @see XMLEntityManager
@@ -262,7 +262,7 @@
* @throws SAXException Thrown by entity handler to signal an error
* when the end of an entity is reached.
*/
- public abstract int scanAttContent(int quote, XMLString content)
+ public abstract int scanLiteral(int quote, XMLString content)
throws IOException, SAXException;
/**
1.1.2.9 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLScanner.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XMLScanner.java 2000/10/19 00:13:45 1.1.2.8
+++ XMLScanner.java 2000/10/19 00:16:38 1.1.2.9
@@ -92,7 +92,7 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: XMLScanner.java,v 1.1.2.8 2000/10/19 00:13:45 lehors Exp $
+ * @version $Id: XMLScanner.java,v 1.1.2.9 2000/10/19 00:16:38 lehors Exp $
*/
public abstract class XMLScanner
implements XMLComponent {
@@ -382,7 +382,7 @@
}
fEntityScanner.scanChar();
// REVISIT: fix this
- fEntityScanner.scanAttContent(quote, value);
+ fEntityScanner.scanLiteral(quote, value);
if (!fEntityScanner.skipChar(quote)) {
fErrorReporter.reportError( XMLMessageFormatter.XML_DOMAIN, "CloseQuoteMissingInTextDecl",
new Object[]{name}, XMLErrorReporter.SEVERITY_FATAL_ERROR);