From 5b9444d84aac6a8068bbdc4b638f2f06eae0cb5f Mon Sep 17 00:00:00 2001
From: "Timothy A. Bish" <tabish@apache.org>
Date: Fri, 29 Aug 2008 21:12:19 +0000
Subject: [PATCH] Code cleanup

git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk@690390 13f79535-47bb-0310-9956-ffa450edef68
---
 .../openwire/commands/ActiveMQMapMessage.h      | 10 +++++-----
 .../openwire/commands/ActiveMQMessageBase.h     | 17 ++++++++---------
 .../openwire/commands/ActiveMQTextMessage.h     |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h b/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
index 36335ed41..34c8f9def 100644
--- a/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
+++ b/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
@@ -38,6 +38,11 @@ namespace commands{
     class ActiveMQMapMessage :
         public ActiveMQMessageBase<cms::MapMessage> {
 
+    private:
+
+        // Map Structure to hold unmarshalled Map Data
+        mutable util::PrimitiveMap* map;
+
     public:
 
         const static unsigned char ID_ACTIVEMQMAPMESSAGE = 25;
@@ -336,11 +341,6 @@ namespace commands{
         virtual void checkMapIsUnmarshalled() const
             throw ( decaf::lang::exceptions::NullPointerException );
 
-    private:
-
-        // Map Structure to hold unmarshalled Map Data
-        mutable util::PrimitiveMap* map;
-
     };
 
 }}}}
diff --git a/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h b/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
index 76f595953..d35dd98f2 100644
--- a/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
+++ b/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
@@ -43,6 +43,11 @@ namespace commands{
     class ActiveMQMessageBase : public T,
                                 public Message,
                                 public core::ActiveMQMessage {
+    private:
+
+        core::ActiveMQAckHandler* ackHandler;
+        int redeliveryCount;
+        util::PrimitiveMap properties;
 
     public:
 
@@ -228,7 +233,7 @@ namespace commands{
          * Acknowledges all consumed messages of the session
          * of this consumed message.
          */
-        virtual void acknowledge(void) const throw( cms::CMSException ) {
+        virtual void acknowledge() const throw( cms::CMSException ) {
             try{
                 this->getAckHandler()->acknowledgeMessage( this );
             }
@@ -555,7 +560,7 @@ namespace commands{
          * Get the Correlation Id for this message
          * @return string representation of the correlation Id
          */
-        virtual std::string getCMSCorrelationID(void) const {
+        virtual std::string getCMSCorrelationID() const {
             return this->getCorrelationId();
         }
 
@@ -571,7 +576,7 @@ namespace commands{
          * Gets the DeliveryMode for this message
          * @return DeliveryMode enumerated value.
          */
-        virtual int getCMSDeliveryMode(void) const {
+        virtual int getCMSDeliveryMode() const {
             return this->isPersistent();
         }
 
@@ -725,12 +730,6 @@ namespace commands{
             this->setType( type );
         }
 
-    private:
-
-        core::ActiveMQAckHandler* ackHandler;
-        int redeliveryCount;
-        util::PrimitiveMap properties;
-
     };
 
 }}}}
diff --git a/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h b/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
index e1283869d..48e9e43bf 100644
--- a/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
+++ b/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
@@ -71,7 +71,7 @@ namespace commands{
          * such as its type and value of its elements.
          * @return formatted string useful for debugging.
          */
-        virtual std::string toString() const{
+        virtual std::string toString() const {
             std::ostringstream stream;
 
             stream << "Begin Class = ActiveMQTextMessage" << std::endl;