You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@apache.org on 2001/05/09 23:11:07 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/parsers DTDParser.java
lehors 01/05/09 14:11:06
Modified: java/samples/ui Tag: xerces_j_2 DOMParserSaveEncoding.java
java/samples/xni Tag: xerces_j_2 Counter.java
DocumentTracer.java
java/src/org/apache/xerces/impl/validation/identity Tag:
xerces_j_2 Field.java FieldActivator.java
Selector.java ValueStore.java
java/src/org/apache/xerces/impl/validation/validators Tag:
xerces_j_2 XMLDTDValidator.java
XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xpath Tag: xerces_j_2
XPathMatcher.java
java/src/org/apache/xerces/parsers Tag: xerces_j_2
DTDParser.java
Log:
finish up move from SAXException to XNIException
Revision Changes Path
No revision
No revision
1.2.4.4 +2 -2 xml-xerces/java/samples/ui/DOMParserSaveEncoding.java
Index: DOMParserSaveEncoding.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/ui/DOMParserSaveEncoding.java,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- DOMParserSaveEncoding.java 2000/12/08 01:37:09 1.2.4.3
+++ DOMParserSaveEncoding.java 2001/05/09 21:10:44 1.2.4.4
@@ -62,7 +62,7 @@
import org.w3c.dom.NodeList;
import org.apache.xerces.util.EncodingMap;
import org.apache.xerces.parsers.DOMParser;
-import org.xml.sax.SAXException;
+import org.apache.xerces.xni.XNIException;
/**
* The DOMParserSaveEncoding class extends DOMParser. It also provides
@@ -97,7 +97,7 @@
return(javaEncoding);
}
public void startEntity(String name, String publicId, String systemId,
- String encoding) throws SAXException {
+ String encoding) throws XNIException {
if( encoding != null){
setMimeEncoding( encoding);
}
No revision
No revision
1.1.2.2 +6 -5 xml-xerces/java/samples/xni/Attic/Counter.java
Index: Counter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/Attic/Counter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Counter.java 2001/04/16 05:42:21 1.1.2.1
+++ Counter.java 2001/05/09 21:10:46 1.1.2.2
@@ -63,6 +63,7 @@
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLAttributes;
import org.apache.xerces.xni.XMLString;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLParserConfiguration;
import org.xml.sax.ErrorHandler;
@@ -88,7 +89,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: Counter.java,v 1.1.2.1 2001/04/16 05:42:21 andyc Exp $
+ * @version $Id: Counter.java,v 1.1.2.2 2001/05/09 21:10:46 lehors Exp $
*/
public class Counter
extends XMLDocumentParser
@@ -189,7 +190,7 @@
/** Start document. */
public void startDocument(String systemId, String encoding)
- throws SAXException {
+ throws XNIException {
fElements = 0;
fAttributes = 0;
@@ -200,7 +201,7 @@
/** Start element. */
public void startElement(QName element, XMLAttributes attrs)
- throws SAXException {
+ throws XNIException {
fElements++;
if (attrs != null) {
@@ -210,14 +211,14 @@
} // startElement(QName,XMLAttributes)
/** Characters. */
- public void characters(XMLString text) throws SAXException {
+ public void characters(XMLString text) throws XNIException {
fCharacters += text.length;
} // characters(XMLString);
/** Ignorable whitespace. */
- public void ignorableWhitespace(XMLString text) throws SAXException {
+ public void ignorableWhitespace(XMLString text) throws XNIException {
fIgnorableWhitespace += text.length;
1.1.2.13 +41 -40 xml-xerces/java/samples/xni/Attic/DocumentTracer.java
Index: DocumentTracer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/Attic/DocumentTracer.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- DocumentTracer.java 2001/04/16 05:42:22 1.1.2.12
+++ DocumentTracer.java 2001/05/09 21:10:48 1.1.2.13
@@ -69,6 +69,7 @@
import org.apache.xerces.xni.XMLDTDContentModelHandler;
import org.apache.xerces.xni.XMLString;
import org.apache.xerces.xni.XMLAttributes;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLParserConfiguration;
import org.xml.sax.ErrorHandler;
@@ -84,7 +85,7 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: DocumentTracer.java,v 1.1.2.12 2001/04/16 05:42:22 andyc Exp $
+ * @version $Id: DocumentTracer.java,v 1.1.2.13 2001/05/09 21:10:48 lehors Exp $
*/
public class DocumentTracer
extends XMLDocumentParser
@@ -194,10 +195,10 @@
* internal entities or a document entity that is
* parsed from a java.io.Reader).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startDocument(String systemId, String encoding)
- throws SAXException {
+ throws XNIException {
fIndent = 0;
printIndent();
@@ -215,7 +216,7 @@
/** XML Declaration. */
public void xmlDecl(String version, String encoding, String actualEncoding,
- String standalone) throws SAXException {
+ String standalone) throws XNIException {
printIndent();
fOut.print("xmlDecl(");
@@ -236,7 +237,7 @@
/** Doctype declaration. */
public void doctypeDecl(String rootElement, String publicId,
- String systemId) throws SAXException {
+ String systemId) throws XNIException {
printIndent();
fOut.print("doctypeDecl(");
@@ -255,7 +256,7 @@
/** Start prefix mapping. */
public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("startPrefixMapping(");
@@ -271,7 +272,7 @@
/** Start element. */
public void startElement(QName element, XMLAttributes attributes)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("startElement(");
@@ -284,7 +285,7 @@
/** Empty element. */
public void emptyElement(QName element, XMLAttributes attributes)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("emptyElement(");
@@ -295,7 +296,7 @@
} // emptyElement(QName,XMLAttributes)
/** Characters. */
- public void characters(XMLString text) throws SAXException {
+ public void characters(XMLString text) throws XNIException {
printIndent();
fOut.print("characters(");
@@ -307,7 +308,7 @@
} // characters(XMLString)
/** Ignorable whitespace. */
- public void ignorableWhitespace(XMLString text) throws SAXException {
+ public void ignorableWhitespace(XMLString text) throws XNIException {
printIndent();
fOut.print("ignorableWhitespace(");
@@ -319,7 +320,7 @@
} // ignorableWhitespace(XMLString)
/** End element. */
- public void endElement(QName element) throws SAXException {
+ public void endElement(QName element) throws XNIException {
fIndent--;
printIndent();
@@ -344,7 +345,7 @@
} // endElement(QName)
/** End prefix mapping. */
- public void endPrefixMapping(String prefix) throws SAXException {
+ public void endPrefixMapping(String prefix) throws XNIException {
printIndent();
fOut.print("endPrefixMapping(");
@@ -356,7 +357,7 @@
} // endPrefixMapping(String)
/** Start CDATA section. */
- public void startCDATA() throws SAXException {
+ public void startCDATA() throws XNIException {
printIndent();
fOut.println("startCDATA()");
@@ -366,7 +367,7 @@
} // startCDATA()
/** End CDATA section. */
- public void endCDATA() throws SAXException {
+ public void endCDATA() throws XNIException {
fIndent--;
printIndent();
@@ -376,7 +377,7 @@
} // endCDATA()
/** End document. */
- public void endDocument() throws SAXException {
+ public void endDocument() throws XNIException {
fIndent--;
printIndent();
@@ -391,7 +392,7 @@
/** Start entity. */
public void startEntity(String name, String publicId, String systemId,
- String encoding) throws SAXException {
+ String encoding) throws XNIException {
printIndent();
fOut.print("startEntity(");
@@ -413,7 +414,7 @@
} // startEntity(String,String,String,String)
/** Text declaration. */
- public void textDecl(String version, String encoding) throws SAXException {
+ public void textDecl(String version, String encoding) throws XNIException {
printIndent();
fOut.print("textDecl(");
@@ -428,7 +429,7 @@
} // textDecl(String,String)
/** Comment. */
- public void comment(XMLString text) throws SAXException {
+ public void comment(XMLString text) throws XNIException {
printIndent();
fOut.print("comment(");
@@ -441,7 +442,7 @@
/** Processing instruction. */
public void processingInstruction(String target, XMLString data)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("processingInstruction(");
@@ -456,7 +457,7 @@
} // processingInstruction(String,XMLString)
/** End entity. */
- public void endEntity(String name) throws SAXException {
+ public void endEntity(String name) throws XNIException {
fIndent--;
printIndent();
@@ -473,7 +474,7 @@
//
/** Start DTD. */
- public void startDTD() throws SAXException {
+ public void startDTD() throws XNIException {
printIndent();
fOut.println("startDTD()");
@@ -484,7 +485,7 @@
/** Element declaration. */
public void elementDecl(String name, String contentModel)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("elementDecl(");
@@ -499,7 +500,7 @@
} // elementDecl(String,String)
/** Start attribute list. */
- public void startAttlist(String elementName) throws SAXException {
+ public void startAttlist(String elementName) throws XNIException {
printIndent();
fOut.print("startAttlist(");
@@ -515,7 +516,7 @@
public void attributeDecl(String elementName, String attributeName,
String type, String[] enumeration,
String defaultType, XMLString defaultValue)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("attributeDecl(");
@@ -560,7 +561,7 @@
} // attributeDecl(String,String,String,String[],String,XMLString)
/** End attribute list. */
- public void endAttlist() throws SAXException {
+ public void endAttlist() throws XNIException {
fIndent--;
printIndent();
@@ -571,7 +572,7 @@
/** Internal entity declaration. */
public void internalEntityDecl(String name, XMLString text)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("internalEntityDecl(");
@@ -587,7 +588,7 @@
/** External entity declaration. */
public void externalEntityDecl(String name, String publicId,
- String systemId) throws SAXException {
+ String systemId) throws XNIException {
printIndent();
fOut.print("externalEntityDecl(");
@@ -607,7 +608,7 @@
/** Unparsed entity declaration. */
public void unparsedEntityDecl(String name, String publicId,
String systemId, String notation)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("externalEntityDecl(");
@@ -629,7 +630,7 @@
/** Notation declaration. */
public void notationDecl(String name, String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("notationDecl(");
@@ -647,7 +648,7 @@
} // notationDecl(String,String,String)
/** Start conditional section. */
- public void startConditional(short type) throws SAXException {
+ public void startConditional(short type) throws XNIException {
printIndent();
fOut.print("startConditional(");
@@ -672,7 +673,7 @@
} // startConditional(short)
/** End conditional section. */
- public void endConditional() throws SAXException {
+ public void endConditional() throws XNIException {
fIndent--;
printIndent();
@@ -682,7 +683,7 @@
} // endConditional()
/** End DTD. */
- public void endDTD() throws SAXException {
+ public void endDTD() throws XNIException {
fIndent--;
printIndent();
@@ -697,7 +698,7 @@
/** Start content model. */
public void startContentModel(String elementName, short type)
- throws SAXException {
+ throws XNIException {
printIndent();
fOut.print("startContentModel(");
@@ -733,7 +734,7 @@
} // startContentModel(String,short)
/** Mixed element. */
- public void mixedElement(String elementName) throws SAXException {
+ public void mixedElement(String elementName) throws XNIException {
printIndent();
fOut.print("mixedElement(");
@@ -745,7 +746,7 @@
} // mixedElement(String)
/** Children start group. */
- public void childrenStartGroup() throws SAXException {
+ public void childrenStartGroup() throws XNIException {
printIndent();
fOut.println("childrenStartGroup()");
@@ -755,7 +756,7 @@
} // childrenStartGroup()
/** Children element. */
- public void childrenElement(String elementName) throws SAXException {
+ public void childrenElement(String elementName) throws XNIException {
printIndent();
fOut.print("childrenElement(");
@@ -767,7 +768,7 @@
} // childrenElement(String)
/** Children separator. */
- public void childrenSeparator(short separator) throws SAXException {
+ public void childrenSeparator(short separator) throws XNIException {
printIndent();
fOut.print("childrenSeparator(");
@@ -791,7 +792,7 @@
} // childrenSeparator(short)
/** Children occurrence. */
- public void childrenOccurrence(short occurrence) throws SAXException {
+ public void childrenOccurrence(short occurrence) throws XNIException {
printIndent();
fOut.print("childrenOccurrence(");
@@ -819,7 +820,7 @@
} // childrenOccurrence(short)
/** Children end group. */
- public void childrenEndGroup() throws SAXException {
+ public void childrenEndGroup() throws XNIException {
fIndent--;
printIndent();
@@ -829,7 +830,7 @@
} // childrenEndGroup()
/** End content model. */
- public void endContentModel() throws SAXException {
+ public void endContentModel() throws XNIException {
fIndent--;
printIndent();
No revision
No revision
1.1.2.2 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/Field.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Field.java 2001/01/16 04:36:05 1.1.2.1
+++ Field.java 2001/05/09 21:10:51 1.1.2.2
@@ -63,14 +63,14 @@
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.NamespaceContext;
+import org.apache.xerces.xni.XNIException;
-import org.xml.sax.SAXException;
/**
* Schema identity constraint field.
*
* @author Andy Clark, IBM
- * @version $Id: Field.java,v 1.1.2.1 2001/01/16 04:36:05 andyc Exp $
+ * @version $Id: Field.java,v 1.1.2.2 2001/05/09 21:10:51 lehors Exp $
*/
public class Field {
@@ -186,7 +186,7 @@
* This method is called when the XPath handler matches the
* XPath expression.
*/
- protected void matched(String content) throws SAXException {
+ protected void matched(String content) throws XNIException {
fStore.addValue(content, Field.this);
} // matched(String)
1.1.2.2 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/FieldActivator.java
Index: FieldActivator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/FieldActivator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FieldActivator.java 2001/01/16 04:36:05 1.1.2.1
+++ FieldActivator.java 2001/05/09 21:10:52 1.1.2.2
@@ -58,8 +58,8 @@
package org.apache.xerces.impl.validation.identity;
import org.apache.xerces.impl.xpath.XPathMatcher;
+import org.apache.xerces.xni.XNIException;
-import org.xml.sax.SAXException;
/**
* Interface for a field activator. The field activator is responsible
@@ -68,7 +68,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: FieldActivator.java,v 1.1.2.1 2001/01/16 04:36:05 andyc Exp $
+ * @version $Id: FieldActivator.java,v 1.1.2.2 2001/05/09 21:10:52 lehors Exp $
*/
public interface FieldActivator {
@@ -82,6 +82,6 @@
*
* @param field The field to activate.
*/
- public XPathMatcher activateField(Field field) throws SAXException;
+ public XPathMatcher activateField(Field field) throws XNIException;
} // interface FieldActivator
1.1.2.2 +5 -5 xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/Selector.java
Index: Selector.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/Selector.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Selector.java 2001/01/16 04:36:06 1.1.2.1
+++ Selector.java 2001/05/09 21:10:53 1.1.2.2
@@ -64,14 +64,14 @@
import org.apache.xerces.xni.NamespaceContext;
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLAttributes;
+import org.apache.xerces.xni.XNIException;
-import org.xml.sax.SAXException;
/**
* Schema identity constraint selector.
*
* @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.1.2.1 2001/01/16 04:36:06 andyc Exp $
+ * @version $Id: Selector.java,v 1.1.2.2 2001/05/09 21:10:53 lehors Exp $
*/
public class Selector {
@@ -125,7 +125,7 @@
* Schema identity constraint selector XPath expression.
*
* @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.1.2.1 2001/01/16 04:36:06 andyc Exp $
+ * @version $Id: Selector.java,v 1.1.2.2 2001/05/09 21:10:53 lehors Exp $
*/
public static class XPath
extends org.apache.xerces.impl.xpath.XPath {
@@ -190,10 +190,10 @@
* @param element The name of the element.
* @param attributes The element attributes.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startElement(QName element, XMLAttributes attributes)
- throws SAXException {
+ throws XNIException {
super.startElement(element, attributes);
// activate the fields, if selector is matched
1.1.2.2 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/ValueStore.java
Index: ValueStore.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/identity/Attic/ValueStore.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ValueStore.java 2001/01/16 04:36:06 1.1.2.1
+++ ValueStore.java 2001/05/09 21:10:53 1.1.2.2
@@ -57,7 +57,7 @@
package org.apache.xerces.impl.validation.identity;
-import org.xml.sax.SAXException;
+import org.apache.xerces.xni.XNIException;
/**
* Interface for storing values associated to an identity constraint.
@@ -75,7 +75,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: ValueStore.java,v 1.1.2.1 2001/01/16 04:36:06 andyc Exp $
+ * @version $Id: ValueStore.java,v 1.1.2.2 2001/05/09 21:10:53 lehors Exp $
*/
public interface ValueStore {
@@ -91,6 +91,6 @@
* is used to ensure that each field only adds a value
* once within a selection scope.
*/
- public void addValue(String value, Field field) throws SAXException;
+ public void addValue(String value, Field field) throws XNIException;
} // interface ValueStore
No revision
No revision
1.1.2.9 +77 -76 xml-xerces/java/src/org/apache/xerces/impl/validation/validators/Attic/XMLDTDValidator.java
Index: XMLDTDValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/validators/Attic/XMLDTDValidator.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- XMLDTDValidator.java 2001/04/11 07:22:10 1.1.2.8
+++ XMLDTDValidator.java 2001/05/09 21:10:57 1.1.2.9
@@ -74,6 +74,7 @@
import org.apache.xerces.xni.XMLDocumentHandler;
import org.apache.xerces.xni.XMLDTDHandler;
import org.apache.xerces.xni.XMLDTDContentModelHandler;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLComponent;
import org.apache.xerces.xni.parser.XMLComponentManager;
@@ -84,7 +85,7 @@
/**
* @author Eric Ye, IBM
*
- * @version $Id: XMLDTDValidator.java,v 1.1.2.8 2001/04/11 07:22:10 andyc Exp $
+ * @version $Id: XMLDTDValidator.java,v 1.1.2.9 2001/05/09 21:10:57 lehors Exp $
*/
public class XMLDTDValidator
extends XMLValidator {
@@ -179,10 +180,10 @@
* internal entities or a document entity that is
* parsed from a java.io.Reader).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startDocument(String systemId, String encoding)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -202,10 +203,10 @@
* not specified.
* @param standalone The standalone value, or null if not specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void xmlDecl(String version, String encoding, String standalone)
- throws SAXException {
+ throws XNIException {
if (standalone != null )
if ( standalone.equals("yes") ) {
@@ -228,10 +229,10 @@
* @param systemId The system identifier if an external DTD, null
* otherwise.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void doctypeDecl(String rootElement, String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
fRootElement.setValues(null, rootElement, rootElement, null);
@@ -249,10 +250,10 @@
* @param prefix The namespace prefix.
* @param uri The URI bound to the prefix.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -269,10 +270,10 @@
* @param element The name of the element.
* @param attributes The element attributes.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startElement(QName element, XMLAttributes attributes)
- throws SAXException {
+ throws XNIException {
// VC: Root Element Type
// see if the root element's name matches the one in DoctypeDecl
@@ -362,9 +363,9 @@
*
* @param text The content.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void characters(XMLString text) throws SAXException {
+ public void characters(XMLString text) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -383,9 +384,9 @@
*
* @param text The ignorable whitespace.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void ignorableWhitespace(XMLString text) throws SAXException {
+ public void ignorableWhitespace(XMLString text) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -399,9 +400,9 @@
*
* @param element The name of the element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endElement(QName element) throws SAXException {
+ public void endElement(QName element) throws XNIException {
fElementDepth--;
if (fValidation) {
@@ -504,9 +505,9 @@
*
* @param prefix The namespace prefix.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endPrefixMapping(String prefix) throws SAXException {
+ public void endPrefixMapping(String prefix) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -518,9 +519,9 @@
/**
* The start of a CDATA section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startCDATA() throws SAXException {
+ public void startCDATA() throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -532,9 +533,9 @@
/**
* The end of a CDATA section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endCDATA() throws SAXException {
+ public void endCDATA() throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -546,9 +547,9 @@
/**
* The end of the document.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endDocument() throws SAXException {
+ public void endDocument() throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -591,10 +592,10 @@
* where the entity encoding is not auto-detected (e.g.
* internal parameter entities).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startEntity(String name, String publicId, String systemId,
- String encoding) throws SAXException {
+ String encoding) throws XNIException {
// call handlers
if (fInDTD) {
@@ -625,9 +626,9 @@
* @param version The XML version, or null if not specified.
* @param encoding The IANA encoding name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void textDecl(String version, String encoding) throws SAXException {
+ public void textDecl(String version, String encoding) throws XNIException {
// call handlers
if (fInDTD) {
@@ -649,9 +650,9 @@
*
* @param text The text in the comment.
*
- * @throws SAXException Thrown by application to signal an error.
+ * @throws XNIException Thrown by application to signal an error.
*/
- public void comment(XMLString text) throws SAXException {
+ public void comment(XMLString text) throws XNIException {
// call handlers
if (fInDTD) {
@@ -682,10 +683,10 @@
* @param target The target.
* @param data The data or null if none specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void processingInstruction(String target, XMLString data)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fInDTD) {
@@ -724,9 +725,9 @@
*
* @param name The name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endEntity(String name) throws SAXException {
+ public void endEntity(String name) throws XNIException {
// call handlers
if (fInDTD) {
@@ -750,9 +751,9 @@
/**
* The start of the DTD.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startDTD() throws SAXException {
+ public void startDTD() throws XNIException {
// set state
fInDTD = true;
@@ -774,10 +775,10 @@
* @param name The name of the element.
* @param contentModel The element content model.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void elementDecl(String name, String contentModel)
- throws SAXException {
+ throws XNIException {
// call handlers
fDTDGrammar.elementDecl(name, contentModel);
@@ -793,9 +794,9 @@
* @param elementName The name of the element that this attribute
* list is associated with.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startAttlist(String elementName) throws SAXException {
+ public void startAttlist(String elementName) throws XNIException {
// call handlers
fDTDGrammar.startAttlist(elementName);
@@ -824,12 +825,12 @@
* @param defaultValue The attribute default value, or null if no
* default value is specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void attributeDecl(String elementName, String attributeName,
String type, String[] enumeration,
String defaultType, XMLString defaultValue)
- throws SAXException {
+ throws XNIException {
// call handlers
fDTDGrammar.attributeDecl(elementName, attributeName,
@@ -846,9 +847,9 @@
/**
* The end of an attribute list.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endAttlist() throws SAXException {
+ public void endAttlist() throws XNIException {
// call handlers
fDTDGrammar.endAttlist();
@@ -866,10 +867,10 @@
* entity name.
* @param text The value of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void internalEntityDecl(String name, XMLString text)
- throws SAXException {
+ throws XNIException {
// call handlers
fDTDGrammar.internalEntityDecl(name, text);
@@ -889,11 +890,11 @@
* the entity was specified with SYSTEM.
* @param systemId The system identifier of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void externalEntityDecl(String name,
String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
// call handlers
fDTDGrammar.externalEntityDecl(name, publicId, systemId);
@@ -913,11 +914,11 @@
* specified.
* @param notation The name of the notation.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void unparsedEntityDecl(String name,
String publicId, String systemId,
- String notation) throws SAXException {
+ String notation) throws XNIException {
// call handlers
fDTDGrammar.unparsedEntityDecl(name, publicId, systemId, notation);
@@ -936,10 +937,10 @@
* @param systemId The system identifier of the notation, or null if not
* specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void notationDecl(String name, String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
// call handlers
fDTDGrammar.notationDecl(name, publicId, systemId);
@@ -955,12 +956,12 @@
* @param type The type of the conditional section. This value will
* either be CONDITIONAL_INCLUDE or CONDITIONAL_IGNORE.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see CONDITIONAL_INCLUDE
* @see CONDITIONAL_IGNORE
*/
- public void startConditional(short type) throws SAXException {
+ public void startConditional(short type) throws XNIException {
// set state
fInDTDIgnore = type == XMLDTDHandler.CONDITIONAL_IGNORE;
@@ -976,9 +977,9 @@
/**
* The end of a conditional section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endConditional() throws SAXException {
+ public void endConditional() throws XNIException {
// set state
fInDTDIgnore = false;
@@ -994,9 +995,9 @@
/**
* The end of the DTD.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endDTD() throws SAXException {
+ public void endDTD() throws XNIException {
// set state
fInDTD = false;
@@ -1025,7 +1026,7 @@
* @param elementName The name of the element.
* @param type The content model type.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_EMPTY
* @see TYPE_ANY
@@ -1033,7 +1034,7 @@
* @see TYPE_CHILDREN
*/
public void startContentModel(String elementName, short type)
- throws SAXException {
+ throws XNIException {
// call handlers
fDTDGrammar.startContentModel(elementName, type);
@@ -1054,11 +1055,11 @@
*
* @param elementName The name of the referenced element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_MIXED
*/
- public void mixedElement(String elementName) throws SAXException {
+ public void mixedElement(String elementName) throws XNIException {
// call handlers
fDTDGrammar.mixedElement(elementName);
@@ -1077,11 +1078,11 @@
* <strong>Note:</strong> Children groups can be nested and have
* associated occurrence counts.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_CHILDREN
*/
- public void childrenStartGroup() throws SAXException {
+ public void childrenStartGroup() throws XNIException {
// call handlers
fDTDGrammar.childrenStartGroup();
@@ -1096,11 +1097,11 @@
*
* @param elementName The name of the referenced element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_CHILDREN
*/
- public void childrenElement(String elementName) throws SAXException {
+ public void childrenElement(String elementName) throws XNIException {
// call handlers
fDTDGrammar.childrenElement(elementName);
@@ -1119,13 +1120,13 @@
*
* @param separator The type of children separator.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see SEPARATOR_CHOICE
* @see SEPARATOR_SEQUENCE
* @see TYPE_CHILDREN
*/
- public void childrenSeparator(short separator) throws SAXException {
+ public void childrenSeparator(short separator) throws XNIException {
// call handlers
fDTDGrammar.childrenSeparator(separator);
@@ -1144,14 +1145,14 @@
* @param occurrence The occurrence count for the last children element
* or children group.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see OCCURS_ZERO_OR_ONE
* @see OCCURS_ZERO_OR_MORE
* @see OCCURS_ONE_OR_MORE
* @see TYPE_CHILDREN
*/
- public void childrenOccurrence(short occurrence) throws SAXException {
+ public void childrenOccurrence(short occurrence) throws XNIException {
// call handlers
fDTDGrammar.childrenOccurrence(occurrence);
@@ -1169,7 +1170,7 @@
*
* @see TYPE_CHILDREN
*/
- public void childrenEndGroup() throws SAXException {
+ public void childrenEndGroup() throws XNIException {
// call handlers
fDTDGrammar.childrenEndGroup();
@@ -1182,9 +1183,9 @@
/**
* The end of a content model.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endContentModel() throws SAXException {
+ public void endContentModel() throws XNIException {
// call handlers
fDTDGrammar.endContentModel();
@@ -1198,7 +1199,7 @@
//private methods
/** Root element specified. */
- private void rootElementSpecified(QName rootElement) throws SAXException {
+ private void rootElementSpecified(QName rootElement) throws XNIException {
if (fValidation) {
String root1 = fRootElement.rawname;
String root2 = rootElement.rawname;
@@ -1248,7 +1249,7 @@
private int checkContent(int elementIndex,
QName[] children,
int childOffset,
- int childCount) throws SAXException {
+ int childCount) throws XNIException {
fCurrentGrammar.getElementDecl(elementIndex, fTempElementDecl);
1.1.2.5 +36 -35 xml-xerces/java/src/org/apache/xerces/impl/validation/validators/Attic/XMLSchemaValidator.java
Index: XMLSchemaValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/validators/Attic/XMLSchemaValidator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLSchemaValidator.java 2001/04/11 07:22:11 1.1.2.4
+++ XMLSchemaValidator.java 2001/05/09 21:10:58 1.1.2.5
@@ -69,6 +69,7 @@
import org.apache.xerces.xni.XMLDocumentHandler;
import org.apache.xerces.xni.XMLDTDHandler;
import org.apache.xerces.xni.XMLDTDContentModelHandler;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLComponent;
import org.apache.xerces.xni.parser.XMLComponentManager;
@@ -79,7 +80,7 @@
/**
* @author Eric Ye, IBM
*
- * @version $Id: XMLSchemaValidator.java,v 1.1.2.4 2001/04/11 07:22:11 andyc Exp $
+ * @version $Id: XMLSchemaValidator.java,v 1.1.2.5 2001/05/09 21:10:58 lehors Exp $
*/
public class XMLSchemaValidator
extends XMLValidator {
@@ -112,10 +113,10 @@
* internal entities or a document entity that is
* parsed from a java.io.Reader).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startDocument(String systemId, String encoding)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -134,10 +135,10 @@
* not specified.
* @param standalone The standalone value, or null if not specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void xmlDecl(String version, String encoding, String standalone)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -155,10 +156,10 @@
* @param systemId The system identifier if an external DTD, null
* otherwise.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void doctypeDecl(String rootElement, String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -174,10 +175,10 @@
* @param prefix The namespace prefix.
* @param uri The URI bound to the prefix.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -194,10 +195,10 @@
* @param element The name of the element.
* @param attributes The element attributes.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startElement(QName element, XMLAttributes attributes)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -211,9 +212,9 @@
*
* @param text The content.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void characters(XMLString text) throws SAXException {
+ public void characters(XMLString text) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -232,9 +233,9 @@
*
* @param text The ignorable whitespace.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void ignorableWhitespace(XMLString text) throws SAXException {
+ public void ignorableWhitespace(XMLString text) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -248,9 +249,9 @@
*
* @param element The name of the element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endElement(QName element) throws SAXException {
+ public void endElement(QName element) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -265,9 +266,9 @@
*
* @param prefix The namespace prefix.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endPrefixMapping(String prefix) throws SAXException {
+ public void endPrefixMapping(String prefix) throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -279,9 +280,9 @@
/**
* The start of a CDATA section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startCDATA() throws SAXException {
+ public void startCDATA() throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -293,9 +294,9 @@
/**
* The end of a CDATA section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endCDATA() throws SAXException {
+ public void endCDATA() throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -307,9 +308,9 @@
/**
* The end of the document.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endDocument() throws SAXException {
+ public void endDocument() throws XNIException {
// call handlers
if (fDocumentHandler != null) {
@@ -352,10 +353,10 @@
* where the entity encoding is not auto-detected (e.g.
* internal parameter entities).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startEntity(String name, String publicId, String systemId,
- String encoding) throws SAXException {
+ String encoding) throws XNIException {
// call handlers
if (fInDTD) {
@@ -386,9 +387,9 @@
* @param version The XML version, or null if not specified.
* @param encoding The IANA encoding name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void textDecl(String version, String encoding) throws SAXException {
+ public void textDecl(String version, String encoding) throws XNIException {
// call handlers
if (fInDTD) {
@@ -410,9 +411,9 @@
*
* @param text The text in the comment.
*
- * @throws SAXException Thrown by application to signal an error.
+ * @throws XNIException Thrown by application to signal an error.
*/
- public void comment(XMLString text) throws SAXException {
+ public void comment(XMLString text) throws XNIException {
// call handlers
if (fInDTD) {
@@ -443,10 +444,10 @@
* @param target The target.
* @param data The data or null if none specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void processingInstruction(String target, XMLString data)
- throws SAXException {
+ throws XNIException {
// call handlers
if (fInDTD) {
@@ -485,9 +486,9 @@
*
* @param name The name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endEntity(String name) throws SAXException {
+ public void endEntity(String name) throws XNIException {
// call handlers
if (fInDTD) {
No revision
No revision
1.1.2.6 +41 -40 xml-xerces/java/src/org/apache/xerces/impl/xpath/Attic/XPathMatcher.java
Index: XPathMatcher.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xpath/Attic/XPathMatcher.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XPathMatcher.java 2001/04/08 21:38:00 1.1.2.5
+++ XPathMatcher.java 2001/05/09 21:11:01 1.1.2.6
@@ -66,6 +66,7 @@
import org.apache.xerces.xni.XMLAttributes;
import org.apache.xerces.xni.XMLDocumentFragmentHandler;
import org.apache.xerces.xni.XMLString;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLComponent;
import org.apache.xerces.xni.parser.XMLComponentManager;
@@ -78,7 +79,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: XPathMatcher.java,v 1.1.2.5 2001/04/08 21:38:00 lehors Exp $
+ * @version $Id: XPathMatcher.java,v 1.1.2.6 2001/05/09 21:11:01 lehors Exp $
*/
public class XPathMatcher
implements XMLComponent, XMLDocumentFragmentHandler {
@@ -203,7 +204,7 @@
* XPath expression. Subclasses can override this method to
* provide default handling upon a match.
*/
- protected void matched(String content) throws SAXException {
+ protected void matched(String content) throws XNIException {
if (DEBUG_METHODS || DEBUG_METHODS2) {
System.out.println("XPATH["+toString()+"]: matched \""+content+'"');
}
@@ -327,10 +328,10 @@
* the current context (and its parent contexts)
* if that information is important.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startDocumentFragment(NamespaceContext namespaceContext)
- throws SAXException {
+ throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: startDocumentFragment("+
"namespaceContext="+namespaceContext+
@@ -379,10 +380,10 @@
* internal entities or a document entity that is
* parsed from a java.io.Reader).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startEntity(String name, String publicId, String systemId,
- String encoding) throws SAXException {
+ String encoding) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: startEntity("+
"name="+name+','+
@@ -407,9 +408,9 @@
* @param version The XML version, or null if not specified.
* @param encoding The IANA encoding name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void textDecl(String version, String encoding) throws SAXException {
+ public void textDecl(String version, String encoding) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: textDecl("+
"version="+version+','+
@@ -426,9 +427,9 @@
*
* @param name The name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endEntity(String name) throws SAXException {
+ public void endEntity(String name) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: endEntity("+
"name="+name+
@@ -441,9 +442,9 @@
*
* @param text The text in the comment.
*
- * @throws SAXException Thrown by application to signal an error.
+ * @throws XNIException Thrown by application to signal an error.
*/
- public void comment(XMLString text) throws SAXException {
+ public void comment(XMLString text) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: comment("+
"text="+text+
@@ -465,10 +466,10 @@
* @param target The target.
* @param data The data or null if none specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void processingInstruction(String target, XMLString data)
- throws SAXException {
+ throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: processingInstruction("+
"target="+target+','+
@@ -484,10 +485,10 @@
* @param prefix The namespace prefix.
* @param uri The URI bound to the prefix.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
+ throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: startPrefixMapping("+
"prefix="+prefix+','+
@@ -508,10 +509,10 @@
* @param element The name of the element.
* @param attributes The element attributes.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startElement(QName element, XMLAttributes attributes)
- throws SAXException {
+ throws XNIException {
if (DEBUG_METHODS || DEBUG_METHODS2) {
System.out.println("XPATH["+toString()+"]: startElement("+
"element="+element+','+
@@ -609,7 +610,7 @@
}
/***/
else {
- throw new SAXException("axis \""+axis+"\" not allowed");
+ throw new XNIException("axis \""+axis+"\" not allowed");
}
// check for attribute match
@@ -658,14 +659,14 @@
matched(fMatchedString);
}
else {
- throw new SAXException("node test \""+nodeTest+"\" not allowed");
+ throw new XNIException("node test \""+nodeTest+"\" not allowed");
}
}
}
break;
}
default: {
- throw new SAXException("step \""+step+"\" not allowed");
+ throw new XNIException("step \""+step+"\" not allowed");
}
}
break;
@@ -682,9 +683,9 @@
*
* @param text The content.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void characters(XMLString text) throws SAXException {
+ public void characters(XMLString text) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: characters("+
"text="+text+
@@ -713,9 +714,9 @@
*
* @param text The ignorable whitespace.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void ignorableWhitespace(XMLString text) throws SAXException {
+ public void ignorableWhitespace(XMLString text) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: ignorableWhitespace("+
"text="+text+
@@ -728,9 +729,9 @@
*
* @param element The name of the element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endElement(QName element) throws SAXException {
+ public void endElement(QName element) throws XNIException {
if (DEBUG_METHODS || DEBUG_METHODS2) {
System.out.println("XPATH["+toString()+"]: endElement("+
"element="+element+
@@ -762,9 +763,9 @@
*
* @param prefix The namespace prefix.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endPrefixMapping(String prefix) throws SAXException {
+ public void endPrefixMapping(String prefix) throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: endPrefixMapping("+
"prefix="+prefix+
@@ -775,9 +776,9 @@
/**
* The start of a CDATA section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startCDATA() throws SAXException {
+ public void startCDATA() throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: startCDATA()");
}
@@ -787,9 +788,9 @@
/**
* The end of a CDATA section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endCDATA() throws SAXException {
+ public void endCDATA() throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: endCDATA()");
}
@@ -798,9 +799,9 @@
/**
* The end of the document fragment.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endDocumentFragment() throws SAXException {
+ public void endDocumentFragment() throws XNIException {
if (DEBUG_METHODS) {
System.out.println("XPATH["+toString()+"]: endDocumentFragment()");
}
@@ -918,19 +919,19 @@
System.out.println("#### argv["+i+"]: \""+expr+"\" -> \""+xpath.toString()+'"');
org.apache.xerces.parsers.XMLDocumentParser parser =
new org.apache.xerces.parsers.XMLDocumentParser(symbols) {
- public void startDocument() throws SAXException {
+ public void startDocument() throws XNIException {
matcher.startDocumentFragment(null);
}
- public void startElement(QName element, XMLAttributes attributes) throws SAXException {
+ public void startElement(QName element, XMLAttributes attributes) throws XNIException {
matcher.startElement(element, attributes);
}
- public void characters(XMLString text) throws SAXException {
+ public void characters(XMLString text) throws XNIException {
matcher.characters(text);
}
- public void endElement(QName element) throws SAXException {
+ public void endElement(QName element) throws XNIException {
matcher.endElement(element);
}
- public void endDocument() throws SAXException {
+ public void endDocument() throws XNIException {
matcher.endDocumentFragment();
}
};
No revision
No revision
1.1.2.12 +55 -55 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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- DTDParser.java 2000/10/14 02:31:48 1.1.2.11
+++ DTDParser.java 2001/05/09 21:11:03 1.1.2.12
@@ -60,14 +60,14 @@
import org.apache.xerces.xni.XMLString;
import org.apache.xerces.xni.XMLDTDContentModelHandler;
import org.apache.xerces.xni.XMLDTDHandler;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.impl.XMLDTDScanner;
import org.apache.xerces.impl.validation.grammars.DTDGrammar;
import org.apache.xerces.util.SymbolTable;
-import org.xml.sax.SAXException;
/**
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
- * @version $Id: DTDParser.java,v 1.1.2.11 2000/10/14 02:31:48 lehors Exp $
+ * @version $Id: DTDParser.java,v 1.1.2.12 2001/05/09 21:11:03 lehors Exp $
*/
public abstract class DTDParser
extends XMLGrammarParser
@@ -129,10 +129,10 @@
* where the entity encoding is not auto-detected (e.g.
* internal parameter entities).
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startEntity(String name, String publicId, String systemId,
- String encoding) throws SAXException {
+ String encoding) throws XNIException {
}
/**
@@ -145,17 +145,17 @@
* @param version The XML version, or null if not specified.
* @param encoding The IANA encoding name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void textDecl(String version, String encoding) throws SAXException {
+ public void textDecl(String version, String encoding) throws XNIException {
}
/**
* The start of the DTD.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startDTD() throws SAXException {
+ public void startDTD() throws XNIException {
} // startDTD
/**
@@ -163,9 +163,9 @@
*
* @param text The text in the comment.
*
- * @throws SAXException Thrown by application to signal an error.
+ * @throws XNIException Thrown by application to signal an error.
*/
- public void comment(XMLString text) throws SAXException {
+ public void comment(XMLString text) throws XNIException {
} // comment
/**
@@ -182,26 +182,26 @@
* @param target The target.
* @param data The data or null if none specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void processingInstruction(String target, XMLString data)
- throws SAXException {
+ throws XNIException {
} // processingInstruction
/**
* The start of the external subset.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startExternalSubset() throws SAXException {
+ public void startExternalSubset() throws XNIException {
} // startExternalSubset
/**
* The end of the external subset.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endExternalSubset() throws SAXException {
+ public void endExternalSubset() throws XNIException {
} // endExternalSubset
/**
@@ -210,10 +210,10 @@
* @param name The name of the element.
* @param contentModel The element content model.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void elementDecl(String name, String contentModel)
- throws SAXException {
+ throws XNIException {
} // elementDecl
/**
@@ -222,9 +222,9 @@
* @param elementName The name of the element that this attribute
* list is associated with.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void startAttlist(String elementName) throws SAXException {
+ public void startAttlist(String elementName) throws XNIException {
} // startAttlist
/**
@@ -246,18 +246,18 @@
* @param defaultValue The attribute default value, or null if no
* default value is specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void attributeDecl(String elementName, String attributeName, String type, String[] enumeration, String defaultType, XMLString defaultValue)
- throws SAXException {
+ throws XNIException {
} // attributeDecl
/**
* The end of an attribute list.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endAttlist() throws SAXException {
+ public void endAttlist() throws XNIException {
} // endAttlist
/**
@@ -268,10 +268,10 @@
* entity name.
* @param text The value of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void internalEntityDecl(String name, XMLString text)
- throws SAXException {
+ throws XNIException {
} // internalEntityDecl
/**
@@ -284,10 +284,10 @@
* the entity was specified with SYSTEM.
* @param systemId The system identifier of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void externalEntityDecl(String name, String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
} // externalEntityDecl
/**
@@ -300,10 +300,10 @@
* specified.
* @param notation The name of the notation.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void unparsedEntityDecl(String name, String publicId, String systemId, String notation)
- throws SAXException {
+ throws XNIException {
} // unparsedEntityDecl
/**
@@ -315,10 +315,10 @@
* @param systemId The system identifier of the notation, or null if not
* specified.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void notationDecl(String name, String publicId, String systemId)
- throws SAXException {
+ throws XNIException {
} // notationDecl
/**
@@ -327,28 +327,28 @@
* @param type The type of the conditional section. This value will
* either be CONDITIONAL_INCLUDE or CONDITIONAL_IGNORE.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see CONDITIONAL_INCLUDE
* @see CONDITIONAL_IGNORE
*/
- public void startConditional(short type) throws SAXException {
+ public void startConditional(short type) throws XNIException {
} // startConditional
/**
* The end of a conditional section.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endConditional() throws SAXException {
+ public void endConditional() throws XNIException {
} // endConditional
/**
* The end of the DTD.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endDTD() throws SAXException {
+ public void endDTD() throws XNIException {
} // endDTD
/**
@@ -362,9 +362,9 @@
*
* @param name The name of the entity.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endEntity(String name) throws SAXException {
+ public void endEntity(String name) throws XNIException {
}
//
@@ -379,7 +379,7 @@
* @param elementName The name of the element.
* @param type The content model type.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_EMPTY
* @see TYPE_ANY
@@ -387,7 +387,7 @@
* @see TYPE_CHILDREN
*/
public void startContentModel(String elementName, short type)
- throws SAXException {
+ throws XNIException {
} // startContentModel
/**
@@ -401,11 +401,11 @@
*
* @param elementName The name of the referenced element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_MIXED
*/
- public void mixedElement(String elementName) throws SAXException {
+ public void mixedElement(String elementName) throws XNIException {
} // mixedElement
/**
@@ -417,11 +417,11 @@
* <strong>Note:</strong> Children groups can be nested and have
* associated occurrence counts.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_CHILDREN
*/
- public void childrenStartGroup() throws SAXException {
+ public void childrenStartGroup() throws XNIException {
} // childrenStartGroup
/**
@@ -429,11 +429,11 @@
*
* @param elementName The name of the referenced element.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see TYPE_CHILDREN
*/
- public void childrenElement(String elementName) throws SAXException {
+ public void childrenElement(String elementName) throws XNIException {
} // childrenElement
/**
@@ -445,13 +445,13 @@
*
* @param separator The type of children separator.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see SEPARATOR_CHOICE
* @see SEPARATOR_SEQUENCE
* @see TYPE_CHILDREN
*/
- public void childrenSeparator(short separator) throws SAXException {
+ public void childrenSeparator(short separator) throws XNIException {
} // childrenSeparator
/**
@@ -463,14 +463,14 @@
* @param occurrence The occurrence count for the last children element
* or children group.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*
* @see OCCURS_ZERO_OR_ONE
* @see OCCURS_ZERO_OR_MORE
* @see OCCURS_ONE_OR_MORE
* @see TYPE_CHILDREN
*/
- public void childrenOccurrence(short occurrence) throws SAXException {
+ public void childrenOccurrence(short occurrence) throws XNIException {
} // childrenOccurrence
/**
@@ -481,15 +481,15 @@
*
* @see TYPE_CHILDREN
*/
- public void childrenEndGroup() throws SAXException {
+ public void childrenEndGroup() throws XNIException {
} // childrenEndGroup
/**
* The end of a content model.
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
- public void endContentModel() throws SAXException {
+ public void endContentModel() throws XNIException {
} // endContentModel
} // class DTDParser
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org