/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.activemq.transport.util;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Reader;

import org.apache.activemq.util.ByteArrayInputStream;
import org.apache.activemq.util.ByteArrayOutputStream;
import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.wireformat.WireFormat;

/**
 * Adds the extra methods available to text based wire format implementations
 * 
 * @version $Revision: 1.1 $
 */
public abstract class TextWireFormat implements WireFormat {

    public abstract Object unmarshalText(String text);    
    public abstract Object unmarshalText(Reader reader);
    public abstract String marshalText(Object command);

    public void marshal(Object command, DataOutputStream out) throws IOException {
        out.writeUTF(marshalText(command));
    }

    public Object unmarshal(DataInputStream in) throws IOException {
        String text = in.readUTF();
        return unmarshalText(text);
	}
    
	public ByteSequence marshal(Object command) throws IOException {
        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(baos);
        marshal(command, dos);
        dos.close();
        return baos.toByteSequence();
    }

    public Object unmarshal(ByteSequence packet) throws IOException {
        ByteArrayInputStream stream = new ByteArrayInputStream(packet);
        DataInputStream dis = new DataInputStream(stream);
        return unmarshal(dis);
    }

}

@@ -860,30 +860,83 @@
 io.DataInput
-Stream
+;%0Aimport java.io.DataInputStream;%0Aimport java.io.DataOutput
 ;%0Aimport jav
@@ -1009,17 +1009,16 @@
 Reader;%0A
-%0A
 import o
@@ -1619,22 +1619,16 @@
 taOutput
-Stream
  out) th
@@ -1734,22 +1734,16 @@
 ataInput
-Stream
  in) thr

Use Input/Output Stream intefaces instead of concrete classes