You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/03/16 05:19:18 UTC
svn commit: r386255 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal:
AllParamWriter.java ArrayParamWriter.java ParamCFileWriter.java
ServiceWriter.java
Author: nadiramra
Date: Wed Mar 15 20:19:16 2006
New Revision: 386255
URL: http://svn.apache.org/viewcvs?rev=386255&view=rev
Log:
Format code so more readable - align braces, etc.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java?rev=386255&r1=386254&r2=386255&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/AllParamWriter.java Wed Mar 15 20:19:16 2006
@@ -57,39 +57,32 @@
try
{
type = (Type) enu.next();
- if (type.isArray())
- {
- if (WSDL2Ws.verbose)
- System.out.println("Array writer called ......");
- (new ArrayParamWriter(wscontext, type)).writeSource();
- }
- else
- {
- /* TODO check whether this type is referenced or not. Synthesize only if reference
- * But of cause that depends on the commandline option too */
- if (type.getLanguageSpecificName().startsWith(">"))
- {
- /* TODO do some processing to this type before synthesizing to remove ">" charactors.
- * And then it should also be synthesized if commandline option says to */
- if(WSDL2Ws.verbose)
- {
- System.out.println(
- "ignoring anonymous type "
- + type.getLanguageSpecificName()
- + "\n");
- }
- }
- else
- {
- if (WSDL2Ws.verbose)
- System.out.println(
- "struct writer called ......");
- (new BeanParamWriter(wscontext, type))
- .writeSource();
- (new ParmHeaderFileWriter(wscontext, type))
- .writeSource();
- }
+ if (type.isArray())
+ {
+ if (WSDL2Ws.verbose)
+ System.out.println("Array writer called ......");
+ (new ArrayParamWriter(wscontext, type)).writeSource();
+ }
+ /* TODO check whether this type is referenced or not. Synthesize only if reference
+ * But of course that depends on the commandline option too */
+ else if (type.getLanguageSpecificName().startsWith(">"))
+ {
+ /* TODO do some processing to this type before synthesizing to remove ">" charactors.
+ * And then it should also be synthesized if commandline option says to */
+ if(WSDL2Ws.verbose)
+ {
+ System.out.println(
+ "ignoring anonymous type " + type.getLanguageSpecificName() + "\n");
}
+ }
+ else
+ {
+ if (WSDL2Ws.verbose)
+ System.out.println("struct writer called ......");
+
+ (new BeanParamWriter(wscontext, type)).writeSource();
+ (new ParmHeaderFileWriter(wscontext, type)).writeSource();
+ }
}
catch (Exception e)
{
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java?rev=386255&r1=386254&r2=386255&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ArrayParamWriter.java Wed Mar 15 20:19:16 2006
@@ -37,8 +37,7 @@
* @param type
* @throws WrapperFault
*/
- public ArrayParamWriter(WebServiceContext wscontext, Type type)
- throws WrapperFault
+ public ArrayParamWriter(WebServiceContext wscontext, Type type) throws WrapperFault
{
super(wscontext, type);
}
@@ -62,7 +61,7 @@
* <xsd:attribute name="att_kind" type="tns:Kind" />
* </xsd:complexType>
*/
- //writer.write("\t"+attribs[0].getTypeName()+"* m_Array;\n\tint m_Size;\n} "+classname+";\n\n");
+
writer.write(
"\tstruct "
+ attribs[0].getTypeName()
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java?rev=386255&r1=386254&r2=386255&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ParamCFileWriter.java Wed Mar 15 20:19:16 2006
@@ -41,8 +41,7 @@
* @param type
* @throws WrapperFault
*/
- public ParamCFileWriter(WebServiceContext wscontext, Type type)
- throws WrapperFault
+ public ParamCFileWriter(WebServiceContext wscontext, Type type) throws WrapperFault
{
super(wscontext, type);
}
@@ -60,14 +59,11 @@
{
try
{
- this.writer =
- new BufferedWriter(new FileWriter(getFilePath(), false));
+ this.writer = new BufferedWriter(new FileWriter(getFilePath(), false));
writeClassComment();
writePreprocessorStatements();
if (type.isSimpleType())
- {
writeRestrictionCheckerFunction();
- }
else
{
writeGlobalCodes();
@@ -78,8 +74,7 @@
writer.flush();
writer.close();
if (WSDL2Ws.verbose)
- System.out.println(
- getFilePath().getAbsolutePath() + " created.....");
+ System.out.println(getFilePath().getAbsolutePath() + " created.....");
}
catch (IOException e)
{
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java?rev=386255&r1=386254&r2=386255&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java Wed Mar 15 20:19:16 2006
@@ -60,15 +60,13 @@
continue;
typeSet.add(atype.getLanguageSpecificName());
}
+
Iterator itr = typeSet.iterator();
while (itr.hasNext())
{
- writer.write(
- "#include \""
- + itr.next().toString()
- + CUtils.C_HEADER_SUFFIX
- + "\"\n");
+ writer.write("#include \"" + itr.next().toString() + CUtils.C_HEADER_SUFFIX + "\"\n");
}
+
writer.write("\n");
}
catch (IOException e)
@@ -77,5 +75,4 @@
throw new WrapperFault(e);
}
}
-
}