You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2002/01/28 20:51:51 UTC
cvs commit: xml-xerces/java/samples/xni DocumentTracer.java PSVIWriter.java
elena 02/01/28 11:51:51
Modified: java/samples/xni DocumentTracer.java PSVIWriter.java
Log:
Update samples to reflex some XNI changes
Revision Changes Path
1.11 +11 -2 xml-xerces/java/samples/xni/DocumentTracer.java
Index: DocumentTracer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/DocumentTracer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DocumentTracer.java 24 Jan 2002 06:43:32 -0000 1.10
+++ DocumentTracer.java 28 Jan 2002 19:51:51 -0000 1.11
@@ -63,6 +63,7 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import org.apache.xerces.impl.Constants;
import org.apache.xerces.parsers.XMLDocumentParser;
import org.apache.xerces.xni.Augmentations;
import org.apache.xerces.xni.QName;
@@ -79,6 +80,8 @@
import org.apache.xerces.xni.parser.XMLParseException;
import org.apache.xerces.xni.parser.XMLParserConfiguration;
+import org.apache.xerces.xni.psvi.ElementPSVI;
+
/**
* Provides a complete trace of XNI document and DTD events for
* files parsed.
@@ -86,7 +89,7 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: DocumentTracer.java,v 1.10 2002/01/24 06:43:32 neilg Exp $
+ * @version $Id: DocumentTracer.java,v 1.11 2002/01/28 19:51:51 elena Exp $
*/
public class DocumentTracer
extends XMLDocumentParser
@@ -228,7 +231,7 @@
fOut.print("literal systemId=");
printQuotedString(locator.getLiteralSystemId());
fOut.print(',');
- fOut.print("baseSystemId=");
+ fOut.print("baseSystemId=");
printQuotedString(locator.getBaseSystemId());
fOut.print(',');
fOut.print("expanded systemId=");
@@ -335,6 +338,12 @@
fOut.print("characters(");
fOut.print("text=");
printQuotedString(text.ch, text.offset, text.length);
+ if (augs != null) {
+ ElementPSVI element = (ElementPSVI)augs.getItem(Constants.ELEMENT_PSVI);
+ fOut.print(" schemaNormalized=");
+ printQuotedString(element.getSchemaNormalizedValue());
+ }
+
fOut.println(')');
fOut.flush();
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PSVIWriter.java 28 Jan 2002 00:37:10 -0000 1.5
+++ PSVIWriter.java 28 Jan 2002 19:51:51 -0000 1.6
@@ -106,7 +106,7 @@
* XML infoset and Post Schema Validation Infoset.
*
* @author Arun Yadav,Sun Miscrosystem.
- * @version $Id: PSVIWriter.java,v 1.5 2002/01/28 00:37:10 elena Exp $
+ * @version $Id: PSVIWriter.java,v 1.6 2002/01/28 19:51:51 elena Exp $
*/
public class PSVIWriter
implements XMLComponent, XMLDocumentFilter {
@@ -601,7 +601,7 @@
checkForChildren();
if (elemPSVI != null) {
- if (elemPSVI.schemaSpecified()){ // value was specified in the instance!
+ if (elemPSVI.isSpecified()){ // value was specified in the instance!
printIndentTag("<character>");
printElement("characterCode", text.toString());
printElement("elementContentWhitespace", "false");
@@ -851,8 +851,8 @@
printElement("psv:schemaErrorCode","");
}
printElement("psv:nil", String.valueOf(elemPSVI.isNil()));
- printElement("psv:schemaNormalizedValue",elemPSVI.schemaNormalizedValue());
- String specified = elemPSVI.schemaSpecified()?"infoset":"schema";
+ printElement("psv:schemaNormalizedValue",elemPSVI.getSchemaNormalizedValue());
+ String specified = elemPSVI.isSpecified()?"infoset":"schema";
printElement("psv:schemaSpecified",specified);
}
@@ -899,8 +899,8 @@
}
- printElement("psv:schemaNormalizedValue",attrPSVI.schemaNormalizedValue());
- printElement("psv:schemaSpecified", (attrPSVI.schemaSpecified())?"infoset":"schema");
+ printElement("psv:schemaNormalizedValue",attrPSVI.getSchemaNormalizedValue());
+ printElement("psv:schemaSpecified", (attrPSVI.isSpecified())?"infoset":"schema");
short definationType = attrPSVI.getTypeDefinitionType();
if (definationType == XSTypeDecl.SIMPLE_TYPE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org