axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r379432 - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/databinding/utils/ codegen/test/org/apache/axis2/schema/populate/derived/ codegen/test/org/apache/axis2/schema/populate/other/ codegen/test/org/apache/axis2/schema...
Date Tue, 21 Feb 2006 11:50:42 GMT
Author: stevel
Date: Tue Feb 21 03:50:33 2006
New Revision: 379432

URL: http://svn.apache.org/viewcvs?rev=379432&view=rev
Log:
three types of change
-spelling corrections
-making package-scoped fields private
-tweaking invoke calls to stop java5 compilier whining needlessly

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/AbstractDerivedPopulater.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateAnonComplexTypeTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateArrayTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/AbstractSimplePopulater.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Tue Feb 21 03:50:33 2006
@@ -94,11 +94,13 @@
                     continue;
                 }
                 if (SimpleTypeMapper.isSimpleType(ptype)) {
-                    Object value = propDesc.getReadMethod().invoke(beanObject, null);
+                    Object value = propDesc.getReadMethod().invoke(beanObject,
+                            (Object[]) null);
                     object.add(propDesc.getName());
                     object.add(value.toString());
                 } else if (ptype.isArray()) {
-                    Object value [] = (Object[]) propDesc.getReadMethod().invoke(beanObject,
null);
+                    Object value [] = (Object[]) propDesc.getReadMethod().invoke(beanObject,
+                            (Object[]) null);
                     if (SimpleTypeMapper.isSimpleType(ptype.getComponentType())) {
                         for (int j = 0; j < value.length; j++) {
                             Object o = value[j];
@@ -114,7 +116,8 @@
                     }
 
                 } else if (SimpleTypeMapper.isArrayList(ptype)) {
-                    Object value = propDesc.getReadMethod().invoke(beanObject, null);
+                    Object value = propDesc.getReadMethod().invoke(beanObject,
+                            (Object[]) null);
                     ArrayList objList = (ArrayList) value;
                     if (objList != null && objList.size() > 0) {
                         //this was given error , when the array.size = 0
@@ -134,7 +137,8 @@
                     }
                 } else {
                     object.add(new QName(propDesc.getName()));
-                    Object value = propDesc.getReadMethod().invoke(beanObject, null);
+                    Object value = propDesc.getReadMethod().invoke(beanObject,
+                            (Object[]) null);
                     object.add(value);
                 }
             }

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/AbstractDerivedPopulater.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/AbstractDerivedPopulater.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/AbstractDerivedPopulater.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/AbstractDerivedPopulater.java
Tue Feb 21 03:50:33 2006
@@ -57,7 +57,8 @@
         for (int i = 0; i < propDescs.length; i++) {
             PropertyDescriptor propDesc = propDescs[i];
             if  (propDesc.getPropertyType().equals(propertyClass)){
-                String s = convertToString(propDesc.getReadMethod().invoke(o, null));
+                String s = convertToString(propDesc.getReadMethod().invoke(o,
+                        (Object[]) null));
                 compare(value,s);
             }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateAnonComplexTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateAnonComplexTypeTest.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateAnonComplexTypeTest.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateAnonComplexTypeTest.java
Tue Feb 21 03:50:33 2006
@@ -50,13 +50,14 @@
             PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
             if ("varInt".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
-                assertEquals(new Integer(5),readMethod.invoke(obj,null));
+                assertEquals(new Integer(5),readMethod.invoke(obj,(Object[]) null));
             } else if ("varFloat".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
-                assertEquals(new Float(3.3),readMethod.invoke(obj,null));
+                assertEquals(new Float(3.3),readMethod.invoke(obj,
+                        (Object[]) null));
             }  else if ("varString".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
-                assertEquals("Hello",readMethod.invoke(obj,null));
+                assertEquals("Hello",readMethod.invoke(obj, (Object[]) null));
             }
 
         }

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateArrayTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateArrayTest.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateArrayTest.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/other/PopulateArrayTest.java
Tue Feb 21 03:50:33 2006
@@ -51,7 +51,7 @@
             PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
             if ("myobject".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
-                soapStruct = readMethod.invoke(obj,null);
+                soapStruct = readMethod.invoke(obj, (Object[]) null);
                 break;
             }
         }
