Refactored code.

git-svn-id: http://svn.wso2.org/repos/wso2/trunk/wsf@67626 a5903396-d722-0410-b921-86c7d4935375
wso2-attic · Jun 5, 2010 · 53eb545 · 53eb545
1 parent 4800870
commit 53eb545
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/jython/server/core/src/main/java/org/wso2/wsf/jython/deployer/PythonDeployer.java b/jython/server/core/src/main/java/org/wso2/wsf/jython/deployer/PythonDeployer.java
@@ -41,6 +41,9 @@
 import org.wso2.wsf.jython.messagereceiver.PythonScriptReceiver;
 import org.wso2.wsf.jython.deployer.schemagenarator.*;
 
+/**
+ * Python service deployer.
+ */
 public class PythonDeployer implements Deployer {
     private static final Log log = LogFactory.getLog(PythonDeployer.class);
 
@@ -118,7 +121,7 @@ public void deploy(DeploymentFileData deploymentFileData) {
     }
 
     public ArrayList<AxisService> processService(DeploymentFileData currentFile,
-                                    AxisServiceGroup axisServiceGroup, String repoPath)
+                                                 AxisServiceGroup axisServiceGroup, String repoPath)
             throws AxisFault {
         try {
             String serviceName = DescriptionBuilder.getShortFileName(currentFile.getName());
@@ -128,7 +131,7 @@ public ArrayList<AxisService> processService(DeploymentFileData currentFile,
             if (log.isDebugEnabled()) {
                 System.out.println(" Script Repo Path : " + repoPath);
                 log.debug(serviceName + " python script is being processed !");
-                log.debug("serviceName                :" + serviceName);
+                log.debug("serviceName                  :" + serviceName);
                 log.debug("currentFileName AbsolutePath :" + currentFile.getAbsolutePath());
                 log.debug("currnetFileName              :" + currentFile.getName());
             }
@@ -196,9 +199,9 @@ public ArrayList<AxisService> processService(DeploymentFileData currentFile,
      * Reads the annotations in the python script and maps the annotations to schema. Generates the xml schema for the
      * python service
      *
-     * @param map             - The HashMap which contains the annotations of the python service
-     * @param axisService     - The axis service
-     * @param schemaGenerator - The schema generator
+     * @param map             The HashMap which contains the annotations of the python service
+     * @param axisService     The axis service
+     * @param schemaGenerator The schema generator
      */
     private void annotationsToSchema(HashMap map, AxisService axisService, SchemaGenerator schemaGenerator) {
         //HashMap map = (HashMap) obj2.__tojava__(HashMap.class);
@@ -310,7 +313,7 @@ private void annotationsToSchema(HashMap map, AxisService axisService, SchemaGen
                 inSchemaElement = schemaGenerator.createInputElement(inComplexType, opName);
                 outSchemaElement = schemaGenerator.createOutputElement(outComplexType, opName);
             } catch (Exception e) {
-                e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+                e.printStackTrace();
             }
             QName inParamElementQname = inSchemaElement.getQName(); // set this to the QName of the in message
             QName outParamElementQname = outSchemaElement.getQName();

diff --git a/...n/server/core/src/main/java/org/wso2/wsf/jython/deployer/schemagenarator/ComplexType.java b/...n/server/core/src/main/java/org/wso2/wsf/jython/deployer/schemagenarator/ComplexType.java
@@ -20,9 +20,9 @@
 
 public class ComplexType extends Type{
 
-    private ArrayList members = new ArrayList();
+    private ArrayList<Type> members = new ArrayList<Type>();
 
-    public ArrayList getMembers() {
+    public ArrayList<Type> getMembers() {
         return members;
     }
 

diff --git a/...rver/core/src/main/java/org/wso2/wsf/jython/deployer/schemagenarator/SchemaGenerator.java b/...rver/core/src/main/java/org/wso2/wsf/jython/deployer/schemagenarator/SchemaGenerator.java
@@ -32,6 +32,9 @@
 import javax.xml.namespace.QName;
 import java.util.Iterator;
 
+/**
+ * Schema generation class.
+ */
 public class SchemaGenerator {
 
     private String schemaTargetNamespace;
@@ -126,7 +129,7 @@ private XmlSchemaComplexType createComplexType(ComplexType complexType, String e
         xmlSchema.getItems().add(xmlSchemaComplexType);
 
         XmlSchemaSequence xmlSchemaSequence = new XmlSchemaSequence();
-        Iterator iterator = complexType.getMembers().iterator();
+        Iterator<Type> iterator = complexType.getMembers().iterator();
         while (iterator.hasNext()) {
             Object object = iterator.next();
             XmlSchemaElement xmlSchemaElement;
@@ -183,9 +186,8 @@ private XmlSchemaSimpleType handleEnumeration(String name, String[] enums) {
         simpleType.setContent(simpleTypeRestriction);
 
         // Create enumeration facets for each value
-        for (int i = 0; i < enums.length; i++) {
-
-            String enumeration = enums[i].trim();
+        for (String anEnum : enums) {
+            String enumeration = anEnum.trim();
             XmlSchemaEnumerationFacet enumerationFacet = new XmlSchemaEnumerationFacet();
             enumerationFacet.setValue(enumeration);
             simpleTypeRestriction.getFacets().add(enumerationFacet);