QPID-3941 Moved the printing of header information into it's own

function so that it can be reused by the other classes.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1336277 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 34 insertions, 29 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index d1e43447cc..9e15b08f12 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -321,7 +321,40 @@ public abstract class AbstractJMSMessage implements org.apache.qpid.jms.Message
 
     protected abstract String getMimeType();
 
+    public String toHeaderString() throws JMSException
+    {
+        StringBuffer buf = new StringBuffer();
+        buf.append("\nJMS Correlation ID: ").append(getJMSCorrelationID());
+        buf.append("\nJMS timestamp: ").append(getJMSTimestamp());
+        buf.append("\nJMS expiration: ").append(getJMSExpiration());
+        buf.append("\nJMS priority: ").append(getJMSPriority());
+        buf.append("\nJMS delivery mode: ").append(getJMSDeliveryMode());
+        buf.append("\nJMS reply to: ").append(getReplyToString());
+        buf.append("\nJMS Redelivered: ").append(_redelivered);
+        buf.append("\nJMS Destination: ").append(getJMSDestination());
+        buf.append("\nJMS Type: ").append(getJMSType());
+        buf.append("\nJMS MessageID: ").append(getJMSMessageID());
+        buf.append("\nJMS Content-Type: ").append(getContentType());
+        buf.append("\nAMQ message number: ").append(getDeliveryTag());
+
+        buf.append("\nProperties:");
+        final Enumeration propertyNames = getPropertyNames();
+        if (!propertyNames.hasMoreElements())
+        {
+            buf.append("<NONE>");
+        }
+        else
+        {
+            buf.append('\n');
+            while(propertyNames.hasMoreElements())
+            {
+                String propertyName = (String) propertyNames.nextElement();
+                buf.append("\t").append(propertyName).append(" = ").append(getObjectProperty(propertyName)).append("\n");
+            }
 
+        }
+        return buf.toString();
+    }
 
     public String toString()
     {
@@ -330,35 +363,7 @@ public abstract class AbstractJMSMessage implements org.apache.qpid.jms.Message
             StringBuffer buf = new StringBuffer("Body:\n");
             
             buf.append(toBodyString());
-            buf.append("\nJMS Correlation ID: ").append(getJMSCorrelationID());
-            buf.append("\nJMS timestamp: ").append(getJMSTimestamp());
-            buf.append("\nJMS expiration: ").append(getJMSExpiration());
-            buf.append("\nJMS priority: ").append(getJMSPriority());
-            buf.append("\nJMS delivery mode: ").append(getJMSDeliveryMode());
-            buf.append("\nJMS reply to: ").append(getReplyToString());
-            buf.append("\nJMS Redelivered: ").append(_redelivered);
-            buf.append("\nJMS Destination: ").append(getJMSDestination());
-            buf.append("\nJMS Type: ").append(getJMSType());
-            buf.append("\nJMS MessageID: ").append(getJMSMessageID());
-            buf.append("\nJMS Content-Type: ").append(getContentType());
-            buf.append("\nAMQ message number: ").append(getDeliveryTag());
-
-            buf.append("\nProperties:");
-            final Enumeration propertyNames = getPropertyNames();
-            if (!propertyNames.hasMoreElements())
-            {
-                buf.append("<NONE>");
-            }
-            else
-            {
-                buf.append('\n');
-                while(propertyNames.hasMoreElements())
-                {
-                    String propertyName = (String) propertyNames.nextElement();
-                    buf.append("\t").append(propertyName).append(" = ").append(getObjectProperty(propertyName)).append("\n");
-                }
-
-            }
+            buf.append(toHeaderString());
 
             return buf.toString();
         }