Author: mrglavas
Date: Mon Jun 9 20:58:47 2008
New Revision: 665969
URL: http://svn.apache.org/viewvc?rev=665969&view=rev
Log:
Marking many fields final.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/SAXParserImpl.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java?rev=665969&r1=665968&r2=665969&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
Mon Jun 9 20:58:47 2008
@@ -91,13 +91,13 @@
private static final String SECURITY_MANAGER =
Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
- private DOMParser domParser = null;
+ private final DOMParser domParser;
private final Schema grammar;
- private XMLComponent fSchemaValidator;
- private XMLComponentManager fSchemaValidatorComponentManager;
- private ValidationManager fSchemaValidationManager;
- private UnparsedEntityHandler fUnparsedEntityHandler;
+ private final XMLComponent fSchemaValidator;
+ private final XMLComponentManager fSchemaValidatorComponentManager;
+ private final ValidationManager fSchemaValidationManager;
+ private final UnparsedEntityHandler fUnparsedEntityHandler;
/** Initial ErrorHandler */
private final ErrorHandler fInitErrorHandler;
@@ -171,6 +171,8 @@
/** For third party grammars, use the JAXP validator component. **/
else {
validatorComponent = new
JAXPValidatorComponent(grammar.newValidatorHandler());
+ fSchemaValidationManager = null;
+ fUnparsedEntityHandler = null;
fSchemaValidatorComponentManager = config;
}
config.addRecognizedFeatures(validatorComponent.getRecognizedFeatures());
@@ -180,6 +182,12 @@
domParser.setDocumentSource((XMLDocumentSource)
validatorComponent);
fSchemaValidator = validatorComponent;
}
+ else {
+ fSchemaValidationManager = null;
+ fUnparsedEntityHandler = null;
+ fSchemaValidatorComponentManager = null;
+ fSchemaValidator = null;
+ }
// Set features
setFeatures(features);
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/SAXParserImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/SAXParserImpl.java?rev=665969&r1=665968&r2=665969&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/SAXParserImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/SAXParserImpl.java
Mon Jun 9 20:58:47 2008
@@ -89,14 +89,14 @@
private static final String SECURITY_MANAGER =
Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
- private JAXPSAXParser xmlReader;
+ private final JAXPSAXParser xmlReader;
private String schemaLanguage = null; // null means DTD
private final Schema grammar;
- private XMLComponent fSchemaValidator;
- private XMLComponentManager fSchemaValidatorComponentManager;
- private ValidationManager fSchemaValidationManager;
- private UnparsedEntityHandler fUnparsedEntityHandler;
+ private final XMLComponent fSchemaValidator;
+ private final XMLComponentManager fSchemaValidatorComponentManager;
+ private final ValidationManager fSchemaValidationManager;
+ private final UnparsedEntityHandler fUnparsedEntityHandler;
/** Initial ErrorHandler */
private final ErrorHandler fInitErrorHandler;
@@ -179,6 +179,8 @@
/** For third party grammars, use the JAXP validator component. **/
else {
validatorComponent = new
JAXPValidatorComponent(grammar.newValidatorHandler());
+ fSchemaValidationManager = null;
+ fUnparsedEntityHandler = null;
fSchemaValidatorComponentManager = config;
}
config.addRecognizedFeatures(validatorComponent.getRecognizedFeatures());
@@ -188,6 +190,12 @@
xmlReader.setDocumentSource((XMLDocumentSource)
validatorComponent);
fSchemaValidator = validatorComponent;
}
+ else {
+ fSchemaValidationManager = null;
+ fUnparsedEntityHandler = null;
+ fSchemaValidatorComponentManager = null;
+ fSchemaValidator = null;
+ }
// Initial EntityResolver
fInitEntityResolver = xmlReader.getEntityResolver();
@@ -352,12 +360,12 @@
*/
public static class JAXPSAXParser extends
org.apache.xerces.parsers.SAXParser {
- private HashMap fInitFeatures = new HashMap();
- private HashMap fInitProperties = new HashMap();
- private SAXParserImpl fSAXParser;
+ private final HashMap fInitFeatures = new HashMap();
+ private final HashMap fInitProperties = new HashMap();
+ private final SAXParserImpl fSAXParser;
public JAXPSAXParser() {
- super();
+ this(null);
}
JAXPSAXParser(SAXParserImpl saxParser) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