@@ -64,14 +64,16 @@
             PropertyDescriptor propertyDescriptor = structPropertyDescriptors[i];
             if ("varInt".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
-                assertEquals("varInt is not properly set",new Integer(5),readMethod.invoke(soapStruct,null));
+                assertEquals("varInt is not properly set",new Integer(5),
+                        readMethod.invoke(soapStruct, (Object[]) null));
             } else if ("varFloat".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
-                assertEquals("varFloat is not properly set",new Float(3.3),readMethod.invoke(soapStruct,null));
+                assertEquals("varFloat is not properly set",new Float(3.3),
+                        readMethod.invoke(soapStruct, (Object[]) null));
             }  else if ("varString".equals(propertyDescriptor.getDisplayName())){
                 readMethod = propertyDescriptor.getReadMethod();
                 assertTrue("String array is not set",readMethod.getReturnType().isArray());
-                Object array = readMethod.invoke(soapStruct, null);
+                Object array = readMethod.invoke(soapStruct, (Object[]) null);
                 int length = Array.getLength(array);
                 assertEquals("Array length is not correct",length,3);
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/AbstractSimplePopulater.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/AbstractSimplePopulater.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/AbstractSimplePopulater.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/AbstractSimplePopulater.java
Tue Feb 21 03:50:33 2006
@@ -55,7 +55,8 @@
         for (int i = 0; i < propDescs.length; i++) {
             PropertyDescriptor propDesc = propDescs[i];
             if  (propDesc.getPropertyType().equals(propertyClass)){
-                String s = convertToString(propDesc.getReadMethod().invoke(o, null));
+                String s = convertToString(propDesc.getReadMethod().invoke(o,
+                        (Object[]) null));
                 compare(value,s);
             }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
Tue Feb 21 03:50:33 2006
@@ -42,25 +42,25 @@
     public static final QName ANON_OUT_IN_OP = new QName("__OPERATION_OUT_IN__");
 
     // the metadata for the service that I'm clienting for
-    AxisService axisService;
+    private AxisService axisService;
 
     // the configuration in which my metadata lives
-    AxisConfiguration axisConfig;
+    private AxisConfiguration axisConfig;
 
     // the configuration context in which I live
-    ConfigurationContext configContext;
+    private ConfigurationContext configContext;
 
     // service context for this specific service instance
-    ServiceContext serviceContext;
+    private ServiceContext serviceContext;
 
     // client options for this service interaction
-    Options options = new Options();
+    private Options options = new Options();
 
     // options that must override those of the child operation client also
-    private Options overideOptions;
+    private Options overrideOptions;
 
     // list of headers to be sent with the simple APIs
-    ArrayList headers;
+    private ArrayList headers;
 
     private CallbackReceiver callbackReceiver;
 
@@ -179,7 +179,7 @@
             trsManager = new ListenerManager();
             trsManager.init(this.configContext);
         }
-        if (!trsManager.isStoped()) {
+        if (!trsManager.isStopped()) {
             trsManager.start();
         }
     }
@@ -250,8 +250,8 @@
      * Set the client configuration related to this service interaction to
      * override any options that the underlying operation client may have.
      */
-    public void setOverideOptions(Options overideOptions) {
-        this.overideOptions = overideOptions;
+    public void setOverrideOptions(Options overrideOptions) {
+        this.overrideOptions = overrideOptions;
     }
 
     /**
@@ -260,8 +260,8 @@
      *
      * @return set of options set earlier.
      */
-    public Options getOverideOptions() {
-        return overideOptions;
+    public Options getOverrideOptions() {
+        return overrideOptions;
     }
 
     /**
@@ -463,7 +463,7 @@
         MessageContext mc = new MessageContext();
         fillSoapEnvelope(mc, elem);
         OperationClient mepClient = createClient(operation);
-        // here a bloking invocation happens in a new thread, so the
+        // here a blocking invocation happens in a new thread, so the
         // progamming model is non blocking
         mepClient.setCallback(callback);
         mepClient.addMessageContext(mc);
@@ -501,9 +501,9 @@
         // if overide options have been set, that means we need to make sure
         // those options override the options of even the operation client. So,
         // what we do is switch the parents around to make that work.
-        if (overideOptions != null) {
-            overideOptions.setParent(oc.getOptions());
-            oc.setOptions(overideOptions);
+        if (overrideOptions != null) {
+            overrideOptions.setParent(oc.getOptions());
+            oc.setOptions(overrideOptions);
         }
         return oc;
     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
Tue Feb 21 03:50:33 2006
@@ -42,7 +42,7 @@
      */
     private final Map operationContextMap = new HashMap();
     private Hashtable serviceGroupContextMap = new Hashtable();
-    private Hashtable applicationSessionServiceGroupContextTabale = new Hashtable();
+    private Hashtable applicationSessionServiceGroupContextTable = new Hashtable();
     private transient AxisConfiguration axisConfiguration;
     private File rootDir;
     private transient ThreadFactory threadPool;
@@ -89,7 +89,7 @@
 
         if (serviceContext == null) {
             if (Constants.SCOPE_APPLICATION.equals(axisService.getScope())) {
-                serviceGroupContext = (ServiceGroupContext) applicationSessionServiceGroupContextTabale.get(
+                serviceGroupContext = (ServiceGroupContext) applicationSessionServiceGroupContextTable.get(
                         ((AxisServiceGroup) axisService.getParent()).getServiceGroupName());
                 if (serviceGroupContext == null) {
                     AxisServiceGroup axisServiceGroup = messageContext.getAxisServiceGroup();
@@ -185,7 +185,7 @@
 
     private synchronized void addServiceGroupContextintoApplicatoionScopeTable(
             ServiceGroupContext serviceGroupContext) {
-        applicationSessionServiceGroupContextTabale.put(
+        applicationSessionServiceGroupContextTable.put(
                 serviceGroupContext.getDescription().getServiceGroupName(), serviceGroupContext);
     }
 
@@ -229,7 +229,9 @@
                 serviceGroupContext.touch();
             }
         }
-        if (serviceGroupContext == null && msgContext.getSessionContext() != null)
{
+        if (serviceGroupContext == null
+                && msgContext!=null  
+                && msgContext.getSessionContext() != null) {
             serviceGroupContext = msgContext.getSessionContext().getServiceGroupContext(
                     serviceGroupContextId);
         }
@@ -239,7 +241,7 @@
                 AxisServiceGroup asg = (AxisServiceGroup) axisService.getParent();
                 if (asg != null) {
                     serviceGroupContext = (ServiceGroupContext)
-                            applicationSessionServiceGroupContextTabale.get(asg.getServiceGroupName());
+                            applicationSessionServiceGroupContextTable.get(asg.getServiceGroupName());
                 }
             }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
Tue Feb 21 03:50:33 2006
@@ -113,15 +113,15 @@
     // Are we doing MTOM now?
     private boolean doingMTOM;
 
-    QName transportInName;
+    private QName transportInName;
 
-    QName transportOutname;
+    private QName transportOutname;
 
-    String serviceGroupId;
+    private String serviceGroupId;
 
-    String axisServiceName;
+    private String axisServiceName;
 
-    QName axisOperationName;
+    private QName axisOperationName;
 
     private transient AxisOperation axisOperation;
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java?rev=379432&r1=379431&r2=379432&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
Tue Feb 21 03:50:33 2006
@@ -36,7 +36,7 @@
 
     private ConfigurationContext configctx;
     private HashMap startedTranports = new HashMap();
-    private boolean stoped;
+    private boolean stopped;
 
     public void init(ConfigurationContext configCtx) {
         configCtx.setTransportManager(this);
@@ -110,7 +110,7 @@
                 log.info(axisFault.getMessage());
             }
         }
-        stoped = false;
+        stopped = false;
     }
 
     public void startSystem(ConfigurationContext configurationContext) {
@@ -127,7 +127,7 @@
             TransportListener transportListener = (TransportListener) itr_st.next();
             transportListener.stop();
         }
-        stoped = true;
+        stopped = true;
     }
 
     public void addListener(TransportInDescription trsIn, boolean start) throws AxisFault
{
@@ -141,7 +141,7 @@
         }
     }
 
-    public boolean isStoped() {
-        return stoped;
+    public boolean isStopped() {
+        return stopped;
     }
 }



Mime
View raw message