Author: bimargulies
Date: Sat Nov 7 18:59:25 2009
New Revision: 833733
URL: http://svn.apache.org/viewvc?rev=833733&view=rev
Log:
Modernization on Redefine and Element.
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/XmlSchemaElement.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.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/ConstraintsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.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=833733&r1=833732&r2=833733&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 18:59:25 2009
@@ -1541,26 +1541,25 @@
XmlSchemaType type = handleSimpleType(schema, el, schemaEl,
false);
- redefine.schemaTypes.collection.put(type.getQName(), type);
- redefine.items.add(type);
+ redefine.getSchemaTypes().put(type.getQName(), type);
+ redefine.getItems().add(type);
} else if (el.getLocalName().equals("complexType")) {
XmlSchemaType type = handleComplexType(schema, el, schemaEl,
true);
- redefine.schemaTypes.collection.put(type.getQName(), type);
- redefine.items.add(type);
+ redefine.getSchemaTypes().put(type.getQName(), type);
+ redefine.getItems().add(type);
} else if (el.getLocalName().equals("group")) {
XmlSchemaGroup group = handleGroup(schema, el, schemaEl);
- redefine.groups.collection.put(group.getQName(), group);
- redefine.items.add(group);
+ redefine.getGroups().put(group.getQName(), group);
+ redefine.getItems().add(group);
} else if (el.getLocalName().equals("attributeGroup")) {
XmlSchemaAttributeGroup group = handleAttributeGroup(schema,
el, schemaEl);
- redefine.attributeGroups.collection
- .put(group.getQName(), group);
- redefine.items.add(group);
+ redefine.getAttributeGroups().put(group.getQName(), group);
+ redefine.getItems().add(group);
} else if (el.getLocalName().equals("annotation")) {
XmlSchemaAnnotation annotation = handleAnnotation(el);
redefine.setAnnotation(annotation);
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=833733&r1=833732&r2=833733&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
Sat Nov 7 18:59:25 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;
import org.apache.ws.commons.schema.utils.XmlSchemaNamedWithForm;
@@ -40,7 +44,7 @@
*/
private XmlSchemaDerivationMethod block;
- private XmlSchemaObjectCollection constraints;
+ private List<XmlSchemaIdentityConstraint> constraints;
/**
* Provides the default value of the element if its content is a simple
type or the element's content is
@@ -83,7 +87,7 @@
namedDelegate.setRefObject(ref);
ref.setNamedObject(namedDelegate);
- constraints = new XmlSchemaObjectCollection();
+ constraints = Collections.synchronizedList(new
ArrayList<XmlSchemaIdentityConstraint>());
abstractElement = false;
nillable = false;
finalDerivation = XmlSchemaDerivationMethod.NONE;
@@ -96,7 +100,7 @@
/**
* Returns a collection of constraints on the element.
*/
- public XmlSchemaObjectCollection getConstraints() {
+ public List<XmlSchemaIdentityConstraint> getConstraints() {
return constraints;
}
@@ -233,13 +237,6 @@
}
/**
- * @param constraints The constraints to set.
- */
- public void setConstraints(XmlSchemaObjectCollection constraints) {
- this.constraints = constraints;
- }
-
- /**
* @param finalDerivation The finalDerivation to set.
*/
public void setFinalDerivation(XmlSchemaDerivationMethod finalDerivation) {
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java?rev=833733&r1=833732&r2=833733&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java
Sat Nov 7 18:59:25 2009
@@ -19,6 +19,14 @@
package org.apache.ws.commons.schema;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
/**
* Allows simple and complex types, groups, and attribute groups from external
schema files to be redefined in
* the current schema. This class provides versioning for the schema elements.
Represents the World Wide Web
@@ -27,36 +35,36 @@
public class XmlSchemaRedefine extends XmlSchemaExternal {
- XmlSchemaObjectTable attributeGroups;
- XmlSchemaObjectTable groups;
- XmlSchemaObjectTable schemaTypes;
+ private Map<QName, XmlSchemaAttributeGroup> attributeGroups;
+ private Map<QName, XmlSchemaGroup> groups;
+ private Map<QName, XmlSchemaType> schemaTypes;
- XmlSchemaObjectCollection items;
+ private List<XmlSchemaObject> items;
/**
* Creates new XmlSchemaRedefine
*/
public XmlSchemaRedefine(XmlSchema parent) {
super(parent);
- items = new XmlSchemaObjectCollection();
- schemaTypes = new XmlSchemaObjectTable();
- groups = new XmlSchemaObjectTable();
- attributeGroups = new XmlSchemaObjectTable();
+ items = Collections.synchronizedList(new ArrayList<XmlSchemaObject>());
+ schemaTypes = Collections.synchronizedMap(new HashMap<QName,
XmlSchemaType>());
+ groups = Collections.synchronizedMap(new HashMap<QName,
XmlSchemaGroup>());
+ attributeGroups = Collections.synchronizedMap(new HashMap<QName,
XmlSchemaAttributeGroup>());
}
- public XmlSchemaObjectTable getAttributeGroup() {
+ public Map<QName, XmlSchemaAttributeGroup> getAttributeGroups() {
return attributeGroups;
}
- public XmlSchemaObjectTable getGroup() {
+ public Map<QName, XmlSchemaGroup> getGroups() {
return groups;
}
- public XmlSchemaObjectCollection getItems() {
+ public List<XmlSchemaObject> getItems() {
return items;
}
- public XmlSchemaObjectTable getSchemaTypes() {
+ public Map<QName, XmlSchemaType> getSchemaTypes() {
return schemaTypes;
}
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=833733&r1=833732&r2=833733&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 18:59:25 2009
@@ -1070,13 +1070,13 @@
serializedEl.appendChild(simpleType);
}
}
- if (elementObj.getConstraints().getCount() > 0) {
- for (int i = 0; i < elementObj.getConstraints().getCount(); i++) {
+ if (elementObj.getConstraints().size() > 0) {
+ for (int i = 0; i < elementObj.getConstraints().size(); i++) {
Element constraint = serializeIdentityConstraint(
doc,
(XmlSchemaIdentityConstraint)
elementObj.getConstraints()
-
.getItem(i), schema);
+ .get(i),
schema);
serializedEl.appendChild(constraint);
}
}
@@ -1486,9 +1486,9 @@
Element annotation = serializeAnnotation(doc,
redefineObj.getAnnotation(), schema);
redefine.appendChild(annotation);
}
- int itemsLength = redefineObj.items.getCount();
+ int itemsLength = redefineObj.getItems().size();
for (int i = 0; i < itemsLength; i++) {
- XmlSchemaObject obj = redefineObj.items.getItem(i);
+ XmlSchemaObject obj = redefineObj.getItems().get(i);
if (obj instanceof XmlSchemaSimpleType) {
Element simpleType = serializeSimpleType(doc,
(XmlSchemaSimpleType)obj, schema);
redefine.appendChild(simpleType);
Modified:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java?rev=833733&r1=833732&r2=833733&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
Sat Nov 7 18:59:25 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;
@@ -29,6 +30,7 @@
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaIdentityConstraint;
import org.apache.ws.commons.schema.XmlSchemaKey;
import org.apache.ws.commons.schema.XmlSchemaKeyref;
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
@@ -79,15 +81,15 @@
assertEquals("constraintTest", elem.getName());
assertEquals(new QName("http://soapinterop.org/types";,
"constraintTest"), elem.getQName());
- XmlSchemaObjectCollection c = elem.getConstraints();
- assertEquals(3, c.getCount());
+ List<XmlSchemaIdentityConstraint> c = elem.getConstraints();
+ assertEquals(3, c.size());
Set<String> s = new HashSet<String>();
s.add(XmlSchemaKey.class.getName());
s.add(XmlSchemaKeyref.class.getName());
s.add(XmlSchemaUnique.class.getName());
- for (int i = 0; i < c.getCount(); i++) {
- Object o = c.getItem(i);
+ for (int i = 0; i < c.size(); i++) {
+ Object o = c.get(i);
if (o instanceof XmlSchemaKey) {
XmlSchemaKey key = (XmlSchemaKey)o;
assertEquals("keyTest", key.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=833733&r1=833732&r2=833733&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
Sat Nov 7 18:59:25 2009
@@ -45,12 +45,12 @@
import org.apache.ws.commons.schema.XmlSchemaMaxInclusiveFacet;
import org.apache.ws.commons.schema.XmlSchemaMinInclusiveFacet;
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-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;
+import org.apache.ws.commons.schema.XmlSchemaType;
import org.junit.Assert;
import org.junit.Test;
@@ -99,16 +99,16 @@
assertEquals(1, xsoc.size());
XmlSchemaRedefine xsr = (XmlSchemaRedefine)xsoc.get(0);
- XmlSchemaObjectTable redefTypes = xsr.getSchemaTypes();
- assertEquals(1, redefTypes.getCount());
+ Map<QName, XmlSchemaType> redefTypes = xsr.getSchemaTypes();
+ assertEquals(1, redefTypes.size());
- for (Iterator i = redefTypes.getNames(); i.hasNext();) {
- QName qname = (QName)i.next();
+ for (Iterator<QName> i = redefTypes.keySet().iterator(); i.hasNext();)
{
+ QName qname = i.next();
assertEquals(new QName("http://soapinterop.org/types";, "person"),
qname);
}
XmlSchemaComplexType xsct = null;
- for (Iterator i = redefTypes.getValues(); i.hasNext();) {
+ for (Iterator<XmlSchemaType> i = redefTypes.values().iterator();
i.hasNext();) {
xsct = (XmlSchemaComplexType)i.next();
}
assertNotNull(xsct);
@@ -173,16 +173,16 @@
assertEquals(1, xsoc.size());
XmlSchemaRedefine xsr = (XmlSchemaRedefine)xsoc.get(0);
- XmlSchemaObjectTable xsot = xsr.getSchemaTypes();
- assertEquals(1, xsot.getCount());
+ Map<QName, XmlSchemaType> xsot = xsr.getSchemaTypes();
+ assertEquals(1, xsot.size());
- for (Iterator i = xsot.getNames(); i.hasNext();) {
- QName qname = (QName)i.next();
+ for (Iterator<QName> i = xsot.keySet().iterator(); i.hasNext();) {
+ QName qname = i.next();
assertEquals(new QName("http://soapinterop.org/types";,
"drinksize"), qname);
}
XmlSchemaSimpleType xsst = null;
- for (Iterator i = xsot.getValues(); i.hasNext();) {
+ for (Iterator<XmlSchemaType> i = xsot.values().iterator();
i.hasNext();) {
xsst = (XmlSchemaSimpleType)i.next();
}
assertNotNull(xsst);
@@ -240,16 +240,16 @@
assertEquals(1, xsoc.size());
XmlSchemaRedefine xsr = (XmlSchemaRedefine)xsoc.get(0);
- XmlSchemaObjectTable xsot = xsr.getGroup();
- assertEquals(1, xsot.getCount());
+ Map<QName, XmlSchemaGroup> xsot = xsr.getGroups();
+ assertEquals(1, xsot.size());
- for (Iterator i = xsot.getNames(); i.hasNext();) {
- assertEquals("PrologGroup", ((QName)i.next()).getLocalPart());
+ for (Iterator<QName> i = xsot.keySet().iterator(); i.hasNext();) {
+ assertEquals("PrologGroup", i.next().getLocalPart());
}
XmlSchemaGroup xsg = null;
- for (Iterator i = xsot.getValues(); i.hasNext();) {
- xsg = (XmlSchemaGroup)i.next();
+ for (Iterator<XmlSchemaGroup> i = xsot.values().iterator();
i.hasNext();) {
+ xsg = i.next();
}
XmlSchemaSequence xss = (XmlSchemaSequence)xsg.getParticle();
@@ -305,15 +305,15 @@
assertEquals(1, xsoc.size());
XmlSchemaRedefine xsr = (XmlSchemaRedefine)xsoc.get(0);
- XmlSchemaObjectTable xsot = xsr.getAttributeGroup();
- assertEquals(1, xsot.getCount());
+ Map<QName, XmlSchemaAttributeGroup> xsot = xsr.getAttributeGroups();
+ assertEquals(1, xsot.size());
- for (Iterator i = xsot.getNames(); i.hasNext();) {
- assertEquals("AttribGroup", ((QName)i.next()).getLocalPart());
+ for (Iterator<QName> i = xsot.keySet().iterator(); i.hasNext();) {
+ assertEquals("AttribGroup", (i.next()).getLocalPart());
}
XmlSchemaAttributeGroup xsag = null;
- for (Iterator i = xsot.getValues(); i.hasNext();) {
+ for (Iterator<XmlSchemaAttributeGroup> i = xsot.values().iterator();
i.hasNext();) {
xsag = (XmlSchemaAttributeGroup)i.next();
}
@@ -389,16 +389,16 @@
assertEquals(1, xsoc.size());
XmlSchemaRedefine xsr = (XmlSchemaRedefine)xsoc.get(0);
- XmlSchemaObjectTable xsot = xsr.getSchemaTypes();
- assertEquals(1, xsot.getCount());
+ Map<QName, XmlSchemaType> xsot = xsr.getSchemaTypes();
+ assertEquals(1, xsot.size());
- for (Iterator i = xsot.getNames(); i.hasNext();) {
- QName qname = (QName)i.next();
+ for (Iterator<QName> i = xsot.keySet().iterator(); i.hasNext();) {
+ QName qname = i.next();
assertEquals(new QName("http://soapinterop.org/types";, "person"),
qname);
}
XmlSchemaComplexType xsct = null;
- for (Iterator i = xsot.getValues(); i.hasNext();) {
+ for (Iterator<XmlSchemaType> i = xsot.values().iterator();
i.hasNext();) {
xsct = (XmlSchemaComplexType)i.next();
}
assertNotNull(xsct);
