neilg 2002/07/31 07:00:09
Modified: java/src/org/apache/xerces/impl XMLEntityManager.java
Log:
making this class somewhat more extensible by providing a method for the constructor
to call to create an instance of the EntityScanner implementation.
Revision Changes Path
1.34 +8 -19 xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XMLEntityManager.java 17 Jul 2002 21:30:11 -0000 1.33
+++ XMLEntityManager.java 31 Jul 2002 14:00:08 -0000 1.34
@@ -334,7 +334,7 @@
public XMLEntityManager(XMLEntityManager entityManager) {
// create scanner
- fEntityScanner = new EntityScanner();
+ fEntityScanner = createEntityScanner();
// save shared entity declarations
fDeclaredEntities = entityManager != null
@@ -1444,6 +1444,11 @@
} // createReader(InputStream,String, Boolean): Reader
+ // returns an instance of XMLEntityScanner
+ protected XMLEntityScanner createEntityScanner() {
+ return new EntityScanner();
+ } // createEntityScanner(): XMLEntityScanner
+
//
// Protected static methods
//
@@ -2037,14 +2042,6 @@
}
c = '\n';
}
- /*** NEWLINE NORMALIZATION ***
- else {
- if (fCurrentEntity.ch[fCurrentEntity.position] == '\r'
- && fCurrentEntity.isExternal()) {
- fCurrentEntity.position++;
- }
- }
- /***/
}
// return character that was scanned
@@ -2408,7 +2405,6 @@
else {
newlines++;
}
- /***/
}
else if (c == '\n') {
newlines++;
@@ -2421,13 +2417,6 @@
break;
}
}
- /*** NEWLINE NORMALIZATION ***
- if (fCurrentEntity.ch[fCurrentEntity.position] == '\r'
- && external) {
- fCurrentEntity.position++;
- offset++;
- }
- /***/
}
else {
fCurrentEntity.position--;
@@ -3241,7 +3230,7 @@
* @returns Returns true if the entity changed as a result of this
* load operation.
*/
- private final boolean load(int offset, boolean changeEntity)
+ final boolean load(int offset, boolean changeEntity)
throws IOException {
if (DEBUG_BUFFER) {
System.out.print("(load, "+offset+": ");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
