Author: nadiramra
Date: Sat Jul 8 14:23:17 2006
New Revision: 420195
URL: http://svn.apache.org/viewvc?rev=420195&view=rev
Log:
minor cleanup..
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
URL:
http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?rev=420195&r1=420194&r2=420195&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Sat Jul 8 14:23:17 2006
@@ -802,9 +802,10 @@
Object nestedObjectType = iterator.next();
if(nestedObjectType instanceof DefinedType)
{
- //System.out.println(
"nestedname"+nestedObjectType);
+ // If the nested parts are complex inner/anonymous
types then they need to
+ // be exposed as seperate classes
+
DefinedType nestedType =(DefinedType)
nestedObjectType;
- // If the nested parts are complex inner/anonymous
types then they need to be exposed as seperate classes
String name
=nestedType.getQName().getLocalPart().toString();
if(WSDL2Ws.verbose)
@@ -844,84 +845,6 @@
}
}
}
-
-
-
-// }
-// }
-//
if(type.getQName().getLocalPart().toString().startsWith(">")&&
!(type.getQName().getLocalPart().toString().lastIndexOf(">")>1))
-// {
-// // this is an "inner" type that will not be exposed
-// // however, it needs to be if it is referenced in a
message part.
-// // check all the messages
-// ArrayList methods =
wsContext.getSerInfo().getMethods();
-// for(int i=0; i<methods.size(); i++)
-// {
-// MethodInfo method = (MethodInfo)methods.get(i);
-// Collection inputParameterTypes =
method.getInputParameterTypes();
-// Iterator paramIterator =
inputParameterTypes.iterator();
-// while(paramIterator.hasNext())
-// {
-// ParameterInfo parameterInfo
=(ParameterInfo)paramIterator.next();
-// Type parameterType = parameterInfo.getType();
-//
if(parameterType.getName().equals(type.getQName()))
-// {
-// QName oldName = parameterType.getName();
-// QName newTypeName = new
QName(parameterType.getName().getNamespaceURI(),
parameterType.getName().getLocalPart().substring(1));
-//
-// Type innerClassType =
wsContext.getTypemap().getType(parameterType.getName());
-// //
innerClassType.setLanguageSpecificName(newTypeName);
-//
-// // First thing to do is to expose the type
so it gets created.
-//
innerClassType.setLanguageSpecificName(newTypeName.getLocalPart().toString());
-//
-// // also have to set the QName becuase this
is used in generating the header info.
-// innerClassType.setName(newTypeName);
-//
-// // The typemap we get back is a copy of
the actual typemap so we have to set the new value explicitly
-// // firstly remove the old version
-// wsContext.getTypemap().removeType(oldName);
-//
wsContext.getTypemap().addType(newTypeName, innerClassType);
-//
-// Iterator AllTypes =
symbolTable.getTypeIndex().values().iterator();
-// }
-// }
-// }
-//
-// }
-// }
-// }
-
-
- // ArrayList methods =
wsContext.getSerInfo().getMethods();
- // for(int i=0; i<methods.size(); i++)
- // {
- // MethodInfo method = (MethodInfo)methods.get(i);
- // Collection inputParameterTypes =
method.getInputParameterTypes();
- // Iterator paramIterator = inputParameterTypes.iterator();
- // while(paramIterator.hasNext())
- // {
- // ParameterInfo parameterInfo
=(ParameterInfo)paramIterator.next();
- // Type parameterType = parameterInfo.getType();
- //
if(parameterType.getLanguageSpecificName().startsWith(">"))
- // {
- // // Then this type has not been exposed as a seperate
class and it needs to be
- // System.out.println( "got to expose
"+parameterType.getName().getLocalPart());
- // QName exposedName = new
QName(parameterType.getName().getNamespaceURI(),
parameterType.getName().getLocalPart().substring(1));
- // // There'#s no point in doing this unless the type
map is changed
- // Type type =
wsContext.getTypemap().getType(parameterType.getName());
- // type.setName(exposedName);
- //
wsContext.getTypemap().removeType(parameterType.getName());
- // wsContext.getTypemap().addType(exposedName, type);
- // //parameterType.setLanguageSpecificName(new
QName(parameterType.getLanguageSpecificName().substring(1)).toString() );
- //
- // // also have to set the QName becuase this is used
in generating the header info.
- // //parameterType.setName(new
QName(parameterType.getName().getNamespaceURI(),
parameterType.getLanguageSpecificName()));
- //
- //
- // }
-
-// }
/**
* This code is taken from the org.apache.axis.wsdl.gen.Parser Class.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
