axis-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sag...@apache.org
Subject svn commit: r1136520 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Date Thu, 16 Jun 2011 16:13:39 GMT
Author: sagara
Date: Thu Jun 16 16:13:39 2011
New Revision: 1136520

URL: http://svn.apache.org/viewvc?rev=1136520&view=rev
Log:
Fixed few Java 5 warnings and some clean-up. 

Modified:
    axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java

Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1136520&r1=1136519&r2=1136520&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Thu Jun 16 16:13:39 2011
@@ -670,7 +670,7 @@ public class BeanUtil {
             if (genericParameterTypes != null) {
                 genericType = genericParameterTypes[count];
             }
-            omElement = ProcessElement(classType, omElement, helper, parts,
+            omElement = processElement(classType, omElement, helper, parts,
                                        currentLocalName, retObjs, count, objectSupplier,
genericType);
             while (omElement != null) {
                 count++;
@@ -696,7 +696,7 @@ public class BeanUtil {
                 if (genericParameterTypes != null) {
                     genericType = genericParameterTypes[count];
                 }
-                omElement = ProcessElement((Class) javaTypes[count], omElement,
+                omElement = processElement((Class) javaTypes[count], omElement,
                                            helper, parts, omElement.getLocalName(), retObjs,
count,
                                            objectSupplier, genericType);
             }
@@ -715,7 +715,7 @@ public class BeanUtil {
         return retObjs;
     }
 
-    private static OMElement ProcessElement(Class classType, OMElement omElement,
+    private static OMElement processElement(Class classType, OMElement omElement,
                                             MultirefHelper helper, Iterator parts,
                                             String currentLocalName,
                                             Object[] retObjs,
@@ -766,7 +766,7 @@ public class BeanUtil {
         return null;
     }
 
-    private static List<Object> ProcessGenericsElement(Class classType, OMElement omElement,
+    private static List<Object> processGenericsElement(Class classType, OMElement omElement,
                                                MultirefHelper helper, Iterator parts,
                                                ObjectSupplier objectSupplier,
                                                Type genericType) throws AxisFault {
@@ -836,7 +836,7 @@ public class BeanUtil {
                         Type[] parameterArgTypes = aType.getActualTypeArguments();
                         Type parameter = parameterArgTypes[0];
                         Iterator parts = omElement.getChildElements();
-                        return ProcessGenericsElement((Class) parameter, omElement, helper,
parts, objectSupplier, generictype);
+                        return processGenericsElement((Class) parameter, omElement, helper,
parts, objectSupplier, generictype);
                     }
                     return SimpleTypeMapper.getArrayList(omElement);
                 } else if (SimpleTypeMapper.isDataHandler(classType)) {

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1136520&r1=1136519&r2=1136520&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
(original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Thu Jun 16 16:13:39 2011
@@ -39,10 +39,10 @@ import java.net.URI;
 
 public class TypeTable {
     
-    private static HashMap  simpleTypetoxsd;
+    private static HashMap<String,QName>  simpleTypetoxsd;
     public static final QName ANY_TYPE = new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD,
"anyType", "xs");
 
-    private HashMap complexTypeMap;
+    private HashMap<String,QName> complexTypeMap;
 
     /**
      * this map is used to keep the class names with the Qnames.
@@ -57,8 +57,8 @@ public class TypeTable {
     public TypeTable() {
         //complex type table is resetted every time this is
         //instantiated
-        complexTypeMap = new HashMap();
-        this.qNameToClassMap = new HashMap();
+        complexTypeMap = new HashMap<String,QName>();
+        this.qNameToClassMap = new HashMap<QName, String>();
     }
 
     /* statically populate the simple type map  - this is not likely to
@@ -70,7 +70,7 @@ public class TypeTable {
 
     /* populate the simpletype hashmap */
     private static void populateSimpleTypes() {
-        simpleTypetoxsd = new HashMap();
+        simpleTypetoxsd = new HashMap<String,QName>();
         //todo pls use the types from org.apache.ws.commons.schema.constants.Constants
         simpleTypetoxsd.put("int",
                 new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "int", "xs"));
@@ -239,7 +239,7 @@ public class TypeTable {
      * Return the complex type map
      * @return  the map with complex types
      */
-    public Map getComplexSchemaMap() {
+    public Map<String,QName> getComplexSchemaMap() {
         return complexTypeMap;
     }
 



Mime
View raw message