svn commit: r690390 - in /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands: ActiveMQMapMessage.h ActiveMQMessageBase.h ActiveMQTextMessage.h

[tabish]

Author: tabish
Date: Fri Aug 29 14:12:19 2008
New Revision: 690390

URL: http://svn.apache.org/viewvc?rev=690390&view=rev
Log:
Code cleanup

Modified:
    
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
    
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
    
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h?rev=690390&r1=690389&r2=690390&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
 Fri Aug 29 14:12:19 2008
@@ -38,6 +38,11 @@
     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 @@
         virtual void checkMapIsUnmarshalled() const
             throw ( decaf::lang::exceptions::NullPointerException );
 
-    private:
-
-        // Map Structure to hold unmarshalled Map Data
-        mutable util::PrimitiveMap* map;
-
     };
 
 }}}}

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h?rev=690390&r1=690389&r2=690390&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
 Fri Aug 29 14:12:19 2008
@@ -43,6 +43,11 @@
     class ActiveMQMessageBase : public T,
                                 public Message,
                                 public core::ActiveMQMessage {
+    private:
+
+        core::ActiveMQAckHandler* ackHandler;
+        int redeliveryCount;
+        util::PrimitiveMap properties;
 
     public:
 
@@ -228,7 +233,7 @@
          * 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 @@
          * 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 @@
          * 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 @@
             this->setType( type );
         }
 
-    private:
-
-        core::ActiveMQAckHandler* ackHandler;
-        int redeliveryCount;
-        util::PrimitiveMap properties;
-
     };
 
 }}}}

Modified: 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h?rev=690390&r1=690389&r2=690390&view=diff
==============================================================================
--- 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
 (original)
+++ 
activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
 Fri Aug 29 14:12:19 2008
@@ -71,7 +71,7 @@
          * 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;