activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [2/15] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: commands/ wireformat/openwire/marshal/generated/
Date Sun, 24 Mar 2013 21:30:56 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionInfo::ConnectionInfo() 
-    : BaseCommand(), connectionId(NULL), clientId(""), password(""), userName(""), brokerPath(), brokerMasterConnector(false), 
+ConnectionInfo::ConnectionInfo() :
+    BaseCommand(), connectionId(NULL), clientId(""), password(""), userName(""), brokerPath(), brokerMasterConnector(false), 
       manageable(false), clientMaster(false), faultTolerant(false), failoverReconnect(false), clientIp("") {
 
 }
@@ -50,44 +50,44 @@ ConnectionInfo::~ConnectionInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ConnectionInfo* ConnectionInfo::cloneDataStructure() const {
-    std::auto_ptr<ConnectionInfo> connectionInfo( new ConnectionInfo() );
+    std::auto_ptr<ConnectionInfo> connectionInfo(new ConnectionInfo());
 
     // Copy the data from the base class or classes
-    connectionInfo->copyDataStructure( this );
+    connectionInfo->copyDataStructure(this);
 
     return connectionInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::copyDataStructure( const DataStructure* src ) {
+void ConnectionInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConnectionInfo* srcPtr = dynamic_cast<const ConnectionInfo*>( src );
+    const ConnectionInfo* srcPtr = dynamic_cast<const ConnectionInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConnectionInfo::copyDataStructure - src is NULL or invalid" );
+            "ConnectionInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setConnectionId( srcPtr->getConnectionId() );
-    this->setClientId( srcPtr->getClientId() );
-    this->setPassword( srcPtr->getPassword() );
-    this->setUserName( srcPtr->getUserName() );
-    this->setBrokerPath( srcPtr->getBrokerPath() );
-    this->setBrokerMasterConnector( srcPtr->isBrokerMasterConnector() );
-    this->setManageable( srcPtr->isManageable() );
-    this->setClientMaster( srcPtr->isClientMaster() );
-    this->setFaultTolerant( srcPtr->isFaultTolerant() );
-    this->setFailoverReconnect( srcPtr->isFailoverReconnect() );
-    this->setClientIp( srcPtr->getClientIp() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setClientId(srcPtr->getClientId());
+    this->setPassword(srcPtr->getPassword());
+    this->setUserName(srcPtr->getUserName());
+    this->setBrokerPath(srcPtr->getBrokerPath());
+    this->setBrokerMasterConnector(srcPtr->isBrokerMasterConnector());
+    this->setManageable(srcPtr->isManageable());
+    this->setClientMaster(srcPtr->isClientMaster());
+    this->setFaultTolerant(srcPtr->isFaultTolerant());
+    this->setFailoverReconnect(srcPtr->isFailoverReconnect());
+    this->setClientIp(srcPtr->getClientIp());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -105,7 +105,7 @@ std::string ConnectionInfo::toString() c
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ConnectionId = ";
-    if( this->getConnectionId() != NULL ) {
+    if (this->getConnectionId() != NULL) {
         stream << this->getConnectionId()->toString();
     } else {
         stream << "NULL";
@@ -118,10 +118,10 @@ std::string ConnectionInfo::toString() c
     stream << "UserName = " << this->getUserName();
     stream << ", ";
     stream << "BrokerPath = ";
-    if( this->getBrokerPath().size() > 0 ) {
+    if (this->getBrokerPath().size() > 0) {
         stream << "[";
-        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+        for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) {
+            if (this->getBrokerPath()[ibrokerPath] != NULL) {
                 stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
             } else {
                 stream << "NULL" << ", ";
@@ -149,62 +149,62 @@ std::string ConnectionInfo::toString() c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionInfo::equals( const DataStructure* value ) const {
+bool ConnectionInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConnectionInfo* valuePtr = dynamic_cast<const ConnectionInfo*>( value );
+    const ConnectionInfo* valuePtr = dynamic_cast<const ConnectionInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getConnectionId() != NULL ) {
-        if( !this->getConnectionId()->equals( valuePtr->getConnectionId().get() ) ) {
+    if (this->getConnectionId() != NULL) {
+        if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) {
             return false;
         }
-    } else if( valuePtr->getConnectionId() != NULL ) {
+    } else if (valuePtr->getConnectionId() != NULL) {
         return false;
     }
-    if( this->getClientId() != valuePtr->getClientId() ) {
+    if (this->getClientId() != valuePtr->getClientId()) {
         return false;
     }
-    if( this->getPassword() != valuePtr->getPassword() ) {
+    if (this->getPassword() != valuePtr->getPassword()) {
         return false;
     }
-    if( this->getUserName() != valuePtr->getUserName() ) {
+    if (this->getUserName() != valuePtr->getUserName()) {
         return false;
     }
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            if( !this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get() ) ) {
+    for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) {
+        if (this->getBrokerPath()[ibrokerPath] != NULL ) {
+            if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) {
                 return false;
             }
-        } else if( valuePtr->getBrokerPath()[ibrokerPath] != NULL ) {
+        } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) {
             return false;
         }
     }
-    if( this->isBrokerMasterConnector() != valuePtr->isBrokerMasterConnector() ) {
+    if (this->isBrokerMasterConnector() != valuePtr->isBrokerMasterConnector()) {
         return false;
     }
-    if( this->isManageable() != valuePtr->isManageable() ) {
+    if (this->isManageable() != valuePtr->isManageable()) {
         return false;
     }
-    if( this->isClientMaster() != valuePtr->isClientMaster() ) {
+    if (this->isClientMaster() != valuePtr->isClientMaster()) {
         return false;
     }
-    if( this->isFaultTolerant() != valuePtr->isFaultTolerant() ) {
+    if (this->isFaultTolerant() != valuePtr->isFaultTolerant()) {
         return false;
     }
-    if( this->isFailoverReconnect() != valuePtr->isFailoverReconnect() ) {
+    if (this->isFailoverReconnect() != valuePtr->isFailoverReconnect()) {
         return false;
     }
-    if( this->getClientIp() != valuePtr->getClientIp() ) {
+    if (this->getClientIp() != valuePtr->getClientIp()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -221,7 +221,7 @@ decaf::lang::Pointer<ConnectionId>& Conn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId ) {
+void ConnectionInfo::setConnectionId(const decaf::lang::Pointer<ConnectionId>& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -236,7 +236,7 @@ std::string& ConnectionInfo::getClientId
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setClientId( const std::string& clientId ) {
+void ConnectionInfo::setClientId(const std::string& clientId) {
     this->clientId = clientId;
 }
 
@@ -251,7 +251,7 @@ std::string& ConnectionInfo::getPassword
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setPassword( const std::string& password ) {
+void ConnectionInfo::setPassword(const std::string& password) {
     this->password = password;
 }
 
@@ -266,7 +266,7 @@ std::string& ConnectionInfo::getUserName
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setUserName( const std::string& userName ) {
+void ConnectionInfo::setUserName(const std::string& userName) {
     this->userName = userName;
 }
 
@@ -281,7 +281,7 @@ std::vector< decaf::lang::Pointer<Broker
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setBrokerPath( const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath ) {
+void ConnectionInfo::setBrokerPath(const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath) {
     this->brokerPath = brokerPath;
 }
 
@@ -291,7 +291,7 @@ bool ConnectionInfo::isBrokerMasterConne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setBrokerMasterConnector( bool brokerMasterConnector ) {
+void ConnectionInfo::setBrokerMasterConnector(bool brokerMasterConnector) {
     this->brokerMasterConnector = brokerMasterConnector;
 }
 
@@ -301,7 +301,7 @@ bool ConnectionInfo::isManageable() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setManageable( bool manageable ) {
+void ConnectionInfo::setManageable(bool manageable) {
     this->manageable = manageable;
 }
 
@@ -311,7 +311,7 @@ bool ConnectionInfo::isClientMaster() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setClientMaster( bool clientMaster ) {
+void ConnectionInfo::setClientMaster(bool clientMaster) {
     this->clientMaster = clientMaster;
 }
 
@@ -321,7 +321,7 @@ bool ConnectionInfo::isFaultTolerant() c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setFaultTolerant( bool faultTolerant ) {
+void ConnectionInfo::setFaultTolerant(bool faultTolerant) {
     this->faultTolerant = faultTolerant;
 }
 
@@ -331,7 +331,7 @@ bool ConnectionInfo::isFailoverReconnect
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setFailoverReconnect( bool failoverReconnect ) {
+void ConnectionInfo::setFailoverReconnect(bool failoverReconnect) {
     this->failoverReconnect = failoverReconnect;
 }
 
@@ -346,20 +346,19 @@ std::string& ConnectionInfo::getClientIp
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionInfo::setClientIp( const std::string& clientIp ) {
+void ConnectionInfo::setClientIp(const std::string& clientIp) {
     this->clientIp = clientIp;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ConnectionInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processConnectionInfo( this );
+decaf::lang::Pointer<commands::Command> ConnectionInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processConnectionInfo(this);
 }
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<RemoveInfo> ConnectionInfo::createRemoveCommand() const {
-    Pointer<RemoveInfo> info( new RemoveInfo() );
-    info->setResponseRequired( this->isResponseRequired() );
-    info->setObjectId( this->getConnectionId() );
+    Pointer<RemoveInfo> info(new RemoveInfo());
+    info->setResponseRequired(this->isResponseRequired());
+    info->setObjectId(this->getConnectionId());
     return info;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h Sun Mar 24 21:30:52 2013
@@ -32,8 +32,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -67,8 +67,8 @@ namespace commands{
 
     private:
 
-        ConnectionInfo( const ConnectionInfo& );
-        ConnectionInfo& operator= ( const ConnectionInfo& );
+        ConnectionInfo(const ConnectionInfo&);
+        ConnectionInfo& operator= (const ConnectionInfo&);
 
     public:
 
@@ -80,11 +80,11 @@ namespace commands{
 
         virtual ConnectionInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         Pointer<RemoveInfo> createRemoveCommand() const;
 
@@ -134,7 +134,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConsumerControl::ConsumerControl() 
-    : BaseCommand(), destination(NULL), close(false), consumerId(NULL), prefetch(0), flush(false), start(false), stop(false) {
+ConsumerControl::ConsumerControl() :
+    BaseCommand(), destination(NULL), close(false), consumerId(NULL), prefetch(0), flush(false), start(false), stop(false) {
 
 }
 
@@ -49,40 +49,40 @@ ConsumerControl::~ConsumerControl() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ConsumerControl* ConsumerControl::cloneDataStructure() const {
-    std::auto_ptr<ConsumerControl> consumerControl( new ConsumerControl() );
+    std::auto_ptr<ConsumerControl> consumerControl(new ConsumerControl());
 
     // Copy the data from the base class or classes
-    consumerControl->copyDataStructure( this );
+    consumerControl->copyDataStructure(this);
 
     return consumerControl.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::copyDataStructure( const DataStructure* src ) {
+void ConsumerControl::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConsumerControl* srcPtr = dynamic_cast<const ConsumerControl*>( src );
+    const ConsumerControl* srcPtr = dynamic_cast<const ConsumerControl*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConsumerControl::copyDataStructure - src is NULL or invalid" );
+            "ConsumerControl::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setDestination( srcPtr->getDestination() );
-    this->setClose( srcPtr->isClose() );
-    this->setConsumerId( srcPtr->getConsumerId() );
-    this->setPrefetch( srcPtr->getPrefetch() );
-    this->setFlush( srcPtr->isFlush() );
-    this->setStart( srcPtr->isStart() );
-    this->setStop( srcPtr->isStop() );
+    this->setDestination(srcPtr->getDestination());
+    this->setClose(srcPtr->isClose());
+    this->setConsumerId(srcPtr->getConsumerId());
+    this->setPrefetch(srcPtr->getPrefetch());
+    this->setFlush(srcPtr->isFlush());
+    this->setStart(srcPtr->isStart());
+    this->setStop(srcPtr->isStop());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ std::string ConsumerControl::toString() 
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "Destination = ";
-    if( this->getDestination() != NULL ) {
+    if (this->getDestination() != NULL) {
         stream << this->getDestination()->toString();
     } else {
         stream << "NULL";
@@ -109,7 +109,7 @@ std::string ConsumerControl::toString() 
     stream << "Close = " << this->isClose();
     stream << ", ";
     stream << "ConsumerId = ";
-    if( this->getConsumerId() != NULL ) {
+    if (this->getConsumerId() != NULL) {
         stream << this->getConsumerId()->toString();
     } else {
         stream << "NULL";
@@ -128,48 +128,48 @@ std::string ConsumerControl::toString() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConsumerControl::equals( const DataStructure* value ) const {
+bool ConsumerControl::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConsumerControl* valuePtr = dynamic_cast<const ConsumerControl*>( value );
+    const ConsumerControl* valuePtr = dynamic_cast<const ConsumerControl*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getDestination() != NULL ) {
-        if( !this->getDestination()->equals( valuePtr->getDestination().get() ) ) {
+    if (this->getDestination() != NULL) {
+        if (!this->getDestination()->equals( valuePtr->getDestination().get())) {
             return false;
         }
-    } else if( valuePtr->getDestination() != NULL ) {
+    } else if (valuePtr->getDestination() != NULL) {
         return false;
     }
-    if( this->isClose() != valuePtr->isClose() ) {
+    if (this->isClose() != valuePtr->isClose()) {
         return false;
     }
-    if( this->getConsumerId() != NULL ) {
-        if( !this->getConsumerId()->equals( valuePtr->getConsumerId().get() ) ) {
+    if (this->getConsumerId() != NULL) {
+        if (!this->getConsumerId()->equals( valuePtr->getConsumerId().get())) {
             return false;
         }
-    } else if( valuePtr->getConsumerId() != NULL ) {
+    } else if (valuePtr->getConsumerId() != NULL) {
         return false;
     }
-    if( this->getPrefetch() != valuePtr->getPrefetch() ) {
+    if (this->getPrefetch() != valuePtr->getPrefetch()) {
         return false;
     }
-    if( this->isFlush() != valuePtr->isFlush() ) {
+    if (this->isFlush() != valuePtr->isFlush()) {
         return false;
     }
-    if( this->isStart() != valuePtr->isStart() ) {
+    if (this->isStart() != valuePtr->isStart()) {
         return false;
     }
-    if( this->isStop() != valuePtr->isStop() ) {
+    if (this->isStop() != valuePtr->isStop()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -186,7 +186,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination ) {
+void ConsumerControl::setDestination(const decaf::lang::Pointer<ActiveMQDestination>& destination) {
     this->destination = destination;
 }
 
@@ -196,7 +196,7 @@ bool ConsumerControl::isClose() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setClose( bool close ) {
+void ConsumerControl::setClose(bool close) {
     this->close = close;
 }
 
@@ -211,7 +211,7 @@ decaf::lang::Pointer<ConsumerId>& Consum
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId ) {
+void ConsumerControl::setConsumerId(const decaf::lang::Pointer<ConsumerId>& consumerId) {
     this->consumerId = consumerId;
 }
 
@@ -221,7 +221,7 @@ int ConsumerControl::getPrefetch() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setPrefetch( int prefetch ) {
+void ConsumerControl::setPrefetch(int prefetch) {
     this->prefetch = prefetch;
 }
 
@@ -231,7 +231,7 @@ bool ConsumerControl::isFlush() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setFlush( bool flush ) {
+void ConsumerControl::setFlush(bool flush) {
     this->flush = flush;
 }
 
@@ -241,7 +241,7 @@ bool ConsumerControl::isStart() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setStart( bool start ) {
+void ConsumerControl::setStart(bool start) {
     this->start = start;
 }
 
@@ -251,12 +251,11 @@ bool ConsumerControl::isStop() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerControl::setStop( bool stop ) {
+void ConsumerControl::setStop(bool stop) {
     this->stop = stop;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ConsumerControl::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processConsumerControl( this );
+decaf::lang::Pointer<commands::Command> ConsumerControl::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processConsumerControl(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.h Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -62,8 +62,8 @@ namespace commands{
 
     private:
 
-        ConsumerControl( const ConsumerControl& );
-        ConsumerControl& operator= ( const ConsumerControl& );
+        ConsumerControl(const ConsumerControl&);
+        ConsumerControl& operator= (const ConsumerControl&);
 
     public:
 
@@ -75,11 +75,11 @@ namespace commands{
 
         virtual ConsumerControl* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const Pointer<ActiveMQDestination>& getDestination() const;
         virtual Pointer<ActiveMQDestination>& getDestination();
@@ -111,7 +111,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp Sun Mar 24 21:30:52 2013
@@ -18,8 +18,9 @@
 #include <activemq/commands/ConsumerId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 #include <sstream>
 
 using namespace std;
@@ -28,6 +29,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -40,25 +42,25 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConsumerId::ConsumerId()
-    : BaseDataStructure(), connectionId(""), sessionId(0), value(0), parentId() {
+ConsumerId::ConsumerId() :
+    BaseDataStructure(), connectionId(""), sessionId(0), value(0), parentId() {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConsumerId::ConsumerId( const ConsumerId& other )
-    : BaseDataStructure(), connectionId(""), sessionId(0), value(0), parentId() {
+ConsumerId::ConsumerId(const ConsumerId& other) :
+    BaseDataStructure(), connectionId(""), sessionId(0), value(0), parentId() {
 
-    this->copyDataStructure( &other );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConsumerId::ConsumerId( const SessionId& sessionId, long long consumerIdd )
-    : BaseDataStructure(), connectionId(""), sessionId(0), value(0), parentId() {
+ConsumerId::ConsumerId(const SessionId& sessionId, long long consumerId) :
+    BaseDataStructure(), connectionId(""), sessionId(0), value(0), parentId() {
 
     this->connectionId = sessionId.getConnectionId();
     this->sessionId = sessionId.getValue();
-    this->value = consumerIdd;
+    this->value = consumerId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -67,36 +69,36 @@ ConsumerId::~ConsumerId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ConsumerId* ConsumerId::cloneDataStructure() const {
-    std::auto_ptr<ConsumerId> consumerId( new ConsumerId() );
+    std::auto_ptr<ConsumerId> consumerId(new ConsumerId());
 
     // Copy the data from the base class or classes
-    consumerId->copyDataStructure( this );
+    consumerId->copyDataStructure(this);
 
     return consumerId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerId::copyDataStructure( const DataStructure* src ) {
+void ConsumerId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConsumerId* srcPtr = dynamic_cast<const ConsumerId*>( src );
+    const ConsumerId* srcPtr = dynamic_cast<const ConsumerId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConsumerId::copyDataStructure - src is NULL or invalid" );
+            "ConsumerId::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setConnectionId( srcPtr->getConnectionId() );
-    this->setSessionId( srcPtr->getSessionId() );
-    this->setValue( srcPtr->getValue() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setSessionId(srcPtr->getSessionId());
+    this->setValue(srcPtr->getValue());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -117,28 +119,28 @@ std::string ConsumerId::toString() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConsumerId::equals( const DataStructure* value ) const {
+bool ConsumerId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConsumerId* valuePtr = dynamic_cast<const ConsumerId*>( value );
+    const ConsumerId* valuePtr = dynamic_cast<const ConsumerId*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getConnectionId() != valuePtr->getConnectionId() ) {
+    if (this->getConnectionId() != valuePtr->getConnectionId()) {
         return false;
     }
-    if( this->getSessionId() != valuePtr->getSessionId() ) {
+    if (this->getSessionId() != valuePtr->getSessionId()) {
         return false;
     }
-    if( this->getValue() != valuePtr->getValue() ) {
+    if (this->getValue() != valuePtr->getValue()) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -155,7 +157,7 @@ std::string& ConsumerId::getConnectionId
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerId::setConnectionId( const std::string& connectionId ) {
+void ConsumerId::setConnectionId(const std::string& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -165,7 +167,7 @@ long long ConsumerId::getSessionId() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerId::setSessionId( long long sessionId ) {
+void ConsumerId::setSessionId(long long sessionId) {
     this->sessionId = sessionId;
 }
 
@@ -175,31 +177,31 @@ long long ConsumerId::getValue() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerId::setValue( long long value ) {
+void ConsumerId::setValue(long long value) {
     this->value = value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int ConsumerId::compareTo( const ConsumerId& value ) const {
+int ConsumerId::compareTo(const ConsumerId& value) const {
 
-    if( this == &value ) {
+    if (this == &value) {
         return 0;
     }
 
-    int connectionIdComp = apr_strnatcasecmp( this->connectionId.c_str(), value.connectionId.c_str() );
-    if( connectionIdComp != 0 ) {
+    int connectionIdComp = StringUtils::compareIgnoreCase(this->connectionId.c_str(), value.connectionId.c_str());
+    if (connectionIdComp != 0) {
         return connectionIdComp;
     }
 
-    if( this->sessionId > value.sessionId ) {
+    if (this->sessionId > value.sessionId) {
         return 1;
-    } else if( this->sessionId < value.sessionId ) {
+    } else if(this->sessionId < value.sessionId) {
         return -1;
     }
 
-    if( this->value > value.value ) {
+    if (this->value > value.value) {
         return 1;
-    } else if( this->value < value.value ) {
+    } else if(this->value < value.value) {
         return -1;
     }
 
@@ -207,30 +209,35 @@ int ConsumerId::compareTo( const Consume
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConsumerId::equals( const ConsumerId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool ConsumerId::equals(const ConsumerId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConsumerId::operator==( const ConsumerId& value ) const {
-    return this->compareTo( value ) == 0;
+bool ConsumerId::operator==(const ConsumerId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConsumerId::operator<( const ConsumerId& value ) const {
-    return this->compareTo( value ) < 0;
+bool ConsumerId::operator<(const ConsumerId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConsumerId& ConsumerId::operator= ( const ConsumerId& other ) {
-    this->copyDataStructure( &other );
+ConsumerId& ConsumerId::operator= (const ConsumerId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+int ConsumerId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 const Pointer<SessionId>& ConsumerId::getParentId() const {
-    if( this->parentId == NULL ) {
-        this->parentId.reset( new SessionId( this ) );
+    if (this->parentId == NULL) {
+        this->parentId.reset(new SessionId(this));
     }
     return this->parentId;
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.h Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -66,9 +66,9 @@ namespace commands{
 
         ConsumerId();
 
-        ConsumerId( const ConsumerId& other );
+        ConsumerId(const ConsumerId& other);
 
-        ConsumerId( const SessionId& sessionId, long long consumerIdd );
+        ConsumerId(const SessionId& sessionId, long long consumerIdd);
 
         virtual ~ConsumerId();
 
@@ -76,11 +76,11 @@ namespace commands{
 
         virtual ConsumerId* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         const Pointer<SessionId>& getParentId() const;
 
@@ -94,15 +94,17 @@ namespace commands{
         virtual long long getValue() const;
         virtual void setValue( long long value );
 
-        virtual int compareTo( const ConsumerId& value ) const;
+        virtual int compareTo(const ConsumerId& value) const;
 
-        virtual bool equals( const ConsumerId& value ) const;
+        virtual bool equals(const ConsumerId& value) const;
 
-        virtual bool operator==( const ConsumerId& value ) const;
+        virtual bool operator==(const ConsumerId& value) const;
 
-        virtual bool operator<( const ConsumerId& value ) const;
+        virtual bool operator<(const ConsumerId& value) const;
 
-        ConsumerId& operator= ( const ConsumerId& other );
+        ConsumerId& operator= (const ConsumerId& other);
+
+        int getHashCode() const;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,10 +38,10 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConsumerInfo::ConsumerInfo()
-    : BaseCommand(), consumerId(NULL), browser(false), destination(NULL), prefetchSize(0), maximumPendingMessageLimit(0), dispatchAsync(false),
-      selector(""), subscriptionName(""), noLocal(false), exclusive(false), retroactive(false), priority(0), brokerPath(),
-      additionalPredicate(NULL), networkSubscription(false), optimizedAcknowledge(false), noRangeAcks(false), networkConsumerPath(), currentPrefetchSize(0) {
+ConsumerInfo::ConsumerInfo() :
+    BaseCommand(), consumerId(NULL), browser(false), destination(NULL), prefetchSize(0), maximumPendingMessageLimit(0), dispatchAsync(false), 
+      selector(""), subscriptionName(""), noLocal(false), exclusive(false), retroactive(false), priority(0), brokerPath(), 
+      additionalPredicate(NULL), networkSubscription(false), optimizedAcknowledge(false), noRangeAcks(false), networkConsumerPath() {
 
 }
 
@@ -51,51 +51,51 @@ ConsumerInfo::~ConsumerInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ConsumerInfo* ConsumerInfo::cloneDataStructure() const {
-    std::auto_ptr<ConsumerInfo> consumerInfo( new ConsumerInfo() );
+    std::auto_ptr<ConsumerInfo> consumerInfo(new ConsumerInfo());
 
     // Copy the data from the base class or classes
-    consumerInfo->copyDataStructure( this );
+    consumerInfo->copyDataStructure(this);
 
     return consumerInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::copyDataStructure( const DataStructure* src ) {
+void ConsumerInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConsumerInfo* srcPtr = dynamic_cast<const ConsumerInfo*>( src );
+    const ConsumerInfo* srcPtr = dynamic_cast<const ConsumerInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConsumerInfo::copyDataStructure - src is NULL or invalid" );
+            "ConsumerInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setConsumerId( srcPtr->getConsumerId() );
-    this->setBrowser( srcPtr->isBrowser() );
-    this->setDestination( srcPtr->getDestination() );
-    this->setPrefetchSize( srcPtr->getPrefetchSize() );
-    this->setMaximumPendingMessageLimit( srcPtr->getMaximumPendingMessageLimit() );
-    this->setDispatchAsync( srcPtr->isDispatchAsync() );
-    this->setSelector( srcPtr->getSelector() );
-    this->setSubscriptionName( srcPtr->getSubscriptionName() );
-    this->setNoLocal( srcPtr->isNoLocal() );
-    this->setExclusive( srcPtr->isExclusive() );
-    this->setRetroactive( srcPtr->isRetroactive() );
-    this->setPriority( srcPtr->getPriority() );
-    this->setBrokerPath( srcPtr->getBrokerPath() );
-    this->setAdditionalPredicate( srcPtr->getAdditionalPredicate() );
-    this->setNetworkSubscription( srcPtr->isNetworkSubscription() );
-    this->setOptimizedAcknowledge( srcPtr->isOptimizedAcknowledge() );
-    this->setNoRangeAcks( srcPtr->isNoRangeAcks() );
-    this->setNetworkConsumerPath( srcPtr->getNetworkConsumerPath() );
+    this->setConsumerId(srcPtr->getConsumerId());
+    this->setBrowser(srcPtr->isBrowser());
+    this->setDestination(srcPtr->getDestination());
+    this->setPrefetchSize(srcPtr->getPrefetchSize());
+    this->setMaximumPendingMessageLimit(srcPtr->getMaximumPendingMessageLimit());
+    this->setDispatchAsync(srcPtr->isDispatchAsync());
+    this->setSelector(srcPtr->getSelector());
+    this->setSubscriptionName(srcPtr->getSubscriptionName());
+    this->setNoLocal(srcPtr->isNoLocal());
+    this->setExclusive(srcPtr->isExclusive());
+    this->setRetroactive(srcPtr->isRetroactive());
+    this->setPriority(srcPtr->getPriority());
+    this->setBrokerPath(srcPtr->getBrokerPath());
+    this->setAdditionalPredicate(srcPtr->getAdditionalPredicate());
+    this->setNetworkSubscription(srcPtr->isNetworkSubscription());
+    this->setOptimizedAcknowledge(srcPtr->isOptimizedAcknowledge());
+    this->setNoRangeAcks(srcPtr->isNoRangeAcks());
+    this->setNetworkConsumerPath(srcPtr->getNetworkConsumerPath());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@ std::string ConsumerInfo::toString() con
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ConsumerId = ";
-    if( this->getConsumerId() != NULL ) {
+    if (this->getConsumerId() != NULL) {
         stream << this->getConsumerId()->toString();
     } else {
         stream << "NULL";
@@ -122,7 +122,7 @@ std::string ConsumerInfo::toString() con
     stream << "Browser = " << this->isBrowser();
     stream << ", ";
     stream << "Destination = ";
-    if( this->getDestination() != NULL ) {
+    if (this->getDestination() != NULL) {
         stream << this->getDestination()->toString();
     } else {
         stream << "NULL";
@@ -147,10 +147,10 @@ std::string ConsumerInfo::toString() con
     stream << "Priority = " << (int)this->getPriority();
     stream << ", ";
     stream << "BrokerPath = ";
-    if( this->getBrokerPath().size() > 0 ) {
+    if (this->getBrokerPath().size() > 0) {
         stream << "[";
-        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+        for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) {
+            if (this->getBrokerPath()[ibrokerPath] != NULL) {
                 stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
             } else {
                 stream << "NULL" << ", ";
@@ -162,7 +162,7 @@ std::string ConsumerInfo::toString() con
     }
     stream << ", ";
     stream << "AdditionalPredicate = ";
-    if( this->getAdditionalPredicate() != NULL ) {
+    if (this->getAdditionalPredicate() != NULL) {
         stream << this->getAdditionalPredicate()->toString();
     } else {
         stream << "NULL";
@@ -175,10 +175,10 @@ std::string ConsumerInfo::toString() con
     stream << "NoRangeAcks = " << this->isNoRangeAcks();
     stream << ", ";
     stream << "NetworkConsumerPath = ";
-    if( this->getNetworkConsumerPath().size() > 0 ) {
+    if (this->getNetworkConsumerPath().size() > 0) {
         stream << "[";
-        for( size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath ) {
-            if( this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+        for (size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath) {
+            if (this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL) {
                 stream << this->getNetworkConsumerPath()[inetworkConsumerPath]->toString() << ", ";
             } else {
                 stream << "NULL" << ", ";
@@ -194,97 +194,97 @@ std::string ConsumerInfo::toString() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConsumerInfo::equals( const DataStructure* value ) const {
+bool ConsumerInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConsumerInfo* valuePtr = dynamic_cast<const ConsumerInfo*>( value );
+    const ConsumerInfo* valuePtr = dynamic_cast<const ConsumerInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getConsumerId() != NULL ) {
-        if( !this->getConsumerId()->equals( valuePtr->getConsumerId().get() ) ) {
+    if (this->getConsumerId() != NULL) {
+        if (!this->getConsumerId()->equals( valuePtr->getConsumerId().get())) {
             return false;
         }
-    } else if( valuePtr->getConsumerId() != NULL ) {
+    } else if (valuePtr->getConsumerId() != NULL) {
         return false;
     }
-    if( this->isBrowser() != valuePtr->isBrowser() ) {
+    if (this->isBrowser() != valuePtr->isBrowser()) {
         return false;
     }
-    if( this->getDestination() != NULL ) {
-        if( !this->getDestination()->equals( valuePtr->getDestination().get() ) ) {
+    if (this->getDestination() != NULL) {
+        if (!this->getDestination()->equals( valuePtr->getDestination().get())) {
             return false;
         }
-    } else if( valuePtr->getDestination() != NULL ) {
+    } else if (valuePtr->getDestination() != NULL) {
         return false;
     }
-    if( this->getPrefetchSize() != valuePtr->getPrefetchSize() ) {
+    if (this->getPrefetchSize() != valuePtr->getPrefetchSize()) {
         return false;
     }
-    if( this->getMaximumPendingMessageLimit() != valuePtr->getMaximumPendingMessageLimit() ) {
+    if (this->getMaximumPendingMessageLimit() != valuePtr->getMaximumPendingMessageLimit()) {
         return false;
     }
-    if( this->isDispatchAsync() != valuePtr->isDispatchAsync() ) {
+    if (this->isDispatchAsync() != valuePtr->isDispatchAsync()) {
         return false;
     }
-    if( this->getSelector() != valuePtr->getSelector() ) {
+    if (this->getSelector() != valuePtr->getSelector()) {
         return false;
     }
-    if( this->getSubscriptionName() != valuePtr->getSubscriptionName() ) {
+    if (this->getSubscriptionName() != valuePtr->getSubscriptionName()) {
         return false;
     }
-    if( this->isNoLocal() != valuePtr->isNoLocal() ) {
+    if (this->isNoLocal() != valuePtr->isNoLocal()) {
         return false;
     }
-    if( this->isExclusive() != valuePtr->isExclusive() ) {
+    if (this->isExclusive() != valuePtr->isExclusive()) {
         return false;
     }
-    if( this->isRetroactive() != valuePtr->isRetroactive() ) {
+    if (this->isRetroactive() != valuePtr->isRetroactive()) {
         return false;
     }
-    if( this->getPriority() != valuePtr->getPriority() ) {
+    if (this->getPriority() != valuePtr->getPriority()) {
         return false;
     }
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            if( !this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get() ) ) {
+    for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) {
+        if (this->getBrokerPath()[ibrokerPath] != NULL ) {
+            if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) {
                 return false;
             }
-        } else if( valuePtr->getBrokerPath()[ibrokerPath] != NULL ) {
+        } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) {
             return false;
         }
     }
-    if( this->getAdditionalPredicate() != NULL ) {
-        if( !this->getAdditionalPredicate()->equals( valuePtr->getAdditionalPredicate().get() ) ) {
+    if (this->getAdditionalPredicate() != NULL) {
+        if (!this->getAdditionalPredicate()->equals( valuePtr->getAdditionalPredicate().get())) {
             return false;
         }
-    } else if( valuePtr->getAdditionalPredicate() != NULL ) {
+    } else if (valuePtr->getAdditionalPredicate() != NULL) {
         return false;
     }
-    if( this->isNetworkSubscription() != valuePtr->isNetworkSubscription() ) {
+    if (this->isNetworkSubscription() != valuePtr->isNetworkSubscription()) {
         return false;
     }
-    if( this->isOptimizedAcknowledge() != valuePtr->isOptimizedAcknowledge() ) {
+    if (this->isOptimizedAcknowledge() != valuePtr->isOptimizedAcknowledge()) {
         return false;
     }
-    if( this->isNoRangeAcks() != valuePtr->isNoRangeAcks() ) {
+    if (this->isNoRangeAcks() != valuePtr->isNoRangeAcks()) {
         return false;
     }
-    for( size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath ) {
-        if( this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
-            if( !this->getNetworkConsumerPath()[inetworkConsumerPath]->equals( valuePtr->getNetworkConsumerPath()[inetworkConsumerPath].get() ) ) {
+    for (size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath) {
+        if (this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+            if (!this->getNetworkConsumerPath()[inetworkConsumerPath]->equals( valuePtr->getNetworkConsumerPath()[inetworkConsumerPath].get())) {
                 return false;
             }
-        } else if( valuePtr->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) {
+        } else if (valuePtr->getNetworkConsumerPath()[inetworkConsumerPath] != NULL) {
             return false;
         }
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -301,7 +301,7 @@ decaf::lang::Pointer<ConsumerId>& Consum
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId ) {
+void ConsumerInfo::setConsumerId(const decaf::lang::Pointer<ConsumerId>& consumerId) {
     this->consumerId = consumerId;
 }
 
@@ -311,7 +311,7 @@ bool ConsumerInfo::isBrowser() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setBrowser( bool browser ) {
+void ConsumerInfo::setBrowser(bool browser) {
     this->browser = browser;
 }
 
@@ -326,7 +326,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination ) {
+void ConsumerInfo::setDestination(const decaf::lang::Pointer<ActiveMQDestination>& destination) {
     this->destination = destination;
 }
 
@@ -336,7 +336,7 @@ int ConsumerInfo::getPrefetchSize() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setPrefetchSize( int prefetchSize ) {
+void ConsumerInfo::setPrefetchSize(int prefetchSize) {
     this->prefetchSize = prefetchSize;
 }
 
@@ -346,7 +346,7 @@ int ConsumerInfo::getMaximumPendingMessa
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setMaximumPendingMessageLimit( int maximumPendingMessageLimit ) {
+void ConsumerInfo::setMaximumPendingMessageLimit(int maximumPendingMessageLimit) {
     this->maximumPendingMessageLimit = maximumPendingMessageLimit;
 }
 
@@ -356,7 +356,7 @@ bool ConsumerInfo::isDispatchAsync() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setDispatchAsync( bool dispatchAsync ) {
+void ConsumerInfo::setDispatchAsync(bool dispatchAsync) {
     this->dispatchAsync = dispatchAsync;
 }
 
@@ -371,7 +371,7 @@ std::string& ConsumerInfo::getSelector()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setSelector( const std::string& selector ) {
+void ConsumerInfo::setSelector(const std::string& selector) {
     this->selector = selector;
 }
 
@@ -386,7 +386,7 @@ std::string& ConsumerInfo::getSubscripti
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setSubscriptionName( const std::string& subscriptionName ) {
+void ConsumerInfo::setSubscriptionName(const std::string& subscriptionName) {
     this->subscriptionName = subscriptionName;
 }
 
@@ -396,7 +396,7 @@ bool ConsumerInfo::isNoLocal() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setNoLocal( bool noLocal ) {
+void ConsumerInfo::setNoLocal(bool noLocal) {
     this->noLocal = noLocal;
 }
 
@@ -406,7 +406,7 @@ bool ConsumerInfo::isExclusive() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setExclusive( bool exclusive ) {
+void ConsumerInfo::setExclusive(bool exclusive) {
     this->exclusive = exclusive;
 }
 
@@ -416,7 +416,7 @@ bool ConsumerInfo::isRetroactive() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setRetroactive( bool retroactive ) {
+void ConsumerInfo::setRetroactive(bool retroactive) {
     this->retroactive = retroactive;
 }
 
@@ -426,7 +426,7 @@ unsigned char ConsumerInfo::getPriority(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setPriority( unsigned char priority ) {
+void ConsumerInfo::setPriority(unsigned char priority) {
     this->priority = priority;
 }
 
@@ -441,7 +441,7 @@ std::vector< decaf::lang::Pointer<Broker
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setBrokerPath( const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath ) {
+void ConsumerInfo::setBrokerPath(const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath) {
     this->brokerPath = brokerPath;
 }
 
@@ -456,7 +456,7 @@ decaf::lang::Pointer<BooleanExpression>&
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setAdditionalPredicate( const decaf::lang::Pointer<BooleanExpression>& additionalPredicate ) {
+void ConsumerInfo::setAdditionalPredicate(const decaf::lang::Pointer<BooleanExpression>& additionalPredicate) {
     this->additionalPredicate = additionalPredicate;
 }
 
@@ -466,7 +466,7 @@ bool ConsumerInfo::isNetworkSubscription
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setNetworkSubscription( bool networkSubscription ) {
+void ConsumerInfo::setNetworkSubscription(bool networkSubscription) {
     this->networkSubscription = networkSubscription;
 }
 
@@ -476,7 +476,7 @@ bool ConsumerInfo::isOptimizedAcknowledg
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setOptimizedAcknowledge( bool optimizedAcknowledge ) {
+void ConsumerInfo::setOptimizedAcknowledge(bool optimizedAcknowledge) {
     this->optimizedAcknowledge = optimizedAcknowledge;
 }
 
@@ -486,7 +486,7 @@ bool ConsumerInfo::isNoRangeAcks() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setNoRangeAcks( bool noRangeAcks ) {
+void ConsumerInfo::setNoRangeAcks(bool noRangeAcks) {
     this->noRangeAcks = noRangeAcks;
 }
 
@@ -501,20 +501,19 @@ std::vector< decaf::lang::Pointer<Consum
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConsumerInfo::setNetworkConsumerPath( const std::vector< decaf::lang::Pointer<ConsumerId> >& networkConsumerPath ) {
+void ConsumerInfo::setNetworkConsumerPath(const std::vector< decaf::lang::Pointer<ConsumerId> >& networkConsumerPath) {
     this->networkConsumerPath = networkConsumerPath;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ConsumerInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processConsumerInfo( this );
+decaf::lang::Pointer<commands::Command> ConsumerInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processConsumerInfo(this);
 }
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<RemoveInfo> ConsumerInfo::createRemoveCommand() const {
-    Pointer<RemoveInfo> info( new RemoveInfo() );
-    info->setResponseRequired( this->isResponseRequired() );
-    info->setObjectId( this->getConsumerId() );
+    Pointer<RemoveInfo> info(new RemoveInfo());
+    info->setResponseRequired(this->isResponseRequired());
+    info->setObjectId(this->getConsumerId());
     return info;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h Sun Mar 24 21:30:52 2013
@@ -34,8 +34,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -81,8 +81,8 @@ namespace commands{
 
     private:
 
-        ConsumerInfo( const ConsumerInfo& );
-        ConsumerInfo& operator= ( const ConsumerInfo& );
+        ConsumerInfo(const ConsumerInfo&);
+        ConsumerInfo& operator= (const ConsumerInfo&);
 
     public:
 
@@ -94,11 +94,11 @@ namespace commands{
 
         virtual ConsumerInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         Pointer<RemoveInfo> createRemoveCommand() const;
 
@@ -178,7 +178,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ControlCommand::ControlCommand() 
-    : BaseCommand(), command("") {
+ControlCommand::ControlCommand() :
+    BaseCommand(), command("") {
 
 }
 
@@ -49,34 +49,34 @@ ControlCommand::~ControlCommand() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ControlCommand* ControlCommand::cloneDataStructure() const {
-    std::auto_ptr<ControlCommand> controlCommand( new ControlCommand() );
+    std::auto_ptr<ControlCommand> controlCommand(new ControlCommand());
 
     // Copy the data from the base class or classes
-    controlCommand->copyDataStructure( this );
+    controlCommand->copyDataStructure(this);
 
     return controlCommand.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ControlCommand::copyDataStructure( const DataStructure* src ) {
+void ControlCommand::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ControlCommand* srcPtr = dynamic_cast<const ControlCommand*>( src );
+    const ControlCommand* srcPtr = dynamic_cast<const ControlCommand*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ControlCommand::copyDataStructure - src is NULL or invalid" );
+            "ControlCommand::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setCommand( srcPtr->getCommand() );
+    this->setCommand(srcPtr->getCommand());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -100,22 +100,22 @@ std::string ControlCommand::toString() c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ControlCommand::equals( const DataStructure* value ) const {
+bool ControlCommand::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ControlCommand* valuePtr = dynamic_cast<const ControlCommand*>( value );
+    const ControlCommand* valuePtr = dynamic_cast<const ControlCommand*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getCommand() != valuePtr->getCommand() ) {
+    if (this->getCommand() != valuePtr->getCommand()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -132,12 +132,11 @@ std::string& ControlCommand::getCommand(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ControlCommand::setCommand( const std::string& command ) {
+void ControlCommand::setCommand(const std::string& command) {
     this->command = command;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ControlCommand::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processControlCommand( this );
+decaf::lang::Pointer<commands::Command> ControlCommand::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processControlCommand(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.h Sun Mar 24 21:30:52 2013
@@ -29,8 +29,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -54,8 +54,8 @@ namespace commands{
 
     private:
 
-        ControlCommand( const ControlCommand& );
-        ControlCommand& operator= ( const ControlCommand& );
+        ControlCommand(const ControlCommand&);
+        ControlCommand& operator= (const ControlCommand&);
 
     public:
 
@@ -67,11 +67,11 @@ namespace commands{
 
         virtual ControlCommand* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const std::string& getCommand() const;
         virtual std::string& getCommand();
@@ -84,7 +84,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-DataArrayResponse::DataArrayResponse() 
-    : Response(), data() {
+DataArrayResponse::DataArrayResponse() :
+    Response(), data() {
 
 }
 
@@ -49,34 +49,34 @@ DataArrayResponse::~DataArrayResponse() 
 
 ////////////////////////////////////////////////////////////////////////////////
 DataArrayResponse* DataArrayResponse::cloneDataStructure() const {
-    std::auto_ptr<DataArrayResponse> dataArrayResponse( new DataArrayResponse() );
+    std::auto_ptr<DataArrayResponse> dataArrayResponse(new DataArrayResponse());
 
     // Copy the data from the base class or classes
-    dataArrayResponse->copyDataStructure( this );
+    dataArrayResponse->copyDataStructure(this);
 
     return dataArrayResponse.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DataArrayResponse::copyDataStructure( const DataStructure* src ) {
+void DataArrayResponse::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const DataArrayResponse* srcPtr = dynamic_cast<const DataArrayResponse*>( src );
+    const DataArrayResponse* srcPtr = dynamic_cast<const DataArrayResponse*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "DataArrayResponse::copyDataStructure - src is NULL or invalid" );
+            "DataArrayResponse::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    Response::copyDataStructure( src );
+    Response::copyDataStructure(src);
 
-    this->setData( srcPtr->getData() );
+    this->setData(srcPtr->getData());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -91,10 +91,10 @@ std::string DataArrayResponse::toString(
 
     stream << "DataArrayResponse { ";
     stream << "Data = ";
-    if( this->getData().size() > 0 ) {
+    if (this->getData().size() > 0) {
         stream << "[";
-        for( size_t idata = 0; idata < this->getData().size(); ++idata ) {
-            if( this->getData()[idata] != NULL ) {
+        for (size_t idata = 0; idata < this->getData().size(); ++idata) {
+            if (this->getData()[idata] != NULL) {
                 stream << this->getData()[idata]->toString() << ", ";
             } else {
                 stream << "NULL" << ", ";
@@ -110,28 +110,28 @@ std::string DataArrayResponse::toString(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool DataArrayResponse::equals( const DataStructure* value ) const {
+bool DataArrayResponse::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const DataArrayResponse* valuePtr = dynamic_cast<const DataArrayResponse*>( value );
+    const DataArrayResponse* valuePtr = dynamic_cast<const DataArrayResponse*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    for( size_t idata = 0; idata < this->getData().size(); ++idata ) {
-        if( this->getData()[idata] != NULL ) {
-            if( !this->getData()[idata]->equals( valuePtr->getData()[idata].get() ) ) {
+    for (size_t idata = 0; idata < this->getData().size(); ++idata) {
+        if (this->getData()[idata] != NULL ) {
+            if (!this->getData()[idata]->equals( valuePtr->getData()[idata].get())) {
                 return false;
             }
-        } else if( valuePtr->getData()[idata] != NULL ) {
+        } else if (valuePtr->getData()[idata] != NULL) {
             return false;
         }
     }
-    if( !Response::equals( value ) ) {
+    if (!Response::equals(value)) {
         return false;
     }
     return true;
@@ -148,7 +148,7 @@ std::vector< decaf::lang::Pointer<DataSt
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DataArrayResponse::setData( const std::vector< decaf::lang::Pointer<DataStructure> >& data ) {
+void DataArrayResponse::setData(const std::vector< decaf::lang::Pointer<DataStructure> >& data) {
     this->data = data;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h Sun Mar 24 21:30:52 2013
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -55,8 +55,8 @@ namespace commands{
 
     private:
 
-        DataArrayResponse( const DataArrayResponse& );
-        DataArrayResponse& operator= ( const DataArrayResponse& );
+        DataArrayResponse(const DataArrayResponse&);
+        DataArrayResponse& operator= (const DataArrayResponse&);
 
     public:
 
@@ -68,11 +68,11 @@ namespace commands{
 
         virtual DataArrayResponse* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const std::vector< decaf::lang::Pointer<DataStructure> >& getData() const;
         virtual std::vector< decaf::lang::Pointer<DataStructure> >& getData();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-DataResponse::DataResponse() 
-    : Response(), data(NULL) {
+DataResponse::DataResponse() :
+    Response(), data(NULL) {
 
 }
 
@@ -49,34 +49,34 @@ DataResponse::~DataResponse() {
 
 ////////////////////////////////////////////////////////////////////////////////
 DataResponse* DataResponse::cloneDataStructure() const {
-    std::auto_ptr<DataResponse> dataResponse( new DataResponse() );
+    std::auto_ptr<DataResponse> dataResponse(new DataResponse());
 
     // Copy the data from the base class or classes
-    dataResponse->copyDataStructure( this );
+    dataResponse->copyDataStructure(this);
 
     return dataResponse.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DataResponse::copyDataStructure( const DataStructure* src ) {
+void DataResponse::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const DataResponse* srcPtr = dynamic_cast<const DataResponse*>( src );
+    const DataResponse* srcPtr = dynamic_cast<const DataResponse*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "DataResponse::copyDataStructure - src is NULL or invalid" );
+            "DataResponse::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    Response::copyDataStructure( src );
+    Response::copyDataStructure(src);
 
-    this->setData( srcPtr->getData() );
+    this->setData(srcPtr->getData());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -91,7 +91,7 @@ std::string DataResponse::toString() con
 
     stream << "DataResponse { ";
     stream << "Data = ";
-    if( this->getData() != NULL ) {
+    if (this->getData() != NULL) {
         stream << this->getData()->toString();
     } else {
         stream << "NULL";
@@ -102,26 +102,26 @@ std::string DataResponse::toString() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool DataResponse::equals( const DataStructure* value ) const {
+bool DataResponse::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const DataResponse* valuePtr = dynamic_cast<const DataResponse*>( value );
+    const DataResponse* valuePtr = dynamic_cast<const DataResponse*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getData() != NULL ) {
-        if( !this->getData()->equals( valuePtr->getData().get() ) ) {
+    if (this->getData() != NULL) {
+        if (!this->getData()->equals( valuePtr->getData().get())) {
             return false;
         }
-    } else if( valuePtr->getData() != NULL ) {
+    } else if (valuePtr->getData() != NULL) {
         return false;
     }
-    if( !Response::equals( value ) ) {
+    if (!Response::equals(value)) {
         return false;
     }
     return true;
@@ -138,7 +138,7 @@ decaf::lang::Pointer<DataStructure>& Dat
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DataResponse::setData( const decaf::lang::Pointer<DataStructure>& data ) {
+void DataResponse::setData(const decaf::lang::Pointer<DataStructure>& data) {
     this->data = data;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.h Sun Mar 24 21:30:52 2013
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -55,8 +55,8 @@ namespace commands{
 
     private:
 
-        DataResponse( const DataResponse& );
-        DataResponse& operator= ( const DataResponse& );
+        DataResponse(const DataResponse&);
+        DataResponse& operator= (const DataResponse&);
 
     public:
 
@@ -68,11 +68,11 @@ namespace commands{
 
         virtual DataResponse* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const Pointer<DataStructure>& getData() const;
         virtual Pointer<DataStructure>& getData();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-DestinationInfo::DestinationInfo() 
-    : BaseCommand(), connectionId(NULL), destination(NULL), operationType(0), timeout(0), brokerPath() {
+DestinationInfo::DestinationInfo() :
+    BaseCommand(), connectionId(NULL), destination(NULL), operationType(0), timeout(0), brokerPath() {
 
 }
 
@@ -49,38 +49,38 @@ DestinationInfo::~DestinationInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 DestinationInfo* DestinationInfo::cloneDataStructure() const {
-    std::auto_ptr<DestinationInfo> destinationInfo( new DestinationInfo() );
+    std::auto_ptr<DestinationInfo> destinationInfo(new DestinationInfo());
 
     // Copy the data from the base class or classes
-    destinationInfo->copyDataStructure( this );
+    destinationInfo->copyDataStructure(this);
 
     return destinationInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::copyDataStructure( const DataStructure* src ) {
+void DestinationInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const DestinationInfo* srcPtr = dynamic_cast<const DestinationInfo*>( src );
+    const DestinationInfo* srcPtr = dynamic_cast<const DestinationInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "DestinationInfo::copyDataStructure - src is NULL or invalid" );
+            "DestinationInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setConnectionId( srcPtr->getConnectionId() );
-    this->setDestination( srcPtr->getDestination() );
-    this->setOperationType( srcPtr->getOperationType() );
-    this->setTimeout( srcPtr->getTimeout() );
-    this->setBrokerPath( srcPtr->getBrokerPath() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setDestination(srcPtr->getDestination());
+    this->setOperationType(srcPtr->getOperationType());
+    this->setTimeout(srcPtr->getTimeout());
+    this->setBrokerPath(srcPtr->getBrokerPath());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -98,14 +98,14 @@ std::string DestinationInfo::toString() 
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ConnectionId = ";
-    if( this->getConnectionId() != NULL ) {
+    if (this->getConnectionId() != NULL) {
         stream << this->getConnectionId()->toString();
     } else {
         stream << "NULL";
     }
     stream << ", ";
     stream << "Destination = ";
-    if( this->getDestination() != NULL ) {
+    if (this->getDestination() != NULL) {
         stream << this->getDestination()->toString();
     } else {
         stream << "NULL";
@@ -116,10 +116,10 @@ std::string DestinationInfo::toString() 
     stream << "Timeout = " << this->getTimeout();
     stream << ", ";
     stream << "BrokerPath = ";
-    if( this->getBrokerPath().size() > 0 ) {
+    if (this->getBrokerPath().size() > 0) {
         stream << "[";
-        for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-            if( this->getBrokerPath()[ibrokerPath] != NULL ) {
+        for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) {
+            if (this->getBrokerPath()[ibrokerPath] != NULL) {
                 stream << this->getBrokerPath()[ibrokerPath]->toString() << ", ";
             } else {
                 stream << "NULL" << ", ";
@@ -135,48 +135,48 @@ std::string DestinationInfo::toString() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool DestinationInfo::equals( const DataStructure* value ) const {
+bool DestinationInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const DestinationInfo* valuePtr = dynamic_cast<const DestinationInfo*>( value );
+    const DestinationInfo* valuePtr = dynamic_cast<const DestinationInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getConnectionId() != NULL ) {
-        if( !this->getConnectionId()->equals( valuePtr->getConnectionId().get() ) ) {
+    if (this->getConnectionId() != NULL) {
+        if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) {
             return false;
         }
-    } else if( valuePtr->getConnectionId() != NULL ) {
+    } else if (valuePtr->getConnectionId() != NULL) {
         return false;
     }
-    if( this->getDestination() != NULL ) {
-        if( !this->getDestination()->equals( valuePtr->getDestination().get() ) ) {
+    if (this->getDestination() != NULL) {
+        if (!this->getDestination()->equals( valuePtr->getDestination().get())) {
             return false;
         }
-    } else if( valuePtr->getDestination() != NULL ) {
+    } else if (valuePtr->getDestination() != NULL) {
         return false;
     }
-    if( this->getOperationType() != valuePtr->getOperationType() ) {
+    if (this->getOperationType() != valuePtr->getOperationType()) {
         return false;
     }
-    if( this->getTimeout() != valuePtr->getTimeout() ) {
+    if (this->getTimeout() != valuePtr->getTimeout()) {
         return false;
     }
-    for( size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath ) {
-        if( this->getBrokerPath()[ibrokerPath] != NULL ) {
-            if( !this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get() ) ) {
+    for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) {
+        if (this->getBrokerPath()[ibrokerPath] != NULL ) {
+            if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) {
                 return false;
             }
-        } else if( valuePtr->getBrokerPath()[ibrokerPath] != NULL ) {
+        } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) {
             return false;
         }
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -193,7 +193,7 @@ decaf::lang::Pointer<ConnectionId>& Dest
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId ) {
+void DestinationInfo::setConnectionId(const decaf::lang::Pointer<ConnectionId>& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -208,7 +208,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination ) {
+void DestinationInfo::setDestination(const decaf::lang::Pointer<ActiveMQDestination>& destination) {
     this->destination = destination;
 }
 
@@ -218,7 +218,7 @@ unsigned char DestinationInfo::getOperat
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::setOperationType( unsigned char operationType ) {
+void DestinationInfo::setOperationType(unsigned char operationType) {
     this->operationType = operationType;
 }
 
@@ -228,7 +228,7 @@ long long DestinationInfo::getTimeout() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::setTimeout( long long timeout ) {
+void DestinationInfo::setTimeout(long long timeout) {
     this->timeout = timeout;
 }
 
@@ -243,12 +243,11 @@ std::vector< decaf::lang::Pointer<Broker
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DestinationInfo::setBrokerPath( const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath ) {
+void DestinationInfo::setBrokerPath(const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath) {
     this->brokerPath = brokerPath;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> DestinationInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processDestinationInfo( this );
+decaf::lang::Pointer<commands::Command> DestinationInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processDestinationInfo(this);
 }



Mime
View raw message