Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 51 insertions, 53 deletions

diff --git a/java/common/templates/model/MethodRegistryClass.vm b/java/common/templates/model/MethodRegistryClass.vm
index 8258175ce7..759e5e4a42 100644
--- a/java/common/templates/model/MethodRegistryClass.vm
+++ b/java/common/templates/model/MethodRegistryClass.vm
@@ -30,8 +30,7 @@
  
 package org.apache.qpid.framing;
 
-import java.io.DataInputStream;
-import java.io.IOException;
+import org.apache.mina.common.ByteBuffer;
 
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 
@@ -54,8 +53,8 @@ public abstract class MethodRegistry
 #end
  			
 			
-    public abstract AMQMethodBody convertToBody(DataInputStream in, long size)
-        throws AMQFrameDecodingException, IOException;
+    public abstract AMQMethodBody convertToBody(ByteBuffer in, long size)
+        throws AMQFrameDecodingException;
 
     public abstract int getMaxClassId();
 
@@ -102,4 +101,4 @@ public abstract class MethodRegistry
 
 	public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter();
 	
-}
+}
\ No newline at end of file
diff --git a/java/common/templates/model/version/MethodRegistryClass.vm b/java/common/templates/model/version/MethodRegistryClass.vm
index 79553f7748..277605e34b 100644
--- a/java/common/templates/model/version/MethodRegistryClass.vm
+++ b/java/common/templates/model/version/MethodRegistryClass.vm
@@ -35,33 +35,32 @@ import org.apache.qpid.protocol.AMQConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.DataInputStream;
-import java.io.IOException;
+import org.apache.mina.common.ByteBuffer;
 
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 
 
 public class MethodRegistry_$version.getMajor()_$version.getMinor() extends MethodRegistry
 {
-    
+	
     private static final Logger _log = LoggerFactory.getLogger(MethodRegistry.class);
 
-    private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_$version.getMajor()_$version.getMinor()();
-    
-#set( $specificModel = $model.asSingleVersionModel() )    
-    
-    
-#set( $maxClassId = $specificModel.getMaximumClassId()+1 )    
-    private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[$maxClassId][];
-
-    public MethodRegistry_$version.getMajor()_$version.getMinor()()
-    {
-        this(new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor()));
+	private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_$version.getMajor()_$version.getMinor()();
+	
+#set( $specificModel = $model.asSingleVersionModel() )	
+	
+	
+#set( $maxClassId = $specificModel.getMaximumClassId()+1 )	
+	private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[$maxClassId][];
+
+	public MethodRegistry_$version.getMajor()_$version.getMinor()()
+	{
+	    this(new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor()));
     }
-    
-    public MethodRegistry_$version.getMajor()_$version.getMinor()(ProtocolVersion pv)
-    {
-        super(pv);    
+	
+	public MethodRegistry_$version.getMajor()_$version.getMinor()(ProtocolVersion pv)
+	{
+        super(pv);	
 #foreach( $amqpClass in $specificModel.getClassList() )
 #set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
 #set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
@@ -69,30 +68,30 @@ public class MethodRegistry_$version.getMajor()_$version.getMinor() extends Meth
 
 
 
-        // Register method body instance factories for the $amqpClassNameUpperCamel class.
+		// Register method body instance factories for the $amqpClassNameUpperCamel class.
 
-#set( $maxMethodId = $amqpClass.getMaximumMethodId()+1 )        
+#set( $maxMethodId = $amqpClass.getMaximumMethodId()+1 )		
         _factories[$amqpClass.getClassId()] = new AMQMethodBodyInstanceFactory[$maxMethodId];
-        
+		
 #foreach( $amqpMethod in $amqpClass.getMethodList() )
 #set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
 #set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
 #set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
         _factories[$amqpClass.getClassId()][$amqpMethod.getMethodId()] = ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl.getFactory(); 
-#end        
-        
+#end		
+		
 #end
-        
-        
-    }
+		
+		
+	}
 
 
-    public AMQMethodBody convertToBody(DataInputStream in, long size)
-        throws AMQFrameDecodingException, IOException
+    public AMQMethodBody convertToBody(ByteBuffer in, long size)
+        throws AMQFrameDecodingException
     {
-        int classId = in.readUnsignedShort();
-        int methodId = in.readUnsignedShort();
-    
+	    int classId = in.getUnsignedShort();
+		int methodId = in.getUnsignedShort();
+	
         AMQMethodBodyInstanceFactory bodyFactory;
         try
         {
@@ -138,15 +137,15 @@ public class MethodRegistry_$version.getMajor()_$version.getMinor() extends Meth
 
 
     public int getMaxClassId()
-    {
-        return $specificModel.getMaximumClassId();
-    }
+	{
+	    return $specificModel.getMaximumClassId();
+	}
     
     public int getMaxMethodId(int classId)
-    {
-        return _factories[classId].length - 1;    
-    }
-    
+	{
+        return _factories[classId].length - 1;	
+	}
+	
 
 
 #foreach( $amqpClass in $specificModel.getClassList() )
@@ -154,12 +153,12 @@ public class MethodRegistry_$version.getMajor()_$version.getMinor() extends Meth
 #set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
 #set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
 
-        
+		
 #foreach( $amqpMethod in $amqpClass.getMethodList() )
 #set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
 #set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
 #set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
-    public ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(    
+    public ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(	
 #foreach( $field in $amqpMethod.FieldList )
 #if( $velocityCount == $amqpMethod.getFieldList().size() )
                                 final $field.NativeType $field.Name
@@ -167,9 +166,9 @@ public class MethodRegistry_$version.getMajor()_$version.getMinor() extends Meth
                                 final $field.NativeType $field.Name,
 #end
 #end                            
-                            )
+	                        )
     {
-        return new ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl(
+	    return new ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl(
 #foreach( $field in $amqpMethod.FieldList )
 #if( $velocityCount == $amqpMethod.getFieldList().size() )
                                 $field.Name
@@ -177,18 +176,18 @@ public class MethodRegistry_$version.getMajor()_$version.getMinor() extends Meth
                                 $field.Name,
 #end
 #end                            
-                            );
+		                    );
     }
     
-#end        
-        
+#end		
+		
 #end
-        
-    
+		
+	
     public ProtocolVersionMethodConverter getProtocolVersionMethodConverter()
     {
         return _protocolVersionConverter;
-    }    
+    }	
 
     
 }