svn commit: r164856 - /incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm

[kentam]

Author: kentam
Date: Tue Apr 26 11:34:14 2005
New Revision: 164856

URL: http://svn.apache.org/viewcvs?rev=164856&view=rev
Log:
Reverted changes made in ControlBean.vm to accomodate IDEs that are not fully 
JDK5 compliant

Contributor: Hoi Lam


Modified:
    
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm?rev=164856&r1=164855&r2=164856&view=diff
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm
 (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm
 Tue Apr 26 11:34:14 2005
@@ -168,34 +168,10 @@
         }
         finally
         {
-            ##Wrapping primitives with their corresponding wrapper class
-            ##will not be necessary once  Javelin and other IDEs become 
-            ##fully compliant with JDK5.
-            ##In this case, we can replace the if statement below with:
-            ## #if ($returnType == "void")
-            ## Object rv = null;
-            ## #else
-            ## Object rv = retval;        
             #if ($returnType == "void")
             Object rv = null;
-            #elseif ($returnType == "int")
-            Object rv = Integer.valueOf(retval);
-            #elseif ($returnType == "long")
-            Object rv = Long.valueOf(retval);
-            #elseif ($returnType == "boolean")
-            Object rv = Boolean.valueOf(retval);
-            #elseif ($returnType == "byte")
-            Object rv = Byte.valueOf(retval);
-            #elseif ($returnType == "short")
-            Object rv = Short.valueOf(retval);
-            #elseif ($returnType == "char")
-            Object rv = Character.valueOf(retval);
-            #elseif ($returnType == "float")
-            Object rv = Float.valueOf(retval);
-            #elseif ($returnType == "double")
-            Object rv = Double.valueOf(retval);
             #else
-            Object rv = retval;
+            Object rv = retval;        
             #end
             #if ($operation.interceptorServiceNames.size() == 0)
             postInvoke(${operation.methodField}, argArray, rv, thrown);