elena 2002/08/16 11:13:32
Modified: java/samples/xni PSVIWriter.java PassThroughFilter.java
java/samples/xni/parser
NonValidatingParserConfiguration.java
PSVIConfiguration.java
Log:
Update XNI samples following a change to XMLDocumentHandler/XMLDocumentSource
Revision Changes Path
1.10 +22 -7 xml-xerces/java/samples/xni/PSVIWriter.java
Index: PSVIWriter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/PSVIWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PSVIWriter.java 17 Jun 2002 18:42:57 -0000 1.9
+++ PSVIWriter.java 16 Aug 2002 18:13:31 -0000 1.10
@@ -86,12 +86,14 @@
import org.apache.xerces.xni.XMLResourceIdentifier;
import org.apache.xerces.xni.XMLString;
import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLDocumentSource;
import org.apache.xerces.xni.psvi.ItemPSVI;
import org.apache.xerces.xni.psvi.ElementPSVI;
import org.apache.xerces.xni.psvi.AttributePSVI;
import org.apache.xerces.xni.parser.XMLComponent;
import org.apache.xerces.xni.parser.XMLComponentManager;
+import org.apache.xerces.xni.parser.XMLDocumentSource;
import org.apache.xerces.xni.parser.XMLDocumentFilter;
import org.apache.xerces.xni.parser.XMLConfigurationException;
import org.apache.xerces.xni.parser.XMLErrorHandler;
@@ -162,6 +164,9 @@
/** Document handler. */
protected XMLDocumentHandler fDocumentHandler;
+ /** Document source */
+ protected XMLDocumentSource fDocumentSource;
+
/** Symbol table. */
protected SymbolTable fSymbolTable;
@@ -305,20 +310,30 @@
// XMLDocumentSource methods
//
- /**
- * Sets the document handler to receive information about the document.
- *
- * @param documentHandler The document handler.
- * @param augs Additional information that may include infoset augmentations
- */
+ /** Sets the document handler to receive information about the document. */
public void setDocumentHandler(XMLDocumentHandler documentHandler) {
fDocumentHandler = documentHandler;
} // setDocumentHandler(XMLDocumentHandler)
+ /** Returns the document handler */
+ public XMLDocumentHandler getDocumentHandler() {
+ return fDocumentHandler;
+ } // setDocumentHandler(XMLDocumentHandler)
+
//
// XMLDocumentHandler methods
//
+
+ /** Sets the document source */
+ public void setDocumentSource(XMLDocumentSource source){
+ fDocumentSource = source;
+ } // setDocumentSource
+
+ /** Returns the document source */
+ public XMLDocumentSource getDocumentSource (){
+ return fDocumentSource;
+ } // getDocumentSource
/**
* This method notifies the start of an entity. General entities are just
1.6 +17 -1 xml-xerces/java/samples/xni/PassThroughFilter.java
Index: PassThroughFilter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/PassThroughFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PassThroughFilter.java 29 Jan 2002 01:15:06 -0000 1.5
+++ PassThroughFilter.java 16 Aug 2002 18:13:31 -0000 1.6
@@ -65,6 +65,7 @@
import org.apache.xerces.xni.XMLResourceIdentifier;
import org.apache.xerces.xni.XMLString;
import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLDocumentSource;
/**
* This sample demonstrates how to implement a simple pass-through
@@ -89,6 +90,9 @@
/** The document handler. */
protected XMLDocumentHandler fDocumentHandler;
+
+ /** The document source */
+ protected XMLDocumentSource fDocumentSource;
//
// Public methods
@@ -410,5 +414,17 @@
fDocumentHandler.endDocument(augs);
}
} // endDocument()
+
+
+ /** Sets the document source. */
+ public void setDocumentSource(XMLDocumentSource source){
+ fDocumentSource = source;
+ }
+
+
+ /** Returns the document source. */
+ public XMLDocumentSource getDocumentSource(){
+ return fDocumentSource;
+ }
} // class PassThroughFilter
1.5 +2 -1
xml-xerces/java/samples/xni/parser/NonValidatingParserConfiguration.java
Index: NonValidatingParserConfiguration.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/samples/xni/parser/NonValidatingParserConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NonValidatingParserConfiguration.java 29 Jan 2002 01:15:06 -0000 1.4
+++ NonValidatingParserConfiguration.java 16 Aug 2002 18:13:31 -0000 1.5
@@ -117,6 +117,7 @@
// setup document pipeline
fScanner.setDocumentHandler(fNamespaceBinder);
fNamespaceBinder.setDocumentHandler(fDocumentHandler);
+ fNamespaceBinder.setDocumentSource(fScanner);
} // configurePipeline()
1.5 +2 -1 xml-xerces/java/samples/xni/parser/PSVIConfiguration.java
Index: PSVIConfiguration.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/parser/PSVIConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PSVIConfiguration.java 25 Mar 2002 19:31:04 -0000 1.4
+++ PSVIConfiguration.java 16 Aug 2002 18:13:31 -0000 1.5
@@ -149,6 +149,7 @@
if (fSchemaValidator != null) {
fSchemaValidator.setDocumentHandler(fPSVIWriter);
fPSVIWriter.setDocumentHandler(fDocumentHandler);
+ fPSVIWriter.setDocumentSource(fSchemaValidator);
}
} // configurePipeline()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
