You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/06/20 22:54:08 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema SchemaGrammar.java TraverseSchema.java
neilg 01/06/20 13:54:08
Modified: java/src/org/apache/xerces/validators/schema
SchemaGrammar.java TraverseSchema.java
Log:
remove unnecessary catch blocks.
Revision Changes Path
1.36 +4 -4 xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaGrammar.java
Index: SchemaGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaGrammar.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SchemaGrammar.java 2001/06/20 16:02:00 1.35
+++ SchemaGrammar.java 2001/06/20 20:54:03 1.36
@@ -60,7 +60,7 @@
* @author Eric Ye
*
* @see
- * @version $Id: SchemaGrammar.java,v 1.35 2001/06/20 16:02:00 sandygao Exp $
+ * @version $Id: SchemaGrammar.java,v 1.36 2001/06/20 20:54:03 neilg Exp $
*/
package org.apache.xerces.validators.schema;
@@ -291,7 +291,7 @@
// A substitute B, B substitute C, with types (AT, BT, CT)
// but the derivation method from AT to BT is block by B's blockset
// then A can't substitute B, but it's still possible that A substitute C.
- private Vector getElementDeclAllSubstitutionGroupQNamesBlock( int elementDeclIndex, GrammarResolver grammarResolver, StringPool stringPool){
+ private Vector getElementDeclAllSubstitutionGroupQNamesBlock( int elementDeclIndex, GrammarResolver grammarResolver, StringPool stringPool) {
if (elementDeclIndex < 0 ) {
return null;
}
@@ -371,7 +371,7 @@
// all elements that can substitute the given one
// returns a list (Vector) of SchemaGrammar.OneSubGroup: qname+grammar+elementIndex
// be sure to call this method ONLY AFTER (not during) schema traversal!!!
- public Vector getElementDeclAllSubstitutionGroupQNames( int elementDeclIndex, GrammarResolver grammarResolver, StringPool stringPool){
+ public Vector getElementDeclAllSubstitutionGroupQNames( int elementDeclIndex, GrammarResolver grammarResolver, StringPool stringPool) {
if (elementDeclIndex < 0 ) {
return null;
@@ -485,7 +485,7 @@
// Unique Particle Attribution
// overrides same method from Grammar, to do UPA checking
- public XMLContentModel getContentModel(int contentSpecIndex, int contentType, SubstitutionGroupComparator comparator) throws CMException {
+ public XMLContentModel getContentModel(int contentSpecIndex, int contentType, SubstitutionGroupComparator comparator) throws Exception {
// if the content model is already there, no UPA checking is necessary
if (existContentModel(contentSpecIndex))
return super.getContentModel(contentSpecIndex, contentType, comparator);
1.214 +2 -6 xml-xerces/java/src/org/apache/xerces/validators/schema/TraverseSchema.java
Index: TraverseSchema.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/TraverseSchema.java,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- TraverseSchema.java 2001/06/20 20:36:43 1.213
+++ TraverseSchema.java 2001/06/20 20:54:04 1.214
@@ -128,7 +128,7 @@
*
* @see org.apache.xerces.validators.common.Grammar
*
- * @version $Id: TraverseSchema.java,v 1.213 2001/06/20 20:36:43 lmartin Exp $
+ * @version $Id: TraverseSchema.java,v 1.214 2001/06/20 20:54:04 neilg Exp $
*/
public class TraverseSchema implements
NamespacesScope.NamespacesHandler{
@@ -874,7 +874,6 @@
fStringPool.toString(eltName.localpart));
}
-
Vector substitutableNames = fSchemaGrammar.getElementDeclAllSubstitutionGroupQNames(topLevelElementNdx, fGrammarResolver, fStringPool);
for (int i = 0; i < substitutableNames.size(); i++) {
@@ -5964,10 +5963,7 @@
if (!referredTo)
reportSchemaError(SchemaMessageProvider.IncorrectDefaultType,
new Object [] { attrDecl.getAttribute(SchemaSymbols.ATT_NAME), idve.getMessage() }); //a-props-correct.2
- } catch (Exception e) {
- e.printStackTrace();
- System.out.println("Internal error in attribute datatype validation");
- }
+ }
}
// check the coexistence of ID and value constraint
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org