You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by je...@locus.apache.org on 2000/11/10 04:00:38 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes DatatypeValidatorFactoryImpl.java ENTITYDatatypeValidator.java IDDatatypeValidator.java IDREFDatatypeValidator.java
jeffreyr 00/11/09 19:00:37
Modified: java/src/org/apache/xerces/impl/validation/datatypes Tag:
xerces_j_2 DatatypeValidatorFactoryImpl.java
ENTITYDatatypeValidator.java
IDDatatypeValidator.java
IDREFDatatypeValidator.java
Log:
Statefull validators update
Revision Changes Path
No revision
No revision
1.1.2.10 +13 -5 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/DatatypeValidatorFactoryImpl.java
Index: DatatypeValidatorFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/DatatypeValidatorFactoryImpl.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- DatatypeValidatorFactoryImpl.java 2000/11/03 01:34:16 1.1.2.9
+++ DatatypeValidatorFactoryImpl.java 2000/11/10 03:00:37 1.1.2.10
@@ -84,7 +84,7 @@
* method to get a validator.
*
* @author Jeffrey Rodriguez
- * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.1.2.9 2000/11/03 01:34:16 jeffreyr Exp $
+ * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.1.2.10 2000/11/10 03:00:37 jeffreyr Exp $
*/
public class DatatypeValidatorFactoryImpl implements DatatypeValidatorFactory {
private static final boolean fDebug = false;
@@ -92,11 +92,16 @@
private static DatatypeValidatorFactoryImpl fRegistryOfDatatypes =
- new DatatypeValidatorFactoryImpl();
+ new DatatypeValidatorFactoryImpl();//comment this in when switching to no Singleton
- private DatatypeValidatorFactoryImpl() {
+ private DatatypeValidatorFactoryImpl() {//this need method to change to public or deleted when change to no singleton
initializeRegistry();
}
+ /* comment this out when change to no singleton.
+ public DatatypeValidatorFactoryImpl() {
+ initializeRegistry();
+ }
+ */
/**
* Initializes registry with primitive and derived
@@ -389,10 +394,13 @@
static public DatatypeValidatorFactoryImpl getDatatypeRegistry() {
return fRegistryOfDatatypes;
- }
+ }//this method needs to be deleted or commented in once we change to no Singleton
static public void main( String argv[] ){
- DatatypeValidatorFactoryImpl tstRegistry = DatatypeValidatorFactoryImpl.getDatatypeRegistry();
+ DatatypeValidatorFactoryImpl tstRegistry = DatatypeValidatorFactoryImpl.getDatatypeRegistry();//this needs to ne commented out or deleted once we go to no singleton
+ /* This needs to be commented out
+ DatatypeValidatorFactoryImpl tstRegistry = new DatatypeValidatorFactoryImpl();
+ */
System.out.println("tstRegistry = " + tstRegistry );
1.1.2.6 +2 -1 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/ENTITYDatatypeValidator.java
Index: ENTITYDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/ENTITYDatatypeValidator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ENTITYDatatypeValidator.java 2000/11/03 01:34:17 1.1.2.5
+++ ENTITYDatatypeValidator.java 2000/11/10 03:00:37 1.1.2.6
@@ -90,7 +90,7 @@
* able to validate entities.</P>
*
* @author Jeffrey Rodriguez-
- * @version $Id: ENTITYDatatypeValidator.java,v 1.1.2.5 2000/11/03 01:34:17 jeffreyr Exp $
+ * @version $Id: ENTITYDatatypeValidator.java,v 1.1.2.6 2000/11/10 03:00:37 jeffreyr Exp $
* @see org.apache.xerces.impl.validation.Grammar
* @see org.apache.xerces.impl.validation.grammars.DTDGrammar
* @see org.apache.xerces.impl.validation.grammars.SchemaGrammar
@@ -169,6 +169,7 @@
* @param grammar
*/
public void initialize( Object grammar ) {
+ //System.out.println("ENTITYDatatypeValidator initialized" );
fGrammar = (Grammar) grammar;
}
1.1.2.7 +4 -2 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDDatatypeValidator.java
Index: IDDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDDatatypeValidator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- IDDatatypeValidator.java 2000/11/03 01:34:19 1.1.2.6
+++ IDDatatypeValidator.java 2000/11/10 03:00:37 1.1.2.7
@@ -126,7 +126,7 @@
* </CODE>
*
* @author Jeffrey Rodriguez
- * @version $Id: IDDatatypeValidator.java,v 1.1.2.6 2000/11/03 01:34:19 jeffreyr Exp $
+ * @version $Id: IDDatatypeValidator.java,v 1.1.2.7 2000/11/10 03:00:37 jeffreyr Exp $
* @see org.apache.xerces.impl.validation.datatypes.AbstractDatatypeValidator
* @see org.apache.xerces.impl.validation.DatatypeValidator
* @see org.apache.xerces.impl.validation.datatypes.IDREFDatatypeValidator
@@ -194,7 +194,9 @@
*
* @param state This is a dummy parameter.
*/
- public void initialize( Object state) {
+ public void initialize( Object tableOfIDs) {
+ //System.out.println("IDDatatypeValidator Initialized" );
+ fTableOfId = (Hashtable) tableOfIDs;
if (this.fTableOfId != null) {
this.fTableOfId.clear();
} else {
1.1.2.6 +3 -1 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDREFDatatypeValidator.java
Index: IDREFDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDREFDatatypeValidator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- IDREFDatatypeValidator.java 2000/11/03 01:34:19 1.1.2.5
+++ IDREFDatatypeValidator.java 2000/11/10 03:00:37 1.1.2.6
@@ -104,7 +104,7 @@
* </CODE>
*
* @author Jeffrey Rodriguez-
- * @version $Id: IDREFDatatypeValidator.java,v 1.1.2.5 2000/11/03 01:34:19 jeffreyr Exp $
+ * @version $Id: IDREFDatatypeValidator.java,v 1.1.2.6 2000/11/10 03:00:37 jeffreyr Exp $
* @see org.apache.xerces.impl.validation.datatypes.IDDatatypeValidator
* @see org.apache.xerces.impl.validation.datatypes.AbstractDatatypeValidator
* @see org.apache.xerces.impl.validation.DatatypeValidator
@@ -194,6 +194,8 @@
* @param tableOfIDs
*/
public void initialize( Object tableOfIDs ){
+ //System.out.println("IDREF datatype initialized" );
+
if ( this.fTableIDRefs != null) {
this.fTableIDRefs.clear();
} else {