neilg 2003/02/13 15:41:52
Modified: java/samples/xni Counter.java Writer.java
Log:
Synchronizing startDocument calls with the (not-so-recent) XNI change. Thanks to
Steven Dulin for discovering this problem
Revision Changes Path
1.12 +4 -3 xml-xerces/java/samples/xni/Counter.java
Index: Counter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/Counter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Counter.java 23 Jan 2003 19:39:11 -0000 1.11
+++ Counter.java 13 Feb 2003 23:41:52 -0000 1.12
@@ -67,6 +67,7 @@
import org.apache.xerces.xni.XMLLocator;
import org.apache.xerces.xni.XMLString;
import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.NamespaceContext;
import org.apache.xerces.xni.parser.XMLConfigurationException;
import org.apache.xerces.xni.parser.XMLErrorHandler;
import org.apache.xerces.xni.parser.XMLInputSource;
@@ -239,7 +240,7 @@
//
/** Start document. */
- public void startDocument(XMLLocator locator, String encoding, Augmentations
augs)
+ public void startDocument(XMLLocator locator, String encoding, NamespaceContext
namespaceContext, Augmentations augs)
throws XNIException {
fElements = 0;
@@ -249,7 +250,7 @@
fTagCharacters = 0;
fOtherCharacters = 0;
- } // startDocument(XMLLocator,String)
+ } // startDocument(XMLLocator,String, NamespaceContext, Augmentations)
/** Start element. */
public void startElement(QName element, XMLAttributes attrs, Augmentations augs)
1.17 +5 -40 xml-xerces/java/samples/xni/Writer.java
Index: Writer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/Writer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Writer.java 23 Jan 2003 19:39:12 -0000 1.16
+++ Writer.java 13 Feb 2003 23:41:52 -0000 1.17
@@ -71,6 +71,7 @@
import org.apache.xerces.xni.XMLLocator;
import org.apache.xerces.xni.XMLString;
import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.NamespaceContext;
import org.apache.xerces.xni.parser.XMLConfigurationException;
import org.apache.xerces.xni.parser.XMLErrorHandler;
import org.apache.xerces.xni.parser.XMLInputSource;
@@ -198,7 +199,8 @@
//
/** Start document. */
- public void startDocument(XMLLocator locator, String encoding, Augmentations
augs)
+ public void startDocument(XMLLocator locator, String encoding,
+ NamespaceContext namespaceContext, Augmentations augs)
throws XNIException {
fSeenRootElement = false;
@@ -209,7 +211,7 @@
fOut.flush();
}
- } // startDocument(XMLLocator,String,Augmentations)
+ } // startDocument(XMLLocator,String,NamespaceContext, Augmentations)
/** Start element. */
public void startElement(QName element, XMLAttributes attrs, Augmentations augs)
@@ -339,43 +341,6 @@
//
// XMLDTDHandler methods
//
-
- /** Processing instruction. */
- public void processingInstruction(String target, XMLString data)
- throws XNIException {
-
- if (fSeenRootElement) {
- fOut.print('\n');
- }
- fOut.print("<?");
- fOut.print(target);
- if (data != null && data.length > 0) {
- fOut.print(' ');
- fOut.print(data.toString());
- }
- fOut.print("?>");
- if (!fSeenRootElement) {
- fOut.print('\n');
- }
- fOut.flush();
-
- } // processingInstruction(String,XMLString)
-
- /** Comment. */
- public void comment(XMLString text) throws XNIException {
- if (!fCanonical) {
- if (fSeenRootElement) {
- fOut.print('\n');
- }
- fOut.print("<!--");
- normalizeAndPrint(text);
- fOut.print("-->");
- if (!fSeenRootElement) {
- fOut.print('\n');
- }
- fOut.flush();
- }
- } // comment(XMLString)
//
// XMLErrorHandler methods
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
