[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/tools Boxer.java,1.1.2.1,1.1.2.2

[Steve F. <sm...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv19337/src/core/com/mockobjects/tools

Modified Files:
      Tag: Nat_reworks_dynamics_from_0_09
	Boxer.java 
Log Message:
Further changes from Nat

Index: Boxer.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/tools/Attic/Boxer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Boxer.java	21 Jun 2003 14:01:08 -0000	1.1.2.1
+++ Boxer.java	26 Jun 2003 17:32:48 -0000	1.1.2.2
@@ -62,9 +62,7 @@
     } 
     
     static String typeSyntax( Class c ) {
-        if( c.isPrimitive() ) {
-            return c.toString();
-        } else if( c.isArray() ) {
+        if( c.isArray() ) {
             return typeSyntax(c.getComponentType()) + "[]";
         } else {
             return c.getName();
@@ -212,7 +210,17 @@
         Class[] originalParameterTypes = m.getParameterTypes();
         
         out.print(INDENT2);
+        
+        if( m.getReturnType() != void.class ) {
+            out.print( "return " );
+        }
+        
+        if( Modifier.isStatic(m.getModifiers()) ) {
+            out.print( m.getDeclaringClass().getName() );
+            out.print(".");
+        } else {
         out.print("super.");
+        }
         out.print(m.getName());
         out.print("(");
         
@@ -240,6 +248,9 @@
     {
         out.print(INDENT1);
         out.print("public ");
+        if( Modifier.isStatic(m.getModifiers()) ) {
+            out.print("static ");
+        }
         out.print(m.getReturnType());
         out.print(" ");
         out.print(m.getName());