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/12/14 19:29:18 UTC

svn commit: r487296 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: Generator.java SourceWriterFactory.java WebServiceGeneratorFactory.java

Author: nadiramra
Date: Thu Dec 14 10:29:17 2006
New Revision: 487296

URL: http://svn.apache.org/viewvc?view=rev&rev=487296
Log:
Code formatting....

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorFactory.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java?view=diff&rev=487296&r1=487295&r2=487296
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java Thu Dec 14 10:29:17 2006
@@ -29,11 +29,9 @@
 {
     private SourceWriter sourceWriter;
 
-    public Generator(int generatorType, WebServiceContext wscontext)
-        throws WrapperFault
+    public Generator(int generatorType, WebServiceContext wscontext) throws WrapperFault
     {
-        this.sourceWriter =
-            SourceWriterFactory.createSourceWriter(generatorType, wscontext);
+        this.sourceWriter = SourceWriterFactory.createSourceWriter(generatorType, wscontext);
     }
 
     public void generate() throws WrapperFault
@@ -42,6 +40,7 @@
         {
             throw new WrapperFault("Can't find Matching Generator");
         }
+        
         this.sourceWriter.writeSource();
     }
 }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java?view=diff&rev=487296&r1=487295&r2=487296
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java Thu Dec 14 10:29:17 2006
@@ -35,6 +35,7 @@
                 return new UndeploymentWriter(wscontext);
             case WrapperConstants.GENERATOR_BUILDSCRIPT :
                 return new BuildScriptWriter(wscontext);
+                
             // C++
             case WrapperConstants.GENERATOR_PARAM_CPP_ALL :
                 return new org.apache.axis.wsdl.wsdl2ws.cpp.AllParamWriter(wscontext);
@@ -42,10 +43,12 @@
                 return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceWriter(wscontext);
             case WrapperConstants.GENERATOR_CLASSLOADER_CPP :
                 return new org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader(wscontext);
+                
             // C
             case WrapperConstants.GENERATOR_PARAM_C_ALL :
                 return new org.apache.axis.wsdl.wsdl2ws.c.AllParamWriter(wscontext);
         }
+        
         if ("rpc".equals(wscontext.getWrapInfo().getWrapperStyle()))
         {
             switch (generatorType)
@@ -63,7 +66,8 @@
                     return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter(wscontext);
                 case WrapperConstants.GENERATOR_SERVER_EXCEPTION :
                     return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Server");
-                    //C
+                
+                // C
                 case WrapperConstants.GENERATOR_WRAPPER_C :
                     return new org.apache.axis.wsdl.wsdl2ws.c.WrapWriter(wscontext);
                 case WrapperConstants.GENERATOR_WRAPPER_H :
@@ -78,40 +82,40 @@
                     return new org.apache.axis.wsdl.wsdl2ws.c.ClientStubWriter(wscontext);
             }
         }
-        else
-            if ("document".equals(wscontext.getWrapInfo().getWrapperStyle()))
+        else if ("document".equals(wscontext.getWrapInfo().getWrapperStyle()))
+        {
+            switch (generatorType)
             {
-                switch (generatorType)
-                {
-                    // C++
-                    case WrapperConstants.GENERATOR_WRAPPER_CPP :
-                        return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapWriter(wscontext);
-                    case WrapperConstants.GENERATOR_WRAPPER_HPP :
-                        return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapHeaderWriter(wscontext);
-                    case WrapperConstants.GENERATOR_SERVICE_HPP :
-                        return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ServiceHeaderWriter(wscontext);
-                    case WrapperConstants.GENERATOR_CLIENT_STUB_HPP :
-                        return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubHeaderWriter(wscontext);
-                    case WrapperConstants.GENERATOR_CLIENT_STUB_CPP :
-                        return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubWriter(wscontext);
-                    case WrapperConstants.GENERATOR_SERVER_EXCEPTION :
-                        // nithya
-                        return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Server");
-                        //C
-                    case WrapperConstants.GENERATOR_WRAPPER_C :
-                        return new org.apache.axis.wsdl.wsdl2ws.c.literal.WrapWriter(wscontext);
-                    case WrapperConstants.GENERATOR_WRAPPER_H :
-                        return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
-                    case WrapperConstants.GENERATOR_SERVICE_C :
-                        return new org.apache.axis.wsdl.wsdl2ws.c.literal.ServiceWriter(wscontext);
-                    case WrapperConstants.GENERATOR_CLASSLOADER_C :
-                        return new org.apache.axis.wsdl.wsdl2ws.c.ClassLoader(wscontext);
-                    case WrapperConstants.GENERATOR_CLIENT_STUB_H :
-                        return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubHeaderWriter(wscontext);
-                    case WrapperConstants.GENERATOR_CLIENT_STUB_C :
-                        return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubWriter(wscontext);
-                }
+                // C++
+                case WrapperConstants.GENERATOR_WRAPPER_CPP :
+                    return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapWriter(wscontext);
+                case WrapperConstants.GENERATOR_WRAPPER_HPP :
+                    return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapHeaderWriter(wscontext);
+                case WrapperConstants.GENERATOR_SERVICE_HPP :
+                    return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ServiceHeaderWriter(wscontext);
+                case WrapperConstants.GENERATOR_CLIENT_STUB_HPP :
+                    return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubHeaderWriter(wscontext);
+                case WrapperConstants.GENERATOR_CLIENT_STUB_CPP :
+                    return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubWriter(wscontext);
+                case WrapperConstants.GENERATOR_SERVER_EXCEPTION :
+                    return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Server");
+                    
+                //C
+                case WrapperConstants.GENERATOR_WRAPPER_C :
+                    return new org.apache.axis.wsdl.wsdl2ws.c.literal.WrapWriter(wscontext);
+                case WrapperConstants.GENERATOR_WRAPPER_H :
+                    return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
+                case WrapperConstants.GENERATOR_SERVICE_C :
+                    return new org.apache.axis.wsdl.wsdl2ws.c.literal.ServiceWriter(wscontext);
+                case WrapperConstants.GENERATOR_CLASSLOADER_C :
+                    return new org.apache.axis.wsdl.wsdl2ws.c.ClassLoader(wscontext);
+                case WrapperConstants.GENERATOR_CLIENT_STUB_H :
+                    return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubHeaderWriter(wscontext);
+                case WrapperConstants.GENERATOR_CLIENT_STUB_C :
+                    return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubWriter(wscontext);
             }
+        }
+        
         throw new WrapperFault("Source writer type not found");
     }
 }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorFactory.java?view=diff&rev=487296&r1=487295&r2=487296
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorFactory.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorFactory.java Thu Dec 14 10:29:17 2006
@@ -27,22 +27,11 @@
 {
     public static WebServiceGenerator createWebServiceGenerator(WebServiceContext wscontext)
     {
-        if (wscontext.getWrapInfo().getWrapperStyle()
-            == WrapperConstants.STYLE_RPC)
-        {
+        if (wscontext.getWrapInfo().getWrapperStyle() == WrapperConstants.STYLE_RPC)
+            return new WebServiceGeneratorImpl(wscontext);
+        else if (wscontext.getWrapInfo().getWrapperStyle() == WrapperConstants.STYLE_DOCUMENT)
             return new WebServiceGeneratorImpl(wscontext);
-        }
         else
-        {
-            if (wscontext.getWrapInfo().getWrapperStyle()
-                == WrapperConstants.STYLE_DOCUMENT)
-            {
-                return new WebServiceGeneratorImpl(wscontext);
-            }
-            else
-            {
-                return null;
-            }
-        }
+            return null;
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org