activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [5/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/MessagePull.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePull::MessagePull() 
-    : BaseCommand(), consumerId(NULL), destination(NULL), timeout(0), correlationId(""), messageId(NULL) {
+MessagePull::MessagePull() :
+    BaseCommand(), consumerId(NULL), destination(NULL), timeout(0), correlationId(""), messageId(NULL) {
 
 }
 
@@ -49,38 +49,38 @@ MessagePull::~MessagePull() {
 
 ////////////////////////////////////////////////////////////////////////////////
 MessagePull* MessagePull::cloneDataStructure() const {
-    std::auto_ptr<MessagePull> messagePull( new MessagePull() );
+    std::auto_ptr<MessagePull> messagePull(new MessagePull());
 
     // Copy the data from the base class or classes
-    messagePull->copyDataStructure( this );
+    messagePull->copyDataStructure(this);
 
     return messagePull.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::copyDataStructure( const DataStructure* src ) {
+void MessagePull::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const MessagePull* srcPtr = dynamic_cast<const MessagePull*>( src );
+    const MessagePull* srcPtr = dynamic_cast<const MessagePull*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "MessagePull::copyDataStructure - src is NULL or invalid" );
+            "MessagePull::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->setDestination( srcPtr->getDestination() );
-    this->setTimeout( srcPtr->getTimeout() );
-    this->setCorrelationId( srcPtr->getCorrelationId() );
-    this->setMessageId( srcPtr->getMessageId() );
+    this->setConsumerId(srcPtr->getConsumerId());
+    this->setDestination(srcPtr->getDestination());
+    this->setTimeout(srcPtr->getTimeout());
+    this->setCorrelationId(srcPtr->getCorrelationId());
+    this->setMessageId(srcPtr->getMessageId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -98,14 +98,14 @@ std::string MessagePull::toString() cons
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ConsumerId = ";
-    if( this->getConsumerId() != NULL ) {
+    if (this->getConsumerId() != NULL) {
         stream << this->getConsumerId()->toString();
     } else {
         stream << "NULL";
     }
     stream << ", ";
     stream << "Destination = ";
-    if( this->getDestination() != NULL ) {
+    if (this->getDestination() != NULL) {
         stream << this->getDestination()->toString();
     } else {
         stream << "NULL";
@@ -116,7 +116,7 @@ std::string MessagePull::toString() cons
     stream << "CorrelationId = " << this->getCorrelationId();
     stream << ", ";
     stream << "MessageId = ";
-    if( this->getMessageId() != NULL ) {
+    if (this->getMessageId() != NULL) {
         stream << this->getMessageId()->toString();
     } else {
         stream << "NULL";
@@ -127,46 +127,46 @@ std::string MessagePull::toString() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool MessagePull::equals( const DataStructure* value ) const {
+bool MessagePull::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const MessagePull* valuePtr = dynamic_cast<const MessagePull*>( value );
+    const MessagePull* valuePtr = dynamic_cast<const MessagePull*>(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->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->getTimeout() != valuePtr->getTimeout() ) {
+    if (this->getTimeout() != valuePtr->getTimeout()) {
         return false;
     }
-    if( this->getCorrelationId() != valuePtr->getCorrelationId() ) {
+    if (this->getCorrelationId() != valuePtr->getCorrelationId()) {
         return false;
     }
-    if( this->getMessageId() != NULL ) {
-        if( !this->getMessageId()->equals( valuePtr->getMessageId().get() ) ) {
+    if (this->getMessageId() != NULL) {
+        if (!this->getMessageId()->equals( valuePtr->getMessageId().get())) {
             return false;
         }
-    } else if( valuePtr->getMessageId() != NULL ) {
+    } else if (valuePtr->getMessageId() != NULL) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -183,7 +183,7 @@ decaf::lang::Pointer<ConsumerId>& Messag
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setConsumerId( const decaf::lang::Pointer<ConsumerId>& consumerId ) {
+void MessagePull::setConsumerId(const decaf::lang::Pointer<ConsumerId>& consumerId) {
     this->consumerId = consumerId;
 }
 
@@ -198,7 +198,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination ) {
+void MessagePull::setDestination(const decaf::lang::Pointer<ActiveMQDestination>& destination) {
     this->destination = destination;
 }
 
@@ -208,7 +208,7 @@ long long MessagePull::getTimeout() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setTimeout( long long timeout ) {
+void MessagePull::setTimeout(long long timeout) {
     this->timeout = timeout;
 }
 
@@ -223,7 +223,7 @@ std::string& MessagePull::getCorrelation
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setCorrelationId( const std::string& correlationId ) {
+void MessagePull::setCorrelationId(const std::string& correlationId) {
     this->correlationId = correlationId;
 }
 
@@ -238,12 +238,11 @@ decaf::lang::Pointer<MessageId>& Message
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void MessagePull::setMessageId( const decaf::lang::Pointer<MessageId>& messageId ) {
+void MessagePull::setMessageId(const decaf::lang::Pointer<MessageId>& messageId) {
     this->messageId = messageId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> MessagePull::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processMessagePull( this );
+decaf::lang::Pointer<commands::Command> MessagePull::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processMessagePull(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.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;
 
@@ -61,8 +61,8 @@ namespace commands{
 
     private:
 
-        MessagePull( const MessagePull& );
-        MessagePull& operator= ( const MessagePull& );
+        MessagePull(const MessagePull&);
+        MessagePull& operator= (const MessagePull&);
 
     public:
 
@@ -74,11 +74,11 @@ namespace commands{
 
         virtual MessagePull* 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<ConsumerId>& getConsumerId() const;
         virtual Pointer<ConsumerId>& getConsumerId();
@@ -106,7 +106,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/NetworkBridgeFilter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-NetworkBridgeFilter::NetworkBridgeFilter() 
-    : BaseDataStructure(), networkTTL(0), networkBrokerId(NULL) {
+NetworkBridgeFilter::NetworkBridgeFilter() :
+    BaseDataStructure(), networkTTL(0), networkBrokerId(NULL) {
 
 }
 
@@ -49,35 +49,35 @@ NetworkBridgeFilter::~NetworkBridgeFilte
 
 ////////////////////////////////////////////////////////////////////////////////
 NetworkBridgeFilter* NetworkBridgeFilter::cloneDataStructure() const {
-    std::auto_ptr<NetworkBridgeFilter> networkBridgeFilter( new NetworkBridgeFilter() );
+    std::auto_ptr<NetworkBridgeFilter> networkBridgeFilter(new NetworkBridgeFilter());
 
     // Copy the data from the base class or classes
-    networkBridgeFilter->copyDataStructure( this );
+    networkBridgeFilter->copyDataStructure(this);
 
     return networkBridgeFilter.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void NetworkBridgeFilter::copyDataStructure( const DataStructure* src ) {
+void NetworkBridgeFilter::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const NetworkBridgeFilter* srcPtr = dynamic_cast<const NetworkBridgeFilter*>( src );
+    const NetworkBridgeFilter* srcPtr = dynamic_cast<const NetworkBridgeFilter*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "NetworkBridgeFilter::copyDataStructure - src is NULL or invalid" );
+            "NetworkBridgeFilter::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setNetworkTTL( srcPtr->getNetworkTTL() );
-    this->setNetworkBrokerId( srcPtr->getNetworkBrokerId() );
+    this->setNetworkTTL(srcPtr->getNetworkTTL());
+    this->setNetworkBrokerId(srcPtr->getNetworkBrokerId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ std::string NetworkBridgeFilter::toStrin
     stream << "NetworkTTL = " << this->getNetworkTTL();
     stream << ", ";
     stream << "NetworkBrokerId = ";
-    if( this->getNetworkBrokerId() != NULL ) {
+    if (this->getNetworkBrokerId() != NULL) {
         stream << this->getNetworkBrokerId()->toString();
     } else {
         stream << "NULL";
@@ -105,29 +105,29 @@ std::string NetworkBridgeFilter::toStrin
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool NetworkBridgeFilter::equals( const DataStructure* value ) const {
+bool NetworkBridgeFilter::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const NetworkBridgeFilter* valuePtr = dynamic_cast<const NetworkBridgeFilter*>( value );
+    const NetworkBridgeFilter* valuePtr = dynamic_cast<const NetworkBridgeFilter*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getNetworkTTL() != valuePtr->getNetworkTTL() ) {
+    if (this->getNetworkTTL() != valuePtr->getNetworkTTL()) {
         return false;
     }
-    if( this->getNetworkBrokerId() != NULL ) {
-        if( !this->getNetworkBrokerId()->equals( valuePtr->getNetworkBrokerId().get() ) ) {
+    if (this->getNetworkBrokerId() != NULL) {
+        if (!this->getNetworkBrokerId()->equals( valuePtr->getNetworkBrokerId().get())) {
             return false;
         }
-    } else if( valuePtr->getNetworkBrokerId() != NULL ) {
+    } else if (valuePtr->getNetworkBrokerId() != NULL) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -139,7 +139,7 @@ int NetworkBridgeFilter::getNetworkTTL()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void NetworkBridgeFilter::setNetworkTTL( int networkTTL ) {
+void NetworkBridgeFilter::setNetworkTTL(int networkTTL) {
     this->networkTTL = networkTTL;
 }
 
@@ -154,7 +154,7 @@ decaf::lang::Pointer<BrokerId>& NetworkB
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void NetworkBridgeFilter::setNetworkBrokerId( const decaf::lang::Pointer<BrokerId>& networkBrokerId ) {
+void NetworkBridgeFilter::setNetworkBrokerId(const decaf::lang::Pointer<BrokerId>& networkBrokerId) {
     this->networkBrokerId = networkBrokerId;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.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;
 
@@ -56,8 +56,8 @@ namespace commands{
 
     private:
 
-        NetworkBridgeFilter( const NetworkBridgeFilter& );
-        NetworkBridgeFilter& operator= ( const NetworkBridgeFilter& );
+        NetworkBridgeFilter(const NetworkBridgeFilter&);
+        NetworkBridgeFilter& operator= (const NetworkBridgeFilter&);
 
     public:
 
@@ -69,11 +69,11 @@ namespace commands{
 
         virtual NetworkBridgeFilter* 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 int getNetworkTTL() const;
         virtual void setNetworkTTL( int networkTTL );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-PartialCommand::PartialCommand() 
-    : BaseDataStructure(), commandId(0), data() {
+PartialCommand::PartialCommand() :
+    BaseDataStructure(), commandId(0), data() {
 
 }
 
@@ -49,35 +49,35 @@ PartialCommand::~PartialCommand() {
 
 ////////////////////////////////////////////////////////////////////////////////
 PartialCommand* PartialCommand::cloneDataStructure() const {
-    std::auto_ptr<PartialCommand> partialCommand( new PartialCommand() );
+    std::auto_ptr<PartialCommand> partialCommand(new PartialCommand());
 
     // Copy the data from the base class or classes
-    partialCommand->copyDataStructure( this );
+    partialCommand->copyDataStructure(this);
 
     return partialCommand.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PartialCommand::copyDataStructure( const DataStructure* src ) {
+void PartialCommand::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const PartialCommand* srcPtr = dynamic_cast<const PartialCommand*>( src );
+    const PartialCommand* srcPtr = dynamic_cast<const PartialCommand*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "PartialCommand::copyDataStructure - src is NULL or invalid" );
+            "PartialCommand::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setCommandId( srcPtr->getCommandId() );
-    this->setData( srcPtr->getData() );
+    this->setCommandId(srcPtr->getCommandId());
+    this->setData(srcPtr->getData());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -94,9 +94,9 @@ std::string PartialCommand::toString() c
     stream << "CommandId = " << this->getCommandId();
     stream << ", ";
     stream << "Data = ";
-    if( this->getData().size() > 0 ) {
+    if (this->getData().size() > 0) {
         stream << "[";
-        for( size_t idata = 0; idata < this->getData().size(); ++idata ) {
+        for (size_t idata = 0; idata < this->getData().size(); ++idata) {
             stream << this->getData()[idata] << ",";
         }
         stream << "]";
@@ -109,27 +109,27 @@ std::string PartialCommand::toString() c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool PartialCommand::equals( const DataStructure* value ) const {
+bool PartialCommand::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const PartialCommand* valuePtr = dynamic_cast<const PartialCommand*>( value );
+    const PartialCommand* valuePtr = dynamic_cast<const PartialCommand*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getCommandId() != valuePtr->getCommandId() ) {
+    if (this->getCommandId() != valuePtr->getCommandId()) {
         return false;
     }
-    for( size_t idata = 0; idata < this->getData().size(); ++idata ) {
-        if( this->getData()[idata] != valuePtr->getData()[idata] ) {
+    for (size_t idata = 0; idata < this->getData().size(); ++idata) {
+        if (this->getData()[idata] != valuePtr->getData()[idata]) {
             return false;
         }
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -141,7 +141,7 @@ int PartialCommand::getCommandId() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PartialCommand::setCommandId( int commandId ) {
+void PartialCommand::setCommandId(int commandId) {
     this->commandId = commandId;
 }
 
@@ -156,7 +156,7 @@ std::vector<unsigned char>& PartialComma
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void PartialCommand::setData( const std::vector<unsigned char>& data ) {
+void PartialCommand::setData(const std::vector<unsigned char>& data) {
     this->data = data;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.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;
 
@@ -55,8 +55,8 @@ namespace commands{
 
     private:
 
-        PartialCommand( const PartialCommand& );
-        PartialCommand& operator= ( const PartialCommand& );
+        PartialCommand(const PartialCommand&);
+        PartialCommand& operator= (const PartialCommand&);
 
     public:
 
@@ -68,11 +68,11 @@ namespace commands{
 
         virtual PartialCommand* 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 int getCommandId() const;
         virtual void setCommandId( int commandId );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerAck::ProducerAck() 
-    : BaseCommand(), producerId(NULL), size(0) {
+ProducerAck::ProducerAck() :
+    BaseCommand(), producerId(NULL), size(0) {
 
 }
 
@@ -49,35 +49,35 @@ ProducerAck::~ProducerAck() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ProducerAck* ProducerAck::cloneDataStructure() const {
-    std::auto_ptr<ProducerAck> producerAck( new ProducerAck() );
+    std::auto_ptr<ProducerAck> producerAck(new ProducerAck());
 
     // Copy the data from the base class or classes
-    producerAck->copyDataStructure( this );
+    producerAck->copyDataStructure(this);
 
     return producerAck.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerAck::copyDataStructure( const DataStructure* src ) {
+void ProducerAck::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ProducerAck* srcPtr = dynamic_cast<const ProducerAck*>( src );
+    const ProducerAck* srcPtr = dynamic_cast<const ProducerAck*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ProducerAck::copyDataStructure - src is NULL or invalid" );
+            "ProducerAck::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setProducerId( srcPtr->getProducerId() );
-    this->setSize( srcPtr->getSize() );
+    this->setProducerId(srcPtr->getProducerId());
+    this->setSize(srcPtr->getSize());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ std::string ProducerAck::toString() cons
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ProducerId = ";
-    if( this->getProducerId() != NULL ) {
+    if (this->getProducerId() != NULL) {
         stream << this->getProducerId()->toString();
     } else {
         stream << "NULL";
@@ -108,29 +108,29 @@ std::string ProducerAck::toString() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ProducerAck::equals( const DataStructure* value ) const {
+bool ProducerAck::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ProducerAck* valuePtr = dynamic_cast<const ProducerAck*>( value );
+    const ProducerAck* valuePtr = dynamic_cast<const ProducerAck*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getProducerId() != NULL ) {
-        if( !this->getProducerId()->equals( valuePtr->getProducerId().get() ) ) {
+    if (this->getProducerId() != NULL) {
+        if (!this->getProducerId()->equals( valuePtr->getProducerId().get())) {
             return false;
         }
-    } else if( valuePtr->getProducerId() != NULL ) {
+    } else if (valuePtr->getProducerId() != NULL) {
         return false;
     }
-    if( this->getSize() != valuePtr->getSize() ) {
+    if (this->getSize() != valuePtr->getSize()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -147,7 +147,7 @@ decaf::lang::Pointer<ProducerId>& Produc
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerAck::setProducerId( const decaf::lang::Pointer<ProducerId>& producerId ) {
+void ProducerAck::setProducerId(const decaf::lang::Pointer<ProducerId>& producerId) {
     this->producerId = producerId;
 }
 
@@ -157,12 +157,11 @@ int ProducerAck::getSize() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerAck::setSize( int size ) {
+void ProducerAck::setSize(int size) {
     this->size = size;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ProducerAck::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processProducerAck( this );
+decaf::lang::Pointer<commands::Command> ProducerAck::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processProducerAck(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.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;
 
@@ -56,8 +56,8 @@ namespace commands{
 
     private:
 
-        ProducerAck( const ProducerAck& );
-        ProducerAck& operator= ( const ProducerAck& );
+        ProducerAck(const ProducerAck&);
+        ProducerAck& operator= (const ProducerAck&);
 
     public:
 
@@ -69,11 +69,11 @@ namespace commands{
 
         virtual ProducerAck* 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<ProducerId>& getProducerId() const;
         virtual Pointer<ProducerId>& getProducerId();
@@ -89,7 +89,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/ProducerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp Sun Mar 24 21:30:52 2013
@@ -18,9 +18,10 @@
 #include <activemq/commands/ProducerId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/Long.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 #include <sstream>
 
 using namespace std;
@@ -29,6 +30,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -41,21 +43,21 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerId::ProducerId() 
-    : BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
+ProducerId::ProducerId() :
+    BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerId::ProducerId( const ProducerId& other )
-    : BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
+ProducerId::ProducerId(const ProducerId& other) :
+    BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
 
-    this->copyDataStructure( &other );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerId::ProducerId( const SessionId& sessionId, long long consumerId )
-    : BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
+ProducerId::ProducerId( const SessionId& sessionId, long long consumerId ) : 
+    BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
 
     this->connectionId = sessionId.getConnectionId();
     this->sessionId = sessionId.getValue();
@@ -63,18 +65,18 @@ ProducerId::ProducerId( const SessionId&
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerId::ProducerId( std::string producerKey )
-    : BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
+ProducerId::ProducerId(std::string producerKey) :
+    BaseDataStructure(), connectionId(""), value(0), sessionId(0), parentId() {
 
     // Parse off the producerId
     std::size_t p = producerKey.rfind( ':' );
 
-    if( p != std::string::npos ) {
-        value = Long::parseLong( producerKey.substr( p + 1, std::string::npos ) );
-        producerKey = producerKey.substr( 0, p );
+    if (p != std::string::npos) {
+        value = Long::parseLong(producerKey.substr(p + 1, std::string::npos));
+        producerKey = producerKey.substr(0, p);
     }
 
-    setProducerSessionKey( producerKey );
+    setProducerSessionKey(producerKey);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -83,36 +85,36 @@ ProducerId::~ProducerId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ProducerId* ProducerId::cloneDataStructure() const {
-    std::auto_ptr<ProducerId> producerId( new ProducerId() );
+    std::auto_ptr<ProducerId> producerId(new ProducerId());
 
     // Copy the data from the base class or classes
-    producerId->copyDataStructure( this );
+    producerId->copyDataStructure(this);
 
     return producerId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerId::copyDataStructure( const DataStructure* src ) {
+void ProducerId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ProducerId* srcPtr = dynamic_cast<const ProducerId*>( src );
+    const ProducerId* srcPtr = dynamic_cast<const ProducerId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ProducerId::copyDataStructure - src is NULL or invalid" );
+            "ProducerId::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->setValue( srcPtr->getValue() );
-    this->setSessionId( srcPtr->getSessionId() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setValue(srcPtr->getValue());
+    this->setSessionId(srcPtr->getSessionId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -133,28 +135,28 @@ std::string ProducerId::toString() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ProducerId::equals( const DataStructure* value ) const {
+bool ProducerId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ProducerId* valuePtr = dynamic_cast<const ProducerId*>( value );
+    const ProducerId* valuePtr = dynamic_cast<const ProducerId*>(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->getValue() != valuePtr->getValue() ) {
+    if (this->getValue() != valuePtr->getValue()) {
         return false;
     }
-    if( this->getSessionId() != valuePtr->getSessionId() ) {
+    if (this->getSessionId() != valuePtr->getSessionId()) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -171,7 +173,7 @@ std::string& ProducerId::getConnectionId
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerId::setConnectionId( const std::string& connectionId ) {
+void ProducerId::setConnectionId(const std::string& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -181,7 +183,7 @@ long long ProducerId::getValue() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerId::setValue( long long value ) {
+void ProducerId::setValue(long long value) {
     this->value = value;
 }
 
@@ -191,31 +193,31 @@ long long ProducerId::getSessionId() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerId::setSessionId( long long sessionId ) {
+void ProducerId::setSessionId(long long sessionId) {
     this->sessionId = sessionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int ProducerId::compareTo( const ProducerId& value ) const {
+int ProducerId::compareTo(const ProducerId& 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->value > value.value ) {
+    if (this->value > value.value) {
         return 1;
-    } else if( this->value < value.value ) {
+    } else if(this->value < value.value) {
         return -1;
     }
 
-    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;
     }
 
@@ -223,30 +225,35 @@ int ProducerId::compareTo( const Produce
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ProducerId::equals( const ProducerId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool ProducerId::equals(const ProducerId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ProducerId::operator==( const ProducerId& value ) const {
-    return this->compareTo( value ) == 0;
+bool ProducerId::operator==(const ProducerId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ProducerId::operator<( const ProducerId& value ) const {
-    return this->compareTo( value ) < 0;
+bool ProducerId::operator<(const ProducerId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerId& ProducerId::operator= ( const ProducerId& other ) {
-    this->copyDataStructure( &other );
+ProducerId& ProducerId::operator= (const ProducerId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+int ProducerId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 const Pointer<SessionId>& ProducerId::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;
 }
@@ -257,9 +264,9 @@ void ProducerId::setProducerSessionKey( 
     // Parse off the value
     std::size_t p = sessionKey.rfind( ':' );
 
-    if( p != std::string::npos ) {
-        this->sessionId = Long::parseLong( sessionKey.substr( p + 1, std::string::npos ) );
-        sessionKey = sessionKey.substr( 0, p );
+    if (p != std::string::npos) {
+        this->sessionId = Long::parseLong(sessionKey.substr(p + 1, std::string::npos));
+        sessionKey = sessionKey.substr(0, p);
     }
 
     // The rest is the value

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.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,11 +66,11 @@ namespace commands{
 
         ProducerId();
 
-        ProducerId( const ProducerId& other );
+        ProducerId(const ProducerId& other);
 
-        ProducerId( const SessionId& sessionId, long long consumerId );
+        ProducerId(const SessionId& sessionId, long long consumerId);
 
-        ProducerId( std::string producerId );
+        ProducerId(std::string producerId);
 
         virtual ~ProducerId();
 
@@ -78,15 +78,15 @@ namespace commands{
 
         virtual ProducerId* 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;
 
-        void setProducerSessionKey( std::string sessionKey );
+        void setProducerSessionKey(std::string sessionKey);
 
         virtual const std::string& getConnectionId() const;
         virtual std::string& getConnectionId();
@@ -98,15 +98,17 @@ namespace commands{
         virtual long long getSessionId() const;
         virtual void setSessionId( long long sessionId );
 
-        virtual int compareTo( const ProducerId& value ) const;
+        virtual int compareTo(const ProducerId& value) const;
 
-        virtual bool equals( const ProducerId& value ) const;
+        virtual bool equals(const ProducerId& value) const;
 
-        virtual bool operator==( const ProducerId& value ) const;
+        virtual bool operator==(const ProducerId& value) const;
 
-        virtual bool operator<( const ProducerId& value ) const;
+        virtual bool operator<(const ProducerId& value) const;
 
-        ProducerId& operator= ( const ProducerId& other );
+        ProducerId& operator= (const ProducerId& other);
+
+        int getHashCode() const;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ProducerInfo::ProducerInfo() 
-    : BaseCommand(), producerId(NULL), destination(NULL), brokerPath(), dispatchAsync(false), windowSize(0) {
+ProducerInfo::ProducerInfo() :
+    BaseCommand(), producerId(NULL), destination(NULL), brokerPath(), dispatchAsync(false), windowSize(0) {
 
 }
 
@@ -49,38 +49,38 @@ ProducerInfo::~ProducerInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ProducerInfo* ProducerInfo::cloneDataStructure() const {
-    std::auto_ptr<ProducerInfo> producerInfo( new ProducerInfo() );
+    std::auto_ptr<ProducerInfo> producerInfo(new ProducerInfo());
 
     // Copy the data from the base class or classes
-    producerInfo->copyDataStructure( this );
+    producerInfo->copyDataStructure(this);
 
     return producerInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerInfo::copyDataStructure( const DataStructure* src ) {
+void ProducerInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ProducerInfo* srcPtr = dynamic_cast<const ProducerInfo*>( src );
+    const ProducerInfo* srcPtr = dynamic_cast<const ProducerInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ProducerInfo::copyDataStructure - src is NULL or invalid" );
+            "ProducerInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setProducerId( srcPtr->getProducerId() );
-    this->setDestination( srcPtr->getDestination() );
-    this->setBrokerPath( srcPtr->getBrokerPath() );
-    this->setDispatchAsync( srcPtr->isDispatchAsync() );
-    this->setWindowSize( srcPtr->getWindowSize() );
+    this->setProducerId(srcPtr->getProducerId());
+    this->setDestination(srcPtr->getDestination());
+    this->setBrokerPath(srcPtr->getBrokerPath());
+    this->setDispatchAsync(srcPtr->isDispatchAsync());
+    this->setWindowSize(srcPtr->getWindowSize());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -98,24 +98,24 @@ std::string ProducerInfo::toString() con
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ProducerId = ";
-    if( this->getProducerId() != NULL ) {
+    if (this->getProducerId() != NULL) {
         stream << this->getProducerId()->toString();
     } else {
         stream << "NULL";
     }
     stream << ", ";
     stream << "Destination = ";
-    if( this->getDestination() != NULL ) {
+    if (this->getDestination() != NULL) {
         stream << this->getDestination()->toString();
     } else {
         stream << "NULL";
     }
     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 ProducerInfo::toString() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ProducerInfo::equals( const DataStructure* value ) const {
+bool ProducerInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ProducerInfo* valuePtr = dynamic_cast<const ProducerInfo*>( value );
+    const ProducerInfo* valuePtr = dynamic_cast<const ProducerInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getProducerId() != NULL ) {
-        if( !this->getProducerId()->equals( valuePtr->getProducerId().get() ) ) {
+    if (this->getProducerId() != NULL) {
+        if (!this->getProducerId()->equals( valuePtr->getProducerId().get())) {
             return false;
         }
-    } else if( valuePtr->getProducerId() != NULL ) {
+    } else if (valuePtr->getProducerId() != 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;
     }
-    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->isDispatchAsync() != valuePtr->isDispatchAsync() ) {
+    if (this->isDispatchAsync() != valuePtr->isDispatchAsync()) {
         return false;
     }
-    if( this->getWindowSize() != valuePtr->getWindowSize() ) {
+    if (this->getWindowSize() != valuePtr->getWindowSize()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -193,7 +193,7 @@ decaf::lang::Pointer<ProducerId>& Produc
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerInfo::setProducerId( const decaf::lang::Pointer<ProducerId>& producerId ) {
+void ProducerInfo::setProducerId(const decaf::lang::Pointer<ProducerId>& producerId) {
     this->producerId = producerId;
 }
 
@@ -208,7 +208,7 @@ decaf::lang::Pointer<ActiveMQDestination
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerInfo::setDestination( const decaf::lang::Pointer<ActiveMQDestination>& destination ) {
+void ProducerInfo::setDestination(const decaf::lang::Pointer<ActiveMQDestination>& destination) {
     this->destination = destination;
 }
 
@@ -223,7 +223,7 @@ std::vector< decaf::lang::Pointer<Broker
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerInfo::setBrokerPath( const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath ) {
+void ProducerInfo::setBrokerPath(const std::vector< decaf::lang::Pointer<BrokerId> >& brokerPath) {
     this->brokerPath = brokerPath;
 }
 
@@ -233,7 +233,7 @@ bool ProducerInfo::isDispatchAsync() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerInfo::setDispatchAsync( bool dispatchAsync ) {
+void ProducerInfo::setDispatchAsync(bool dispatchAsync) {
     this->dispatchAsync = dispatchAsync;
 }
 
@@ -243,20 +243,19 @@ int ProducerInfo::getWindowSize() const 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ProducerInfo::setWindowSize( int windowSize ) {
+void ProducerInfo::setWindowSize(int windowSize) {
     this->windowSize = windowSize;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ProducerInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processProducerInfo( this );
+decaf::lang::Pointer<commands::Command> ProducerInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processProducerInfo(this);
 }
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<RemoveInfo> ProducerInfo::createRemoveCommand() const {
-    Pointer<RemoveInfo> info( new RemoveInfo() );
-    info->setResponseRequired( this->isResponseRequired() );
-    info->setObjectId( this->getProducerId() );
+    Pointer<RemoveInfo> info(new RemoveInfo());
+    info->setResponseRequired(this->isResponseRequired());
+    info->setObjectId(this->getProducerId());
     return info;
 }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h Sun Mar 24 21:30:52 2013
@@ -33,8 +33,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -62,8 +62,8 @@ namespace commands{
 
     private:
 
-        ProducerInfo( const ProducerInfo& );
-        ProducerInfo& operator= ( const ProducerInfo& );
+        ProducerInfo(const ProducerInfo&);
+        ProducerInfo& operator= (const ProducerInfo&);
 
     public:
 
@@ -75,11 +75,11 @@ namespace commands{
 
         virtual ProducerInfo* 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;
 
@@ -108,7 +108,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/RemoveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-RemoveInfo::RemoveInfo() 
-    : BaseCommand(), objectId(NULL), lastDeliveredSequenceId(0) {
+RemoveInfo::RemoveInfo() :
+    BaseCommand(), objectId(NULL), lastDeliveredSequenceId(0) {
 
 }
 
@@ -49,35 +49,35 @@ RemoveInfo::~RemoveInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 RemoveInfo* RemoveInfo::cloneDataStructure() const {
-    std::auto_ptr<RemoveInfo> removeInfo( new RemoveInfo() );
+    std::auto_ptr<RemoveInfo> removeInfo(new RemoveInfo());
 
     // Copy the data from the base class or classes
-    removeInfo->copyDataStructure( this );
+    removeInfo->copyDataStructure(this);
 
     return removeInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveInfo::copyDataStructure( const DataStructure* src ) {
+void RemoveInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const RemoveInfo* srcPtr = dynamic_cast<const RemoveInfo*>( src );
+    const RemoveInfo* srcPtr = dynamic_cast<const RemoveInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "RemoveInfo::copyDataStructure - src is NULL or invalid" );
+            "RemoveInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setObjectId( srcPtr->getObjectId() );
-    this->setLastDeliveredSequenceId( srcPtr->getLastDeliveredSequenceId() );
+    this->setObjectId(srcPtr->getObjectId());
+    this->setLastDeliveredSequenceId(srcPtr->getLastDeliveredSequenceId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ std::string RemoveInfo::toString() const
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ObjectId = ";
-    if( this->getObjectId() != NULL ) {
+    if (this->getObjectId() != NULL) {
         stream << this->getObjectId()->toString();
     } else {
         stream << "NULL";
@@ -108,29 +108,29 @@ std::string RemoveInfo::toString() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool RemoveInfo::equals( const DataStructure* value ) const {
+bool RemoveInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const RemoveInfo* valuePtr = dynamic_cast<const RemoveInfo*>( value );
+    const RemoveInfo* valuePtr = dynamic_cast<const RemoveInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getObjectId() != NULL ) {
-        if( !this->getObjectId()->equals( valuePtr->getObjectId().get() ) ) {
+    if (this->getObjectId() != NULL) {
+        if (!this->getObjectId()->equals( valuePtr->getObjectId().get())) {
             return false;
         }
-    } else if( valuePtr->getObjectId() != NULL ) {
+    } else if (valuePtr->getObjectId() != NULL) {
         return false;
     }
-    if( this->getLastDeliveredSequenceId() != valuePtr->getLastDeliveredSequenceId() ) {
+    if (this->getLastDeliveredSequenceId() != valuePtr->getLastDeliveredSequenceId()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -147,7 +147,7 @@ decaf::lang::Pointer<DataStructure>& Rem
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveInfo::setObjectId( const decaf::lang::Pointer<DataStructure>& objectId ) {
+void RemoveInfo::setObjectId(const decaf::lang::Pointer<DataStructure>& objectId) {
     this->objectId = objectId;
 }
 
@@ -157,12 +157,11 @@ long long RemoveInfo::getLastDeliveredSe
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveInfo::setLastDeliveredSequenceId( long long lastDeliveredSequenceId ) {
+void RemoveInfo::setLastDeliveredSequenceId(long long lastDeliveredSequenceId) {
     this->lastDeliveredSequenceId = lastDeliveredSequenceId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> RemoveInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processRemoveInfo( this );
+decaf::lang::Pointer<commands::Command> RemoveInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processRemoveInfo(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.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;
 
@@ -56,8 +56,8 @@ namespace commands{
 
     private:
 
-        RemoveInfo( const RemoveInfo& );
-        RemoveInfo& operator= ( const RemoveInfo& );
+        RemoveInfo(const RemoveInfo&);
+        RemoveInfo& operator= (const RemoveInfo&);
 
     public:
 
@@ -69,11 +69,11 @@ namespace commands{
 
         virtual RemoveInfo* 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>& getObjectId() const;
         virtual Pointer<DataStructure>& getObjectId();
@@ -89,7 +89,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/RemoveSubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-RemoveSubscriptionInfo::RemoveSubscriptionInfo() 
-    : BaseCommand(), connectionId(NULL), subcriptionName(""), clientId("") {
+RemoveSubscriptionInfo::RemoveSubscriptionInfo() :
+    BaseCommand(), connectionId(NULL), subcriptionName(""), clientId("") {
 
 }
 
@@ -49,36 +49,36 @@ RemoveSubscriptionInfo::~RemoveSubscript
 
 ////////////////////////////////////////////////////////////////////////////////
 RemoveSubscriptionInfo* RemoveSubscriptionInfo::cloneDataStructure() const {
-    std::auto_ptr<RemoveSubscriptionInfo> removeSubscriptionInfo( new RemoveSubscriptionInfo() );
+    std::auto_ptr<RemoveSubscriptionInfo> removeSubscriptionInfo(new RemoveSubscriptionInfo());
 
     // Copy the data from the base class or classes
-    removeSubscriptionInfo->copyDataStructure( this );
+    removeSubscriptionInfo->copyDataStructure(this);
 
     return removeSubscriptionInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfo::copyDataStructure( const DataStructure* src ) {
+void RemoveSubscriptionInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const RemoveSubscriptionInfo* srcPtr = dynamic_cast<const RemoveSubscriptionInfo*>( src );
+    const RemoveSubscriptionInfo* srcPtr = dynamic_cast<const RemoveSubscriptionInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "RemoveSubscriptionInfo::copyDataStructure - src is NULL or invalid" );
+            "RemoveSubscriptionInfo::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->setSubcriptionName( srcPtr->getSubcriptionName() );
-    this->setClientId( srcPtr->getClientId() );
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setSubcriptionName(srcPtr->getSubcriptionName());
+    this->setClientId(srcPtr->getClientId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -96,7 +96,7 @@ std::string RemoveSubscriptionInfo::toSt
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "ConnectionId = ";
-    if( this->getConnectionId() != NULL ) {
+    if (this->getConnectionId() != NULL) {
         stream << this->getConnectionId()->toString();
     } else {
         stream << "NULL";
@@ -111,32 +111,32 @@ std::string RemoveSubscriptionInfo::toSt
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool RemoveSubscriptionInfo::equals( const DataStructure* value ) const {
+bool RemoveSubscriptionInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const RemoveSubscriptionInfo* valuePtr = dynamic_cast<const RemoveSubscriptionInfo*>( value );
+    const RemoveSubscriptionInfo* valuePtr = dynamic_cast<const RemoveSubscriptionInfo*>(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->getSubcriptionName() != valuePtr->getSubcriptionName() ) {
+    if (this->getSubcriptionName() != valuePtr->getSubcriptionName()) {
         return false;
     }
-    if( this->getClientId() != valuePtr->getClientId() ) {
+    if (this->getClientId() != valuePtr->getClientId()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -153,7 +153,7 @@ decaf::lang::Pointer<ConnectionId>& Remo
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfo::setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId ) {
+void RemoveSubscriptionInfo::setConnectionId(const decaf::lang::Pointer<ConnectionId>& connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -168,7 +168,7 @@ std::string& RemoveSubscriptionInfo::get
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfo::setSubcriptionName( const std::string& subcriptionName ) {
+void RemoveSubscriptionInfo::setSubcriptionName(const std::string& subcriptionName) {
     this->subcriptionName = subcriptionName;
 }
 
@@ -183,12 +183,11 @@ std::string& RemoveSubscriptionInfo::get
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfo::setClientId( const std::string& clientId ) {
+void RemoveSubscriptionInfo::setClientId(const std::string& clientId) {
     this->clientId = clientId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> RemoveSubscriptionInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processRemoveSubscriptionInfo( this );
+decaf::lang::Pointer<commands::Command> RemoveSubscriptionInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processRemoveSubscriptionInfo(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.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;
 
@@ -57,8 +57,8 @@ namespace commands{
 
     private:
 
-        RemoveSubscriptionInfo( const RemoveSubscriptionInfo& );
-        RemoveSubscriptionInfo& operator= ( const RemoveSubscriptionInfo& );
+        RemoveSubscriptionInfo(const RemoveSubscriptionInfo&);
+        RemoveSubscriptionInfo& operator= (const RemoveSubscriptionInfo&);
 
     public:
 
@@ -70,11 +70,11 @@ namespace commands{
 
         virtual RemoveSubscriptionInfo* 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<ConnectionId>& getConnectionId() const;
         virtual Pointer<ConnectionId>& getConnectionId();
@@ -95,7 +95,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/ReplayCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ReplayCommand::ReplayCommand() 
-    : BaseCommand(), firstNakNumber(0), lastNakNumber(0) {
+ReplayCommand::ReplayCommand() :
+    BaseCommand(), firstNakNumber(0), lastNakNumber(0) {
 
 }
 
@@ -49,35 +49,35 @@ ReplayCommand::~ReplayCommand() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ReplayCommand* ReplayCommand::cloneDataStructure() const {
-    std::auto_ptr<ReplayCommand> replayCommand( new ReplayCommand() );
+    std::auto_ptr<ReplayCommand> replayCommand(new ReplayCommand());
 
     // Copy the data from the base class or classes
-    replayCommand->copyDataStructure( this );
+    replayCommand->copyDataStructure(this);
 
     return replayCommand.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ReplayCommand::copyDataStructure( const DataStructure* src ) {
+void ReplayCommand::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ReplayCommand* srcPtr = dynamic_cast<const ReplayCommand*>( src );
+    const ReplayCommand* srcPtr = dynamic_cast<const ReplayCommand*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ReplayCommand::copyDataStructure - src is NULL or invalid" );
+            "ReplayCommand::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setFirstNakNumber( srcPtr->getFirstNakNumber() );
-    this->setLastNakNumber( srcPtr->getLastNakNumber() );
+    this->setFirstNakNumber(srcPtr->getFirstNakNumber());
+    this->setLastNakNumber(srcPtr->getLastNakNumber());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -103,25 +103,25 @@ std::string ReplayCommand::toString() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ReplayCommand::equals( const DataStructure* value ) const {
+bool ReplayCommand::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ReplayCommand* valuePtr = dynamic_cast<const ReplayCommand*>( value );
+    const ReplayCommand* valuePtr = dynamic_cast<const ReplayCommand*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getFirstNakNumber() != valuePtr->getFirstNakNumber() ) {
+    if (this->getFirstNakNumber() != valuePtr->getFirstNakNumber()) {
         return false;
     }
-    if( this->getLastNakNumber() != valuePtr->getLastNakNumber() ) {
+    if (this->getLastNakNumber() != valuePtr->getLastNakNumber()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -133,7 +133,7 @@ int ReplayCommand::getFirstNakNumber() c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ReplayCommand::setFirstNakNumber( int firstNakNumber ) {
+void ReplayCommand::setFirstNakNumber(int firstNakNumber) {
     this->firstNakNumber = firstNakNumber;
 }
 
@@ -143,12 +143,11 @@ int ReplayCommand::getLastNakNumber() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ReplayCommand::setLastNakNumber( int lastNakNumber ) {
+void ReplayCommand::setLastNakNumber(int lastNakNumber) {
     this->lastNakNumber = lastNakNumber;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ReplayCommand::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processReplayCommand( this );
+decaf::lang::Pointer<commands::Command> ReplayCommand::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processReplayCommand(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.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;
 
@@ -55,8 +55,8 @@ namespace commands{
 
     private:
 
-        ReplayCommand( const ReplayCommand& );
-        ReplayCommand& operator= ( const ReplayCommand& );
+        ReplayCommand(const ReplayCommand&);
+        ReplayCommand& operator= (const ReplayCommand&);
 
     public:
 
@@ -68,11 +68,11 @@ namespace commands{
 
         virtual ReplayCommand* 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 int getFirstNakNumber() const;
         virtual void setFirstNakNumber( int firstNakNumber );
@@ -87,7 +87,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/Response.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-Response::Response() 
-    : BaseCommand(), correlationId(0) {
+Response::Response() :
+    BaseCommand(), correlationId(0) {
 
 }
 
@@ -49,34 +49,34 @@ Response::~Response() {
 
 ////////////////////////////////////////////////////////////////////////////////
 Response* Response::cloneDataStructure() const {
-    std::auto_ptr<Response> response( new Response() );
+    std::auto_ptr<Response> response(new Response());
 
     // Copy the data from the base class or classes
-    response->copyDataStructure( this );
+    response->copyDataStructure(this);
 
     return response.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Response::copyDataStructure( const DataStructure* src ) {
+void Response::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const Response* srcPtr = dynamic_cast<const Response*>( src );
+    const Response* srcPtr = dynamic_cast<const Response*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "Response::copyDataStructure - src is NULL or invalid" );
+            "Response::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setCorrelationId( srcPtr->getCorrelationId() );
+    this->setCorrelationId(srcPtr->getCorrelationId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -100,22 +100,22 @@ std::string Response::toString() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Response::equals( const DataStructure* value ) const {
+bool Response::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const Response* valuePtr = dynamic_cast<const Response*>( value );
+    const Response* valuePtr = dynamic_cast<const Response*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getCorrelationId() != valuePtr->getCorrelationId() ) {
+    if (this->getCorrelationId() != valuePtr->getCorrelationId()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -127,12 +127,11 @@ int Response::getCorrelationId() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Response::setCorrelationId( int correlationId ) {
+void Response::setCorrelationId(int correlationId) {
     this->correlationId = correlationId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> Response::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processResponse( this );
+decaf::lang::Pointer<commands::Command> Response::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processResponse(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.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:
 
-        Response( const Response& );
-        Response& operator= ( const Response& );
+        Response(const Response&);
+        Response& operator= (const Response&);
 
     public:
 
@@ -67,11 +67,11 @@ namespace commands{
 
         virtual Response* 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 int getCorrelationId() const;
         virtual void setCorrelationId( int correlationId );
@@ -83,7 +83,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 



Mime
View raw message