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/07 00:21:26 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/parsers XMLDocumentParser.java XMLParser.java
andyc 00/10/06 15:21:25
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
Constants.java
java/src/org/apache/xerces/parsers Tag: xerces_j_2
XMLDocumentParser.java XMLParser.java
Log:
Updated more things to use the Constants class. Less redundant
strings means less chance of errors due to typos. Plus, we can
change the actual strings later if needed and just need to
recompile the source -- no hunting down all of the uses of
the old strings.
Revision Changes Path
No revision
No revision
1.1.2.2 +33 -1 xml-xerces/java/src/org/apache/xerces/impl/Attic/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/Constants.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Constants.java 2000/10/06 21:50:20 1.1.2.1
+++ Constants.java 2000/10/06 22:21:22 1.1.2.2
@@ -65,7 +65,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: Constants.java,v 1.1.2.1 2000/10/06 21:50:20 andyc Exp $
+ * @version $Id: Constants.java,v 1.1.2.2 2000/10/06 22:21:22 andyc Exp $
*/
public final class Constants {
@@ -151,6 +151,15 @@
/** EXPERIMENTAL: Grammar access feature ("domx/grammar-access"). */
//public static final String GRAMMAR_ACCESS_FEATURE = "domx/grammar-access";
+ /** Default attribute values feature ("validation/default-attribute-values"). */
+ public static final String DEFAULT_ATTRIBUTE_VALUES_FEATURE = "validation/default-attribute-values";
+
+ /** Validate content models feature ("validation/validate-content-models"). */
+ public static final String VALIDATE_CONTENT_MODELS_FEATURE = "validation/validate-content-models";
+
+ /** Validate datatypes feature ("validation/validate-datatypes"). */
+ public static final String VALIDATE_DATATYPES_FEATURE = "validation/validate-datatypes";
+
// xerces properties
/** Xerces properties prefix ("http://apache.org/xml/properties/"). */
@@ -177,6 +186,21 @@
/** Entity resolver property ("internal/entity-resolver"). */
public static final String ENTITY_RESOLVER_PROPERTY = "internal/entity-resolver";
+ /** Grammar pool property ("internal/grammar-pool"). */
+ public static final String GRAMMAR_POOL_PROPERTY = "internal/grammar-pool";
+
+ /** Datatype validator factory ("internal/datatype-validator-factory"). */
+ public static final String DATATYPE_VALIDATOR_FACTORY_PROPERTY = "internal/datatype-validator-factory";
+
+ /** Document scanner property ("internal/document-scanner"). */
+ public static final String DOCUMENT_SCANNER_PROPERTY = "internal/document-scanner";
+
+ /** DTD scanner property ("internal/dtd-scanner"). */
+ public static final String DTD_SCANNER_PROPERTY = "internal/dtd-scanner";
+
+ /** Validator property ("internal/validator"). */
+ public static final String VALIDATOR_PROPERTY = "internal/validator";
+
// private
/** SAX features. */
@@ -210,6 +234,9 @@
CREATE_ENTITY_REF_NODES_FEATURE,
INCLUDE_IGNORABLE_WHITESPACE,
//GRAMMAR_ACCESS_FEATURE,
+ DEFAULT_ATTRIBUTE_VALUES_FEATURE,
+ VALIDATE_CONTENT_MODELS_FEATURE,
+ VALIDATE_DATATYPES_FEATURE,
};
/** Xerces properties. */
@@ -221,6 +248,11 @@
ERROR_REPORTER_PROPERTY,
ENTITY_MANAGER_PROPERTY,
ENTITY_RESOLVER_PROPERTY,
+ GRAMMAR_POOL_PROPERTY,
+ DATATYPE_VALIDATOR_FACTORY_PROPERTY,
+ DOCUMENT_SCANNER_PROPERTY,
+ DTD_SCANNER_PROPERTY,
+ VALIDATOR_PROPERTY,
};
/** Empty enumeration. */
No revision
No revision
1.1.2.16 +48 -28 xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLDocumentParser.java
Index: XMLDocumentParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLDocumentParser.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- XMLDocumentParser.java 2000/10/06 17:50:05 1.1.2.15
+++ XMLDocumentParser.java 2000/10/06 22:21:23 1.1.2.16
@@ -58,17 +58,20 @@
package org.apache.xerces.parsers;
import java.io.IOException;
-import org.apache.xerces.xni.XMLString;
-import org.apache.xerces.impl.XMLEntityManager;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.impl.XMLDTDScanner;
-import org.apache.xerces.xni.XMLDocumentHandler;
+
+import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.XMLDocumentScanner;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.impl.XMLDTDScanner;
+import org.apache.xerces.impl.XMLEntityManager;
+import org.apache.xerces.impl.XMLValidator;
import org.apache.xerces.impl.validation.DatatypeValidatorFactory;
import org.apache.xerces.impl.validation.GrammarPool;
-import org.apache.xerces.impl.XMLValidator;
+import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.xni.QName;
+import org.apache.xerces.xni.XMLAttributes;
+import org.apache.xerces.xni.XMLDocumentHandler;
+import org.apache.xerces.xni.XMLString;
+
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
@@ -77,7 +80,7 @@
/**
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Arnaud Le Hors, IBM
- * @version $Id: XMLDocumentParser.java,v 1.1.2.15 2000/10/06 17:50:05 andyc Exp $
+ * @version $Id: XMLDocumentParser.java,v 1.1.2.16 2000/10/06 22:21:23 andyc Exp $
*/
public abstract class XMLDocumentParser
extends XMLParser
@@ -137,32 +140,49 @@
super(symbolTable);
// set default features
- fFeatures.put(SAX2_FEATURES_PREFIX+"namespaces", Boolean.TRUE);
- fFeatures.put(SAX2_FEATURES_PREFIX+"validation", Boolean.FALSE);
+ final String NAMESPACES = Constants.SAX_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE;
+ fFeatures.put(NAMESPACES, Boolean.TRUE);
+ final String VALIDATION = Constants.SAX_FEATURE_PREFIX + Constants.VALIDATION_FEATURE;
+ fFeatures.put(VALIDATION, Boolean.FALSE);
// create and register components
- fProperties.put(XERCES_PROPERTIES_PREFIX+"internal/symbol-table",
- fSymbolTable);
+ final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY;
+ fProperties.put(SYMBOL_TABLE, fSymbolTable);
+
fGrammarPool = grammarPool;
- fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/grammar-pool",
- fGrammarPool);
- //fEntityManager = new XMLEntityManager();
- //fProperties.put(XERCES_PROPERTIES_PREFIX+"internal/entity-manager",
- //fEntityManager);
+ final String GRAMMAR_POOL = Constants.XERCES_PROPERTY_PREFIX + Constants.GRAMMAR_POOL_PROPERTY;
+ fProperties.put(GRAMMAR_POOL, fGrammarPool);
+
+ /***
+ fEntityManager = new XMLEntityManager();
+ final String ENTITY_MANAGER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
+ fProperties.put(ENTITY_MANAGER, fEntityManager);
+ /***/
+
fScanner = new XMLDocumentScanner();
- fProperties.put(XERCES_PROPERTIES_PREFIX+"internal/document-scanner",
- fScanner);
- // fValidator = new Validator();
- // fDatatypeValidatorFactory = ...
- // fProperties.put(XERCES_PROPERTIES_PREFIX +
- // "internal/datatype-validator-factory",
- // fDatatypeValidatorFactory);
+ final String DOCUMENT_SCANNER = Constants.XERCES_PROPERTY_PREFIX + Constants.DOCUMENT_SCANNER_PROPERTY;
+ fProperties.put(DOCUMENT_SCANNER, fScanner);
+
+ /***
+ fValidator = new XMLValidator();
+ final String VALIDATOR = Constants.XERCES_PROPERTY_PREFIX + Constants.VALIDATOR_PROPERTY;
+ fProperties.put(VALIDATOR, fValidator);
+
+ fDatatypeValidatorFactory = new DatatypeValidatorFactory();
+ final String DATATYE_VALIDATOR_FACTORY = Constants.XERCES_PROPERTY_PREFIX + Constants.DATATYE_VALIDATOR_FACTORY_PROPERTY;
+ fProperties.put(DATATYE_VALIDATOR_FACTORY, fDatatypeValidatorFactory);
+ /***/
+
// plug in components
+ /***/
fScanner.setDocumentHandler(this);
- // fScanner.setDocumentHandler(fValidator);
- // fValidator.setDocumentHandler(this);
- }
+ /***
+ fScanner.setDocumentHandler(fValidator);
+ fValidator.setDocumentHandler(this);
+ /***/
+
+ } // <init>(SymbolTable,GrammarPool)
//
// XMLEntityHandler methods
1.1.2.12 +52 -91 xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLParser.java
Index: XMLParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLParser.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- XMLParser.java 2000/10/06 21:55:48 1.1.2.11
+++ XMLParser.java 2000/10/06 22:21:24 1.1.2.12
@@ -61,11 +61,14 @@
import java.io.IOException;
import java.io.Reader;
import java.util.Locale;
+
+import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.XMLEntityManager;
import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.msg.XMLMessageFormatter;
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.XMLComponentManager;
+
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
@@ -78,32 +81,12 @@
/**
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Arnaud Le Hors, IBM
- * @version $Id: XMLParser.java,v 1.1.2.11 2000/10/06 21:55:48 ericye Exp $
+ * @version $Id: XMLParser.java,v 1.1.2.12 2000/10/06 22:21:24 andyc Exp $
*/
public abstract class XMLParser
implements XMLComponentManager {
//
- // Constants
- //
-
- /** SAX2 features prefix. */
- protected static final String SAX2_FEATURES_PREFIX =
- "http://xml.org/sax/features/";
-
- /** SAX2 properties prefix. */
- protected static final String SAX2_PROPERTIES_PREFIX =
- "http://xml.org/sax/properties/";
-
- /** Xerces features prefix. */
- protected static final String XERCES_FEATURES_PREFIX =
- "http://apache.org/xml/features/";
-
- /** Xerces properties prefix. */
- protected static final String XERCES_PROPERTIES_PREFIX =
- "http://apache.org/xml/properties/";
-
- //
// Data
//
@@ -145,20 +128,22 @@
// create and register components
fSymbolTable = symbolTable;
- fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/symbol-table",
- fSymbolTable);
+ final String SYMBOL_TABLE = Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY;
+ fProperties.put(SYMBOL_TABLE, fSymbolTable);
+
fEntityManager = new XMLEntityManager();
- fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/entity-manager",
- fEntityManager);
+ final String ENTITY_MANAGER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
+ fProperties.put(ENTITY_MANAGER, fEntityManager);
+
fErrorReporter = new XMLErrorReporter( fEntityManager.getEntityScanner() );
+ final String ERROR_REPORTER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY;
+ fProperties.put(ERROR_REPORTER, fErrorReporter);
+
XMLMessageFormatter xmft = new XMLMessageFormatter();
fErrorReporter.putMessageFormatter(XMLMessageFormatter.XML_DOMAIN, xmft);
fErrorReporter.putMessageFormatter(XMLMessageFormatter.XMLNS_DOMAIN, xmft);
- fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/error-reporter",
- fErrorReporter);
- // set features to their default values
- }
+ } // <init>(SymbolTable)
//
// Methods
@@ -233,28 +218,28 @@
// SAX2 Features
//
- if (featureId.startsWith(SAX2_FEATURES_PREFIX)) {
+ if (featureId.startsWith(Constants.SAX_FEATURE_PREFIX)) {
String feature =
- featureId.substring(SAX2_FEATURES_PREFIX.length());
+ featureId.substring(Constants.SAX_FEATURE_PREFIX.length());
//
// http://xml.org/sax/features/validation
// Validate (true) or don't validate (false).
//
- if (feature.equals("validation")) {
+ if (feature.equals(Constants.VALIDATION_FEATURE)) {
return;
}
//
// http://xml.org/sax/features/external-general-entities
// Expand external general entities (true) or not (false).
//
- if (feature.equals("external-general-entities")) {
+ if (feature.equals(Constants.EXTERNAL_GENERAL_ENTITIES_FEATURE)) {
return;
}
//
// http://xml.org/sax/features/external-parameter-entities
// Expand external parameter entities (true) or not (false).
//
- if (feature.equals("external-parameter-entities")) {
+ if (feature.equals(Constants.EXTERNAL_PARAMETER_ENTITIES_FEATURE)) {
return;
}
//
@@ -262,7 +247,7 @@
// Preprocess namespaces (true) or not (false). See also
// the http://xml.org/sax/properties/namespace-sep property.
//
- if (feature.equals("namespaces")) {
+ if (feature.equals(Constants.NAMESPACES_FEATURE)) {
return;
}
//
@@ -274,14 +259,14 @@
// Xerces Features
//
- else if (featureId.startsWith(XERCES_FEATURES_PREFIX)) {
+ else if (featureId.startsWith(Constants.XERCES_FEATURE_PREFIX)) {
String feature =
- featureId.substring(XERCES_FEATURES_PREFIX.length());
+ featureId.substring(Constants.XERCES_FEATURE_PREFIX.length());
//
// http://apache.org/xml/features/validation/schema
// Lets the user turn Schema validation support on/off.
//
- if (feature.equals("validation/schema")) {
+ if (feature.equals(Constants.SCHEMA_VALIDATION_FEATURE)) {
return;
}
//
@@ -290,41 +275,41 @@
// contains a grammar. Validation is turned on/off based
// on each document instance, automatically.
//
- if (feature.equals("validation/dynamic")) {
+ if (feature.equals(Constants.DYNAMIC_VALIDATION_FEATURE)) {
return;
}
//
// http://apache.org/xml/features/validation/default-attribute-values
//
- if (feature.equals("validation/default-attribute-values")) {
+ if (feature.equals(Constants.DEFAULT_ATTRIBUTE_VALUES_FEATURE)) {
// REVISIT
throw new SAXNotSupportedException(featureId);
}
//
// http://apache.org/xml/features/validation/default-attribute-values
//
- if (feature.equals("validation/validate-content-models")) {
+ if (feature.equals(Constants.VALIDATE_CONTENT_MODELS_FEATURE)) {
// REVISIT
throw new SAXNotSupportedException(featureId);
}
//
// http://apache.org/xml/features/validation/nonvalidating/load-dtd-grammar
//
- if (feature.equals("nonvalidating/load-dtd-grammar")) {
+ if (feature.equals(Constants.LOAD_DTD_GRAMMAR_FEATURE)) {
return;
}
//
// http://apache.org/xml/features/validation/default-attribute-values
//
- if (feature.equals("validation/validate-datatypes")) {
+ if (feature.equals(Constants.VALIDATE_DATATYPES_FEATURE)) {
throw new SAXNotSupportedException(featureId);
}
//
// http://apache.org/xml/features/validation/warn-on-duplicate-attdef
// Emits an error when an attribute is redefined.
//
- if (feature.equals("validation/warn-on-duplicate-attdef")) {
+ if (feature.equals(Constants.WARN_ON_DUPLICATE_ATTDEF_FEATURE)) {
return;
}
//
@@ -333,7 +318,7 @@
// references an element, by name, that is not declared
// in the grammar.
//
- if (feature.equals("validation/warn-on-undeclared-elemdef")) {
+ if (feature.equals(Constants.WARN_ON_UNDECLARED_ELEMDEF_FEATURE)) {
return;
}
//
@@ -341,7 +326,7 @@
// Allows the use of Java encoding names in the XML
// and TextDecl lines.
//
- if (feature.equals("allow-java-encodings")) {
+ if (feature.equals(Constants.ALLOW_JAVA_ENCODINGS_FEATURE)) {
return;
}
//
@@ -349,7 +334,7 @@
// Allows the parser to continue after a fatal error.
// Normally, a fatal error would stop the parse.
//
- if (feature.equals("continue-after-fatal-error")) {
+ if (feature.equals(Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE)) {
return;
}
//
@@ -422,33 +407,9 @@
// SAX2 Properties
//
- if (propertyId.startsWith(SAX2_PROPERTIES_PREFIX)) {
+ if (propertyId.startsWith(Constants.SAX_PROPERTY_PREFIX)) {
String property =
- propertyId.substring(SAX2_PROPERTIES_PREFIX.length());
- //
- // http://xml.org/sax/properties/namespace-sep
- // Value type: String
- // Access: read/write, pre-parse only
- // Set the separator to be used between the URI part of a name
- // and the local part of a name when namespace processing is
- // being performed (see the
- // http://xml.org/sax/features/namespaces feature). By default,
- // the separator is a single space. This property may not be set
- // while a parse is in progress (throws a
- // SAXNotSupportedException).
- //
- /***
- if (property.equals("namespace-sep")) {
- try {
- setNamespaceSep((String)value);
- }
- catch (ClassCastException e) {
- throw new SAXNotSupportedException(propertyId);
- }
- return;
- }
- /***/
-
+ propertyId.substring(Constants.SAX_PROPERTY_PREFIX.length());
//
// http://xml.org/sax/properties/xml-string
// Value type: String
@@ -459,7 +420,7 @@
// null (this is a good way to check for availability before the
// parse begins).
//
- if (property.equals("xml-string")) {
+ if (property.equals(Constants.XML_STRING_PROPERTY)) {
// REVISIT - we should probably ask xml-dev for a precise
// definition of what this is actually supposed to return, and
// in exactly which circumstances.
@@ -474,28 +435,28 @@
// Xerces Properties
//
- else if (propertyId.startsWith(XERCES_PROPERTIES_PREFIX)) {
+ else if (propertyId.startsWith(Constants.XERCES_PROPERTY_PREFIX)) {
String property =
- propertyId.substring(XERCES_PROPERTIES_PREFIX.length());
- if (property.equals("internal/symbol-table")) {
+ propertyId.substring(Constants.XERCES_PROPERTY_PREFIX.length());
+ if (property.equals(Constants.SYMBOL_TABLE_PROPERTY)) {
return;
}
- if (property.equals("internal/error-reporter")) {
+ if (property.equals(Constants.ERROR_REPORTER_PROPERTY)) {
return;
}
- if (property.equals("internal/entity-manager")) {
+ if (property.equals(Constants.ENTITY_MANAGER_PROPERTY)) {
return;
}
- if (property.equals("internal/grammar-pool")) {
+ if (property.equals(Constants.GRAMMAR_POOL_PROPERTY)) {
return;
}
- if (property.equals("internal/datatype-validator-factory")) {
+ if (property.equals(Constants.DATATYPE_VALIDATOR_FACTORY_PROPERTY)) {
return;
}
- if (property.equals("internal/entity-resolver")) {
+ if (property.equals(Constants.ENTITY_RESOLVER_PROPERTY)) {
return;
}
- if (property.equals("internal/error-handler")) {
+ if (property.equals(Constants.ERROR_HANDLER_PROPERTY)) {
return;
}
}
@@ -516,8 +477,8 @@
* uninstall the currently installed resolver.
*/
public void setEntityResolver(EntityResolver resolver) {
- fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/entity-resolver",
- resolver);
+ final String ENTITY_RESOLVER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
+ fProperties.put(ENTITY_RESOLVER, resolver);
} // setEntityResolver
/**
@@ -528,8 +489,8 @@
* @see #setEntityResolver
*/
public EntityResolver getEntityResolver() {
- return (EntityResolver)fProperties.get(XERCES_PROPERTIES_PREFIX +
- "internal/entity-resolver");
+ final String ENTITY_RESOLVER = Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
+ return (EntityResolver)fProperties.get(ENTITY_RESOLVER);
} // getEntityResolver
/**
@@ -551,8 +512,8 @@
* @see #getErrorHandler
*/
public void setErrorHandler(ErrorHandler errorHandler) {
- fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/error-handler",
- errorHandler);
+ final String ERROR_HANDLER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_HANDLER_PROPERTY;
+ fProperties.put(ERROR_HANDLER, errorHandler);
} // setErrorHandler
/**
@@ -563,8 +524,8 @@
* @see #setErrorHandler
*/
public ErrorHandler getErrorHandler() {
- return (ErrorHandler)fProperties.get(XERCES_PROPERTIES_PREFIX +
- "internal/error-handler");
+ final String ERROR_HANDLER = Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_HANDLER_PROPERTY;
+ return (ErrorHandler)fProperties.get(ERROR_HANDLER);
} // getErrorHandler
/**