Author: bimargulies
Date: Sat Nov 7 14:43:58 2009
New Revision: 833688
URL: http://svn.apache.org/viewvc?rev=833688&view=rev
Log:
Remove another use of XmlSchemaObjectCollection, and fix a typo or two.
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeUnion.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=833688&r1=833687&r2=833688&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
Sat Nov 7 14:43:58 2009
@@ -1880,15 +1880,15 @@
*/
if (unionEl.hasAttribute("memberTypes")) {
String memberTypes = unionEl.getAttribute("memberTypes");
- union.memberTypesSource = memberTypes;
+ union.setMemberTypesSource(memberTypes);
Vector<QName> v = new Vector<QName>();
StringTokenizer tokenizer = new StringTokenizer(memberTypes, " ");
while (tokenizer.hasMoreTokens()) {
String member = tokenizer.nextToken();
v.add(getRefQName(member, unionEl));
}
- union.memberTypesQNames = new QName[v.size()];
- v.copyInto(union.memberTypesQNames);
+ union.setMemberTypesQNames(new QName[v.size()]);
+ v.copyInto(union.getMemberTypesQNames());
}
Element inlineUnionType = XDOMUtil.getFirstChildElementNS(unionEl,
@@ -1898,10 +1898,11 @@
XmlSchemaSimpleType unionSimpleType = handleSimpleType(schema,
inlineUnionType, schemaEl, false);
- union.baseTypes.add(unionSimpleType);
+ union.getBaseTypes().add(unionSimpleType);
if (!unionSimpleType.isAnonymous()) {
- union.memberTypesSource += " " + unionSimpleType.getName();
+ union.setMemberTypesSource(union.getMemberTypesSource()
+ + " " + unionSimpleType.getName());
}
inlineUnionType = XDOMUtil.getNextSiblingElementNS(inlineUnionType,
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?rev=833688&r1=833687&r2=833688&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
Sat Nov 7 14:43:58 2009
@@ -139,16 +139,12 @@
}
/**
- * *********************************************************************
Element serializeAll(Document
- * doc, XmlSchemaAll allObj, XmlSchema schema) throws
XmlSchemaSerializerException{
- * <p/>
- * Each member of complex type will be appended and pass the element
created. Complex type processed
- * according to w3c Recommendation May 2 2001.
- * <p/>
- * Parameter: doc - Document the parent use. allObj - XmlSchemaAll that
will be serialized. schema -
- * Schema Document object of the parent.
- * <p/>
- * Return: Element of particle all.
**********************************************************************
+ * Serialize an 'all' item.
+ * @param doc
+ * @param allObj
+ * @param schema
+ * @return
+ * @throws XmlSchemaSerializerException
*/
Element serializeAll(Document doc, XmlSchemaAll allObj, XmlSchema schema)
throws XmlSchemaSerializerException {
@@ -2120,15 +2116,15 @@
union.setAttribute("id", unionObj.getId());
}
- if (unionObj.memberTypesSource != null) {
- union.setAttribute("memberTypes", unionObj.memberTypesSource);
+ if (unionObj.getMemberTypesSource() != null) {
+ union.setAttribute("memberTypes", unionObj.getMemberTypesSource());
}
- if (unionObj.baseTypes.getCount() > 0) {
- int baseTypesLength = unionObj.baseTypes.getCount();
+ if (unionObj.getBaseTypes().size() > 0) {
+ int baseTypesLength = unionObj.getBaseTypes().size();
Element baseType;
for (int i = 0; i < baseTypesLength; i++) {
try {
- baseType = serializeSimpleType(doc,
(XmlSchemaSimpleType)unionObj.baseTypes.getItem(i),
+ baseType = serializeSimpleType(doc,
(XmlSchemaSimpleType)unionObj.getBaseTypes().get(i),
schema);
union.appendChild(baseType);
} catch (ClassCastException e) {
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeUnion.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeUnion.java?rev=833688&r1=833687&r2=833688&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeUnion.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeUnion.java
Sat Nov 7 14:43:58 2009
@@ -19,6 +19,10 @@
package org.apache.ws.commons.schema;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import javax.xml.namespace.QName;
/**
@@ -28,15 +32,15 @@
public class XmlSchemaSimpleTypeUnion extends XmlSchemaSimpleTypeContent {
- XmlSchemaObjectCollection baseTypes;
- String memberTypesSource;
- QName[] memberTypesQNames;
+ private List<XmlSchemaSimpleType> baseTypes;
+ private String memberTypesSource;
+ private QName[] memberTypesQNames;
public XmlSchemaSimpleTypeUnion() {
- baseTypes = new XmlSchemaObjectCollection();
+ baseTypes = Collections.synchronizedList(new
ArrayList<XmlSchemaSimpleType>());
}
- public XmlSchemaObjectCollection getBaseTypes() {
+ public List<XmlSchemaSimpleType> getBaseTypes() {
return this.baseTypes;
}
@@ -52,4 +56,8 @@
return this.memberTypesQNames;
}
+ public void setMemberTypesQNames(QName[] memberTypesQNames) {
+ this.memberTypesQNames = memberTypesQNames;
+ }
+
}
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java?rev=833688&r1=833687&r2=833688&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
Sat Nov 7 14:43:58 2009
@@ -38,7 +38,7 @@
/**
* Try to resolve a schema location to some data.
*
- * @param namespace targt namespace.
+ * @param namespace target namespace.
* @param schemaLocation system ID.
* @param baseUri base URI for the schema.
*/
@@ -75,7 +75,9 @@
* @return boolean
*/
protected boolean isAbsolute(String uri) {
- return uri.startsWith("http://";);
+ return uri.startsWith("http://";)
+ || uri.startsWith("https://";)
+ || uri.startsWith("urn:");
}
/**
