You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by bi...@apache.org on 2009/04/13 04:02:30 UTC
svn commit: r764349 - in /webservices/commons/trunk/modules/XmlSchema/src:
main/java/org/apache/ws/commons/schema/ test/java/tests/
Author: bimargulies
Date: Mon Apr 13 02:02:28 2009
New Revision: 764349
URL: http://svn.apache.org/viewvc?rev=764349&view=rev
Log:
Keep chipping away at the use of XmlSchemaObjectCollection.
Added:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java (with props)
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java (with props)
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java (with props)
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java (with props)
Removed:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupBase.java
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/XmlSchemaAll.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotationItem.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAny.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroup.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupRef.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoice.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefs2Test.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.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=764349&r1=764348&r2=764349&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 Mon Apr 13 02:02:28 2009
@@ -319,8 +319,11 @@
ct.attributes.add(handleAttributeGroupRef(schema, el));
} else if (el.getLocalName().equals("group")) {
XmlSchemaGroupRef group = handleGroupRef(schema, el, schemaEl);
- ct.particle = group.particle == null ? (XmlSchemaParticle) group
- : group.particle;
+ if (group.getParticle() == null) {
+ ct.setParticle(group);
+ } else {
+ ct.setParticle(group.getParticle());
+ }
} else if (el.getLocalName().equals("simpleContent")) {
ct.contentModel = handleSimpleContent(schema, el, schemaEl);
} else if (el.getLocalName().equals("complexContent")) {
@@ -898,7 +901,7 @@
if (el.getLocalName().equals("element")) {
XmlSchemaElement element = handleElement(schema, el, schemaEl,
false);
- all.items.add(element);
+ all.getItems().add(element);
} else if (el.getLocalName().equals("annotation")) {
XmlSchemaAnnotation annotation = handleAnnotation(el);
all.setAnnotation(annotation);
@@ -914,14 +917,14 @@
XmlSchemaAny any = new XmlSchemaAny();
if (anyEl.hasAttribute("namespace")) {
- any.namespace = anyEl.getAttribute("namespace");
+ any.setNamespace(anyEl.getAttribute("namespace"));
}
if (anyEl.hasAttribute("processContents")) {
String processContent = getEnumString(anyEl, "processContents");
- any.processContent = XmlSchemaContentProcessing
- .schemaValueOf(processContent);
+ any.setProcessContent(XmlSchemaContentProcessing
+ .schemaValueOf(processContent));
}
Element annotationEl = XDOMUtil.getFirstChildElementNS(anyEl,
@@ -1161,20 +1164,20 @@
if (el.getLocalName().equals("sequence")) {
XmlSchemaSequence seq = handleSequence(schema, el, schemaEl);
- choice.items.add(seq);
+ choice.getItems().add(seq);
} else if (el.getLocalName().equals("element")) {
XmlSchemaElement element = handleElement(schema, el, schemaEl,
false);
- choice.items.add(element);
+ choice.getItems().add(element);
} else if (el.getLocalName().equals("group")) {
XmlSchemaGroupRef group = handleGroupRef(schema, el, schemaEl);
- choice.items.add(group);
+ choice.getItems().add(group);
} else if (el.getLocalName().equals("choice")) {
XmlSchemaChoice choiceItem = handleChoice(schema, el, schemaEl);
- choice.items.add(choiceItem);
+ choice.getItems().add(choiceItem);
} else if (el.getLocalName().equals("any")) {
XmlSchemaAny any = handleAny(schema, el, schemaEl);
- choice.items.add(any);
+ choice.getItems().add(any);
} else if (el.getLocalName().equals("annotation")) {
XmlSchemaAnnotation annotation = handleAnnotation(el);
choice.setAnnotation(annotation);
@@ -1447,7 +1450,7 @@
if (groupEl.hasAttribute("ref")) {
String ref = groupEl.getAttribute("ref");
- group.refName = getRefQName(ref, groupEl);
+ group.setRefName(getRefQName(ref, groupEl));
return group;
}
for (Element el = XDOMUtil.getFirstChildElementNS(groupEl,
@@ -1455,11 +1458,11 @@
.getNextSiblingElement(el)) {
if (el.getLocalName().equals("sequence")) {
- group.particle = handleSequence(schema, el, schemaEl);
+ group.setParticle(handleSequence(schema, el, schemaEl));
} else if (el.getLocalName().equals("all")) {
- group.particle = handleAll(schema, el, schemaEl);
+ group.setParticle(handleAll(schema, el, schemaEl));
} else if (el.getLocalName().equals("choice")) {
- group.particle = handleChoice(schema, el, schemaEl);
+ group.setParticle(handleChoice(schema, el, schemaEl));
}
}
return group;
@@ -1640,20 +1643,20 @@
if (el.getLocalName().equals("sequence")) {
XmlSchemaSequence seq = handleSequence(schema, el, schemaEl);
- sequence.items.add(seq);
+ sequence.getItems().add(seq);
} else if (el.getLocalName().equals("element")) {
XmlSchemaElement element = handleElement(schema, el, schemaEl,
false);
- sequence.items.add(element);
+ sequence.getItems().add(element);
} else if (el.getLocalName().equals("group")) {
XmlSchemaGroupRef group = handleGroupRef(schema, el, schemaEl);
- sequence.items.add(group);
+ sequence.getItems().add(group);
} else if (el.getLocalName().equals("choice")) {
XmlSchemaChoice choice = handleChoice(schema, el, schemaEl);
- sequence.items.add(choice);
+ sequence.getItems().add(choice);
} else if (el.getLocalName().equals("any")) {
XmlSchemaAny any = handleAny(schema, el, schemaEl);
- sequence.items.add(any);
+ sequence.getItems().add(any);
} else if (el.getLocalName().equals("annotation")) {
XmlSchemaAnnotation annotation = handleAnnotation(el);
sequence.setAnnotation(annotation);
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAll.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAll.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAll.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAll.java Mon Apr 13 02:02:28 2009
@@ -19,20 +19,26 @@
package org.apache.ws.commons.schema;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Permits the elements in the group to appear (or not appear) in any order in the containing element.
* Represents the World Wide Web Consortium (W3C) all element (compositor).
*/
-public class XmlSchemaAll extends XmlSchemaGroupBase {
+public class XmlSchemaAll extends XmlSchemaGroupParticle {
+
+ private List<XmlSchemaElement> items;
/**
* Creates new XmlSchemaAll
*/
public XmlSchemaAll() {
+ items = new ArrayList<XmlSchemaElement>();
}
- public XmlSchemaObjectCollection getItems() {
- return this.items;
+ public List<XmlSchemaElement> getItems() {
+ return items;
}
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotationItem.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotationItem.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotationItem.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotationItem.java Mon Apr 13 02:02:28 2009
@@ -22,7 +22,6 @@
/**
* Common base class of the items that can live inside an annotation.
*/
-public class XmlSchemaAnnotationItem
+public abstract class XmlSchemaAnnotationItem
extends XmlSchemaObject {
-
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAny.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAny.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAny.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAny.java Mon Apr 13 02:02:28 2009
@@ -24,13 +24,14 @@
* element. Represents the World Wide Web Consortium (W3C) any element.
*/
-public class XmlSchemaAny extends XmlSchemaParticle {
+public class XmlSchemaAny extends XmlSchemaParticle
+ implements XmlSchemaChoiceMember, XmlSchemaSequenceMember {
/**
* Namespaces containing the elements that can be used.
*/
- String namespace;
- XmlSchemaContentProcessing processContent;
+ private String namespace;
+ private XmlSchemaContentProcessing processContent;
/**
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java Mon Apr 13 02:02:28 2009
@@ -30,7 +30,8 @@
*
* ref= attributes are in the parent items collection, not in the map of named items.
*/
-public class XmlSchemaAttribute extends XmlSchemaAnnotated implements XmlSchemaNamedWithForm {
+public class XmlSchemaAttribute extends XmlSchemaAnnotated implements XmlSchemaNamedWithForm,
+ XmlSchemaAttributeGroupMember {
private String defaultValue;
private String fixedValue;
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroup.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroup.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroup.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroup.java Mon Apr 13 02:02:28 2009
@@ -19,6 +19,9 @@
package org.apache.ws.commons.schema;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.xml.namespace.QName;
import org.apache.ws.commons.schema.utils.XmlSchemaNamed;
@@ -32,9 +35,10 @@
* attribute.
*/
-public class XmlSchemaAttributeGroup extends XmlSchemaAnnotated implements XmlSchemaNamed {
+public class XmlSchemaAttributeGroup extends XmlSchemaAnnotated implements XmlSchemaNamed,
+ XmlSchemaAttributeGroupMember {
private XmlSchemaAnyAttribute anyAttribute;
- private XmlSchemaObjectCollection attributes;
+ private List<XmlSchemaAttributeGroupMember> attributes;
private XmlSchemaNamedImpl namedDelegate;
/**
@@ -44,7 +48,7 @@
namedDelegate = new XmlSchemaNamedImpl(parent, true);
parent.getItems().add(this);
// we can't be put in the map until we have a name. Perhaps we should be forced to have a name ?
- attributes = new XmlSchemaObjectCollection();
+ attributes = new ArrayList<XmlSchemaAttributeGroupMember>();
}
public XmlSchemaAnyAttribute getAnyAttribute() {
@@ -55,14 +59,10 @@
this.anyAttribute = anyAttribute;
}
- public XmlSchemaObjectCollection getAttributes() {
+ public List<XmlSchemaAttributeGroupMember> getAttributes() {
return this.attributes;
}
- public void setAttributes(XmlSchemaObjectCollection attributes) {
- this.attributes = attributes;
- }
-
public String getName() {
return namedDelegate.getName();
}
Added: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java?rev=764349&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java Mon Apr 13 02:02:28 2009
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ws.commons.schema;
+
+/**
+ * Implemented by the types that can go into an attribute group.
+ */
+public interface XmlSchemaAttributeGroupMember {
+
+}
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupMember.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupRef.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupRef.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupRef.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupRef.java Mon Apr 13 02:02:28 2009
@@ -26,7 +26,8 @@
* Represents the World Wide Web Consortium (W3C) attributeGroup
* element with the ref attribute.
*/
-public class XmlSchemaAttributeGroupRef extends XmlSchemaAnnotated {
+public class XmlSchemaAttributeGroupRef extends XmlSchemaAnnotated
+ implements XmlSchemaAttributeGroupMember {
private XmlSchemaRef<XmlSchemaAttributeGroup> ref;
/**
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoice.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoice.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoice.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoice.java Mon Apr 13 02:02:28 2009
@@ -19,20 +19,28 @@
package org.apache.ws.commons.schema;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Allows only one of its children to appear in an instance. Represents the World Wide Web Consortium (W3C)
- * choice (compositor) element.
+ * choice (compositor) element.
+ *
+ * This can contain any of (element|group|choice|sequence|any)*.
*/
-public class XmlSchemaChoice extends XmlSchemaGroupBase {
+public class XmlSchemaChoice extends XmlSchemaGroupParticle implements XmlSchemaChoiceMember,
+ XmlSchemaSequenceMember {
+ private List<XmlSchemaObject> items;
/**
* Creates new XmlSchemaChoice
*/
public XmlSchemaChoice() {
+ items = new ArrayList<XmlSchemaObject>();
}
- public XmlSchemaObjectCollection getItems() {
- return this.items;
+ public List<XmlSchemaObject> getItems() {
+ return items;
}
}
Added: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java?rev=764349&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java Mon Apr 13 02:02:28 2009
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ws.commons.schema;
+
+/**
+ * This interface exists to allow all of the items that can occur in a choice element
+ * to have a type in common. It has no protocol.
+ */
+public interface XmlSchemaChoiceMember {
+}
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoiceMember.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java Mon Apr 13 02:02:28 2009
@@ -32,7 +32,8 @@
* not in the 'element' Map.
*/
-public class XmlSchemaElement extends XmlSchemaParticle implements TypeReceiver, XmlSchemaNamedWithForm {
+public class XmlSchemaElement extends XmlSchemaParticle implements TypeReceiver, XmlSchemaNamedWithForm,
+ XmlSchemaChoiceMember, XmlSchemaSequenceMember {
/**
* Attribute used to block a type derivation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java Mon Apr 13 02:02:28 2009
@@ -31,10 +31,10 @@
* the World Wide Web Consortium (W3C) group element.
*/
-public class XmlSchemaGroup extends XmlSchemaAnnotated implements XmlSchemaNamed {
+public class XmlSchemaGroup extends XmlSchemaAnnotated implements XmlSchemaNamed,
+ XmlSchemaChoiceMember, XmlSchemaSequenceMember {
-
- private XmlSchemaGroupBase particle;
+ private XmlSchemaGroupParticle particle;
private XmlSchemaNamedImpl namedDelegate;
public XmlSchemaGroup(XmlSchema parent) {
@@ -43,11 +43,11 @@
}
- public XmlSchemaGroupBase getParticle() {
+ public XmlSchemaGroupParticle getParticle() {
return particle;
}
- public void setParticle(XmlSchemaGroupBase particle) {
+ public void setParticle(XmlSchemaGroupParticle particle) {
this.particle = particle;
}
Added: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java?rev=764349&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java Mon Apr 13 02:02:28 2009
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ws.commons.schema;
+
+/**
+ * Common type for items that can serve as the particle of a group.
+ */
+public abstract class XmlSchemaGroupParticle extends XmlSchemaParticle {
+
+}
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupParticle.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java Mon Apr 13 02:02:28 2009
@@ -26,11 +26,11 @@
* Represents the World Wide Web Consortium (W3C) group element with ref attribute.
*/
-public class XmlSchemaGroupRef extends XmlSchemaParticle {
+public class XmlSchemaGroupRef extends XmlSchemaParticle implements XmlSchemaSequenceMember {
- XmlSchemaGroupBase particle;
+ private XmlSchemaGroupParticle particle;
- QName refName;
+ private QName refName;
/**
* Creates new XmlSchemaGroupRef
@@ -38,7 +38,7 @@
public XmlSchemaGroupRef() {
}
- public XmlSchemaGroupBase getParticle() {
+ public XmlSchemaGroupParticle getParticle() {
return this.particle;
}
@@ -50,4 +50,8 @@
this.refName = refName;
}
+ void setParticle(XmlSchemaGroupParticle particle) {
+ this.particle = particle;
+ }
+
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java Mon Apr 13 02:02:28 2009
@@ -19,24 +19,33 @@
package org.apache.ws.commons.schema;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Requires the elements in the group to appear in the specified sequence within the containing element.
* Represents the World Wide Web Consortium (W3C) sequence (compositor) element.
+ *
+ * (element|group|choice|sequence|any)
*/
-public class XmlSchemaSequence extends XmlSchemaGroupBase {
+public class XmlSchemaSequence extends XmlSchemaGroupParticle implements XmlSchemaChoiceMember,
+ XmlSchemaSequenceMember {
+
+ private List<XmlSchemaSequenceMember> items;
/**
* Creates new XmlSchemaSequence
*/
public XmlSchemaSequence() {
+ items = new ArrayList<XmlSchemaSequenceMember>();
}
/**
* The elements contained within the compositor. Collection of XmlSchemaElement, XmlSchemaGroupRef,
* XmlSchemaChoice, XmlSchemaSequence, or XmlSchemaAny.
*/
- public XmlSchemaObjectCollection getItems() {
+ public List<XmlSchemaSequenceMember> getItems() {
return items;
}
}
Added: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java?rev=764349&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java Mon Apr 13 02:02:28 2009
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ws.commons.schema;
+
+/**
+ * Common type for all items that can occur in a sequence.
+ */
+public interface XmlSchemaSequenceMember {
+
+}
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=764349&r1=764348&r2=764349&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 Mon Apr 13 02:02:28 2009
@@ -161,13 +161,13 @@
allEl.appendChild(annotation);
}
- XmlSchemaObjectCollection itemColl = allObj.items;
+ List<XmlSchemaElement> itemColl = allObj.getItems();
if (itemColl != null) {
- int itemLength = itemColl.getCount();
+ int itemLength = itemColl.size();
for (int i = 0; i < itemLength; i++) {
- XmlSchemaObject obj = itemColl.getItem(i);
+ XmlSchemaObject obj = itemColl.get(i);
if (obj instanceof XmlSchemaElement) {
Element el = serializeElement(doc, (XmlSchemaElement)obj, schema);
allEl.appendChild(el);
@@ -249,12 +249,13 @@
serializeMaxMinOccurs(anyObj, anyEl);
- if (anyObj.namespace != null) {
- anyEl.setAttribute("namespace", anyObj.namespace);
+ if (anyObj.getNamespace() != null) {
+ anyEl.setAttribute("namespace", anyObj.getNamespace());
}
- if (anyObj.processContent != null && anyObj.processContent != XmlSchemaContentProcessing.NONE) {
- anyEl.setAttribute("processContents", anyObj.processContent.toString());
+ if (anyObj.getProcessContent() != null
+ && anyObj.getProcessContent() != XmlSchemaContentProcessing.NONE) {
+ anyEl.setAttribute("processContents", anyObj.getProcessContent().toString());
}
if (anyObj.getAnnotation() != null) {
@@ -501,9 +502,9 @@
Element annotation = serializeAnnotation(doc, attributeGroupObj.getAnnotation(), schema);
attributeGroup.appendChild(annotation);
}
- int attributesLength = attributeGroupObj.getAttributes().getCount();
+ int attributesLength = attributeGroupObj.getAttributes().size();
for (int i = 0; i < attributesLength; i++) {
- XmlSchemaObject obj = attributeGroupObj.getAttributes().getItem(i);
+ XmlSchemaAttributeGroupMember obj = attributeGroupObj.getAttributes().get(i);
if (obj instanceof XmlSchemaAttribute) {
Element attr = serializeAttribute(doc, (XmlSchemaAttribute)obj, schema);
@@ -601,13 +602,13 @@
choice.appendChild(annotation);
}
- XmlSchemaObjectCollection itemColl = choiceObj.items;
+ List<XmlSchemaObject> itemColl = choiceObj.getItems();
if (itemColl != null) {
- int itemLength = itemColl.getCount();
+ int itemLength = itemColl.size();
for (int i = 0; i < itemLength; i++) {
- XmlSchemaObject obj = itemColl.getItem(i);
+ XmlSchemaObject obj = itemColl.get(i);
if (obj instanceof XmlSchemaElement) {
Element el = serializeElement(doc, (XmlSchemaElement)obj, schema);
@@ -1261,8 +1262,8 @@
Element groupRef = createNewElement(doc, "group", schema.getSchemaNamespacePrefix(),
XmlSchema.SCHEMA_NS);
- if (groupRefObj.refName != null) {
- String groupRefName = resolveQName(groupRefObj.refName, schema);
+ if (groupRefObj.getRefName() != null) {
+ String groupRefName = resolveQName(groupRefObj.getRefName(), schema);
groupRef.setAttribute("ref", groupRefName);
} else {
throw new XmlSchemaSerializerException("Group must have name or ref");
@@ -1270,13 +1271,13 @@
serializeMaxMinOccurs(groupRefObj, groupRef);
- if (groupRefObj.particle != null) {
- if (groupRefObj.particle instanceof XmlSchemaChoice) {
- serializeChoice(doc, (XmlSchemaChoice)groupRefObj.particle, schema);
- } else if (groupRefObj.particle instanceof XmlSchemaSequence) {
- serializeSequence(doc, (XmlSchemaSequence)groupRefObj.particle, schema);
- } else if (groupRefObj.particle instanceof XmlSchemaAll) {
- serializeAll(doc, (XmlSchemaAll)groupRefObj.particle, schema);
+ if (groupRefObj.getParticle() != null) {
+ if (groupRefObj.getParticle() instanceof XmlSchemaChoice) {
+ serializeChoice(doc, (XmlSchemaChoice)groupRefObj.getParticle(), schema);
+ } else if (groupRefObj.getParticle() instanceof XmlSchemaSequence) {
+ serializeSequence(doc, (XmlSchemaSequence)groupRefObj.getParticle(), schema);
+ } else if (groupRefObj.getParticle() instanceof XmlSchemaAll) {
+ serializeAll(doc, (XmlSchemaAll)groupRefObj.getParticle(), schema);
} else {
throw new XmlSchemaSerializerException("The content of group " + "ref particle should be"
+ " sequence, choice or all reference: "
@@ -1717,10 +1718,10 @@
serializeMaxMinOccurs(sequenceObj, sequence);
- XmlSchemaObjectCollection seqColl = sequenceObj.items;
- int containLength = seqColl.getCount();
+ List<XmlSchemaSequenceMember> seqColl = sequenceObj.getItems();
+ int containLength = seqColl.size();
for (int i = 0; i < containLength; i++) {
- XmlSchemaObject obj = seqColl.getItem(i);
+ XmlSchemaSequenceMember obj = seqColl.get(i);
if (obj instanceof XmlSchemaElement) {
Element el = serializeElement(doc, (XmlSchemaElement)obj, schema);
sequence.appendChild(el);
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java Mon Apr 13 02:02:28 2009
@@ -24,6 +24,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -38,8 +39,8 @@
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaContentProcessing;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaType;
import org.junit.Assert;
@@ -157,15 +158,15 @@
XmlSchemaSequence xss = (XmlSchemaSequence)type.getParticle();
assertNotNull(xss);
- XmlSchemaObjectCollection c = xss.getItems();
- assertEquals(3, c.getCount());
+ List<XmlSchemaSequenceMember> c = xss.getItems();
+ assertEquals(3, c.size());
Set<String> s = new HashSet<String>();
s.add("id");
s.add("name");
Object o = null;
- for (int i = 0; i < c.getCount(); i++) {
- o = c.getItem(i);
+ for (int i = 0; i < c.size(); i++) {
+ o = c.get(i);
if (o instanceof XmlSchemaElement) {
String name = ((XmlSchemaElement)o).getName();
if ("id".equals(name)) {
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java Mon Apr 13 02:02:28 2009
@@ -22,6 +22,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -30,6 +31,7 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaAttribute;
import org.apache.ws.commons.schema.XmlSchemaAttributeGroup;
+import org.apache.ws.commons.schema.XmlSchemaAttributeGroupMember;
import org.apache.ws.commons.schema.XmlSchemaAttributeGroupRef;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -105,10 +107,10 @@
for (XmlSchemaAttributeGroup group : attG.values()) {
assertEquals("department", group.getName());
- XmlSchemaObjectCollection attributes = group.getAttributes();
+ List<XmlSchemaAttributeGroupMember> attributes = group.getAttributes();
assertNotNull(attributes);
- assertEquals(2, attributes.getCount());
- for (Iterator j = attributes.getIterator(); j.hasNext();) {
+ assertEquals(2, attributes.size());
+ for (Iterator j = attributes.iterator(); j.hasNext();) {
XmlSchemaAttribute obj2 = (XmlSchemaAttribute)j.next();
String name = obj2.getName();
if ("id".equals(name)) {
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java Mon Apr 13 02:02:28 2009
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -32,7 +33,7 @@
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaObject;
import org.junit.Assert;
import org.junit.Test;
@@ -77,8 +78,8 @@
Set<String> s = new HashSet<String>();
s.add("desktop");
s.add("laptop");
- XmlSchemaObjectCollection items = choice.getItems();
- Iterator iterator = items.getIterator();
+ List<XmlSchemaObject> items = choice.getItems();
+ Iterator iterator = items.iterator();
while (iterator.hasNext()) {
XmlSchemaElement e = (XmlSchemaElement)iterator.next();
String eName = e.getName();
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java Mon Apr 13 02:02:28 2009
@@ -22,6 +22,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -32,8 +33,8 @@
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaContentModel;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.junit.Assert;
import org.junit.Test;
@@ -77,14 +78,14 @@
XmlSchemaSequence xsp = (XmlSchemaSequence)xsccr.getParticle();
assertNotNull(xsp);
- XmlSchemaObjectCollection col = xsp.getItems();
+ List<XmlSchemaSequenceMember> col = xsp.getItems();
Set<String> s = new HashSet<String>();
s.add("Name");
s.add("Description");
s.add("Parts");
- for (int i = 0; i < col.getCount(); i++) {
- XmlSchemaElement xse = (XmlSchemaElement)col.getItem(i);
+ for (int i = 0; i < col.size(); i++) {
+ XmlSchemaElement xse = (XmlSchemaElement)col.get(i);
String name = xse.getName();
if ("Name".equals(name)) {
assertEquals(new QName("", "Name"), xse.getWireName());
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefs2Test.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefs2Test.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefs2Test.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefs2Test.java Mon Apr 13 02:02:28 2009
@@ -23,6 +23,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Iterator;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -38,8 +39,8 @@
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.junit.Assert;
import org.junit.Test;
@@ -57,9 +58,9 @@
assertNotNull(elem);
XmlSchemaComplexType cmplxType = (XmlSchemaComplexType)elem.getSchemaType();
- XmlSchemaObjectCollection items = ((XmlSchemaSequence)cmplxType.getParticle()).getItems();
+ List<XmlSchemaSequenceMember> items = ((XmlSchemaSequence)cmplxType.getParticle()).getItems();
- Iterator it = items.getIterator();
+ Iterator it = items.iterator();
while (it.hasNext()) {
XmlSchemaElement innerElement = (XmlSchemaElement)it.next();
assertNotNull(innerElement.getRef().getTargetQName());
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefsTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefsTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefsTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefsTest.java Mon Apr 13 02:02:28 2009
@@ -23,6 +23,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Iterator;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
@@ -31,8 +32,8 @@
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.junit.Assert;
import org.junit.Test;
@@ -50,9 +51,9 @@
assertNotNull(elem);
XmlSchemaComplexType cmplxType = (XmlSchemaComplexType)elem.getSchemaType();
- XmlSchemaObjectCollection items = ((XmlSchemaSequence)cmplxType.getParticle()).getItems();
+ List<XmlSchemaSequenceMember> items = ((XmlSchemaSequence)cmplxType.getParticle()).getItems();
- Iterator it = items.getIterator();
+ Iterator it = items.iterator();
while (it.hasNext()) {
XmlSchemaElement innerElement = (XmlSchemaElement)it.next();
assertNotNull(innerElement.getRef().getTargetQName());
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java Mon Apr 13 02:02:28 2009
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -36,7 +37,7 @@
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaGroup;
import org.apache.ws.commons.schema.XmlSchemaGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaObject;
import org.junit.Assert;
import org.junit.Test;
@@ -112,8 +113,8 @@
s.add("salePrice");
s.add("clearancePrice");
s.add("freePrice");
- XmlSchemaObjectCollection items = xsc.getItems();
- Iterator iterator = items.getIterator();
+ List<XmlSchemaObject> items = xsc.getItems();
+ Iterator iterator = items.iterator();
while (iterator.hasNext()) {
XmlSchemaElement e = (XmlSchemaElement)iterator.next();
String eName = e.getName();
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java Mon Apr 13 02:02:28 2009
@@ -33,6 +33,7 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaAttribute;
import org.apache.ws.commons.schema.XmlSchemaAttributeGroup;
+import org.apache.ws.commons.schema.XmlSchemaAttributeGroupMember;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -47,6 +48,7 @@
import org.apache.ws.commons.schema.XmlSchemaObjectTable;
import org.apache.ws.commons.schema.XmlSchemaRedefine;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
@@ -120,12 +122,12 @@
XmlSchemaSequence xsp = (XmlSchemaSequence)xscce.getParticle();
assertNotNull(xsp);
- XmlSchemaObjectCollection c = xsp.getItems();
- assertEquals(1, c.getCount());
+ List<XmlSchemaSequenceMember> c = xsp.getItems();
+ assertEquals(1, c.size());
xse = null;
- for (int i = 0; i < c.getCount(); i++) {
- xse = (XmlSchemaElement)c.getItem(i);
+ for (int i = 0; i < c.size(); i++) {
+ xse = (XmlSchemaElement)c.get(i);
}
assertEquals("id", xse.getName());
assertEquals(new QName("http://www.w3.org/2001/XMLSchema", "string"), xse.getSchemaTypeName());
@@ -252,13 +254,13 @@
XmlSchemaSequence xss = (XmlSchemaSequence)xsg.getParticle();
- XmlSchemaObjectCollection sequenceItems = xss.getItems();
- assertEquals(2, sequenceItems.getCount());
+ List<XmlSchemaSequenceMember> sequenceItems = xss.getItems();
+ assertEquals(2, sequenceItems.size());
Set<String> s = new HashSet<String>();
s.add(XmlSchemaGroupRef.class.getName());
s.add(XmlSchemaElement.class.getName());
- for (Iterator i = sequenceItems.getIterator(); i.hasNext();) {
+ for (Iterator i = sequenceItems.iterator(); i.hasNext();) {
Object o = i.next();
assertTrue(s.remove(o.getClass().getName()));
if (o instanceof XmlSchemaGroupRef) {
@@ -317,12 +319,12 @@
assertNotNull(xsag);
assertEquals("AttribGroup", xsag.getName());
- XmlSchemaObjectCollection attributes = xsag.getAttributes();
+ List<XmlSchemaAttributeGroupMember> attributes = xsag.getAttributes();
Set<String> s = new HashSet<String>();
s.add("type");
s.add("units");
- for (Iterator i = attributes.getIterator(); i.hasNext();) {
+ for (Iterator i = attributes.iterator(); i.hasNext();) {
XmlSchemaAttribute xsa = (XmlSchemaAttribute)i.next();
assertTrue(s.remove(xsa.getName()));
}
@@ -410,12 +412,12 @@
XmlSchemaSequence xsp = (XmlSchemaSequence)xscce.getParticle();
assertNotNull(xsp);
- XmlSchemaObjectCollection c = xsp.getItems();
- assertEquals(1, c.getCount());
+ List<XmlSchemaSequenceMember> c = xsp.getItems();
+ assertEquals(1, c.size());
xse = null;
- for (int i = 0; i < c.getCount(); i++) {
- xse = (XmlSchemaElement)c.getItem(i);
+ for (int i = 0; i < c.size(); i++) {
+ xse = (XmlSchemaElement)c.get(i);
}
assertEquals("id", xse.getName());
assertEquals(new QName("http://www.w3.org/2001/XMLSchema", "string"), xse.getSchemaTypeName());
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java Mon Apr 13 02:02:28 2009
@@ -20,6 +20,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
@@ -27,8 +28,8 @@
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.junit.Assert;
import org.junit.Before;
@@ -55,12 +56,12 @@
assertNotNull("Couldn't find unQualifiedLocals element", element);
XmlSchemaComplexType type = (XmlSchemaComplexType)element.getSchemaType();
XmlSchemaSequence seq = (XmlSchemaSequence)type.getParticle();
- XmlSchemaObjectCollection items = seq.getItems();
+ List<XmlSchemaSequenceMember> items = seq.getItems();
XmlSchemaElement subElement;
- subElement = (XmlSchemaElement)items.getItem(0);
+ subElement = (XmlSchemaElement)items.get(0);
QName qname = subElement.getWireName();
assertEquals("Namespace on unqualified element", "", qname.getNamespaceURI());
- subElement = (XmlSchemaElement)items.getItem(1);
+ subElement = (XmlSchemaElement)items.get(1);
qname = subElement.getWireName();
assertEquals("Bad namespace on qualified element", NS, qname.getNamespaceURI());
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java?rev=764349&r1=764348&r2=764349&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java Mon Apr 13 02:02:28 2009
@@ -20,6 +20,7 @@
package tests;
import java.util.Iterator;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,8 +31,8 @@
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaType;
import org.junit.Assert;
@@ -56,8 +57,8 @@
assertNotNull(t);
XmlSchemaSequence seq = (XmlSchemaSequence)t.getParticle();
- XmlSchemaObjectCollection items = seq.getItems();
- Iterator iterator = items.getIterator();
+ List<XmlSchemaSequenceMember> items = seq.getItems();
+ Iterator iterator = items.iterator();
while (iterator.hasNext()) {
XmlSchemaElement elt2 = (XmlSchemaElement)iterator.next();
XmlSchemaType schemaType2 = elt2.getSchemaType();