Author: oshani
Date: Sun Aug 20 17:37:32 2006
New Revision: 433105
URL: http://svn.apache.org/viewvc?rev=433105&view=rev
Log:
Removed the JDK1.5 specific features such as generics and for each loops
that were introduced in the previous commit.
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java?rev=433105&r1=433104&r2=433105&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Sun Aug 20 17:37:32 2006
@@ -77,7 +77,7 @@
public class OMWSDLReader extends BaseWSDLReader{
//A map of imported schema definitions keyed by schema location URI
- private Map<String,XmlSchema> fImportedSchemas = new Hashtable<String,
XmlSchema>();
+ private Map fImportedSchemas = new Hashtable();
public OMWSDLReader() throws WSDLException {
super();
@@ -102,7 +102,7 @@
private DescriptionElement parseDescription(String documentBaseURI,
OMElement omDescription,
- Map<String,DescriptionElement>
wsdlModules)
+ Map wsdlModules)
throws WSDLException {
checkElementName(omDescription,Constants.Q_ELEM_DESCRIPTION);
@@ -113,7 +113,7 @@
if(wsdlModules == null){
//This is the initial WSDL document. No imports or includes yet.
//TODO this might be the place to flag the initial Desc if
necessary.
- wsdlModules = new HashMap<String, DescriptionElement>();
+ wsdlModules = new HashMap();
}
if(getExtensionRegistry() != null){
@@ -665,19 +665,22 @@
String styleDefault = OMUtils.getAttribute(interfaceEl,
Constants.ATTR_STYLE_DEFAULT);
if(styleDefault != null){
List stringList = StringUtils.parseNMTokens(styleDefault);
- String uriString;
- for (Object aStringList : stringList) {
- uriString = (String) aStringList;
- intface.addStyleDefaultURI(getURI(uriString));
+ String uriString = null;
+ Iterator it = stringList.iterator();
+ while(it.hasNext()){
+ uriString = (String)it.next();
}
+ intface.addStyleDefaultURI(getURI(uriString));
}
+
String extendsAttr = OMUtils.getAttribute(interfaceEl,
Constants.ATTR_EXTENDS);
if(extendsAttr != null){
List stringList = StringUtils.parseNMTokens(extendsAttr);
- String qnString;
- for (Object aStringList : stringList) {
- qnString = (String) aStringList;
+ String qnString = null;
+ Iterator it = stringList.iterator();
+ while(it.hasNext()){
+ qnString = (String)it.next();
intface.addExtendedInterfaceName(OMUtils.getQName(qnString,
interfaceEl));
}
}
@@ -729,9 +732,10 @@
String style = OMUtils.getAttribute(operEl, Constants.ATTR_STYLE);
if(style != null){
List stringList = StringUtils.parseNMTokens(style);
- String uriString;
- for (Object aStringList : stringList) {
- uriString = (String) aStringList;
+ String uriString = null;
+ Iterator it = stringList.iterator();
+ while(it.hasNext()){
+ uriString = (String)it.next();
oper.addStyleURI(getURI(uriString));
}
}
@@ -1104,7 +1108,7 @@
String schemaURL = url.toString();
//If the schema has already been imported, reuse it.
- XmlSchema schemaDef = fImportedSchemas.get(schemaURL);
+ XmlSchema schemaDef = (XmlSchema)fImportedSchemas.get(schemaURL);
if(schemaDef == null){
//not previously imported, so retrieve it now.
@@ -1249,7 +1253,7 @@
private ImportElement parseImport(OMElement importEl,
DescriptionElement desc,
- Map<String,DescriptionElement>
wsdlModules)
+ Map wsdlModules)
throws WSDLException{
ImportElement imp = desc.createImportElement();
@@ -1276,7 +1280,7 @@
private IncludeElement parseInclude(OMElement includeEl,
DescriptionElement desc,
- Map<String,DescriptionElement>
wsdlModules)
+ Map wsdlModules)
throws WSDLException{
IncludeElement include = desc.createIncludeElement();
@@ -1432,7 +1436,7 @@
*/
private DescriptionElement getWSDLFromLocation(String locationURI,
DescriptionElement desc,
-
Map<String,DescriptionElement> wsdlModules)
+ Map wsdlModules)
throws WSDLException{
DescriptionElement referencedDesc = null;
OMElement docEl;
@@ -1460,7 +1464,7 @@
String locationStr = locationURL.toString();
//Check if WSDL imported or included previously from this location.
- referencedDesc = wsdlModules.get(locationStr);
+ referencedDesc = (DescriptionElement)wsdlModules.get(locationStr);
if(referencedDesc == null){
//not previously imported or included, so retrieve the WSDL.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
