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/09/11 23:57:27 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/models DFAContentModel.java MixedContentModel.java SimpleContentModel.java
andyc 00/09/11 14:57:25
Modified: java/src/org/apache/xerces/framework Tag: xerces_j_2
XMLErrorReporter.java XMLString.java
XMLStringBuffer.java
java/src/org/apache/xerces/parsers Tag: xerces_j_2
CachingParserPool.java DOMParser.java
DTDParser.java SAXParser.java SchemaParser.java
XMLDocumentParser.java XMLGrammarParser.java
XMLParser.java
java/src/org/apache/xerces/readers Tag: xerces_j_2
XMLEntityManager.java XMLEntityReader.java
java/src/org/apache/xerces/scanners Tag: xerces_j_2
XMLAttributes.java XMLDTDContentModelHandler.java
XMLDTDHandler.java XMLDTDScanner.java
XMLDocumentHandler.java XMLDocumentScanner.java
java/src/org/apache/xerces/utils Tag: xerces_j_2
EncodingMap.java SymbolTable.java XMLChar.java
java/src/org/apache/xerces/validators Tag: xerces_j_2
ContentModelValidator.java DatatypeValidator.java
Grammar.java GrammarPool.java XMLElementDecl.java
XMLEntityDecl.java XMLValidator.java
java/src/org/apache/xerces/validators/datatypes Tag:
xerces_j_2 AbstractDatatypeValidator.java
StringDatatypeValidator.java
java/src/org/apache/xerces/validators/grammars Tag:
xerces_j_2 DTDGrammar.java SchemaGrammar.java
java/src/org/apache/xerces/validators/models Tag: xerces_j_2
DFAContentModel.java MixedContentModel.java
SimpleContentModel.java
Added: java/src/org/apache/xerces/framework Tag: xerces_j_2
XMLComponent.java XMLComponentManager.java
java/src/org/apache/xerces/scanners Tag: xerces_j_2
XMLDTDContentModelSource.java XMLDTDSource.java
XMLDocumentSource.java
Removed: java/src/org/apache/xerces/framework Tag: xerces_j_2
XMLConfigurable.java XMLConfigurationManager.java
java/src/org/apache/xerces/readers Tag: xerces_j_2
XMLEntityReaderChangeListener.java
java/src/org/apache/xerces/utils Tag: xerces_j_2
NamespaceScope.java
java/src/org/apache/xerces/validators Tag: xerces_j_2
ContentSpecProvider.java XMLContentSpec.java
Log:
Changes based on review of design document including multiple name
changes and changes in interfaces and classes.
Revision Changes Path
No revision
No revision
1.2.4.5 +4 -12 xml-xerces/java/src/org/apache/xerces/framework/XMLErrorReporter.java
Index: XMLErrorReporter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLErrorReporter.java,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- XMLErrorReporter.java 2000/06/08 00:09:20 1.2.4.4
+++ XMLErrorReporter.java 2000/09/11 21:56:11 1.2.4.5
@@ -66,11 +66,11 @@
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLErrorReporter.java,v 1.2.4.4 2000/06/08 00:09:20 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLErrorReporter.java,v 1.2.4.5 2000/09/11 21:56:11 andyc Exp $
*/
public class XMLErrorReporter
- implements XMLConfigurable {
+ implements XMLComponent {
//
// Constants
@@ -155,14 +155,6 @@
} // removeMessageFormatter
/**
- * setErrorHandler
- *
- * @param errorHandler
- */
- public void setErrorHandler(ErrorHandler errorHandler) {
- } // setErrorHandler
-
- /**
* reportError
*
* @param domain
@@ -175,7 +167,7 @@
} // reportError
//
- // XMLConfigurable methods
+ // XMLComponent methods
//
/**
@@ -183,7 +175,7 @@
*
* @param configurationManager
*/
- public void reset(XMLConfigurationManager configurationManager)
+ public void reset(XMLComponentManager configurationManager)
throws SAXException {
} // reset
1.1.2.5 +1 -1 xml-xerces/java/src/org/apache/xerces/framework/Attic/XMLString.java
Index: XMLString.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/Attic/XMLString.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLString.java 2000/06/08 00:09:20 1.1.2.4
+++ XMLString.java 2000/09/11 21:56:13 1.1.2.5
@@ -58,8 +58,8 @@
package org.apache.xerces.framework;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLString.java,v 1.1.2.4 2000/06/08 00:09:20 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLString.java,v 1.1.2.5 2000/09/11 21:56:13 andyc Exp $
*/
public class XMLString {
1.1.2.5 +9 -1 xml-xerces/java/src/org/apache/xerces/framework/Attic/XMLStringBuffer.java
Index: XMLStringBuffer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/Attic/XMLStringBuffer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLStringBuffer.java 2000/06/08 00:09:20 1.1.2.4
+++ XMLStringBuffer.java 2000/09/11 21:56:14 1.1.2.5
@@ -58,8 +58,8 @@
package org.apache.xerces.framework;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLStringBuffer.java,v 1.1.2.4 2000/06/08 00:09:20 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLStringBuffer.java,v 1.1.2.5 2000/09/11 21:56:14 andyc Exp $
*/
public class XMLStringBuffer
extends XMLString {
@@ -117,6 +117,14 @@
* @param length
*/
public void append(char[] ch, int offset, int length) {
+ } // append
+
+ /**
+ * append
+ *
+ * @param s
+ */
+ public void append(XMLString s) {
} // append
} // class XMLStringBuffer
No revision
No revision
1.1.2.1 +96 -0 xml-xerces/java/src/org/apache/xerces/framework/Attic/XMLComponent.java
1.1.2.1 +90 -0 xml-xerces/java/src/org/apache/xerces/framework/Attic/XMLComponentManager.java
No revision
No revision
1.1.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/parsers/Attic/CachingParserPool.java
Index: CachingParserPool.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/CachingParserPool.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CachingParserPool.java 2000/06/08 00:09:21 1.1.2.3
+++ CachingParserPool.java 2000/09/11 21:56:21 1.1.2.4
@@ -61,8 +61,8 @@
import org.apache.xerces.validators.GrammarPool;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: CachingParserPool.java,v 1.1.2.3 2000/06/08 00:09:21 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: CachingParserPool.java,v 1.1.2.4 2000/09/11 21:56:21 andyc Exp $
*/
public class CachingParserPool {
1.19.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/parsers/DOMParser.java
Index: DOMParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMParser.java,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- DOMParser.java 2000/06/08 00:09:21 1.19.2.3
+++ DOMParser.java 2000/09/11 21:56:22 1.19.2.4
@@ -62,8 +62,8 @@
import org.w3c.dom.Document;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: DOMParser.java,v 1.19.2.3 2000/06/08 00:09:21 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: DOMParser.java,v 1.19.2.4 2000/09/11 21:56:22 andyc Exp $
*/
public class DOMParser
extends XMLDocumentParser {
1.1.2.4 +20 -41 xml-xerces/java/src/org/apache/xerces/parsers/Attic/DTDParser.java
Index: DTDParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/DTDParser.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DTDParser.java 2000/06/08 00:09:22 1.1.2.3
+++ DTDParser.java 2000/09/11 21:56:23 1.1.2.4
@@ -61,14 +61,13 @@
import org.apache.xerces.scanners.XMLDTDContentModelHandler;
import org.apache.xerces.scanners.XMLDTDHandler;
import org.apache.xerces.scanners.XMLDTDScanner;
-import org.apache.xerces.utils.QName;
import org.apache.xerces.utils.SymbolTable;
import org.apache.xerces.validators.grammars.DTDGrammar;
import org.xml.sax.SAXException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: DTDParser.java,v 1.1.2.3 2000/06/08 00:09:22 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: DTDParser.java,v 1.1.2.4 2000/09/11 21:56:23 andyc Exp $
*/
public class DTDParser
extends XMLGrammarParser
@@ -153,33 +152,33 @@
/**
* elementDecl
*
- * @param element
+ * @param name
* @param contentModel
*/
- public void elementDecl(QName element, XMLString contentModel)
+ public void elementDecl(String name, XMLString contentModel)
throws SAXException {
} // elementDecl
/**
* startAttlist
*
- * @param element
+ * @param elementName
*/
- public void startAttlist(QName element)
+ public void startAttlist(String elementName)
throws SAXException {
} // startAttlist
/**
* attributeDecl
*
- * @param element
- * @param attribute
+ * @param elementName
+ * @param attributeName
* @param type
* @param enumeration
* @param defaultType
* @param defaultValue
*/
- public void attributeDecl(QName element, QName attribute, short type, String[] enumeration, short defaultType, XMLString defaultValue)
+ public void attributeDecl(String elementName, String attributeName, String type, String[] enumeration, String defaultType, XMLString defaultValue)
throws SAXException {
} // attributeDecl
@@ -236,41 +235,21 @@
throws SAXException {
} // notationDecl
- /**
- * startParameterEntityReference
- *
- * @param name
- * @param publicId
- * @param systemId
- */
- public void startParameterEntityReference(String name, String publicId, String systemId)
- throws SAXException {
- } // startParameterEntityReference
-
- /**
- * endParameterEntityReference
- *
- * @param name
- */
- public void endParameterEntityReference(String name)
- throws SAXException {
- } // endParameterEntityReference
-
/**
- * startConditionalSection
+ * startConditional
*
* @param type
*/
- public void startConditionalSection(short type)
+ public void startConditional(short type)
throws SAXException {
- } // startConditionalSection
+ } // startConditional
/**
- * endConditionalSection
+ * endConditional
*/
- public void endConditionalSection()
+ public void endConditional()
throws SAXException {
- } // endConditionalSection
+ } // endConditional
/**
* endDTD
@@ -286,19 +265,19 @@
/**
* startContentModel
*
- * @param element
+ * @param elementName
* @param type
*/
- public void startContentModel(QName element, short type)
+ public void startContentModel(String elementName, short type)
throws SAXException {
} // startContentModel
/**
* mixedElement
*
- * @param element
+ * @param elementName
*/
- public void mixedElement(QName element)
+ public void mixedElement(String elementName)
throws SAXException {
} // mixedElement
@@ -312,9 +291,9 @@
/**
* childrenElement
*
- * @param element
+ * @param elementName
*/
- public void childrenElement(QName element)
+ public void childrenElement(String elementName)
throws SAXException {
} // childrenElement
1.12.2.4 +14 -35 xml-xerces/java/src/org/apache/xerces/parsers/SAXParser.java
Index: SAXParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/SAXParser.java,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- SAXParser.java 2000/06/08 00:09:22 1.12.2.3
+++ SAXParser.java 2000/09/11 21:56:23 1.12.2.4
@@ -61,7 +61,6 @@
import java.util.Locale;
import org.apache.xerces.framework.XMLString;
import org.apache.xerces.scanners.XMLDTDHandler;
-import org.apache.xerces.utils.QName;
import org.apache.xerces.utils.SymbolTable;
import org.apache.xerces.validators.GrammarPool;
import org.xml.sax.ContentHandler;
@@ -77,8 +76,8 @@
import org.xml.sax.XMLReader;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: SAXParser.java,v 1.12.2.3 2000/06/08 00:09:22 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: SAXParser.java,v 1.12.2.4 2000/09/11 21:56:23 andyc Exp $
*/
public class SAXParser
extends XMLDocumentParser
@@ -150,33 +149,33 @@
/**
* elementDecl
*
- * @param element
+ * @param name
* @param contentModel
*/
- public void elementDecl(QName element, XMLString contentModel)
+ public void elementDecl(String name, XMLString contentModel)
throws SAXException {
} // elementDecl
/**
* startAttlist
*
- * @param element
+ * @param elementName
*/
- public void startAttlist(QName element)
+ public void startAttlist(String elementName)
throws SAXException {
} // startAttlist
/**
* attributeDecl
*
- * @param element
- * @param attribute
+ * @param elementName
+ * @param attributeName
* @param type
* @param enumeration
* @param defaultType
* @param defaultValue
*/
- public void attributeDecl(QName element, QName attribute, short type, String[] enumeration, short defaultType, XMLString defaultValue)
+ public void attributeDecl(String elementName, String attributeName, String type, String[] enumeration, String defaultType, XMLString defaultValue)
throws SAXException {
} // attributeDecl
@@ -233,41 +232,21 @@
throws SAXException {
} // notationDecl
- /**
- * startParameterEntityReference
- *
- * @param name
- * @param publicId
- * @param systemId
- */
- public void startParameterEntityReference(String name, String publicId, String systemId)
- throws SAXException {
- } // startParameterEntityReference
-
- /**
- * endParameterEntityReference
- *
- * @param name
- */
- public void endParameterEntityReference(String name)
- throws SAXException {
- } // endParameterEntityReference
-
/**
- * startConditionalSection
+ * startConditional
*
* @param type
*/
- public void startConditionalSection(short type)
+ public void startConditional(short type)
throws SAXException {
- } // startConditionalSection
+ } // startConditional
/**
- * endConditionalSection
+ * endConditional
*/
- public void endConditionalSection()
+ public void endConditional()
throws SAXException {
- } // endConditionalSection
+ } // endConditional
/**
* endDTD
1.1.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/parsers/Attic/SchemaParser.java
Index: SchemaParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/SchemaParser.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SchemaParser.java 2000/06/08 00:09:22 1.1.2.3
+++ SchemaParser.java 2000/09/11 21:56:24 1.1.2.4
@@ -62,8 +62,8 @@
import org.apache.xerces.validators.grammars.SchemaGrammar;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: SchemaParser.java,v 1.1.2.3 2000/06/08 00:09:22 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: SchemaParser.java,v 1.1.2.4 2000/09/11 21:56:24 andyc Exp $
*/
public class SchemaParser
extends XMLGrammarParser {
1.1.2.4 +33 -23 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDocumentParser.java 2000/06/08 00:09:22 1.1.2.3
+++ XMLDocumentParser.java 2000/09/11 21:56:25 1.1.2.4
@@ -70,8 +70,8 @@
import org.xml.sax.SAXException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLDocumentParser.java,v 1.1.2.3 2000/06/08 00:09:22 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLDocumentParser.java,v 1.1.2.4 2000/09/11 21:56:25 andyc Exp $
*/
public class XMLDocumentParser
extends XMLParser
@@ -131,9 +131,10 @@
*
* @param version
* @param encoding
+ * @param actualEncoding
* @param standalone
*/
- public void xmlDecl(String version, String encoding, String standalone)
+ public void xmlDecl(String version, String encoding, String actualEncoding, String standalone)
throws SAXException {
} // xmlDecl
@@ -144,7 +145,7 @@
* @param publicId
* @param systemId
*/
- public void doctypeDecl(QName rootElement, String publicId, String systemId)
+ public void doctypeDecl(String rootElement, String publicId, String systemId)
throws SAXException {
} // doctypeDecl
@@ -168,14 +169,14 @@
} // processingInstruction
/**
- * startNamespaceScope
+ * startPrefixMapping
*
* @param prefix
* @param uri
*/
- public void startNamespaceScope(String prefix, String uri)
+ public void startPrefixMapping(String prefix, String uri)
throws SAXException {
- } // startNamespaceScope
+ } // startPrefixMapping
/**
* startElement
@@ -216,47 +217,56 @@
} // endElement
/**
- * endNamespaceScope
+ * endPrefixMapping
*
* @param prefix
*/
- public void endNamespaceScope(String prefix)
+ public void endPrefixMapping(String prefix)
throws SAXException {
- } // endNamespaceScope
+ } // endPrefixMapping
/**
- * startEntityReference
+ * startEntity
*
* @param name
- * @param publicId
- * @param systemId
+ */
+ public void startEntity(String name)
+ throws SAXException {
+ } // startEntity
+
+ /**
+ * textDecl
+ *
+ * @param version
+ * @param encoding
+ * @param actualEncoding
*/
- public void startEntityReference(String name, String publicId, String systemId)
+ public void textDecl(String version, String encoding, String actualEncoding)
throws SAXException {
- } // startEntityReference
+ } // textDecl
/**
- * endEntityReference
+ * endEntity
*
* @param name
*/
- public void endEntityReference(String name)
+ public void endEntity(String name)
throws SAXException {
- } // endEntityReference
+ } // endEntity
/**
- * startCDATASection
+ * startCDATA
*/
- public void startCDATASection()
+ public void startCDATA()
throws SAXException {
- } // startCDATASection
+ } // startCDATA
/**
- * endCDATASection
+ * endCDATA
*/
- public void endCDATASection()
+ public void endCDATA()
throws SAXException {
- } // endCDATASection
+ } // endCDATA
/**
* endDocument
1.1.2.4 +4 -4 xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLGrammarParser.java
Index: XMLGrammarParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLGrammarParser.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLGrammarParser.java 2000/06/08 00:09:22 1.1.2.3
+++ XMLGrammarParser.java 2000/09/11 21:56:26 1.1.2.4
@@ -57,19 +57,19 @@
package org.apache.xerces.parsers;
-import org.apache.xerces.framework.XMLConfigurationManager;
+import org.apache.xerces.framework.XMLComponentManager;
import org.apache.xerces.utils.SymbolTable;
import org.apache.xerces.validators.DatatypeValidatorFactory;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLGrammarParser.java,v 1.1.2.3 2000/06/08 00:09:22 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLGrammarParser.java,v 1.1.2.4 2000/09/11 21:56:26 andyc Exp $
*/
public class XMLGrammarParser
extends XMLParser
- implements XMLConfigurationManager {
+ implements XMLComponentManager {
//
// Data
@@ -91,7 +91,7 @@
}
//
- // XMLConfigurationManager methods
+ // XMLComponentManager methods
//
/**
1.1.2.4 +4 -4 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLParser.java 2000/06/08 00:09:22 1.1.2.3
+++ XMLParser.java 2000/09/11 21:56:26 1.1.2.4
@@ -58,7 +58,7 @@
package org.apache.xerces.parsers;
import java.io.IOException;
-import org.apache.xerces.framework.XMLConfigurationManager;
+import org.apache.xerces.framework.XMLComponentManager;
import org.apache.xerces.framework.XMLErrorReporter;
import org.apache.xerces.readers.XMLEntityManager;
import org.apache.xerces.utils.SymbolTable;
@@ -70,11 +70,11 @@
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLParser.java,v 1.1.2.3 2000/06/08 00:09:22 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLParser.java,v 1.1.2.4 2000/09/11 21:56:26 andyc Exp $
*/
public class XMLParser
- implements XMLConfigurationManager {
+ implements XMLComponentManager {
//
// Data
@@ -202,7 +202,7 @@
} // parse
//
- // XMLConfigurationManager methods
+ // XMLComponentManager methods
//
/**
No revision
No revision
1.1.2.4 +35 -38 xml-xerces/java/src/org/apache/xerces/readers/Attic/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/readers/Attic/XMLEntityManager.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLEntityManager.java 2000/06/08 00:09:24 1.1.2.3
+++ XMLEntityManager.java 2000/09/11 21:56:34 1.1.2.4
@@ -59,9 +59,9 @@
import java.io.IOException;
import java.util.Stack;
-import java.util.Vector;
-import org.apache.xerces.framework.XMLConfigurable;
-import org.apache.xerces.framework.XMLConfigurationManager;
+import org.apache.xerces.framework.XMLComponent;
+import org.apache.xerces.framework.XMLComponentManager;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -69,22 +69,22 @@
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLEntityManager.java,v 1.1.2.3 2000/06/08 00:09:24 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLEntityManager.java,v 1.1.2.4 2000/09/11 21:56:34 andyc Exp $
*/
public class XMLEntityManager
- implements XMLConfigurable, Locator {
+ implements XMLComponent, Locator {
//
// Data
//
+ /** fEntityResolver */
+ protected EntityResolver fEntityResolver;
+
/** fEntityReaders */
protected Stack fEntityReaders;
- /** fEntityReaderChangeListeners */
- protected Vector fEntityReaderChangeListeners;
-
//
// Constructors
//
@@ -104,17 +104,41 @@
*
* @param publicId
* @param systemId
+ * @param baseSystemId
*
* @return
*/
- public InputSource resolveEntity(String publicId, String systemId)
+ public InputSource resolveEntity(String publicId, String systemId, String baseSystemId)
throws IOException, SAXException {
return null;
} // resolveEntity
/**
+ * addEntity
+ *
+ * @param name
+ * @param publicId
+ * @param systemId
+ * @param baseSystemId
+ */
+ public void addEntity(String name, String publicId, String systemId, String baseSystemId) {
+ } // addEntity
+
+ /**
* createEntityReader
*
+ * @param entityName
+ *
+ * @return
+ */
+ public XMLEntityReader createEntityReader(String entityName)
+ throws IOException {
+ return null;
+ } // createEntityReader
+
+ /**
+ * createEntityReader
+ *
* @param inputSource
*
* @return
@@ -133,17 +157,6 @@
} // pushEntityReader
/**
- * peekEntityReader
- *
- * @param depth
- *
- * @return
- */
- public XMLEntityReader peekEntityReader(int depth) {
- return null;
- } // peekEntityReader
-
- /**
* popEntityReader
*
* @return
@@ -152,24 +165,8 @@
return null;
} // popEntityReader
- /**
- * addEntityReaderChangeListener
- *
- * @param entityReaderChangeListener
- */
- public void addEntityReaderChangeListener(XMLEntityReaderChangeListener entityReaderChangeListener) {
- } // addEntityReaderChangeListener
-
- /**
- * removeEntityReaderChangeListener
- *
- * @param entityReaderChangeListener
- */
- public void removeEntityReaderChangeListener(XMLEntityReaderChangeListener entityReaderChangeListener) {
- } // removeEntityReaderChangeListener
-
//
- // XMLConfigurable methods
+ // XMLComponent methods
//
/**
@@ -177,7 +174,7 @@
*
* @param configurationManager
*/
- public void reset(XMLConfigurationManager configurationManager)
+ public void reset(XMLComponentManager configurationManager)
throws SAXException {
} // reset
1.2.4.5 +13 -141 xml-xerces/java/src/org/apache/xerces/readers/XMLEntityReader.java
Index: XMLEntityReader.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/readers/XMLEntityReader.java,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- XMLEntityReader.java 2000/06/08 00:09:24 1.2.4.4
+++ XMLEntityReader.java 2000/09/11 21:56:35 1.2.4.5
@@ -58,37 +58,22 @@
package org.apache.xerces.readers;
import java.io.IOException;
-import org.apache.xerces.framework.XMLString;
+import java.io.Reader;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLEntityReader.java,v 1.2.4.4 2000/06/08 00:09:24 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLEntityReader.java,v 1.2.4.5 2000/09/11 21:56:35 andyc Exp $
*/
public class XMLEntityReader
+ extends Reader
implements Locator {
//
- // Constants
- //
-
- /** SCAN_ATT_COMPLETE */
- public static final short SCAN_ATT_COMPLETE = -1;
-
- /** SCAN_ATT_CONTENT */
- public static final short SCAN_ATT_CONTENT = -1;
-
- /** SCAN_ATT_ENTITY */
- public static final short SCAN_ATT_ENTITY = -1;
-
- //
// Data
//
- /** fEntityManager */
- protected XMLEntityManager fEntityManager;
-
/** fInputSource */
protected InputSource fInputSource;
@@ -111,10 +96,9 @@
/**
*
*
- * @param entityManager
* @param inputSource
*/
- public XMLEntityReader(XMLEntityManager entityManager, InputSource inputSource) {
+ public XMLEntityReader(InputSource inputSource) {
}
//
@@ -139,141 +123,29 @@
return -1;
} // getCharPosition
- /**
- * lookingAtChar
- *
- * @param c
- * @param consume
- *
- * @return
- */
- public boolean lookingAtChar(char c, boolean consume)
- throws IOException {
- return false;
- } // lookingAtChar
-
- /**
- * lookingAtSpace
- *
- * @param consume
- *
- * @return
- */
- public boolean lookingAtSpace(boolean consume)
- throws IOException {
- return false;
- } // lookingAtSpace
-
- /**
- * scanName
- *
- * @param name
- *
- * @return
- */
- public boolean scanName(XMLString name)
- throws IOException {
- return false;
- } // scanName
-
- /**
- * scanQName
- *
- * @param prefix
- * @param localpart
- * @param rawname
- *
- * @return
- */
- public boolean scanQName(XMLString prefix, XMLString localpart, XMLString rawname)
- throws IOException {
- return false;
- } // scanQName
-
/**
- * scanToChar
+ * read
*
- * @param c
- * @param text
- *
- * @return
- */
- public boolean scanToChar(char c, XMLString text)
- throws IOException {
- return false;
- } // scanToChar
-
- /**
- * scanContent
- *
- * @param content
- *
- * @return
- */
- public boolean scanContent(XMLString content)
- throws IOException {
- return false;
- } // scanContent
-
- /**
- * scanAttContent
- *
- * @param quote
- * @param content
- *
* @return
*/
- public short scanAttContent(char quote, XMLString content)
+ public int read()
throws IOException {
return -1;
- } // scanAttContent
+ } // read
/**
- * scanCharRef
+ * read
*
- * @param hexadecimal
+ * @param buffer
+ * @param offset
+ * @param length
*
* @return
*/
- public int scanCharRef(boolean hexadecimal)
+ public int read(char[] buffer, int offset, int length)
throws IOException {
return -1;
- } // scanCharRef
-
- /**
- * skipToChar
- *
- * @param c
- * @param consume
- *
- * @return
- */
- public boolean skipToChar(char c, boolean consume)
- throws IOException {
- return false;
- } // skipToChar
-
- /**
- * skipSpaces
- *
- * @return
- */
- public boolean skipSpaces()
- throws IOException {
- return false;
- } // skipSpaces
-
- /**
- * skipString
- *
- * @param string
- *
- * @return
- */
- public boolean skipString(char[] string)
- throws IOException {
- return false;
- } // skipString
+ } // read
/**
* close
No revision
No revision
1.1.2.4 +24 -4 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLAttributes.java
Index: XMLAttributes.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLAttributes.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLAttributes.java 2000/06/08 00:09:25 1.1.2.3
+++ XMLAttributes.java 2000/09/11 21:56:38 1.1.2.4
@@ -63,8 +63,8 @@
import org.xml.sax.Attributes;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLAttributes.java,v 1.1.2.3 2000/06/08 00:09:25 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLAttributes.java,v 1.1.2.4 2000/09/11 21:56:38 andyc Exp $
*/
public class XMLAttributes
implements AttributeList, Attributes {
@@ -84,7 +84,7 @@
//
/**
- * addAttribute
+ * setAttribute
*
* @param name
* @param type
@@ -92,9 +92,9 @@
*
* @return
*/
- public int addAttribute(QName name, String type, XMLString value) {
+ public int setAttribute(QName name, String type, XMLString value) {
return -1;
- } // addAttribute
+ } // setAttribute
/**
* addAttributeEntity
@@ -108,6 +108,14 @@
} // addAttributeEntity
/**
+ * removeAttribute
+ *
+ * @param name
+ */
+ public void removeAttribute(QName name) {
+ } // removeAttribute
+
+ /**
* clear
*/
public void clear() {
@@ -197,6 +205,18 @@
public int getEntityCount(int attrIndex) {
return -1;
} // getEntityCount
+
+ /**
+ * getEntityName
+ *
+ * @param attrIndex
+ * @param entityIndex
+ *
+ * @return
+ */
+ public String getEntityName(int attrIndex, int entityIndex) {
+ return null;
+ } // getEntityName
/**
* getEntityOffset
1.1.2.4 +7 -7 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDContentModelHandler.java
Index: XMLDTDContentModelHandler.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDContentModelHandler.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDTDContentModelHandler.java 2000/06/08 00:09:25 1.1.2.3
+++ XMLDTDContentModelHandler.java 2000/09/11 21:56:39 1.1.2.4
@@ -58,8 +58,8 @@
package org.apache.xerces.scanners;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLDTDContentModelHandler.java,v 1.1.2.3 2000/06/08 00:09:25 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLDTDContentModelHandler.java,v 1.1.2.4 2000/09/11 21:56:39 andyc Exp $
*/
public interface XMLDTDContentModelHandler {
@@ -101,18 +101,18 @@
/**
* startContentModel
*
- * @param element
+ * @param elementName
* @param type
*/
- public void startContentModel(QName element, short type)
+ public void startContentModel(String elementName, short type)
throws SAXException;
/**
* mixedElement
*
- * @param element
+ * @param elementName
*/
- public void mixedElement(QName element)
+ public void mixedElement(String elementName)
throws SAXException;
/**
@@ -124,9 +124,9 @@
/**
* childrenElement
*
- * @param element
+ * @param elementName
*/
- public void childrenElement(QName element)
+ public void childrenElement(String elementName)
throws SAXException;
/**
1.1.2.4 +12 -30 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDHandler.java
Index: XMLDTDHandler.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDHandler.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDTDHandler.java 2000/06/08 00:09:25 1.1.2.3
+++ XMLDTDHandler.java 2000/09/11 21:56:41 1.1.2.4
@@ -58,8 +58,8 @@
package org.apache.xerces.scanners;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLDTDHandler.java,v 1.1.2.3 2000/06/08 00:09:25 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLDTDHandler.java,v 1.1.2.4 2000/09/11 21:56:41 andyc Exp $
*/
public interface XMLDTDHandler {
@@ -115,31 +115,31 @@
/**
* elementDecl
*
- * @param element
+ * @param name
* @param contentModel
*/
- public void elementDecl(QName element, XMLString contentModel)
+ public void elementDecl(String name, XMLString contentModel)
throws SAXException;
/**
* startAttlist
*
- * @param element
+ * @param elementName
*/
- public void startAttlist(QName element)
+ public void startAttlist(String elementName)
throws SAXException;
/**
* attributeDecl
*
- * @param element
- * @param attribute
+ * @param elementName
+ * @param attributeName
* @param type
* @param enumeration
* @param defaultType
* @param defaultValue
*/
- public void attributeDecl(QName element, QName attribute, short type, String[] enumeration, short defaultType, XMLString defaultValue)
+ public void attributeDecl(String elementName, String attributeName, String type, String[] enumeration, String defaultType, XMLString defaultValue)
throws SAXException;
/**
@@ -190,36 +190,18 @@
public void notationDecl(String name, String publicId, String systemId)
throws SAXException;
- /**
- * startParameterEntityReference
- *
- * @param name
- * @param publicId
- * @param systemId
- */
- public void startParameterEntityReference(String name, String publicId, String systemId)
- throws SAXException;
-
- /**
- * endParameterEntityReference
- *
- * @param name
- */
- public void endParameterEntityReference(String name)
- throws SAXException;
-
/**
- * startConditionalSection
+ * startConditional
*
* @param type
*/
- public void startConditionalSection(short type)
+ public void startConditional(short type)
throws SAXException;
/**
- * endConditionalSection
+ * endConditional
*/
- public void endConditionalSection()
+ public void endConditional()
throws SAXException;
/**
1.1.2.4 +23 -33 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDScanner.java
Index: XMLDTDScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDScanner.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDTDScanner.java 2000/06/08 00:09:25 1.1.2.3
+++ XMLDTDScanner.java 2000/09/11 21:56:42 1.1.2.4
@@ -58,12 +58,10 @@
package org.apache.xerces.scanners;
import java.io.IOException;
-import org.apache.xerces.framework.XMLConfigurable;
-import org.apache.xerces.framework.XMLConfigurationManager;
+import org.apache.xerces.framework.XMLComponent;
+import org.apache.xerces.framework.XMLComponentManager;
import org.apache.xerces.framework.XMLErrorReporter;
import org.apache.xerces.readers.XMLEntityManager;
-import org.apache.xerces.readers.XMLEntityReader;
-import org.apache.xerces.readers.XMLEntityReaderChangeListener;
import org.apache.xerces.utils.SymbolTable;
import org.apache.xerces.validators.GrammarPool;
import org.xml.sax.SAXException;
@@ -71,11 +69,11 @@
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLDTDScanner.java,v 1.1.2.3 2000/06/08 00:09:25 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLDTDScanner.java,v 1.1.2.4 2000/09/11 21:56:42 andyc Exp $
*/
public class XMLDTDScanner
- implements XMLConfigurable, XMLEntityReaderChangeListener {
+ implements XMLComponent, XMLDTDSource, XMLDTDContentModelSource {
//
// Data
@@ -93,9 +91,6 @@
/** fGrammarPool */
protected GrammarPool fGrammarPool;
- /** fNamespaces */
- protected boolean fNamespaces;
-
/** fDTDHandler */
protected XMLDTDHandler fDTDHandler;
@@ -117,22 +112,6 @@
//
/**
- * setDTDHandler
- *
- * @param dtdHandler
- */
- public void setDTDHandler(XMLDTDHandler dtdHandler) {
- } // setDTDHandler
-
- /**
- * setDTDContentModelHandler
- *
- * @param dtdHandler
- */
- public void setDTDContentModelHandler(XMLDTDContentModelHandler dtdHandler) {
- } // setDTDContentModelHandler
-
- /**
* scanDTD
*
* @param complete
@@ -169,7 +148,7 @@
} // scanDTDInternalSubset
//
- // XMLConfigurable methods
+ // XMLComponent methods
//
/**
@@ -177,7 +156,7 @@
*
* @param configurationManager
*/
- public void reset(XMLConfigurationManager configurationManager)
+ public void reset(XMLComponentManager configurationManager)
throws SAXException {
} // reset
@@ -202,16 +181,27 @@
} // setProperty
//
- // XMLEntityReaderChangeListener methods
+ // XMLDTDSource methods
//
/**
- * entityReaderChanged
+ * setDTDHandler
*
- * @param reader
+ * @param dtdHandler
*/
- public void entityReaderChanged(XMLEntityReader reader)
- throws SAXException {
- } // entityReaderChanged
+ public void setDTDHandler(XMLDTDHandler dtdHandler) {
+ } // setDTDHandler
+
+ //
+ // XMLDTDContentModelSource methods
+ //
+
+ /**
+ * setDTDContentModelHandler
+ *
+ * @param dtdContentModelHandler
+ */
+ public void setDTDContentModelHandler(XMLDTDContentModelHandler dtdContentModelHandler) {
+ } // setDTDContentModelHandler
} // class XMLDTDScanner
1.1.2.4 +26 -17 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDocumentHandler.java
Index: XMLDocumentHandler.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDocumentHandler.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDocumentHandler.java 2000/06/08 00:09:25 1.1.2.3
+++ XMLDocumentHandler.java 2000/09/11 21:56:43 1.1.2.4
@@ -58,8 +58,8 @@
package org.apache.xerces.scanners;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLDocumentHandler.java,v 1.1.2.3 2000/06/08 00:09:25 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLDocumentHandler.java,v 1.1.2.4 2000/09/11 21:56:43 andyc Exp $
*/
public interface XMLDocumentHandler {
@@ -78,9 +78,10 @@
*
* @param version
* @param encoding
+ * @param actualEncoding
* @param standalone
*/
- public void xmlDecl(String version, String encoding, String standalone)
+ public void xmlDecl(String version, String encoding, String actualEncoding, String standalone)
throws SAXException;
/**
@@ -90,7 +91,7 @@
* @param publicId
* @param systemId
*/
- public void doctypeDecl(QName rootElement, String publicId, String systemId)
+ public void doctypeDecl(String rootElement, String publicId, String systemId)
throws SAXException;
/**
@@ -111,12 +112,12 @@
throws SAXException;
/**
- * startNamespaceScope
+ * startPrefixMapping
*
* @param prefix
* @param uri
*/
- public void startNamespaceScope(String prefix, String uri)
+ public void startPrefixMapping(String prefix, String uri)
throws SAXException;
/**
@@ -154,41 +155,49 @@
throws SAXException;
/**
- * endNamespaceScope
+ * endPrefixMapping
*
* @param prefix
*/
- public void endNamespaceScope(String prefix)
+ public void endPrefixMapping(String prefix)
throws SAXException;
/**
- * startEntityReference
+ * startEntity
*
* @param name
- * @param publicId
- * @param systemId
+ */
+ public void startEntity(String name)
+ throws SAXException;
+
+ /**
+ * textDecl
+ *
+ * @param version
+ * @param encoding
+ * @param actualEncoding
*/
- public void startEntityReference(String name, String publicId, String systemId)
+ public void textDecl(String version, String encoding, String actualEncoding)
throws SAXException;
/**
- * endEntityReference
+ * endEntity
*
* @param name
*/
- public void endEntityReference(String name)
+ public void endEntity(String name)
throws SAXException;
/**
- * startCDATASection
+ * startCDATA
*/
- public void startCDATASection()
+ public void startCDATA()
throws SAXException;
/**
- * endCDATASection
+ * endCDATA
*/
- public void endCDATASection()
+ public void endCDATA()
throws SAXException;
/**
1.1.2.4 +11 -34 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDocumentScanner.java
Index: XMLDocumentScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDocumentScanner.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDocumentScanner.java 2000/06/08 00:09:25 1.1.2.3
+++ XMLDocumentScanner.java 2000/09/11 21:56:46 1.1.2.4
@@ -58,23 +58,21 @@
package org.apache.xerces.scanners;
import java.io.IOException;
-import org.apache.xerces.framework.XMLConfigurable;
-import org.apache.xerces.framework.XMLConfigurationManager;
+import org.apache.xerces.framework.XMLComponent;
+import org.apache.xerces.framework.XMLComponentManager;
import org.apache.xerces.framework.XMLErrorReporter;
import org.apache.xerces.readers.XMLEntityManager;
-import org.apache.xerces.readers.XMLEntityReader;
-import org.apache.xerces.readers.XMLEntityReaderChangeListener;
import org.apache.xerces.utils.SymbolTable;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLDocumentScanner.java,v 1.1.2.3 2000/06/08 00:09:25 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLDocumentScanner.java,v 1.1.2.4 2000/09/11 21:56:46 andyc Exp $
*/
public class XMLDocumentScanner
- implements XMLConfigurable, XMLEntityReaderChangeListener {
+ implements XMLComponent, XMLDocumentSource {
//
// Data
@@ -113,14 +111,6 @@
//
/**
- * setDocumentHandler
- *
- * @param documentHandler
- */
- public void setDocumentHandler(XMLDocumentHandler documentHandler) {
- } // setDocumentHandler
-
- /**
* scanDocument
*
* @param complete
@@ -132,20 +122,8 @@
return false;
} // scanDocument
- /**
- * scanDocumentFragment
- *
- * @param complete
- *
- * @return
- */
- public boolean scanDocumentFragment(boolean complete)
- throws IOException, SAXException {
- return false;
- } // scanDocumentFragment
-
//
- // XMLConfigurable methods
+ // XMLComponent methods
//
/**
@@ -153,7 +131,7 @@
*
* @param configurationManager
*/
- public void reset(XMLConfigurationManager configurationManager)
+ public void reset(XMLComponentManager configurationManager)
throws SAXException {
} // reset
@@ -178,16 +156,15 @@
} // setProperty
//
- // XMLEntityReaderChangeListener methods
+ // XMLDocumentSource methods
//
/**
- * entityReaderChanged
+ * setDocumentHandler
*
- * @param reader
+ * @param documentHandler
*/
- public void entityReaderChanged(XMLEntityReader reader)
- throws SAXException {
- } // entityReaderChanged
+ public void setDocumentHandler(XMLDocumentHandler documentHandler) {
+ } // setDocumentHandler
} // class XMLDocumentScanner
No revision
No revision
1.1.2.1 +77 -0 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDContentModelSource.java
1.1.2.1 +77 -0 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDTDSource.java
1.1.2.1 +77 -0 xml-xerces/java/src/org/apache/xerces/scanners/Attic/XMLDocumentSource.java
No revision
No revision
1.1.2.4 +575 -48 xml-xerces/java/src/org/apache/xerces/utils/Attic/EncodingMap.java
Index: EncodingMap.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/utils/Attic/EncodingMap.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EncodingMap.java 2000/06/08 00:09:27 1.1.2.3
+++ EncodingMap.java 2000/09/11 21:56:52 1.1.2.4
@@ -2,8 +2,8 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999,2000 The Apache Software Foundation. All rights
- * reserved.
+ * Copyright (c) 1998,1999,2000 The Apache Software Foundation.
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -60,8 +60,453 @@
import java.util.Hashtable;
/**
+ * EncodingMap is a convenience class which handles conversions between
+ * IANA encoding names and Java encoding names, and vice versa. The
+ * encoding names used in XML instance documents <strong>must</strong>
+ * be the IANA encoding names specified.
+ * <p>
+ * <TABLE BORDER="0" WIDTH="100%">
+ * <TR>
+ * <TD WIDTH="33%">
+ * <P ALIGN="CENTER"><B>Common Name</B>
+ * </TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER"><B>Use this name in XML files</B>
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER"><B>Name Type</B>
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER"><B>Xerces converts to this Java Encoder Name</B>
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">8 bit Unicode</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">UTF-8
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">UTF8
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin 1</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-1
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-1
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin 2</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-2
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-2
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin 3</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-3
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-3
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin 4</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-4
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-4
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin Cyrillic</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-5
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-5
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin Arabic</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-6
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-6
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin Greek</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-7
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-7
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin Hebrew</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-8
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-8
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">ISO Latin 5</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ISO-8859-9
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">ISO-8859-9
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: US</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-us
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp037
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Canada</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-ca
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp037
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Netherlands</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-nl
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp037
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Denmark</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-dk
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp277
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Norway</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-no
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp277
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Finland</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-fi
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp278
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Sweden</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-se
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp278
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Italy</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-it
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp280
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Spain, Latin America</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-es
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp284
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Great Britain</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-gb
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp285
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: France</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-fr
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp297
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Arabic</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-ar1
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp420
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Hebrew</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-he
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp424
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Switzerland</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-ch
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp500
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Roece</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-roece
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp870
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Yogoslavia</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-yu
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp870
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Iceland</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-is
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp871
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">EBCDIC: Urdu</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">ebcdic-cp-ar2
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">IANA
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">cp918
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Chinese for PRC, mixed 1/2 byte</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">gb2312
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">GB2312
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Extended Unix Code, packed for Japanese</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">euc-jp
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">eucjis
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Japanese: iso-2022-jp</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">iso-2020-jp
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">JIS
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Japanese: Shift JIS</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">Shift_JIS
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">SJIS
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Chinese: Big5</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">Big5
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">Big5
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Extended Unix Code, packed for Korean</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">euc-kr
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">iso2022kr
+ * </TD>
+ * </TR>
+ * <TR>
+ * <TD WIDTH="33%">Cyrillic</TD>
+ * <TD WIDTH="15%">
+ * <P ALIGN="CENTER">koi8-r
+ * </TD>
+ * <TD WIDTH="12%">
+ * <P ALIGN="CENTER">MIME
+ * </TD>
+ * <TD WIDTH="31%">
+ * <P ALIGN="CENTER">koi8-r
+ * </TD>
+ * </TR>
+ * </TABLE>
+ *
+ * @author TAMURA Kent, IBM
* @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: EncodingMap.java,v 1.1.2.3 2000/06/08 00:09:27 andyc Exp $
+ * @author Andy Clark, IBM
+ *
+ * @version $Id: EncodingMap.java,v 1.1.2.4 2000/09/11 21:56:52 andyc Exp $
*/
public class EncodingMap {
@@ -70,85 +515,167 @@
//
/** fIANA2JavaMap */
- protected Hashtable fIANA2JavaMap;
+ protected final static Hashtable fIANA2JavaMap = new Hashtable();
/** fJava2IANAMap */
- protected Hashtable fJava2IANAMap;
+ protected final static Hashtable fJava2IANAMap = new Hashtable();
+
+ //
+ // Static initialization
+ //
+
+ static {
+
+ // add IANA to Java encoding mappings.
+ fIANA2JavaMap.put("BIG5", "Big5");
+ fIANA2JavaMap.put("EBCDIC-CP-US", "CP037");
+ fIANA2JavaMap.put("EBCDIC-CP-CA", "CP037");
+ fIANA2JavaMap.put("EBCDIC-CP-NL", "CP037");
+ fIANA2JavaMap.put("EBCDIC-CP-DK", "CP277");
+ fIANA2JavaMap.put("EBCDIC-CP-NO", "CP277");
+ fIANA2JavaMap.put("EBCDIC-CP-FI", "CP278");
+ fIANA2JavaMap.put("EBCDIC-CP-SE", "CP278");
+ fIANA2JavaMap.put("EBCDIC-CP-IT", "CP280");
+ fIANA2JavaMap.put("EBCDIC-CP-ES", "CP284");
+ fIANA2JavaMap.put("EBCDIC-CP-GB", "CP285");
+ fIANA2JavaMap.put("EBCDIC-CP-FR", "CP297");
+ fIANA2JavaMap.put("EBCDIC-CP-AR1", "CP420");
+ fIANA2JavaMap.put("EBCDIC-CP-HE", "CP424");
+ fIANA2JavaMap.put("EBCDIC-CP-CH", "CP500");
+ fIANA2JavaMap.put("EBCDIC-CP-ROECE", "CP870");
+ fIANA2JavaMap.put("EBCDIC-CP-YU", "CP870");
+ fIANA2JavaMap.put("EBCDIC-CP-IS", "CP871");
+ fIANA2JavaMap.put("EBCDIC-CP-AR2", "CP918");
+ fIANA2JavaMap.put("EUC-JP", "EUCJIS");
+ fIANA2JavaMap.put("EUC-KR", "KSC5601");
+ fIANA2JavaMap.put("GB2312", "GB2312");
+ fIANA2JavaMap.put("ISO-2022-JP", "JIS");
+ fIANA2JavaMap.put("ISO-2022-KR", "ISO2022KR");
+ fIANA2JavaMap.put("ISO-8859-1", "8859_1");
+ fIANA2JavaMap.put("ISO-8859-2", "8859_2");
+ fIANA2JavaMap.put("ISO-8859-3", "8859_3");
+ fIANA2JavaMap.put("ISO-8859-4", "8859_4");
+ fIANA2JavaMap.put("ISO-8859-5", "8859_5");
+ fIANA2JavaMap.put("ISO-8859-6", "8859_6");
+ fIANA2JavaMap.put("ISO-8859-7", "8859_7");
+ fIANA2JavaMap.put("ISO-8859-8", "8859_8");
+ fIANA2JavaMap.put("ISO-8859-9", "8859_9");
+ fIANA2JavaMap.put("KOI8-R", "KOI8_R");
+ fIANA2JavaMap.put("US-ASCII", "8859_1"); // ?
+ fIANA2JavaMap.put("UTF-8", "UTF8");
+
+ // REVISIT:
+ // j:CNS11643 -> EUC-TW?
+ // ISO-2022-CN? ISO-2022-CN-EXT?
+
+ // add Java to IANA encoding mappings
+ //fJava2IANAMap.put("8859_1", "US-ASCII"); // ?
+ fJava2IANAMap.put("8859_1", "ISO-8859-1");
+ fJava2IANAMap.put("8859_2", "ISO-8859-2");
+ fJava2IANAMap.put("8859_3", "ISO-8859-3");
+ fJava2IANAMap.put("8859_4", "ISO-8859-4");
+ fJava2IANAMap.put("8859_5", "ISO-8859-5");
+ fJava2IANAMap.put("8859_6", "ISO-8859-6");
+ fJava2IANAMap.put("8859_7", "ISO-8859-7");
+ fJava2IANAMap.put("8859_8", "ISO-8859-8");
+ fJava2IANAMap.put("8859_9", "ISO-8859-9");
+ fJava2IANAMap.put("BIG5", "Big5");
+ fJava2IANAMap.put("CP037", "EBCDIC-CP-US");
+ fJava2IANAMap.put("CP037", "EBCDIC-CP-CA");
+ fJava2IANAMap.put("CP037", "EBCDIC-CP-NL");
+ fJava2IANAMap.put("CP277", "EBCDIC-CP-DK");
+ fJava2IANAMap.put("CP277", "EBCDIC-CP-NO");
+ fJava2IANAMap.put("CP278", "EBCDIC-CP-FI");
+ fJava2IANAMap.put("CP278", "EBCDIC-CP-SE");
+ fJava2IANAMap.put("CP280", "EBCDIC-CP-IT");
+ fJava2IANAMap.put("CP284", "EBCDIC-CP-ES");
+ fJava2IANAMap.put("CP285", "EBCDIC-CP-GB");
+ fJava2IANAMap.put("CP297", "EBCDIC-CP-FR");
+ fJava2IANAMap.put("CP420", "EBCDIC-CP-AR1");
+ fJava2IANAMap.put("CP424", "EBCDIC-CP-HE");
+ fJava2IANAMap.put("CP500", "EBCDIC-CP-CH");
+ fJava2IANAMap.put("CP870", "EBCDIC-CP-ROECE");
+ fJava2IANAMap.put("CP870", "EBCDIC-CP-YU");
+ fJava2IANAMap.put("CP871", "EBCDIC-CP-IS");
+ fJava2IANAMap.put("CP918", "EBCDIC-CP-AR2");
+ fJava2IANAMap.put("EUCJIS", "EUC-JP");
+ fJava2IANAMap.put("GB2312", "GB2312");
+ fJava2IANAMap.put("ISO2022KR", "ISO-2022-KR");
+ fJava2IANAMap.put("JIS", "ISO-2022-JP");
+ fJava2IANAMap.put("KOI8_R", "KOI8-R");
+ fJava2IANAMap.put("KSC5601", "EUC-KR");
+ fJava2IANAMap.put("SJIS", "Shift_JIS");
+ fJava2IANAMap.put("UTF8", "UTF-8");
+
+ } // <clinit>()
//
// Constructors
//
- /**
- *
- */
- public EncodingMap() {
- }
+ /** Default constructor. */
+ public EncodingMap() {}
//
- // Methods
+ // Public static methods
//
/**
- * putIANA2JavaMapping
+ * Adds an IANA to Java encoding name mapping.
*
- * @param ianaEncoding
- * @param javaEncoding
+ * @param ianaEncoding The IANA encoding name.
+ * @param javaEncoding The Java encoding name.
*/
- public void putIANA2JavaMapping(String ianaEncoding, String javaEncoding) {
- } // putIANA2JavaMapping
+ public static void putIANA2JavaMapping(String ianaEncoding,
+ String javaEncoding) {
+ fIANA2JavaMap.put(ianaEncoding, javaEncoding);
+ } // putIANA2JavaMapping(String,String)
/**
- * getIANA2JavaMapping
- *
- * @param ianaEncoding
+ * Returns the Java encoding name for the specified IANA encoding name.
*
- * @return
+ * @param ianaEncoding The IANA encoding name.
*/
- public String getIANA2JavaMapping(String ianaEncoding) {
- return null;
- } // getIANA2JavaMapping
+ public static String getIANA2JavaMapping(String ianaEncoding) {
+ return (String)fIANA2JavaMap.get(ianaEncoding);
+ } // getIANA2JavaMapping(String):String
/**
- * removeIANA2JavaMapping
+ * Removes an IANA to Java encoding name mapping.
*
- * @param ianaEncoding
- *
- * @return
+ * @param ianaEncoding The IANA encoding name.
*/
- public String removeIANA2JavaMapping(String ianaEncoding) {
- return null;
- } // removeIANA2JavaMapping
+ public static String removeIANA2JavaMapping(String ianaEncoding) {
+ return (String)fIANA2JavaMap.remove(ianaEncoding);
+ } // removeIANA2JavaMapping(String):String
/**
- * putJava2IANAMapping
+ * Adds a Java to IANA encoding name mapping.
*
- * @param javaEncoding
- * @param ianaEncoding
+ * @param javaEncoding The Java encoding name.
+ * @param ianaEncoding The IANA encodign name.
*/
- public void putJava2IANAMapping(String javaEncoding, String ianaEncoding) {
- } // putJava2IANAMapping
+ public static void putJava2IANAMapping(String javaEncoding,
+ String ianaEncoding) {
+ fJava2IANAMap.put(javaEncoding, ianaEncoding);
+ } // putJava2IANAMapping(String,String)
/**
- * getJava2IANAMapping
- *
- * @param javaEncoding
+ * Returns the IANA encoding name for the specified Java encoding name.
*
- * @return
+ * @param javaEncoding The Java encoding name.
*/
- public String getJava2IANAMapping(String javaEncoding) {
- return null;
- } // getJava2IANAMapping
+ public static String getJava2IANAMapping(String javaEncoding) {
+ return (String)fJava2IANAMap.get(javaEncoding);
+ } // getJava2IANAMapping(String):String
/**
- * removeJava2IANAMapping
- *
- * @param javaEncoding
+ * Removes a Java to IANA encoding name mapping.
*
- * @return
+ * @param javaEncoding The Java encoding name.
*/
- public String removeJava2IANAMapping(String javaEncoding) {
- return null;
+ public static String removeJava2IANAMapping(String javaEncoding) {
+ return (String)fJava2IANAMap.remove(javaEncoding);
} // removeJava2IANAMapping
} // class EncodingMap
1.1.2.5 +36 -47 xml-xerces/java/src/org/apache/xerces/utils/Attic/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/utils/Attic/SymbolTable.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SymbolTable.java 2000/06/08 01:42:54 1.1.2.4
+++ SymbolTable.java 2000/09/11 21:56:53 1.1.2.5
@@ -85,7 +85,7 @@
* @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
* @author Andy Clark
*
- * @version $Id: SymbolTable.java,v 1.1.2.4 2000/06/08 01:42:54 andyc Exp $
+ * @version $Id: SymbolTable.java,v 1.1.2.5 2000/09/11 21:56:53 andyc Exp $
*/
public class SymbolTable {
@@ -201,57 +201,46 @@
} // addSymbol(char[],int,int):String
- //
- // Classes
- //
-
/**
- * Default symbol hasher implementation.
- */
- protected static final class Hasher
- implements SymbolHasher {
-
- //
- // SymbolHasher methods
- //
-
- /**
- * Returns a hashcode value for the specified symbol. The value
- * returned by this method must be identical to the value returned
- * by the <code>hash(char[],int,int)</code> method when called
- * with the character array that comprises the symbol string.
- *
- * @param symbol The symbol to hash.
- */
- public int hash(String symbol) {
- int code = 0;
- int length = symbol.length();
- for (int i = 0; i < length; i++) {
- code = code * 37 + symbol.charAt(i);
- }
- return code & 0x7FFFFFF;
+ * Returns a hashcode value for the specified symbol. The value
+ * returned by this method must be identical to the value returned
+ * by the <code>hash(char[],int,int)</code> method when called
+ * with the character array that comprises the symbol string.
+ *
+ * @param symbol The symbol to hash.
+ */
+ public int hash(String symbol) {
+ int code = 0;
+ int length = symbol.length();
+ for (int i = 0; i < length; i++) {
+ code = code * 37 + symbol.charAt(i);
}
+ return code & 0x7FFFFFF;
+ }
- /**
- * Returns a hashcode value for the specified symbol information.
- * The value returned by this method must be identical to the value
- * returned by the <code>hash(String)</code> method when called
- * with the string object created from the symbol information.
- *
- * @param buffer The character buffer containing the symbol.
- * @param offset The offset into the character buffer of the start
- * of the symbol.
- * @param length The length of the symbol.
- */
- public int hash(char[] buffer, int offset, int length) {
- int code = 0;
- for (int i = 0; i < length; i++) {
- code = code * 37 + buffer[offset + i];
- }
- return code & 0x7FFFFFF;
+
+ /**
+ * Returns a hashcode value for the specified symbol information.
+ * The value returned by this method must be identical to the value
+ * returned by the <code>hash(String)</code> method when called
+ * with the string object created from the symbol information.
+ *
+ * @param buffer The character buffer containing the symbol.
+ * @param offset The offset into the character buffer of the start
+ * of the symbol.
+ * @param length The length of the symbol.
+ */
+ public int hash(char[] buffer, int offset, int length) {
+ int code = 0;
+ for (int i = 0; i < length; i++) {
+ code = code * 37 + buffer[offset + i];
}
+ return code & 0x7FFFFFF;
+ }
- } // class Hasher
+ //
+ // Classes
+ //
/**
* This class is a symbol table entry. Each entry acts as a node
1.1.2.4 +278 -94 xml-xerces/java/src/org/apache/xerces/utils/Attic/XMLChar.java
Index: XMLChar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/utils/Attic/XMLChar.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLChar.java 2000/06/08 00:09:29 1.1.2.3
+++ XMLChar.java 2000/09/11 21:56:54 1.1.2.4
@@ -58,8 +58,25 @@
package org.apache.xerces.utils;
/**
+ * This class defines the basic XML character properties. The data
+ * in this class can be used to verify that a character is a valid
+ * XML character or if the character is a space, name start, or name
+ * character.
+ * <p>
+ * A series of convenience methods are supplied to ease the burden
+ * of the developer. Because inlining the checks can improve per
+ * character performance, the tables of character properties are
+ * public. Using the character as an index into the <code>CHARS</code>
+ * array and applying the appropriate mask flag (e.g.
+ * <code>MASK_VALID</code>), yields the same results as calling the
+ * convenience methods. There is one exception: check the comments
+ * for the <code>isValid</code> method for details.
+ *
+ * @author Glenn Marcy, IBM
* @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLChar.java,v 1.1.2.3 2000/06/08 00:09:29 andyc Exp $
+ * @author Andy Clark, IBM
+ *
+ * @version $Id: XMLChar.java,v 1.1.2.4 2000/09/11 21:56:54 andyc Exp $
*/
public class XMLChar {
@@ -67,123 +84,290 @@
// Constants
//
- /** CHARS */
- public static final byte[] CHARS = null;
+ /** Character flags. */
+ public static final byte[] CHARS = new byte[1 << 16];
- /** MASK_VALID */
- public static final byte MASK_VALID = ???;
+ /** Valid character mask. */
+ public static final int MASK_VALID = 0x01;
- /** MASK_LETTER */
- public static final byte MASK_LETTER = ???;
+ /** Space character mask. */
+ public static final int MASK_SPACE = 0x02;
- /** MASK_COMBINING_CHAR */
- public static final byte MASK_COMBINING_CHAR = ???;
+ /** Name start character mask. */
+ public static final int MASK_NAME_START = 0x04;
- /** MASK_DIGIT */
- public static final byte MASK_DIGIT = ???;
+ /** Name character mask. */
+ public static final int MASK_NAME = 0x08;
- /** MASK_EXTENDER */
- public static final byte MASK_EXTENDER = ???;
-
- /** MASK_SPACE */
- public static final byte MASK_SPACE = ???;
-
- /** MASK_NAME_START */
- public static final byte MASK_NAME_START = ???;
-
- /** MASK_NAME */
- public static final byte MASK_NAME = ???;
-
//
- // Methods
+ // Static initialization
//
- /**
- * isValid
- *
- * @param c
- *
- * @return
- */
- public boolean isValid(char c) {
- return false;
- } // isValid
+ static {
+
+ //
+ // [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] |
+ // [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+ //
+
+ int charRange[] = {
+ 0x0009, 0x000A, 0x000D, 0x000D, 0x0020, 0xD7FF, 0xE000, 0xFFFD,
+ };
+
+ //
+ // [3] S ::= (#x20 | #x9 | #xD | #xA)+
+ //
+
+ int spaceChar[] = {
+ 0x0020, 0x0009, 0x000D, 0x000A,
+ };
+
+ //
+ // [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
+ // CombiningChar | Extender
+ //
+
+ int nameChar[] = {
+ 0x002D, 0x002E, // '-' and '.'
+ };
+
+ //
+ // [5] Name ::= (Letter | '_' | ':') (NameChar)*
+ //
+
+ int nameStartChar[] = {
+ 0x003A, 0x005F, // ':' and '_'
+ };
+
+ //
+ // [84] Letter ::= BaseChar | Ideographic
+ //
+
+ int letterRange[] = {
+ // BaseChar
+ 0x0041, 0x005A, 0x0061, 0x007A, 0x00C0, 0x00D6, 0x00D8, 0x00F6,
+ 0x00F8, 0x0131, 0x0134, 0x013E, 0x0141, 0x0148, 0x014A, 0x017E,
+ 0x0180, 0x01C3, 0x01CD, 0x01F0, 0x01F4, 0x01F5, 0x01FA, 0x0217,
+ 0x0250, 0x02A8, 0x02BB, 0x02C1, 0x0388, 0x038A, 0x038E, 0x03A1,
+ 0x03A3, 0x03CE, 0x03D0, 0x03D6, 0x03E2, 0x03F3, 0x0401, 0x040C,
+ 0x040E, 0x044F, 0x0451, 0x045C, 0x045E, 0x0481, 0x0490, 0x04C4,
+ 0x04C7, 0x04C8, 0x04CB, 0x04CC, 0x04D0, 0x04EB, 0x04EE, 0x04F5,
+ 0x04F8, 0x04F9, 0x0531, 0x0556, 0x0561, 0x0586, 0x05D0, 0x05EA,
+ 0x05F0, 0x05F2, 0x0621, 0x063A, 0x0641, 0x064A, 0x0671, 0x06B7,
+ 0x06BA, 0x06BE, 0x06C0, 0x06CE, 0x06D0, 0x06D3, 0x06E5, 0x06E6,
+ 0x0905, 0x0939, 0x0958, 0x0961, 0x0985, 0x098C, 0x098F, 0x0990,
+ 0x0993, 0x09A8, 0x09AA, 0x09B0, 0x09B6, 0x09B9, 0x09DC, 0x09DD,
+ 0x09DF, 0x09E1, 0x09F0, 0x09F1, 0x0A05, 0x0A0A, 0x0A0F, 0x0A10,
+ 0x0A13, 0x0A28, 0x0A2A, 0x0A30, 0x0A32, 0x0A33, 0x0A35, 0x0A36,
+ 0x0A38, 0x0A39, 0x0A59, 0x0A5C, 0x0A72, 0x0A74, 0x0A85, 0x0A8B,
+ 0x0A8F, 0x0A91, 0x0A93, 0x0AA8, 0x0AAA, 0x0AB0, 0x0AB2, 0x0AB3,
+ 0x0AB5, 0x0AB9, 0x0B05, 0x0B0C, 0x0B0F, 0x0B10, 0x0B13, 0x0B28,
+ 0x0B2A, 0x0B30, 0x0B32, 0x0B33, 0x0B36, 0x0B39, 0x0B5C, 0x0B5D,
+ 0x0B5F, 0x0B61, 0x0B85, 0x0B8A, 0x0B8E, 0x0B90, 0x0B92, 0x0B95,
+ 0x0B99, 0x0B9A, 0x0B9E, 0x0B9F, 0x0BA3, 0x0BA4, 0x0BA8, 0x0BAA,
+ 0x0BAE, 0x0BB5, 0x0BB7, 0x0BB9, 0x0C05, 0x0C0C, 0x0C0E, 0x0C10,
+ 0x0C12, 0x0C28, 0x0C2A, 0x0C33, 0x0C35, 0x0C39, 0x0C60, 0x0C61,
+ 0x0C85, 0x0C8C, 0x0C8E, 0x0C90, 0x0C92, 0x0CA8, 0x0CAA, 0x0CB3,
+ 0x0CB5, 0x0CB9, 0x0CE0, 0x0CE1, 0x0D05, 0x0D0C, 0x0D0E, 0x0D10,
+ 0x0D12, 0x0D28, 0x0D2A, 0x0D39, 0x0D60, 0x0D61, 0x0E01, 0x0E2E,
+ 0x0E32, 0x0E33, 0x0E40, 0x0E45, 0x0E81, 0x0E82, 0x0E87, 0x0E88,
+ 0x0E94, 0x0E97, 0x0E99, 0x0E9F, 0x0EA1, 0x0EA3, 0x0EAA, 0x0EAB,
+ 0x0EAD, 0x0EAE, 0x0EB2, 0x0EB3, 0x0EC0, 0x0EC4, 0x0F40, 0x0F47,
+ 0x0F49, 0x0F69, 0x10A0, 0x10C5, 0x10D0, 0x10F6, 0x1102, 0x1103,
+ 0x1105, 0x1107, 0x110B, 0x110C, 0x110E, 0x1112, 0x1154, 0x1155,
+ 0x115F, 0x1161, 0x116D, 0x116E, 0x1172, 0x1173, 0x11AE, 0x11AF,
+ 0x11B7, 0x11B8, 0x11BC, 0x11C2, 0x1E00, 0x1E9B, 0x1EA0, 0x1EF9,
+ 0x1F00, 0x1F15, 0x1F18, 0x1F1D, 0x1F20, 0x1F45, 0x1F48, 0x1F4D,
+ 0x1F50, 0x1F57, 0x1F5F, 0x1F7D, 0x1F80, 0x1FB4, 0x1FB6, 0x1FBC,
+ 0x1FC2, 0x1FC4, 0x1FC6, 0x1FCC, 0x1FD0, 0x1FD3, 0x1FD6, 0x1FDB,
+ 0x1FE0, 0x1FEC, 0x1FF2, 0x1FF4, 0x1FF6, 0x1FFC, 0x212A, 0x212B,
+ 0x2180, 0x2182, 0x3041, 0x3094, 0x30A1, 0x30FA, 0x3105, 0x312C,
+ 0xAC00, 0xD7A3,
+ // Ideographic
+ 0x3021, 0x3029, 0x4E00, 0x9FA5,
+ };
+ int letterChar[] = {
+ // BaseChar
+ 0x0386, 0x038C, 0x03DA, 0x03DC, 0x03DE, 0x03E0, 0x0559, 0x06D5,
+ 0x093D, 0x09B2, 0x0A5E, 0x0A8D, 0x0ABD, 0x0AE0, 0x0B3D, 0x0B9C,
+ 0x0CDE, 0x0E30, 0x0E84, 0x0E8A, 0x0E8D, 0x0EA5, 0x0EA7, 0x0EB0,
+ 0x0EBD, 0x1100, 0x1109, 0x113C, 0x113E, 0x1140, 0x114C, 0x114E,
+ 0x1150, 0x1159, 0x1163, 0x1165, 0x1167, 0x1169, 0x1175, 0x119E,
+ 0x11A8, 0x11AB, 0x11BA, 0x11EB, 0x11F0, 0x11F9, 0x1F59, 0x1F5B,
+ 0x1F5D, 0x1FBE, 0x2126, 0x212E,
+ // Ideographic
+ 0x3007,
+ };
+
+ //
+ // [87] CombiningChar ::= ...
+ //
+
+ int combiningCharRange[] = {
+ 0x0300, 0x0345, 0x0360, 0x0361, 0x0483, 0x0486, 0x0591, 0x05A1,
+ 0x05A3, 0x05B9, 0x05BB, 0x05BD, 0x05C1, 0x05C2, 0x064B, 0x0652,
+ 0x06D6, 0x06DC, 0x06DD, 0x06DF, 0x06E0, 0x06E4, 0x06E7, 0x06E8,
+ 0x06EA, 0x06ED, 0x0901, 0x0903, 0x093E, 0x094C, 0x0951, 0x0954,
+ 0x0962, 0x0963, 0x0981, 0x0983, 0x09C0, 0x09C4, 0x09C7, 0x09C8,
+ 0x09CB, 0x09CD, 0x09E2, 0x09E3, 0x0A40, 0x0A42, 0x0A47, 0x0A48,
+ 0x0A4B, 0x0A4D, 0x0A70, 0x0A71, 0x0A81, 0x0A83, 0x0ABE, 0x0AC5,
+ 0x0AC7, 0x0AC9, 0x0ACB, 0x0ACD, 0x0B01, 0x0B03, 0x0B3E, 0x0B43,
+ 0x0B47, 0x0B48, 0x0B4B, 0x0B4D, 0x0B56, 0x0B57, 0x0B82, 0x0B83,
+ 0x0BBE, 0x0BC2, 0x0BC6, 0x0BC8, 0x0BCA, 0x0BCD, 0x0C01, 0x0C03,
+ 0x0C3E, 0x0C44, 0x0C46, 0x0C48, 0x0C4A, 0x0C4D, 0x0C55, 0x0C56,
+ 0x0C82, 0x0C83, 0x0CBE, 0x0CC4, 0x0CC6, 0x0CC8, 0x0CCA, 0x0CCD,
+ 0x0CD5, 0x0CD6, 0x0D02, 0x0D03, 0x0D3E, 0x0D43, 0x0D46, 0x0D48,
+ 0x0D4A, 0x0D4D, 0x0E34, 0x0E3A, 0x0E47, 0x0E4E, 0x0EB4, 0x0EB9,
+ 0x0EBB, 0x0EBC, 0x0EC8, 0x0ECD, 0x0F18, 0x0F19, 0x0F71, 0x0F84,
+ 0x0F86, 0x0F8B, 0x0F90, 0x0F95, 0x0F99, 0x0FAD, 0x0FB1, 0x0FB7,
+ 0x20D0, 0x20DC, 0x302A, 0x302F,
+ };
+
+ int combiningCharChar[] = {
+ 0x05BF, 0x05C4, 0x0670, 0x093C, 0x094D, 0x09BC, 0x09BE, 0x09BF,
+ 0x09D7, 0x0A02, 0x0A3C, 0x0A3E, 0x0A3F, 0x0ABC, 0x0B3C, 0x0BD7,
+ 0x0D57, 0x0E31, 0x0EB1, 0x0F35, 0x0F37, 0x0F39, 0x0F3E, 0x0F3F,
+ 0x0F97, 0x0FB9, 0x20E1, 0x3099, 0x309A,
+ };
+
+ //
+ // [88] Digit ::= ...
+ //
+
+ int digitRange[] = {
+ 0x0030, 0x0039, 0x0660, 0x0669, 0x06F0, 0x06F9, 0x0966, 0x096F,
+ 0x09E6, 0x09EF, 0x0A66, 0x0A6F, 0x0AE6, 0x0AEF, 0x0B66, 0x0B6F,
+ 0x0BE7, 0x0BEF, 0x0C66, 0x0C6F, 0x0CE6, 0x0CEF, 0x0D66, 0x0D6F,
+ 0x0E50, 0x0E59, 0x0ED0, 0x0ED9, 0x0F20, 0x0F29,
+ };
+
+ //
+ // [89] Extender ::= ...
+ //
+
+ int extenderRange[] = {
+ 0x3031, 0x3035, 0x309D, 0x309E, 0x30FC, 0x30FE,
+ };
+
+ int extenderChar[] = {
+ 0x00B7, 0x02D0, 0x02D1, 0x0387, 0x0640, 0x0E46, 0x0EC6, 0x3005,
+ };
+
+ //
+ // Initialize
+ //
+
+ // set valid characters
+ for (int i = 0; i < charRange.length; i += 2) {
+ for (int j = charRange[i]; j <= charRange[i + 1]; j++) {
+ CHARS[j] |= MASK_VALID;
+ }
+ }
+
+ // set space characters
+ for (int i = 0; i < spaceChar.length; i++) {
+ CHARS[spaceChar[i]] |= MASK_SPACE;
+ }
+
+ // set name start characters
+ for (int i = 0; i < nameStartChar.length; i++) {
+ CHARS[nameStartChar[i]] |= MASK_NAME_START | MASK_NAME;
+ }
+ for (int i = 0; i < letterRange.length; i += 2) {
+ for (int j = letterRange[i]; j < letterRange[i + 1]; j++) {
+ CHARS[j] |= MASK_NAME_START | MASK_NAME;
+ }
+ }
+ for (int i = 0; i < letterChar.length; i++) {
+ CHARS[letterChar[i]] |= MASK_NAME_START | MASK_NAME;
+ }
+
+ // set name characters
+ for (int i = 0; i < nameChar.length; i++) {
+ CHARS[nameChar[i]] |= MASK_NAME;
+ }
+ for (int i = 0; i < digitRange.length; i += 2) {
+ for (int j = digitRange[i]; j < digitRange[i + 1]; j++) {
+ CHARS[j] |= MASK_NAME;
+ }
+ }
+ for (int i = 0; i < combiningCharRange.length; i += 2) {
+ for (int j = combiningCharRange[i]; j < combiningCharRange[i + 1]; j++) {
+ CHARS[j] |= MASK_NAME;
+ }
+ }
+ for (int i = 0; i < combiningCharChar.length; i++) {
+ CHARS[combiningCharChar[i]] |= MASK_NAME;
+ }
+ for (int i = 0; i < extenderRange.length; i += 2) {
+ for (int j = extenderRange[i]; j < extenderRange[i + 1]; j++) {
+ CHARS[j] |= MASK_NAME;
+ }
+ }
+ for (int i = 0; i < extenderChar.length; i++) {
+ CHARS[extenderChar[i]] |= MASK_NAME;
+ }
- /**
- * isLetter
- *
- * @param c
- *
- * @return
- */
- public boolean isLetter(char c) {
- return false;
- } // isLetter
+ } // <clinit>()
- /**
- * isCombiningChar
- *
- * @param c
- *
- * @return
- */
- public boolean isCombiningChar(char c) {
- return false;
- } // isCombiningChar
+ //
+ // Public static methods
+ //
/**
- * isDigit
- *
- * @param c
- *
- * @return
+ * Returns true if the specified character is valid. This method
+ * also checks the surrogate character range from 0x10000 to 0x10FFFF.
+ * <p>
+ * If the program chooses to apply the mask directly to the
+ * <code>CHARS</code> array, then they are responsible for checking
+ * the surrogate character range.
+ *
+ * @param c The character to check.
*/
- public boolean isDigit(char c) {
- return false;
- } // isDigit
+ public static boolean isValid(int c) {
+ return (c < 0x10000 && (CHARS[c] & MASK_VALID) != 0) ||
+ (c >= 0x10000 && c <= 0x10FFFF);
+ }
/**
- * isExtender
- *
- * @param c
- *
- * @return
+ * Returns true if the specified character is invalid.
+ *
+ * @param c The character to check.
*/
- public boolean isExtender(char c) {
- return false;
- } // isExtender
+ public static boolean isInvalid(int c) {
+ return !isValid(c);
+ }
/**
- * isSpace
- *
- * @param c
- *
- * @return
+ * Returns true if the specified character is a space character
+ * as defined by production [3] in the XML 1.0 specification.
+ *
+ * @param c The character to check.
*/
- public boolean isSpace(char c) {
- return false;
- } // isSpace
+ public static boolean isSpace(int c) {
+ return c < 0x10000 && (CHARS[c] & MASK_SPACE) != 0;
+ }
/**
- * isNameStart
- *
- * @param c
- *
- * @return
+ * Returns true if the specified character is a valid name start
+ * character as defined by production [5] in the XML 1.0
+ * specification.
+ *
+ * @param c The character to check.
*/
- public boolean isNameStart(char c) {
- return false;
- } // isNameStart
+ public static boolean isNameStartChar(int c) {
+ return c < 0x10000 && (CHARS[c] & MASK_NAME_START) != 0;
+ }
/**
- * isName
- *
- * @param c
- *
- * @return
+ * Returns true if the specified character is a valid name
+ * character as defined by production [4] in the XML 1.0
+ * specification.
+ *
+ * @param c The character to check.
*/
- public boolean isName(char c) {
- return false;
- } // isName
+ public static boolean isNameChar(int c) {
+ return c < 0x10000 && (CHARS[c] & MASK_NAME) != 0;
+ }
} // class XMLChar
No revision
No revision
1.1.2.4 +3 -1 xml-xerces/java/src/org/apache/xerces/validators/Attic/ContentModelValidator.java
Index: ContentModelValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/ContentModelValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ContentModelValidator.java 2000/06/08 00:09:31 1.1.2.3
+++ ContentModelValidator.java 2000/09/11 21:56:58 1.1.2.4
@@ -57,9 +57,11 @@
package org.apache.xerces.validators;
+import org.apache.xerces.utils.QName;
+
/**
* @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: ContentModelValidator.java,v 1.1.2.3 2000/06/08 00:09:31 andyc Exp $
+ * @version $Id: ContentModelValidator.java,v 1.1.2.4 2000/09/11 21:56:58 andyc Exp $
*/
public interface ContentModelValidator {
1.1.2.4 +4 -4 xml-xerces/java/src/org/apache/xerces/validators/Attic/DatatypeValidator.java
Index: DatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/DatatypeValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DatatypeValidator.java 2000/06/08 00:09:31 1.1.2.3
+++ DatatypeValidator.java 2000/09/11 21:57:00 1.1.2.4
@@ -57,9 +57,11 @@
package org.apache.xerces.validators;
+import java.util.Hashtable;
+
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: DatatypeValidator.java,v 1.1.2.3 2000/06/08 00:09:31 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: DatatypeValidator.java,v 1.1.2.4 2000/09/11 21:57:00 andyc Exp $
*/
public interface DatatypeValidator {
@@ -79,10 +81,8 @@
*
* @param data
* @param state
- *
- * @return
*/
- public Object validate(String data, Object state)
+ public void validate(String data, Object state)
throws InvalidDatatypeValueException;
/**
1.1.2.5 +66 -56 xml-xerces/java/src/org/apache/xerces/validators/Attic/Grammar.java
Index: Grammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/Grammar.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Grammar.java 2000/06/08 22:51:41 1.1.2.4
+++ Grammar.java 2000/09/11 21:57:00 1.1.2.5
@@ -57,16 +57,15 @@
package org.apache.xerces.validators;
-import org.w3c.dom.Document;
-
import org.apache.xerces.utils.QName;
/**
* @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: Grammar.java,v 1.1.2.4 2000/06/08 22:51:41 ericye Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ *
+ * @version $Id: Grammar.java,v 1.1.2.5 2000/09/11 21:57:00 andyc Exp $
*/
-public class Grammar
- implements ContentSpecProvider {
+public class Grammar {
//
// Constants
@@ -86,33 +85,19 @@
/** fTargetNamespace */
protected String fTargetNamespace;
-
- /** fGrammarDocument */
- protected Document fGrammarDocument;
- // element decl tables
+ // element decl tables
private int fElementDeclCount = 0;
private String fElementDeclName[][] = new String[INITIAL_CHUNK_COUNT][];
private short fElementDeclType[][] = new short[INITIAL_CHUNK_COUNT][];
private DatatypeValidator fElementDeclDatatypeValidator[][] = new DatatypeValidator[INITIAL_CHUNK_COUNT][];
- private int fElementDeclContentSpecIndex[][] = new int[INITIAL_CHUNK_COUNT][];
private ContentModelValidator fElementDeclContentModelValidator[][] = new ContentModelValidator[INITIAL_CHUNK_COUNT][];
private int fElementDeclFirstAttributeDeclIndex[][] = new int[INITIAL_CHUNK_COUNT][];
private int fElementDeclLastAttributeDeclIndex[][] = new int[INITIAL_CHUNK_COUNT][];
private String fElementDeclDefaultValue[][] = new String[INITIAL_CHUNK_COUNT][];
private short fElementDeclDefaultType[][] = new short[INITIAL_CHUNK_COUNT][];
- // content spec tables
-
- private int fContentSpecCount = 0 ;
- private int fContentSpecType[][] = new int[INITIAL_CHUNK_COUNT][];
- private Object fContentSpecTree[][] = new Object[INITIAL_CHUNK_COUNT][];
- /***
- private int fContentSpecValue[][] = new int[INITIAL_CHUNK_COUNT][];
- private int fContentSpecOtherValue[][] = new int[INITIAL_CHUNK_COUNT][];
- ***/
-
// attribute decl tables
private int fAttributeDeclCount = 0 ;
@@ -151,14 +136,26 @@
return fTargetNamespace;
} // getTargetNamespace
+ /**
+ * getFirstElementDeclIndex
+ *
+ * @return
+ */
+ public int getFirstElementDeclIndex() {
+ return fElementDeclCount > 0 ? fElementDeclCount : -1;
+ } // getFirstElementDeclIndex
+
/**
- * getGrammarDocument
+ * getNextElementDeclIndex
*
+ * @param elementDeclIndex
+ *
* @return
*/
- public Document getGrammarDocument() {
- return fGrammarDocument;
- } // getGrammarDocument
+ public int getNextElementDeclIndex(int elementDeclIndex) {
+ return elementDeclIndex < fElementDeclCount - 1
+ ? elementDeclIndex + 1 : -1;
+ } // getNextElementDeclIndex
/**
* getElementDeclIndex
@@ -169,7 +166,7 @@
* @return
*/
public int getElementDeclIndex(String elementDeclName, int scope) {
- return -1;
+ throw new RuntimeException("implement Grammar#getElementDeclIndex(String,int):int");
} // getElementDeclIndex
/**
@@ -204,7 +201,7 @@
elementDecl.simpleType.list = (fElementDeclType[chunk][index] & LIST_FLAG) != 0;
}
- elementDecl.contentSpec = fElementDeclContentSpecIndex[chunk][index];
+ elementDecl.contentModelValidator = fElementDeclContentModelValidator[chunk][index];
elementDecl.simpleType.datatypeValidator = fElementDeclDatatypeValidator[chunk][index];
elementDecl.simpleType.defaultType = fElementDeclDefaultType[chunk][index];
@@ -250,7 +247,7 @@
* @return
*/
public int getAttributeDeclIndex(int elementDeclIndex, String attributeDeclName) {
- return -1;
+ throw new RuntimeException("implement Grammar#getAttributeDeclIndex(int,String):int");
} // getAttributeDeclIndex
/**
@@ -296,6 +293,26 @@
} // getAttributeDecl
/**
+ * getFirstEntityDeclIndex
+ *
+ * @return
+ */
+ public int getFirstEntityDeclIndex() {
+ throw new RuntimeException("implement Grammar#getFirstEntityDeclIndex():int");
+ } // getFirstEntityDeclIndex
+
+ /**
+ * getNextEntityDeclIndex
+ *
+ * @param elementDeclIndex
+ *
+ * @return
+ */
+ public int getNextEntityDeclIndex(int elementDeclIndex) {
+ throw new RuntimeException("implement Grammar#getNextEntityDeclIndex(int):int");
+ } // getNextEntityDeclIndex
+
+ /**
* getEntityDeclIndex
*
* @param entityDeclName
@@ -303,7 +320,7 @@
* @return
*/
public int getEntityDeclIndex(String entityDeclName) {
- return -1;
+ throw new RuntimeException("implement Grammar#getEntityDeclIndex(String):int");
} // getEntityDeclIndex
/**
@@ -315,57 +332,50 @@
* @return
*/
public boolean getEntityDecl(int entityDeclIndex, XMLEntityDecl entityDecl) {
- return false;
+ throw new RuntimeException("implement Grammar#getEntityDecl(int,XMLEntityDecl):boolean");
} // getEntityDecl
/**
- * getNotationDeclIndex
+ * getFirstNotationDeclIndex
*
- * @param notationDeclName
- *
* @return
*/
- public int getNotationDeclIndex(String notationDeclName) {
- return -1;
- } // getNotationDeclIndex
+ public int getFirstNotationDeclIndex() {
+ throw new RuntimeException("implement Grammar#getFirstNotationDeclIndex():int");
+ } // getFirstNotationDeclIndex
/**
- * getNotationDecl
+ * getNextNotationDeclIndex
*
- * @param notationDeclIndex
- * @param notationDecl
+ * @param elementDeclIndex
*
* @return
*/
- public boolean getNotationDecl(int notationDeclIndex, XMLNotationDecl notationDecl) {
- return false;
- } // getNotationDecl
+ public int getNextNotationDeclIndex(int elementDeclIndex) {
+ throw new RuntimeException("implement Grammar#getNextNotationDeclIndex(int):int");
+ } // getNextNotationDeclIndex
/**
- * getElementContentModel
+ * getNotationDeclIndex
*
- * @param elementDeclIndex
+ * @param notationDeclName
*
* @return
*/
- public ContentModelValidator getElementContentModel(int elementDeclIndex) {
- return null;
- } // getElementContentModel
-
- //
- // ContentSpecProvider methods
- //
+ public int getNotationDeclIndex(String notationDeclName) {
+ throw new RuntimeException("implement Grammar#getNotationDeclIndex(String):int");
+ } // getNotationDeclIndex
/**
- * getContentSpec
+ * getNotationDecl
*
- * @param contentSpecIndex
- * @param contentSpec The values of this structure are set by this call.
+ * @param notationDeclIndex
+ * @param notationDecl
*
* @return
*/
- public boolean getContentSpec(int contentSpecIndex, XMLContentSpec contentSpec) {
- return false;
- } // getContentSpec
+ public boolean getNotationDecl(int notationDeclIndex, XMLNotationDecl notationDecl) {
+ throw new RuntimeException("implement Grammar#getNotationDecl(int,XMLNotationDecl):boolean");
+ } // getNotationDecl
} // class Grammar
1.1.2.4 +7 -7 xml-xerces/java/src/org/apache/xerces/validators/Attic/GrammarPool.java
Index: GrammarPool.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/GrammarPool.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- GrammarPool.java 2000/06/08 00:09:31 1.1.2.3
+++ GrammarPool.java 2000/09/11 21:57:01 1.1.2.4
@@ -60,8 +60,8 @@
import java.util.Hashtable;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: GrammarPool.java,v 1.1.2.3 2000/06/08 00:09:31 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: GrammarPool.java,v 1.1.2.4 2000/09/11 21:57:01 andyc Exp $
*/
public class GrammarPool {
@@ -89,31 +89,31 @@
/**
* putGrammar
*
- * @param targetNamespace
+ * @param key
* @param grammar
*/
- public void putGrammar(String targetNamespace, Grammar grammar) {
+ public void putGrammar(String key, Grammar grammar) {
} // putGrammar
/**
* getGrammar
*
- * @param targetNamespace
+ * @param key
*
* @return
*/
- public Grammar getGrammar(String targetNamespace) {
+ public Grammar getGrammar(String key) {
return null;
} // getGrammar
/**
* removeGrammar
*
- * @param targetNamespace
+ * @param key
*
* @return
*/
- public Grammar removeGrammar(String targetNamespace) {
+ public Grammar removeGrammar(String key) {
return null;
} // removeGrammar
1.1.2.4 +5 -5 xml-xerces/java/src/org/apache/xerces/validators/Attic/XMLElementDecl.java
Index: XMLElementDecl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/XMLElementDecl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLElementDecl.java 2000/06/08 00:09:32 1.1.2.3
+++ XMLElementDecl.java 2000/09/11 21:57:02 1.1.2.4
@@ -60,8 +60,8 @@
import org.apache.xerces.utils.QName;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLElementDecl.java,v 1.1.2.3 2000/06/08 00:09:32 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:54:05 PDT 2000
+ * @version $Id: XMLElementDecl.java,v 1.1.2.4 2000/09/11 21:57:02 andyc Exp $
*/
public class XMLElementDecl {
@@ -97,8 +97,8 @@
/** type */
public short type;
- /** contentSpec */
- public int contentSpec;
+ /** contentModelValidator */
+ public ContentModelValidator contentModelValidator;
/** simpleType */
public XMLSimpleType simpleType;
@@ -113,10 +113,10 @@
* @param name
* @param scope
* @param type
- * @param contentSpec
+ * @param contentModelValidator
* @param simpleType
*/
- public void setValues(QName name, int scope, short type, int contentSpec, XMLSimpleType simpleType) {
+ public void setValues(QName name, int scope, short type, ContentModelValidator contentModelValidator, XMLSimpleType simpleType) {
} // setValues
/**
1.1.2.4 +6 -2 xml-xerces/java/src/org/apache/xerces/validators/Attic/XMLEntityDecl.java
Index: XMLEntityDecl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/XMLEntityDecl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLEntityDecl.java 2000/06/08 00:09:32 1.1.2.3
+++ XMLEntityDecl.java 2000/09/11 21:57:03 1.1.2.4
@@ -58,8 +58,8 @@
package org.apache.xerces.validators;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLEntityDecl.java,v 1.1.2.3 2000/06/08 00:09:32 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLEntityDecl.java,v 1.1.2.4 2000/09/11 21:57:03 andyc Exp $
*/
public class XMLEntityDecl {
@@ -76,6 +76,9 @@
/** systemId */
public String systemId;
+ /** baseSystemId */
+ public String baseSystemId;
+
/** notation */
public String notation;
@@ -92,10 +95,11 @@
* @param name
* @param publicId
* @param systemId
+ * @param baseSystemId
* @param notation
* @param isPE
*/
- public void setValues(String name, String publicId, String systemId, String notation, boolean isPE) {
+ public void setValues(String name, String publicId, String systemId, String baseSystemId, String notation, boolean isPE) {
} // setValues
/**
1.1.2.4 +51 -28 xml-xerces/java/src/org/apache/xerces/validators/Attic/XMLValidator.java
Index: XMLValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/Attic/XMLValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLValidator.java 2000/06/08 00:09:32 1.1.2.3
+++ XMLValidator.java 2000/09/11 21:57:04 1.1.2.4
@@ -57,12 +57,13 @@
package org.apache.xerces.validators;
-import org.apache.xerces.framework.XMLConfigurable;
-import org.apache.xerces.framework.XMLConfigurationManager;
+import org.apache.xerces.framework.XMLComponent;
+import org.apache.xerces.framework.XMLComponentManager;
import org.apache.xerces.framework.XMLErrorReporter;
import org.apache.xerces.framework.XMLString;
import org.apache.xerces.scanners.XMLAttributes;
import org.apache.xerces.scanners.XMLDocumentHandler;
+import org.apache.xerces.scanners.XMLDocumentSource;
import org.apache.xerces.utils.QName;
import org.apache.xerces.utils.SymbolTable;
import org.xml.sax.SAXException;
@@ -70,11 +71,11 @@
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: XMLValidator.java,v 1.1.2.3 2000/06/08 00:09:32 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: XMLValidator.java,v 1.1.2.4 2000/09/11 21:57:04 andyc Exp $
*/
public class XMLValidator
- implements XMLConfigurable, XMLDocumentHandler {
+ implements XMLComponent, XMLDocumentSource, XMLDocumentHandler {
//
// Data
@@ -124,7 +125,7 @@
} // setDocumentHandler
//
- // XMLConfigurable methods
+ // XMLComponent methods
//
/**
@@ -132,7 +133,7 @@
*
* @param configurationManager
*/
- public void reset(XMLConfigurationManager configurationManager)
+ public void reset(XMLComponentManager configurationManager)
throws SAXException {
} // reset
@@ -157,6 +158,18 @@
} // setProperty
//
+ // XMLDocumentSource methods
+ //
+
+ /**
+ * setDocumentHandler
+ *
+ * @param documentHandler
+ */
+ public void setDocumentHandler(XMLDocumentHandler documentHandler) {
+ } // setDocumentHandler
+
+ //
// XMLDocumentHandler methods
//
@@ -172,9 +185,10 @@
*
* @param version
* @param encoding
+ * @param actualEncoding
* @param standalone
*/
- public void xmlDecl(String version, String encoding, String standalone)
+ public void xmlDecl(String version, String encoding, String actualEncoding, String standalone)
throws SAXException {
} // xmlDecl
@@ -185,7 +199,7 @@
* @param publicId
* @param systemId
*/
- public void doctypeDecl(QName rootElement, String publicId, String systemId)
+ public void doctypeDecl(String rootElement, String publicId, String systemId)
throws SAXException {
} // doctypeDecl
@@ -209,14 +223,14 @@
} // processingInstruction
/**
- * startNamespaceScope
+ * startPrefixMapping
*
* @param prefix
* @param uri
*/
- public void startNamespaceScope(String prefix, String uri)
+ public void startPrefixMapping(String prefix, String uri)
throws SAXException {
- } // startNamespaceScope
+ } // startPrefixMapping
/**
* startElement
@@ -257,47 +271,56 @@
} // endElement
/**
- * endNamespaceScope
+ * endPrefixMapping
*
* @param prefix
*/
- public void endNamespaceScope(String prefix)
+ public void endPrefixMapping(String prefix)
throws SAXException {
- } // endNamespaceScope
+ } // endPrefixMapping
/**
- * startEntityReference
+ * startEntity
*
* @param name
- * @param publicId
- * @param systemId
+ */
+ public void startEntity(String name)
+ throws SAXException {
+ } // startEntity
+
+ /**
+ * textDecl
+ *
+ * @param version
+ * @param encoding
+ * @param actualEncoding
*/
- public void startEntityReference(String name, String publicId, String systemId)
+ public void textDecl(String version, String encoding, String actualEncoding)
throws SAXException {
- } // startEntityReference
+ } // textDecl
/**
- * endEntityReference
+ * endEntity
*
* @param name
*/
- public void endEntityReference(String name)
+ public void endEntity(String name)
throws SAXException {
- } // endEntityReference
+ } // endEntity
/**
- * startCDATASection
+ * startCDATA
*/
- public void startCDATASection()
+ public void startCDATA()
throws SAXException {
- } // startCDATASection
+ } // startCDATA
/**
- * endCDATASection
+ * endCDATA
*/
- public void endCDATASection()
+ public void endCDATA()
throws SAXException {
- } // endCDATASection
+ } // endCDATA
/**
* endDocument
No revision
No revision
1.1.2.4 +2 -5 xml-xerces/java/src/org/apache/xerces/validators/datatypes/Attic/AbstractDatatypeValidator.java
Index: AbstractDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatypes/Attic/AbstractDatatypeValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractDatatypeValidator.java 2000/06/08 00:09:35 1.1.2.3
+++ AbstractDatatypeValidator.java 2000/09/11 21:57:12 1.1.2.4
@@ -63,8 +63,8 @@
import org.apache.xerces.validators.InvalidDatatypeValueException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: AbstractDatatypeValidator.java,v 1.1.2.3 2000/06/08 00:09:35 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: AbstractDatatypeValidator.java,v 1.1.2.4 2000/09/11 21:57:12 andyc Exp $
*/
public class AbstractDatatypeValidator
implements DatatypeValidator {
@@ -109,12 +109,9 @@
*
* @param data
* @param state
- *
- * @return
*/
- public Object validate(String data, Object state)
+ public void validate(String data, Object state)
throws InvalidDatatypeValueException {
- return null;
} // validate
/**
1.1.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/validators/datatypes/Attic/StringDatatypeValidator.java
Index: StringDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatypes/Attic/StringDatatypeValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- StringDatatypeValidator.java 2000/06/08 00:09:36 1.1.2.3
+++ StringDatatypeValidator.java 2000/09/11 21:57:13 1.1.2.4
@@ -62,8 +62,8 @@
import org.apache.xerces.validators.InvalidDatatypeFacetException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: StringDatatypeValidator.java,v 1.1.2.3 2000/06/08 00:09:36 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: StringDatatypeValidator.java,v 1.1.2.4 2000/09/11 21:57:13 andyc Exp $
*/
public class StringDatatypeValidator
extends AbstractDatatypeValidator {
No revision
No revision
1.1.2.4 +39 -50 xml-xerces/java/src/org/apache/xerces/validators/grammars/Attic/DTDGrammar.java
Index: DTDGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/grammars/Attic/DTDGrammar.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DTDGrammar.java 2000/06/08 00:09:36 1.1.2.3
+++ DTDGrammar.java 2000/09/11 21:57:16 1.1.2.4
@@ -59,18 +59,19 @@
import org.apache.xerces.framework.XMLString;
import org.apache.xerces.scanners.XMLDTDContentModelHandler;
+import org.apache.xerces.scanners.XMLDTDContentModelSource;
import org.apache.xerces.scanners.XMLDTDHandler;
-import org.apache.xerces.utils.QName;
+import org.apache.xerces.scanners.XMLDTDSource;
import org.apache.xerces.validators.Grammar;
import org.xml.sax.SAXException;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: DTDGrammar.java,v 1.1.2.3 2000/06/08 00:09:36 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: DTDGrammar.java,v 1.1.2.4 2000/09/11 21:57:16 andyc Exp $
*/
public class DTDGrammar
extends Grammar
- implements XMLDTDHandler, XMLDTDContentModelHandler {
+ implements XMLDTDSource, XMLDTDHandler, XMLDTDContentModelSource, XMLDTDContentModelHandler {
//
// Data
@@ -101,21 +102,17 @@
}
//
- // Methods
+ // XMLDTDSource methods
//
/**
* setDTDHandler
+ *
+ * @param dtdHandler
*/
- public void setDTDHandler() {
+ public void setDTDHandler(XMLDTDHandler dtdHandler) {
} // setDTDHandler
- /**
- * setDTDContentModelHandler
- */
- public void setDTDContentModelHandler() {
- } // setDTDContentModelHandler
-
//
// XMLDTDHandler methods
//
@@ -163,33 +160,33 @@
/**
* elementDecl
*
- * @param element
+ * @param name
* @param contentModel
*/
- public void elementDecl(QName element, XMLString contentModel)
+ public void elementDecl(String name, XMLString contentModel)
throws SAXException {
} // elementDecl
/**
* startAttlist
*
- * @param element
+ * @param elementName
*/
- public void startAttlist(QName element)
+ public void startAttlist(String elementName)
throws SAXException {
} // startAttlist
/**
* attributeDecl
*
- * @param element
- * @param attribute
+ * @param elementName
+ * @param attributeName
* @param type
* @param enumeration
* @param defaultType
* @param defaultValue
*/
- public void attributeDecl(QName element, QName attribute, short type, String[] enumeration, short defaultType, XMLString defaultValue)
+ public void attributeDecl(String elementName, String attributeName, String type, String[] enumeration, String defaultType, XMLString defaultValue)
throws SAXException {
} // attributeDecl
@@ -246,41 +243,21 @@
throws SAXException {
} // notationDecl
- /**
- * startParameterEntityReference
- *
- * @param name
- * @param publicId
- * @param systemId
- */
- public void startParameterEntityReference(String name, String publicId, String systemId)
- throws SAXException {
- } // startParameterEntityReference
-
/**
- * endParameterEntityReference
+ * startConditional
*
- * @param name
- */
- public void endParameterEntityReference(String name)
- throws SAXException {
- } // endParameterEntityReference
-
- /**
- * startConditionalSection
- *
* @param type
*/
- public void startConditionalSection(short type)
+ public void startConditional(short type)
throws SAXException {
- } // startConditionalSection
+ } // startConditional
/**
- * endConditionalSection
+ * endConditional
*/
- public void endConditionalSection()
+ public void endConditional()
throws SAXException {
- } // endConditionalSection
+ } // endConditional
/**
* endDTD
@@ -290,25 +267,37 @@
} // endDTD
//
+ // XMLDTDContentModelSource methods
+ //
+
+ /**
+ * setDTDContentModelHandler
+ *
+ * @param dtdContentModelHandler
+ */
+ public void setDTDContentModelHandler(XMLDTDContentModelHandler dtdContentModelHandler) {
+ } // setDTDContentModelHandler
+
+ //
// XMLDTDContentModelHandler methods
//
/**
* startContentModel
*
- * @param element
+ * @param elementName
* @param type
*/
- public void startContentModel(QName element, short type)
+ public void startContentModel(String elementName, short type)
throws SAXException {
} // startContentModel
/**
* mixedElement
*
- * @param element
+ * @param elementName
*/
- public void mixedElement(QName element)
+ public void mixedElement(String elementName)
throws SAXException {
} // mixedElement
@@ -322,9 +311,9 @@
/**
* childrenElement
*
- * @param element
+ * @param elementName
*/
- public void childrenElement(QName element)
+ public void childrenElement(String elementName)
throws SAXException {
} // childrenElement
1.1.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/validators/grammars/Attic/SchemaGrammar.java
Index: SchemaGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/grammars/Attic/SchemaGrammar.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SchemaGrammar.java 2000/06/08 00:09:37 1.1.2.3
+++ SchemaGrammar.java 2000/09/11 21:57:17 1.1.2.4
@@ -62,8 +62,8 @@
import org.w3c.dom.Document;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: SchemaGrammar.java,v 1.1.2.3 2000/06/08 00:09:37 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: SchemaGrammar.java,v 1.1.2.4 2000/09/11 21:57:17 andyc Exp $
*/
public class SchemaGrammar
extends Grammar {
No revision
No revision
1.1.2.4 +2 -6 xml-xerces/java/src/org/apache/xerces/validators/models/Attic/DFAContentModel.java
Index: DFAContentModel.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/models/Attic/DFAContentModel.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DFAContentModel.java 2000/06/08 00:09:40 1.1.2.3
+++ DFAContentModel.java 2000/09/11 21:57:20 1.1.2.4
@@ -59,11 +59,10 @@
import org.apache.xerces.utils.QName;
import org.apache.xerces.validators.ContentModelValidator;
-import org.apache.xerces.validators.ContentSpecProvider;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: DFAContentModel.java,v 1.1.2.3 2000/06/08 00:09:40 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: DFAContentModel.java,v 1.1.2.4 2000/09/11 21:57:20 andyc Exp $
*/
public class DFAContentModel
implements ContentModelValidator {
@@ -74,11 +73,8 @@
/**
*
- *
- * @param contentSpecProvider
- * @param contentSpecIndex
*/
- public DFAContentModel(ContentSpecProvider contentSpecProvider, int contentSpecIndex) {
+ public DFAContentModel() {
}
//
1.1.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/validators/models/Attic/MixedContentModel.java
Index: MixedContentModel.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/models/Attic/MixedContentModel.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- MixedContentModel.java 2000/06/08 00:09:40 1.1.2.3
+++ MixedContentModel.java 2000/09/11 21:57:21 1.1.2.4
@@ -61,8 +61,8 @@
import org.apache.xerces.validators.ContentModelValidator;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: MixedContentModel.java,v 1.1.2.3 2000/06/08 00:09:40 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: MixedContentModel.java,v 1.1.2.4 2000/09/11 21:57:21 andyc Exp $
*/
public class MixedContentModel
implements ContentModelValidator {
1.1.2.4 +1 -1 xml-xerces/java/src/org/apache/xerces/validators/models/Attic/SimpleContentModel.java
Index: SimpleContentModel.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/models/Attic/SimpleContentModel.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SimpleContentModel.java 2000/06/08 00:09:41 1.1.2.3
+++ SimpleContentModel.java 2000/09/11 21:57:23 1.1.2.4
@@ -61,8 +61,8 @@
import org.apache.xerces.validators.ContentModelValidator;
/**
- * @author Stubs generated by DesignDoc on Wed Jun 07 11:58:44 PDT 2000
- * @version $Id: SimpleContentModel.java,v 1.1.2.3 2000/06/08 00:09:41 andyc Exp $
+ * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
+ * @version $Id: SimpleContentModel.java,v 1.1.2.4 2000/09/11 21:57:23 andyc Exp $
*/
public class SimpleContentModel
implements ContentModelValidator {