Merged revisions 492756 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid

........
  r492756 | kpvdr | 2007-01-04 16:30:39 -0500 (Thu, 04 Jan 2007) | 1 line
  
  Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and tidy-up in related code.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@516485 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 20 deletions

diff --git a/gentools/templ.java/MethodBodyClass.tmpl b/gentools/templ.java/MethodBodyClass.tmpl
index 11753394e7..21599956da 100644
--- a/gentools/templ.java/MethodBodyClass.tmpl
+++ b/gentools/templ.java/MethodBodyClass.tmpl
@@ -153,28 +153,16 @@ public class ${CLASS}${METHOD}Body extends AMQMethodBody implements EncodableAMQ
         return buf.toString();
     }
 
-    public static ${CLASS}${METHOD}Body createMethodBody(byte major, byte minor
+    public static AMQFrame createAMQFrame(int _channelId, byte major, byte minor
 %{FLIST}    ${mb_field_parameter_list}
                                          )
     {
-        return createMethodBody(major, minor, getClazz(major, minor), getMethod(major, minor)
-%{FLIST}    ${mb_field_passed_parameter_list}
-        );
-    }
-
-    public static ${CLASS}${METHOD}Body createMethodBody(byte major, byte minor, int clazzID, int methodID
-%{FLIST}    ${mb_field_parameter_list}
-                                         )
-    {
-        return new ${CLASS}${METHOD}Body(major, minor, clazzID, methodID
-%{FLIST}    ${mb_field_passed_parameter_list}
-        );
-    }
-
-    public ${CLASS}${METHOD}Body copy()
-    {
-        return new ${CLASS}${METHOD}Body(major, minor, getClazz(major, minor), getMethod(major, minor)
-%{FLIST}    ${mb_field_passed_parameter_list}
-        );
+        ${CLASS}${METHOD}Body body = new ${CLASS}${METHOD}Body(major, minor);
+%{FLIST}    ${mb_field_body_initialize}
+        		 
+        AMQFrame frame = new AMQFrame();
+        frame.channel = _channelId;
+        frame.bodyFrame = body;
+        return frame;
     }
 }