mrglavas 2004/12/15 19:56:03
Modified: java/samples/dom Counter.java GetElementsByTagName.java
Writer.java
Log:
Add validate-annotations option to DOM samples.
Revision Changes Path
1.11 +20 -1 xml-xerces/java/samples/dom/Counter.java
Index: Counter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/Counter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Counter.java 24 Feb 2004 23:41:05 -0000 1.10
+++ Counter.java 16 Dec 2004 03:56:03 -0000 1.11
@@ -68,6 +68,9 @@
/** Schema full checking feature id
(http://apache.org/xml/features/validation/schema-full-checking). */
protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID =
"http://apache.org/xml/features/validation/schema-full-checking";;
+ /** Validate schema annotations feature id
(http://apache.org/xml/features/validate-annotations). */
+ protected static final String VALIDATE_ANNOTATIONS_ID =
"http://apache.org/xml/features/validate-annotations";;
+
/** Dynamic validation feature id
(http://apache.org/xml/features/validation/dynamic). */
protected static final String DYNAMIC_VALIDATION_FEATURE_ID =
"http://apache.org/xml/features/validation/dynamic";;
@@ -90,6 +93,9 @@
/** Default Schema full checking support (false). */
protected static final boolean DEFAULT_SCHEMA_FULL_CHECKING = false;
+
+ /** Default validate schema annotations (false). */
+ protected static final boolean DEFAULT_VALIDATE_ANNOTATIONS = false;
/** Default dynamic validation support (false). */
protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
@@ -240,6 +246,7 @@
boolean validation = DEFAULT_VALIDATION;
boolean schemaValidation = DEFAULT_SCHEMA_VALIDATION;
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
+ boolean validateAnnotations = DEFAULT_VALIDATE_ANNOTATIONS;
boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
// process arguments
@@ -299,6 +306,10 @@
schemaFullChecking = option.equals("f");
continue;
}
+ if (option.equalsIgnoreCase("va")) {
+ validateAnnotations = option.equals("va");
+ continue;
+ }
if (option.equalsIgnoreCase("dv")) {
dynamicValidation = option.equals("dv");
continue;
@@ -348,6 +359,12 @@
System.err.println("warning: Parser does not support feature
("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
}
try {
+ parser.setFeature(VALIDATE_ANNOTATIONS_ID,
validateAnnotations);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature
("+VALIDATE_ANNOTATIONS_ID+")");
+ }
+ try {
parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID,
dynamicValidation);
}
catch (SAXException e) {
@@ -415,6 +432,8 @@
System.err.println(" -s | -S Turn on/off Schema validation
support.");
System.err.println(" NOTE: Not supported by all
parsers.");
System.err.println(" -f | -F Turn on/off Schema full
checking.");
+ System.err.println(" NOTE: Requires use of -s and not
supported by all parsers.");
+ System.err.println(" -va | -VA Turn on/off validation of schema
annotations.");
System.err.println(" NOTE: Requires use of -s and not
supported by all parsers.");
System.err.println(" -dv | -DV Turn on/off dynamic validation.");
System.err.println(" NOTE: Not supported by all
parsers.");
1.10 +20 -7 xml-xerces/java/samples/dom/GetElementsByTagName.java
Index: GetElementsByTagName.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/GetElementsByTagName.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GetElementsByTagName.java 24 Feb 2004 23:41:05 -0000 1.9
+++ GetElementsByTagName.java 16 Dec 2004 03:56:03 -0000 1.10
@@ -16,20 +16,14 @@
package dom;
-import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
/**
@@ -62,6 +56,9 @@
/** Schema full checking feature id
(http://apache.org/xml/features/validation/schema-full-checking). */
protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID =
"http://apache.org/xml/features/validation/schema-full-checking";;
+ /** Validate schema annotations feature id
(http://apache.org/xml/features/validate-annotations). */
+ protected static final String VALIDATE_ANNOTATIONS_ID =
"http://apache.org/xml/features/validate-annotations";;
+
/** Dynamic validation feature id
(http://apache.org/xml/features/validation/dynamic). */
protected static final String DYNAMIC_VALIDATION_FEATURE_ID =
"http://apache.org/xml/features/validation/dynamic";;
@@ -85,6 +82,9 @@
/** Default Schema full checking support (false). */
protected static final boolean DEFAULT_SCHEMA_FULL_CHECKING = false;
+ /** Default validate schema annotations (false). */
+ protected static final boolean DEFAULT_VALIDATE_ANNOTATIONS = false;
+
/** Default dynamic validation support (false). */
protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
@@ -217,6 +217,7 @@
boolean validation = DEFAULT_VALIDATION;
boolean schemaValidation = DEFAULT_SCHEMA_VALIDATION;
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
+ boolean validateAnnotations = DEFAULT_VALIDATE_ANNOTATIONS;
boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
// process arguments
@@ -271,6 +272,10 @@
schemaFullChecking = option.equals("f");
continue;
}
+ if (option.equalsIgnoreCase("va")) {
+ validateAnnotations = option.equals("va");
+ continue;
+ }
if (option.equalsIgnoreCase("dv")) {
dynamicValidation = option.equals("dv");
continue;
@@ -320,6 +325,12 @@
System.err.println("warning: Parser does not support feature
("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
}
try {
+ parser.setFeature(VALIDATE_ANNOTATIONS_ID,
validateAnnotations);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature
("+VALIDATE_ANNOTATIONS_ID+")");
+ }
+ try {
parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID,
dynamicValidation);
}
catch (SAXException e) {
@@ -367,6 +378,8 @@
System.err.println(" -s | -S Turn on/off Schema validation
support.");
System.err.println(" NOTE: Not supported by all
parsers.");
System.err.println(" -f | -F Turn on/off Schema full
checking.");
+ System.err.println(" NOTE: Requires use of -s and not
supported by all parsers.");
+ System.err.println(" -va | -VA Turn on/off validation of schema
annotations.");
System.err.println(" NOTE: Requires use of -s and not
supported by all parsers.");
System.err.println(" -dv | -DV Turn on/off dynamic validation.");
System.err.println(" NOTE: Not supported by all
parsers.");
1.13 +21 -5 xml-xerces/java/samples/dom/Writer.java
Index: Writer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/Writer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Writer.java 23 Jun 2004 03:43:20 -0000 1.12
+++ Writer.java 16 Dec 2004 03:56:03 -0000 1.13
@@ -16,20 +16,17 @@
package dom;
-import java.lang.reflect.Method;
-
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -61,6 +58,9 @@
/** Schema full checking feature id
(http://apache.org/xml/features/validation/schema-full-checking). */
protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID =
"http://apache.org/xml/features/validation/schema-full-checking";;
+ /** Validate schema annotations feature id
(http://apache.org/xml/features/validate-annotations). */
+ protected static final String VALIDATE_ANNOTATIONS_ID =
"http://apache.org/xml/features/validate-annotations";;
+
/** Dynamic validation feature id
(http://apache.org/xml/features/validation/dynamic). */
protected static final String DYNAMIC_VALIDATION_FEATURE_ID =
"http://apache.org/xml/features/validation/dynamic";;
@@ -87,6 +87,9 @@
/** Default Schema full checking support (false). */
protected static final boolean DEFAULT_SCHEMA_FULL_CHECKING = false;
+ /** Default validate schema annotations (false). */
+ protected static final boolean DEFAULT_VALIDATE_ANNOTATIONS = false;
+
/** Default dynamic validation support (false). */
protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
@@ -448,6 +451,7 @@
boolean externalDTD = DEFAULT_LOAD_EXTERNAL_DTD;
boolean schemaValidation = DEFAULT_SCHEMA_VALIDATION;
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
+ boolean validateAnnotations = DEFAULT_VALIDATE_ANNOTATIONS;
boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
boolean canonical = DEFAULT_CANONICAL;
@@ -493,6 +497,10 @@
schemaFullChecking = option.equals("f");
continue;
}
+ if (option.equalsIgnoreCase("va")) {
+ validateAnnotations = option.equals("va");
+ continue;
+ }
if (option.equalsIgnoreCase("dv")) {
dynamicValidation = option.equals("dv");
continue;
@@ -552,6 +560,12 @@
System.err.println("warning: Parser does not support feature
("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
}
try {
+ parser.setFeature(VALIDATE_ANNOTATIONS_ID,
validateAnnotations);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature
("+VALIDATE_ANNOTATIONS_ID+")");
+ }
+ try {
parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID,
dynamicValidation);
}
catch (SAXException e) {
@@ -612,6 +626,8 @@
System.err.println(" -s | -S Turn on/off Schema validation
support.");
System.err.println(" NOTE: Not supported by all
parsers.");
System.err.println(" -f | -F Turn on/off Schema full
checking.");
+ System.err.println(" NOTE: Requires use of -s and not
supported by all parsers.");
+ System.err.println(" -va | -VA Turn on/off validation of schema
annotations.");
System.err.println(" NOTE: Requires use of -s and not
supported by all parsers.");
System.err.println(" -dv | -DV Turn on/off dynamic validation.");
System.err.println(" NOTE: Not supported by all
parsers.");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
