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/09/28 20:11:44 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2 SchemaGrammar.java SchemaSymbols.java SchemaValidator.java XSAttributeChecker.java XSDAttributeTraverser.java XSDHandler.java XSDSimpleTypeTraverser.java XSDocumentInfo.java XSGrammarResolver.java
neilg 01/09/28 11:11:44
Modified: java/src/org/apache/xerces/impl/v2 SchemaGrammar.java
SchemaSymbols.java SchemaValidator.java
XSAttributeChecker.java XSDAttributeTraverser.java
XSDHandler.java XSDSimpleTypeTraverser.java
XSDocumentInfo.java XSGrammarResolver.java
Log:
use null to represent the empty namespace consistently instead of using the empty string.
Revision Changes Path
1.24 +9 -1 xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaGrammar.java
Index: SchemaGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaGrammar.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SchemaGrammar.java 2001/09/21 16:22:28 1.23
+++ SchemaGrammar.java 2001/09/28 18:11:43 1.24
@@ -71,7 +71,7 @@
* @author Sandy Gao, IBM
* @author Elena Litani, IBM
*
- * @version $Id: SchemaGrammar.java,v 1.23 2001/09/21 16:22:28 sandygao Exp $
+ * @version $Id: SchemaGrammar.java,v 1.24 2001/09/28 18:11:43 neilg Exp $
*/
public class SchemaGrammar {
@@ -325,6 +325,14 @@
* register one global type
*/
public final void addGlobalTypeDecl(XSTypeDecl decl) {
+ if(decl == null) {
+ System.err.println("decl");
+ System.exit(0);
+ } else if (decl.getXSTypeName() == null) {
+ System.err.println("decl.whatever");
+ System.exit(0);
+ }
+
fGlobalTypeDecls.put(decl.getXSTypeName(), decl);
}
1.15 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaSymbols.java
Index: SchemaSymbols.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaSymbols.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SchemaSymbols.java 2001/09/24 17:06:44 1.14
+++ SchemaSymbols.java 2001/09/28 18:11:43 1.15
@@ -63,7 +63,7 @@
* Collection of symbols used to parse a Schema Grammar.
*
* @author jeffrey rodriguez
- * @version $Id: SchemaSymbols.java,v 1.14 2001/09/24 17:06:44 sandygao Exp $
+ * @version $Id: SchemaSymbols.java,v 1.15 2001/09/28 18:11:43 neilg Exp $
*/
public final class SchemaSymbols {
@@ -77,7 +77,7 @@
// xmlns attributes
public static final String O_XMLNS = "xmlns";
// xsi attributes: in validator
- public static final String OURI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
+ public static final String URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
public static final String OXSI_SCHEMALOCACTION = "schemaLocation";
public static final String OXSI_NONAMESPACESCHEMALOCACTION = "noNamespaceSchemaLocation";
public static final String OXSI_TYPE = "type";
1.15 +3 -4 xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaValidator.java
Index: SchemaValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaValidator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SchemaValidator.java 2001/09/25 22:46:07 1.14
+++ SchemaValidator.java 2001/09/28 18:11:43 1.15
@@ -108,7 +108,7 @@
* @author Andy Clark, IBM
* @author Jeffrey Rodriguez IBM
*
- * @version $Id: SchemaValidator.java,v 1.14 2001/09/25 22:46:07 sandygao Exp $
+ * @version $Id: SchemaValidator.java,v 1.15 2001/09/28 18:11:43 neilg Exp $
*/
public class SchemaValidator
implements XMLComponent, XMLDocumentHandler {
@@ -783,7 +783,7 @@
SymbolTable symbolTable = (SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
if (symbolTable != fSymbolTable) {
XMLNS = symbolTable.addSymbol(SchemaSymbols.O_XMLNS);
- URI_XSI = symbolTable.addSymbol(SchemaSymbols.OURI_XSI);
+ URI_XSI = symbolTable.addSymbol(SchemaSymbols.URI_XSI);
XSI_SCHEMALOCACTION = symbolTable.addSymbol(SchemaSymbols.OXSI_SCHEMALOCACTION);
XSI_NONAMESPACESCHEMALOCACTION = symbolTable.addSymbol(SchemaSymbols.OXSI_NONAMESPACESCHEMALOCACTION);
XSI_TYPE = symbolTable.addSymbol(SchemaSymbols.OXSI_TYPE);
@@ -966,8 +966,7 @@
// try again to get the element decl
if (fCurrentElemDecl == null) {
- // REVISIT: null or ""
- SchemaGrammar sGrammar = fGrammarResolver.getGrammar(element.uri == null ? "" : element.uri);
+ SchemaGrammar sGrammar = fGrammarResolver.getGrammar(element.uri);
if (sGrammar != null)
fCurrentElemDecl = sGrammar.getGlobalElementDecl(element.localpart);
}
1.23 +1 -2 xml-xerces/java/src/org/apache/xerces/impl/v2/XSAttributeChecker.java
Index: XSAttributeChecker.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSAttributeChecker.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XSAttributeChecker.java 2001/09/25 18:50:11 1.22
+++ XSAttributeChecker.java 2001/09/28 18:11:43 1.23
@@ -89,7 +89,7 @@
* - use symbol table instead of many hashtables
*
* @author Sandy Gao, IBM
- * @version $Id: XSAttributeChecker.java,v 1.22 2001/09/25 18:50:11 sandygao Exp $
+ * @version $Id: XSAttributeChecker.java,v 1.23 2001/09/28 18:11:43 neilg Exp $
*/
public class XSAttributeChecker {
@@ -1620,7 +1620,6 @@
if (prefix != null) {
uri = fSymbolTable.addSymbol(DOMUtil.getValue(sattr));
// REVISIT: copied from namespce binder
- // why null instead of ""?
nsSupport.declarePrefix(prefix, uri.length()!=0 ? uri : null);
}
}
1.15 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAttributeTraverser.java
Index: XSDAttributeTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAttributeTraverser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSDAttributeTraverser.java 2001/09/25 22:46:07 1.14
+++ XSDAttributeTraverser.java 2001/09/28 18:11:43 1.15
@@ -82,7 +82,7 @@
*
* @author Sandy Gao, IBM
*
- * @version $Id: XSDAttributeTraverser.java,v 1.14 2001/09/25 22:46:07 sandygao Exp $
+ * @version $Id: XSDAttributeTraverser.java,v 1.15 2001/09/28 18:11:43 neilg Exp $
*/
class XSDAttributeTraverser extends XSDAbstractTraverser {
@@ -358,8 +358,8 @@
// no-xsi
// The {target namespace} of an attribute declaration, whether local or top-level, must not match http://www.w3.org/2001/XMLSchema-instance (unless it is one of the four built-in declarations given in the next section).
- if (attribute.fTargetNamespace.equals(SchemaSymbols.OURI_XSI)) {
- reportSchemaError("no-xsi", new Object[]{SchemaSymbols.OURI_XSI});
+ if (attribute.fTargetNamespace != null && attribute.fTargetNamespace.equals(SchemaSymbols.URI_XSI)) {
+ reportSchemaError("no-xsi", new Object[]{SchemaSymbols.URI_XSI});
}
return attribute;
1.32 +34 -19 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDHandler.java
Index: XSDHandler.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XSDHandler.java 2001/09/27 20:25:40 1.31
+++ XSDHandler.java 2001/09/28 18:11:43 1.32
@@ -95,7 +95,7 @@
* schema, other grammars may be constructed as a side-effect.
*
* @author Neil Graham, IBM
- * @version $Id: XSDHandler.java,v 1.31 2001/09/27 20:25:40 neilg Exp $
+ * @version $Id: XSDHandler.java,v 1.32 2001/09/28 18:11:43 neilg Exp $
*/
class XSDHandler {
@@ -334,7 +334,7 @@
Object[] includeAttrs = fAttributeChecker.checkAttributes(child, true, currSchemaInfo);
schemaHint = (String)includeAttrs[XSAttributeChecker.ATTIDX_SCHEMALOCATION];
fAttributeChecker.returnAttrArray(includeAttrs, currSchemaInfo);
- newSchemaRoot = getSchema(EMPTY_STRING, schemaHint);
+ newSchemaRoot = getSchema(null, schemaHint);
}
else {
// no more possibility of schema references in well-formed
@@ -411,7 +411,9 @@
String lName = DOMUtil.getAttrValue(redefineComp, SchemaSymbols.ATT_NAME);
if(lName.length() == 0) // an error we'll catch later
continue;
- String qName = currSchemaDoc.fTargetNamespace +","+lName;
+ String qName = currSchemaDoc.fTargetNamespace == null ?
+ ","+lName:
+ currSchemaDoc.fTargetNamespace +","+lName;
String componentType = DOMUtil.getLocalName(redefineComp);
if(componentType.equals(SchemaSymbols.ELT_ATTRIBUTEGROUP)) {
checkForDuplicateNames(qName, fUnparsedAttributeGroupRegistry, globalComp, currSchemaDoc);
@@ -451,7 +453,9 @@
String lName = DOMUtil.getAttrValue(globalComp, SchemaSymbols.ATT_NAME);
if(lName.length() == 0) // an error we'll catch later
continue;
- String qName = currSchemaDoc.fTargetNamespace +","+lName;
+ String qName = currSchemaDoc.fTargetNamespace == null?
+ ","+lName:
+ currSchemaDoc.fTargetNamespace +","+lName;
String componentType = DOMUtil.getLocalName(globalComp);
if(componentType.equals(SchemaSymbols.ELT_ATTRIBUTE)) {
checkForDuplicateNames(qName, fUnparsedAttributeRegistry, globalComp, currSchemaDoc);
@@ -604,12 +608,8 @@
declToTraverse.uri.equals(SchemaSymbols.URI_SCHEMAFORSCHEMA)) {
sGrammar = SchemaGrammar.SG_SchemaNS;
} else {
- String declKey = null;
- if (declToTraverse.uri != null) {
- declKey = declToTraverse.uri+","+declToTraverse.localpart;
- } else {
- declKey = ","+declToTraverse.localpart;
- }
+ String declKey = declToTraverse.uri == null? ","+declToTraverse.localpart:
+ declToTraverse.uri+","+declToTraverse.localpart;
switch (declType) {
case ATTRIBUTE_TYPE :
decl = (Element)fUnparsedAttributeRegistry.get(declKey);
@@ -889,7 +889,10 @@
String newName = qName.substring(qName.lastIndexOf(','));
currComp.setAttribute(SchemaSymbols.ATT_NAME, newName);
// and take care of nested redefines by calling recursively:
- checkForDuplicateNames(currSchema.fTargetNamespace+","+newName, registry, currComp, currSchema);
+ if(currSchema.fTargetNamespace == null)
+ checkForDuplicateNames(","+newName, registry, currComp, currSchema);
+ else
+ checkForDuplicateNames(currSchema.fTargetNamespace+","+newName, registry, currComp, currSchema);
} else if (redefinedSchema != null) { // we're apparently redefining the wrong schema
// REVISIT: error that redefined element in wrong schema
} else { // we've just got a flat-out collision
@@ -926,7 +929,8 @@
SchemaNamespaceSupport currNSMap = currSchema.fNamespaceSupport;
if (componentType.equals(SchemaSymbols.ELT_SIMPLETYPE)) {
- String processedTypeName = currSchema.fTargetNamespace+","+oldName;
+ String processedTypeName = currSchema.fTargetNamespace == null?
+ ","+oldName:currSchema.fTargetNamespace+","+oldName;
Element grandKid = DOMUtil.getFirstChildElement(child);
if (grandKid == null) {
// fRedefineSucceeded = false;
@@ -966,7 +970,8 @@
}
}
} else if (componentType.equals(SchemaSymbols.ELT_COMPLEXTYPE)) {
- String processedTypeName = currSchema.fTargetNamespace+","+oldName;
+ String processedTypeName = currSchema.fTargetNamespace == null?
+ ","+oldName:currSchema.fTargetNamespace+","+oldName;
Element grandKid = DOMUtil.getFirstChildElement(child);
if (grandKid == null) {
// fRedefineSucceeded = false;
@@ -1025,7 +1030,8 @@
}
}
} else if (componentType.equals(SchemaSymbols.ELT_ATTRIBUTEGROUP)) {
- String processedBaseName = currSchema.fTargetNamespace+","+oldName;
+ String processedBaseName = (currSchema.fTargetNamespace == null)?
+ ","+oldName:currSchema.fTargetNamespace+","+oldName;
int attGroupRefsCount = changeRedefineGroup(processedBaseName, componentType, newName, child, currSchema.fNamespaceSupport);
if(attGroupRefsCount > 1) {
// fRedefineSucceeded = false;
@@ -1034,9 +1040,13 @@
} else if (attGroupRefsCount == 1) {
// return true;
} else
- fRedefinedRestrictedAttributeGroupRegistry.put(processedBaseName, currSchema.fTargetNamespace+","+newName);
+ if(currSchema.fTargetNamespace == null)
+ fRedefinedRestrictedAttributeGroupRegistry.put(processedBaseName, ","+newName);
+ else
+ fRedefinedRestrictedAttributeGroupRegistry.put(processedBaseName, currSchema.fTargetNamespace+","+newName);
} else if (componentType.equals(SchemaSymbols.ELT_GROUP)) {
- String processedBaseName = currSchema.fTargetNamespace+","+oldName;
+ String processedBaseName = (currSchema.fTargetNamespace == null)?
+ ","+oldName:currSchema.fTargetNamespace+","+oldName;
int groupRefsCount = changeRedefineGroup(processedBaseName, componentType, newName, child, currSchema.fNamespaceSupport);
if(groupRefsCount > 1) {
// fRedefineSucceeded = false;
@@ -1045,7 +1055,10 @@
} else if (groupRefsCount == 1) {
// return true;
} else {
- fRedefinedRestrictedGroupRegistry.put(processedBaseName, currSchema.fTargetNamespace+","+newName);
+ if(currSchema.fTargetNamespace == null)
+ fRedefinedRestrictedGroupRegistry.put(processedBaseName, ","+newName);
+ else
+ fRedefinedRestrictedGroupRegistry.put(processedBaseName, currSchema.fTargetNamespace+","+newName);
}
} else {
// fRedefineSucceeded = false;
@@ -1062,11 +1075,13 @@
// decl Hashtables.
private String findQName(String name, SchemaNamespaceSupport currNSMap) {
int colonPtr = name.indexOf(':');
- String prefix = "";
+ String prefix = EMPTY_STRING;
if (colonPtr > 0)
prefix = name.substring(0, colonPtr);
String uri = currNSMap.getURI(prefix);
String localpart = (colonPtr == 0)?name:name.substring(colonPtr);
+ if(uri == null)
+ return ","+localpart;
return uri+","+localpart;
} // findQName(String, SchemaNamespaceSupport): String
@@ -1090,7 +1105,7 @@
if (ref.length() != 0) {
String processedRef = findQName(ref, currNSMap);
if(originalQName.equals(processedRef)) {
- String prefix = "";
+ String prefix = EMPTY_STRING;
String localpart = ref;
int colonptr = ref.indexOf(":");
if ( colonptr > 0) {
1.17 +10 -12 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDSimpleTypeTraverser.java
Index: XSDSimpleTypeTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDSimpleTypeTraverser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XSDSimpleTypeTraverser.java 2001/09/24 15:24:55 1.16
+++ XSDSimpleTypeTraverser.java 2001/09/28 18:11:43 1.17
@@ -109,7 +109,7 @@
* </union>
*
* @author Elena Litani, IBM
- * @version $Id: XSDSimpleTypeTraverser.java,v 1.16 2001/09/24 15:24:55 sandygao Exp $
+ * @version $Id: XSDSimpleTypeTraverser.java,v 1.17 2001/09/28 18:11:43 neilg Exp $
*/
class XSDSimpleTypeTraverser extends XSDAbstractTraverser {
@@ -166,18 +166,16 @@
// set qualified name
//---------------------------------------------------
if (nameProperty == null) { // anonymous simpleType
- qualifiedName = fSchemaDoc.fTargetNamespace+","+"#S#"+(fSimpleTypeAnonCount++);
+ qualifiedName = fSchemaDoc.fTargetNamespace == null?
+ ",#s#"+(fSimpleTypeAnonCount++):
+ fSchemaDoc.fTargetNamespace+",#S#"+(fSimpleTypeAnonCount++);
//REVISIT:
// add to symbol table?
}
else {
- // this behaviour has been changed so that we neither
- // process unqualified names as if they came from the schemaforschema namespace nor
- // fail to pick up unqualified names from schemas with no
- // targetnamespace. - NG
- //if (fTargetNSURIString.length () != 0) {
- qualifiedName = fSchemaDoc.fTargetNamespace+","+qualifiedName;
- //}
+ qualifiedName = fSchemaDoc.fTargetNamespace == null?
+ ","+nameProperty:
+ fSchemaDoc.fTargetNamespace+","+nameProperty;
//REVISIT:
// add to symbol table?
@@ -390,7 +388,7 @@
// reset fListName, meaning that we are done with
// traversing <list> and its itemType resolves to atomic value
if (fListName.equals(qualifiedName)) {
- fListName = "";
+ fListName = fSchemaHandler.EMPTY_STRING;
}
}
@@ -413,7 +411,7 @@
String localName;
if (baseValidator instanceof NOTATIONDatatypeValidator) {
fAttrChecker.checkAttributes(content, false, schemaDoc);
- String prefix = "";
+ String prefix = fSchemaHandler.EMPTY_STRING;
String localpart = enumVal;
int colonptr = enumVal.indexOf(":");
if (colonptr > 0) {
@@ -605,7 +603,7 @@
private void reportCosListOfAtomic () {
reportGenericSchemaError("cos-list-of-atomic: The itemType must have a {variety} of atomic or union (in which case all the {member type definitions} must be atomic)");
- fListName="";
+ fListName=fSchemaHandler.EMPTY_STRING;
}
//@param: elm - top element
1.12 +3 -4 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDocumentInfo.java
Index: XSDocumentInfo.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDocumentInfo.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSDocumentInfo.java 2001/09/25 21:33:40 1.11
+++ XSDocumentInfo.java 2001/09/28 18:11:43 1.12
@@ -73,7 +73,7 @@
* affect the contents of that schema document alone.
*
* @author Neil Graham, IBM
- * @version $Id: XSDocumentInfo.java,v 1.11 2001/09/25 21:33:40 neilg Exp $
+ * @version $Id: XSDocumentInfo.java,v 1.12 2001/09/28 18:11:43 neilg Exp $
*/
class XSDocumentInfo {
@@ -120,9 +120,8 @@
((XInt)schemaAttrs[XSAttributeChecker.ATTIDX_FINALDEFAULT]).shortValue();
fTargetNamespace =
(String)schemaAttrs[XSAttributeChecker.ATTIDX_TARGETNAMESPACE];
- if (fTargetNamespace == null)
- fTargetNamespace = EMPTY_STRING;
- fTargetNamespace = symbolTable.addSymbol(fTargetNamespace);
+ if (fTargetNamespace != null)
+ fTargetNamespace = symbolTable.addSymbol(fTargetNamespace);
fNamespaceSupportRoot = new SchemaNamespaceSupport(fNamespaceSupport);
1.7 +12 -2 xml-xerces/java/src/org/apache/xerces/impl/v2/XSGrammarResolver.java
Index: XSGrammarResolver.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSGrammarResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSGrammarResolver.java 2001/09/21 16:22:29 1.6
+++ XSGrammarResolver.java 2001/09/28 18:11:43 1.7
@@ -62,10 +62,15 @@
/**
* A class used to hold the internal schema grammar set for the current instance
* @author Sandy Gao, IBM
- * @version $Id: XSGrammarResolver.java,v 1.6 2001/09/21 16:22:29 sandygao Exp $
+ * @version $Id: XSGrammarResolver.java,v 1.7 2001/09/28 18:11:43 neilg Exp $
*/
class XSGrammarResolver {
+ // Constants
+ private static String EMPTY_STRING = "";
+
+ // Data
+
/**
* Hashtable that maps between Namespace and a Grammar
*/
@@ -78,6 +83,8 @@
* @return SchemaGrammar associated with the namespace
*/
public SchemaGrammar getGrammar(String namespace) {
+ if(namespace == null)
+ return(SchemaGrammar)fGrammarRegistry.get(EMPTY_STRING);
return (SchemaGrammar)fGrammarRegistry.get(namespace);
}
@@ -87,7 +94,10 @@
* @param grammar the grammar to put in the registry
*/
public void putGrammar(SchemaGrammar grammar) {
- fGrammarRegistry.put(grammar.getTargetNamespace(), grammar);
+ if(grammar.getTargetNamespace() == null)
+ fGrammarRegistry.put(EMPTY_STRING, grammar);
+ else
+ fGrammarRegistry.put(grammar.getTargetNamespace(), grammar);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org