You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/10/10 10:06:04 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl Makefile XMLEntityManager.java
andyc 00/10/10 01:06:04
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2 Makefile
XMLEntityManager.java
Log:
Some simple updates to the Makefile and XMLEntityManager.
Revision Changes Path
No revision
No revision
1.1.2.5 +1 -0 xml-xerces/java/src/org/apache/xerces/impl/Attic/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/Makefile,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Makefile 2000/10/06 23:50:18 1.1.2.4
+++ Makefile 2000/10/10 08:06:03 1.1.2.5
@@ -8,6 +8,7 @@
XMLEntityManager.class\
XMLEntityScanner.class\
XMLErrorReporter.class\
+ XMLInputSource.class\
XMLScanner.class\
XMLValidator.class
1.1.2.11 +14 -19 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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- XMLEntityManager.java 2000/10/08 01:36:40 1.1.2.10
+++ XMLEntityManager.java 2000/10/10 08:06:04 1.1.2.11
@@ -105,7 +105,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.10 2000/10/08 01:36:40 andyc Exp $
+ * @version $Id: XMLEntityManager.java,v 1.1.2.11 2000/10/10 08:06:04 andyc Exp $
*/
public class XMLEntityManager
implements XMLComponent {
@@ -122,7 +122,7 @@
/**
* Debug printing of buffer. This debugging flag works best when you
* resize the DEFAULT_BUFFER_SIZE down to something reasonable like
- * 64 bytes.
+ * 64 characters.
*/
private static final boolean DEBUG_PRINT = false;
@@ -186,7 +186,7 @@
/** Default constructor. */
public XMLEntityManager() {
fEntityScanner = new EntityScanner();
- }
+ } // <init>()
//
// Public methods
@@ -199,7 +199,7 @@
*/
public void setEntityHandler(XMLEntityHandler entityHandler) {
fEntityHandler = entityHandler;
- }
+ } // setEntityHandler(XMLEntityHandler)
/**
* addExternalEntity
@@ -340,7 +340,7 @@
public void startDocumentEntity(XMLInputSource xmlInputSource)
throws IOException, SAXException {
startEntity("[xml]", xmlInputSource);
- } // startDocumentEntity(InputSource)
+ } // startDocumentEntity(XMLInputSource)
/**
* startDTDEntity
@@ -350,7 +350,7 @@
public void startDTDEntity(XMLInputSource xmlInputSource)
throws IOException, SAXException {
startEntity("[dtd]", xmlInputSource);
- } // startDTDEntity(InputSource)
+ } // startDTDEntity(XMLInputSource)
/**
* getEntityScanner
@@ -359,7 +359,7 @@
*/
public XMLEntityScanner getEntityScanner() {
return fEntityScanner;
- } // getEntityScanner
+ } // getEntityScanner():XMLEntityScanner
//
// XMLComponent methods
@@ -397,6 +397,8 @@
addExternalEntity("external-text", null, "external-text.ent", "test/external-text.xml");
addExternalEntity("external-balanced-element", null, "external-balanced-element.ent", "test/external-balanced-element.xml");
+ addExternalEntity("one", null, "ent/one.ent", "test/external-entity.xml");
+ addExternalEntity("two", null, "ent/two.ent", "test/ent/one.xml");
}
} // reset(XMLComponentManager)
@@ -492,13 +494,6 @@
//reader = new OneCharReader(reader);
}
- /***
- // REVISIT: This goes away once I've updated the entity
- // scanner to buffer from a standard java.io.Reader
- // object. -Ac
- reader = new PushbackReader(reader, 32);
- /***/
-
// push entity on stack
if (fCurrentEntity != null) {
fEntityStack.push(fCurrentEntity);
@@ -514,7 +509,7 @@
fEntityHandler.startEntity(name, publicId, systemId, ianaEncoding);
}
- } // startEntity(String,InputSource)
+ } // startEntity(String,XMLInputSource)
/**
* Ends an entity.
@@ -530,7 +525,7 @@
fCurrentEntity = fEntityStack.size() > 0
? (ScannedEntity)fEntityStack.pop() : null;
- } // endEntity(String)
+ } // endEntity()
/**
* Expands a system id and returns the system id as a URI, if
@@ -958,7 +953,7 @@
// encoding
- /** Auto-detected ncoding. */
+ /** Auto-detected encoding. */
public String encoding;
// buffer
@@ -1029,7 +1024,7 @@
/** Default constructor. */
public EntityScanner() {
- }
+ } // <init>()
//
// XMLEntityScanner methods
@@ -1591,7 +1586,7 @@
/** Constructs this reader from another reader. */
public OneCharReader(Reader reader) {
super(reader);
- }
+ } // <init>(Reader)
//
// Public methods