You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2012/03/31 04:49:24 UTC
svn commit: r1307705 - in /webservices/xmlschema/trunk/xmlschema-core/src:
main/java/org/apache/ws/commons/schema/
main/java/org/apache/ws/commons/schema/extensions/
main/java/org/apache/ws/commons/schema/resolver/
main/java/org/apache/ws/commons/schem...
Author: dkulp
Date: Sat Mar 31 02:49:23 2012
New Revision: 1307705
URL: http://svn.apache.org/viewvc?rev=1307705&view=rev
Log:
Fix all the usage of generics to remove all the Eclipse warnings
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionSerializer.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/AttributeGroupTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ChoiceTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefs2Test.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefsTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ExternalAttTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/GroupTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ImportTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/MultipleExternalAttTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/TestUnqualifiedSchema.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/WSCommons378Test.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomElementSerializer.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ext/PlainExtensionDeserializerTest.java
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java Sat Mar 31 02:49:23 2012
@@ -28,7 +28,6 @@ import java.security.PrivilegedException
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Stack;
@@ -219,10 +218,9 @@ public final class XmlSchemaCollection {
*/
public XmlSchemaType getTypeByQName(QName schemaTypeName) {
String uri = schemaTypeName.getNamespaceURI();
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- XmlSchemaType type = ((XmlSchema)entry.getValue()).getTypeByName(schemaTypeName);
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ XmlSchemaType type = entry.getValue().getTypeByName(schemaTypeName);
if (type != null) {
return type;
}
@@ -360,7 +358,7 @@ public final class XmlSchemaCollection {
String extRegProp = getSystemProperty(Constants.SystemConstants.EXTENSION_REGISTRY_KEY);
if (extRegProp != null) {
try {
- Class clazz = Class.forName(extRegProp);
+ Class<?> clazz = Class.forName(extRegProp);
this.extReg = (ExtensionRegistry)clazz.newInstance();
} catch (ClassNotFoundException e) {
System.err.println("The specified extension registry class cannot be found!");
@@ -597,10 +595,9 @@ public final class XmlSchemaCollection {
* @return the schema.
*/
public XmlSchema schemaForNamespace(String uri) {
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- return (XmlSchema)entry.getValue();
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ return entry.getValue();
}
}
return null;
@@ -686,7 +683,7 @@ public final class XmlSchemaCollection {
* @return
*/
XmlSchema getKnownSchema(String namespace) {
- return (XmlSchema)knownNamespaceMap.get(namespace);
+ return knownNamespaceMap.get(namespace);
}
/**
@@ -717,12 +714,11 @@ public final class XmlSchemaCollection {
}
void resolveType(QName typeName, XmlSchemaType type) {
- List receivers = unresolvedTypes.get(typeName);
+ List<TypeReceiver> receivers = unresolvedTypes.get(typeName);
if (receivers == null) {
return;
}
- for (Iterator i = receivers.iterator(); i.hasNext();) {
- TypeReceiver receiver = (TypeReceiver)i.next();
+ for (TypeReceiver receiver : receivers) {
receiver.setType(type);
}
unresolvedTypes.remove(typeName);
@@ -762,10 +758,9 @@ public final class XmlSchemaCollection {
*/
public XmlSchemaAttribute getAttributeByQName(QName schemaAttributeName) {
String uri = schemaAttributeName.getNamespaceURI();
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- XmlSchemaAttribute attribute = ((XmlSchema)entry.getValue())
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ XmlSchemaAttribute attribute = entry.getValue()
.getAttributeByName(schemaAttributeName);
if (attribute != null) {
return attribute;
@@ -783,10 +778,9 @@ public final class XmlSchemaCollection {
*/
public XmlSchemaElement getElementByQName(QName qname) {
String uri = qname.getNamespaceURI();
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- XmlSchemaElement element = ((XmlSchema)entry.getValue()).getElementByName(qname);
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ XmlSchemaElement element = entry.getValue().getElementByName(qname);
if (element != null) {
return element;
}
@@ -798,10 +792,9 @@ public final class XmlSchemaCollection {
public XmlSchemaAttributeGroup getAttributeGroupByQName(QName name) {
String uri = name.getNamespaceURI();
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- XmlSchemaAttributeGroup group = ((XmlSchema)entry.getValue())
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ XmlSchemaAttributeGroup group = entry.getValue()
.getAttributeGroupByName(name);
if (group != null) {
return group;
@@ -813,10 +806,9 @@ public final class XmlSchemaCollection {
public XmlSchemaGroup getGroupByQName(QName name) {
String uri = name.getNamespaceURI();
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- XmlSchemaGroup group = ((XmlSchema)entry.getValue())
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ XmlSchemaGroup group = entry.getValue()
.getGroupByName(name);
if (group != null) {
return group;
@@ -828,10 +820,9 @@ public final class XmlSchemaCollection {
public XmlSchemaNotation getNotationByQName(QName name) {
String uri = name.getNamespaceURI();
- for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (((SchemaKey)entry.getKey()).getNamespace().equals(uri)) {
- XmlSchemaNotation notation = ((XmlSchema)entry.getValue())
+ for (Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+ if (entry.getKey().getNamespace().equals(uri)) {
+ XmlSchemaNotation notation = entry.getValue()
.getNotationByName(name);
if (notation != null) {
return notation;
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java Sat Mar 31 02:49:23 2012
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -2281,20 +2280,14 @@ public class XmlSchemaSerializer {
private void processExtensibilityComponents(XmlSchemaObject schemaObject, Element parentElement) {
if (extReg != null) {
- Map metaInfoMap = schemaObject.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
if (metaInfoMap != null && !metaInfoMap.isEmpty()) {
// get the extra objects and call the respective deserializers
- Iterator keysIt = metaInfoMap.keySet().iterator();
- while (keysIt.hasNext()) {
- Object key = keysIt.next();
+ for (Object key : metaInfoMap.keySet()) {
extReg.serializeExtension(schemaObject, metaInfoMap.get(key).getClass(), parentElement);
-
}
-
}
-
}
-
}
/**
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java Sat Mar 31 02:49:23 2012
@@ -41,17 +41,17 @@ public class DefaultExtensionSerializer
* @param classOfType - the class of the object to be serialized
* @param node - The DOM Node that is the parent of the serialzation
*/
- public void serialize(XmlSchemaObject schemaObject, Class classOfType, Node node) {
+ public void serialize(XmlSchemaObject schemaObject, Class<?> classOfType, Node node) {
// serialization is somewhat tricky in most cases hence this default serializer will
// do the exact reverse of the deserializer - look for any plain 'as is' items
// and attach them to the parent node.
// we just attach the raw node either to the meta map of
// elements or the attributes
- Map metaInfoMap = schemaObject.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
Document parentDoc = node.getOwnerDocument();
if (metaInfoMap.containsKey(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES)) {
- Map attribMap = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
- for (Iterator it = attribMap.values().iterator(); it.hasNext();) {
+ Map<?, ?> attribMap = (Map<?, ?>)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
+ for (Iterator<?> it = attribMap.values().iterator(); it.hasNext();) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
((Element)node).setAttributeNodeNS((Attr)parentDoc.importNode((Node)it.next(), true));
}
@@ -60,8 +60,8 @@ public class DefaultExtensionSerializer
}
if (metaInfoMap.containsKey(Constants.MetaDataConstants.EXTERNAL_ELEMENTS)) {
- Map elementMap = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ELEMENTS);
- for (Iterator it = elementMap.values().iterator(); it.hasNext();) {
+ Map<?, ?> elementMap = (Map<?, ?>)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ELEMENTS);
+ for (Iterator<?> it = elementMap.values().iterator(); it.hasNext();) {
node.appendChild(parentDoc.importNode((Node)it.next(), true));
}
}
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java Sat Mar 31 02:49:23 2012
@@ -38,9 +38,10 @@ public class ExtensionRegistry {
/**
* Maps for the storage of extension serializers /deserializers
*/
- private Map<Class, ExtensionSerializer> extensionSerializers = new HashMap<Class, ExtensionSerializer>();
- private Map<QName, ExtensionDeserializer> extensionDeserializers =
- new HashMap<QName, ExtensionDeserializer>();
+ private Map<Class<?>, ExtensionSerializer> extensionSerializers
+ = new HashMap<Class<?>, ExtensionSerializer>();
+ private Map<QName, ExtensionDeserializer> extensionDeserializers
+ = new HashMap<QName, ExtensionDeserializer>();
/**
* Default serializer and serializer
@@ -80,7 +81,7 @@ public class ExtensionRegistry {
* @param classOfType - the class of the object that would be serialized
* @param serializer - an instance of the deserializer
*/
- public void registerSerializer(Class classOfType, ExtensionSerializer serializer) {
+ public void registerSerializer(Class<?> classOfType, ExtensionSerializer serializer) {
extensionSerializers.put(classOfType, serializer);
}
@@ -98,7 +99,7 @@ public class ExtensionRegistry {
*
* @param classOfType - the the deserializer is associated with
*/
- public void unregisterDeserializer(Class classOfType) {
+ public void unregisterDeserializer(Class<?> classOfType) {
extensionDeserializers.remove(classOfType);
}
@@ -111,7 +112,7 @@ public class ExtensionRegistry {
* @param node - the parent DOM Node that will ultimately be serialized. The XMLSchema serialization
* mechanism is to create a DOM tree first and serialize it
*/
- public void serializeExtension(XmlSchemaObject parentSchemaObject, Class classOfType, Node node) {
+ public void serializeExtension(XmlSchemaObject parentSchemaObject, Class<?> classOfType, Node node) {
Object serializerObject = extensionSerializers.get(classOfType);
if (serializerObject != null) {
// perform the serialization
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionSerializer.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionSerializer.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionSerializer.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionSerializer.java Sat Mar 31 02:49:23 2012
@@ -38,5 +38,5 @@ public interface ExtensionSerializer {
* @param domNode - the parent DOM Node that will ultimately be serialized. The XMLSchema serialization
* mechanism is to create a DOM tree first and serialize it
*/
- void serialize(XmlSchemaObject schemaObject, Class classOfType, Node domNode);
+ void serialize(XmlSchemaObject schemaObject, Class<?> classOfType, Node domNode);
}
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java Sat Mar 31 02:49:23 2012
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import org.xml.sax.InputSource;
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java Sat Mar 31 02:49:23 2012
@@ -64,7 +64,7 @@ public class NamespaceMap extends HashMa
return null;
}
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<String> getPrefixes(String namespaceURI) {
List<String> list = new ArrayList<String>();
for (Map.Entry<String, Object> entry : entrySet()) {
if (entry.getValue().toString().equals(namespaceURI)) {
Modified: webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java Sat Mar 31 02:49:23 2012
@@ -38,6 +38,8 @@ import org.apache.ws.commons.schema.cons
* Implementation of {@link NamespaceContext}, which is based on a DOM node.
*/
public final class NodeNamespaceContext implements NamespacePrefixList, Serializable {
+ private static final long serialVersionUID = 1L;
+
private static final boolean DOM_LEVEL_3;
private static final Collection<String> XML_NS_PREFIX_COLLECTION = Collections
@@ -52,7 +54,7 @@ public final class NodeNamespaceContext
static {
boolean level3 = false;
try {
- Class cls = Class.forName("org.w3c.dom.UserDataHandler", false, Node.class.getClassLoader());
+ Class<?> cls = Class.forName("org.w3c.dom.UserDataHandler", false, Node.class.getClassLoader());
Node.class.getMethod("getUserData", new Class[] {
String.class
});
@@ -146,10 +148,9 @@ public final class NodeNamespaceContext
if (Constants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)) {
return Constants.XMLNS_ATTRIBUTE;
}
- for (Iterator iter = declarations.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
+ for (Map.Entry<String, String> entry : declarations.entrySet()) {
if (pNamespaceURI.equals(entry.getValue())) {
- return (String)entry.getKey();
+ return entry.getKey();
}
}
return null;
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/AttributeGroupTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/AttributeGroupTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/AttributeGroupTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/AttributeGroupTest.java Sat Mar 31 02:49:23 2012
@@ -110,7 +110,7 @@ public class AttributeGroupTest
List<XmlSchemaAttributeGroupMember> attributes = group.getAttributes();
assertNotNull(attributes);
assertEquals(2, attributes.size());
- for (Iterator j = attributes.iterator(); j.hasNext();) {
+ for (Iterator<XmlSchemaAttributeGroupMember> j = attributes.iterator(); j.hasNext();) {
XmlSchemaAttribute obj2 = (XmlSchemaAttribute)j.next();
String name = obj2.getName();
if ("id".equals(name)) {
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ChoiceTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ChoiceTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ChoiceTest.java Sat Mar 31 02:49:23 2012
@@ -79,7 +79,7 @@ public class ChoiceTest extends Assert {
s.add("desktop");
s.add("laptop");
List<XmlSchemaObject> items = choice.getItems();
- Iterator iterator = items.iterator();
+ Iterator<XmlSchemaObject> iterator = items.iterator();
while (iterator.hasNext()) {
XmlSchemaElement e = (XmlSchemaElement)iterator.next();
String eName = e.getName();
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefs2Test.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefs2Test.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefs2Test.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefs2Test.java Sat Mar 31 02:49:23 2012
@@ -60,7 +60,7 @@ public class ElementRefs2Test extends As
XmlSchemaComplexType cmplxType = (XmlSchemaComplexType)elem.getSchemaType();
List<XmlSchemaSequenceMember> items = ((XmlSchemaSequence)cmplxType.getParticle()).getItems();
- Iterator it = items.iterator();
+ Iterator<XmlSchemaSequenceMember> it = items.iterator();
while (it.hasNext()) {
XmlSchemaElement innerElement = (XmlSchemaElement)it.next();
assertNotNull(innerElement.getRef().getTargetQName());
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefsTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefsTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefsTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ElementRefsTest.java Sat Mar 31 02:49:23 2012
@@ -53,7 +53,7 @@ public class ElementRefsTest extends Ass
XmlSchemaComplexType cmplxType = (XmlSchemaComplexType)elem.getSchemaType();
List<XmlSchemaSequenceMember> items = ((XmlSchemaSequence)cmplxType.getParticle()).getItems();
- Iterator it = items.iterator();
+ Iterator<XmlSchemaSequenceMember> it = items.iterator();
while (it.hasNext()) {
XmlSchemaElement innerElement = (XmlSchemaElement)it.next();
assertNotNull(innerElement.getRef().getTargetQName());
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ExternalAttTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ExternalAttTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ExternalAttTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ExternalAttTest.java Sat Mar 31 02:49:23 2012
@@ -45,10 +45,11 @@ public class ExternalAttTest extends Ass
XmlSchema s = schemaCol.read(doc.getDocumentElement());
// check the meta data
- Map metaInfoMap = s.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = s.getMetaInfoMap();
assertNotNull(metaInfoMap);
- Map extenalAttributeMap = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
+ Map<?, ?> extenalAttributeMap
+ = (Map<?, ?>)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
assertNotNull(extenalAttributeMap);
assertEquals(1, extenalAttributeMap.size());
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/GroupTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/GroupTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/GroupTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/GroupTest.java Sat Mar 31 02:49:23 2012
@@ -114,7 +114,7 @@ public class GroupTest extends Assert {
s.add("clearancePrice");
s.add("freePrice");
List<XmlSchemaObject> items = xsc.getItems();
- Iterator iterator = items.iterator();
+ Iterator<XmlSchemaObject> iterator = items.iterator();
while (iterator.hasNext()) {
XmlSchemaElement e = (XmlSchemaElement)iterator.next();
String eName = e.getName();
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ImportTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ImportTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ImportTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ImportTest.java Sat Mar 31 02:49:23 2012
@@ -155,7 +155,7 @@ public class ImportTest extends Assert {
if (basedir == null) {
basedir = ".";
}
- URL jarUrl = new File(basedir, "target/test-zip.zip").toURL();
+ URL jarUrl = new File(basedir, "target/test-zip.zip").toURI().toURL();
URL schemaUrl = new URL("jar:" + jarUrl + "!/test-dir/importBase.xsd");
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new InputSource(schemaUrl.toExternalForm()));
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/MultipleExternalAttTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/MultipleExternalAttTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/MultipleExternalAttTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/MultipleExternalAttTest.java Sat Mar 31 02:49:23 2012
@@ -46,10 +46,10 @@ public class MultipleExternalAttTest ext
XmlSchema s = schemaCol.read(doc.getDocumentElement());
// check the meta data
- Map metaInfoMap = s.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = s.getMetaInfoMap();
assertNotNull(metaInfoMap);
- Map extenalAttributeMap = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
+ Map<?, ?> extenalAttributeMap = (Map<?, ?>)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
assertNotNull(extenalAttributeMap);
assertEquals(3, extenalAttributeMap.size());
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java Sat Mar 31 02:49:23 2012
@@ -260,7 +260,7 @@ public class RedefineTest extends Assert
Set<String> s = new HashSet<String>();
s.add(XmlSchemaGroupRef.class.getName());
s.add(XmlSchemaElement.class.getName());
- for (Iterator i = sequenceItems.iterator(); i.hasNext();) {
+ for (Iterator<XmlSchemaSequenceMember> i = sequenceItems.iterator(); i.hasNext();) {
Object o = i.next();
assertTrue(s.remove(o.getClass().getName()));
if (o instanceof XmlSchemaGroupRef) {
@@ -324,7 +324,7 @@ public class RedefineTest extends Assert
Set<String> s = new HashSet<String>();
s.add("type");
s.add("units");
- for (Iterator i = attributes.iterator(); i.hasNext();) {
+ for (Iterator<XmlSchemaAttributeGroupMember> i = attributes.iterator(); i.hasNext();) {
XmlSchemaAttribute xsa = (XmlSchemaAttribute)i.next();
assertTrue(s.remove(xsa.getName()));
}
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/TestUnqualifiedSchema.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/TestUnqualifiedSchema.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/TestUnqualifiedSchema.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/TestUnqualifiedSchema.java Sat Mar 31 02:49:23 2012
@@ -58,7 +58,7 @@ public class TestUnqualifiedSchema exten
XmlSchemaSequence seq = (XmlSchemaSequence)t.getParticle();
List<XmlSchemaSequenceMember> items = seq.getItems();
- Iterator iterator = items.iterator();
+ Iterator<XmlSchemaSequenceMember> iterator = items.iterator();
while (iterator.hasNext()) {
XmlSchemaElement elt2 = (XmlSchemaElement)iterator.next();
XmlSchemaType schemaType2 = elt2.getSchemaType();
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/WSCommons378Test.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/WSCommons378Test.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/WSCommons378Test.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/WSCommons378Test.java Sat Mar 31 02:49:23 2012
@@ -67,9 +67,9 @@ public class WSCommons378Test extends As
XmlSchemaEnumerationFacet facet1 = (XmlSchemaEnumerationFacet)facets.get(0);
XmlSchemaEnumerationFacet facet2 = (XmlSchemaEnumerationFacet)facets.get(1);
- final Map externalAttributes1 = (Map)facet1.getMetaInfoMap()
+ final Map<?, ?> externalAttributes1 = (Map<?, ?>)facet1.getMetaInfoMap()
.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
- final Map externalAttributes2 = (Map)facet2.getMetaInfoMap()
+ final Map<?, ?> externalAttributes2 = (Map<?, ?>)facet2.getMetaInfoMap()
.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
assertNotNull(externalAttributes1);
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java Sat Mar 31 02:49:23 2012
@@ -40,8 +40,8 @@ public class CustomAttributeSerializer i
* @param domNode - the parent DOM Node that will ultimately be serialized. The XMLSchema serialization
* mechanism is to create a DOM tree first and serialize it
*/
- public void serialize(XmlSchemaObject schemaObject, Class classOfType, Node domNode) {
- Map metaInfoMap = schemaObject.getMetaInfoMap();
+ public void serialize(XmlSchemaObject schemaObject, Class<?> classOfType, Node domNode) {
+ Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
CustomAttribute att = (CustomAttribute)metaInfoMap.get(CustomAttribute.CUSTOM_ATTRIBUTE_QNAME);
Element elt = (Element)domNode;
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java Sat Mar 31 02:49:23 2012
@@ -60,7 +60,7 @@ public class CustomExtDeserializerTest e
// populated
for (XmlSchemaElement elt : schema.getElements().values()) {
assertNotNull(elt);
- Map metaInfoMap = elt.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
CustomAttribute customAttrib = (CustomAttribute)metaInfoMap
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java Sat Mar 31 02:49:23 2012
@@ -78,7 +78,7 @@ public class CustomExtensionSerializerTe
// get the elements and check whether their annotations are properly
// populated
for (XmlSchemaElement elt : schema.getElements().values()) {
- Map metaInfoMap = elt.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
CustomAttribute customAttrib = (CustomAttribute)metaInfoMap
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomElementSerializer.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomElementSerializer.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomElementSerializer.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomElementSerializer.java Sat Mar 31 02:49:23 2012
@@ -38,8 +38,8 @@ public class CustomElementSerializer imp
* @param domNode - the parent DOM Node that will ultimately be serialized. The XMLSchema serialization
* mechanism is to create a DOM tree first and serialize it
*/
- public void serialize(XmlSchemaObject schemaObject, Class classOfType, Node domNode) {
- Map metaInfoMap = schemaObject.getMetaInfoMap();
+ public void serialize(XmlSchemaObject schemaObject, Class<?> classOfType, Node domNode) {
+ Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
CustomElement customElt = (CustomElement)metaInfoMap.get(CustomElement.CUSTOM_ELT_QNAME);
Element elt = (Element)domNode;
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java Sat Mar 31 02:49:23 2012
@@ -58,7 +58,7 @@ public class CustomExtElementDeserialize
// get the elements and check whether their annotations are properly
// populated
for (XmlSchemaElement elt : schema.getElements().values()) {
- Map metaInfoMap = elt.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
CustomElement customElt = (CustomElement)metaInfoMap.get(CustomElement.CUSTOM_ELT_QNAME);
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java Sat Mar 31 02:49:23 2012
@@ -78,7 +78,7 @@ public class CustomExtElementSerializerT
// get the elements and check whether their annotations are properly
// populated
for (XmlSchemaElement elt : schema.getElements().values()) {
- Map metaInfoMap = elt.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
CustomElement customElt = (CustomElement)metaInfoMap.get(CustomElement.CUSTOM_ELT_QNAME);
Modified: webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ext/PlainExtensionDeserializerTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ext/PlainExtensionDeserializerTest.java?rev=1307705&r1=1307704&r2=1307705&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ext/PlainExtensionDeserializerTest.java (original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/ext/PlainExtensionDeserializerTest.java Sat Mar 31 02:49:23 2012
@@ -54,7 +54,7 @@ public class PlainExtensionDeserializerT
// get the elements and check whether their annotations are properly
// populated
for (XmlSchemaElement elt : schema.getElements().values()) {
- Map metaInfoMap = elt.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
}
@@ -77,7 +77,7 @@ public class PlainExtensionDeserializerT
// populated
for (XmlSchemaElement elt : schema.getElements().values()) {
assertNotNull(elt);
- Map metaInfoMap = elt.getMetaInfoMap();
+ Map<Object, Object> metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
}