Repository: activemq-cpp Updated Branches: refs/heads/master 0ffc11fdc -> f1ff5ef45
Fix a number of warnings in the docs that get shown during 'make doxygen-run' Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/c312cfe0 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/c312cfe0 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/c312cfe0 Branch: refs/heads/master Commit: c312cfe0eb8d502fb1bb786514022af9929c3fe9 Parents: 0ffc11f Author: Timothy Bish <[email protected]> Authored: Thu Aug 6 15:34:31 2015 -0400 Committer: Timothy Bish <[email protected]> Committed: Thu Aug 6 15:34:31 2015 -0400 ---------------------------------------------------------------------- .../src/main/activemq/core/ActiveMQConnection.h | 5 +- .../activemq/core/ActiveMQConnectionFactory.h | 4 +- .../src/main/activemq/threads/TaskRunner.h | 2 +- .../util/ActiveMQMessageTransformation.h | 2 + .../main/decaf/internal/nio/DoubleArrayBuffer.h | 28 ++++---- .../main/decaf/internal/nio/FloatArrayBuffer.h | 30 ++++---- activemq-cpp/src/main/decaf/net/ServerSocket.h | 34 ++++----- activemq-cpp/src/main/decaf/net/SocketFactory.h | 4 +- activemq-cpp/src/main/decaf/net/URL.h | 6 +- .../src/main/decaf/net/ssl/SSLParameters.h | 3 +- .../src/main/decaf/net/ssl/SSLServerSocket.h | 16 ++--- .../src/main/decaf/security/MessageDigest.h | 6 +- .../src/main/decaf/security/SecureRandom.cpp | 76 ++++++++++---------- .../src/main/decaf/security/SecureRandom.h | 28 +++----- activemq-cpp/src/main/decaf/util/HashSet.h | 4 +- activemq-cpp/src/main/decaf/util/List.h | 4 +- activemq-cpp/src/main/decaf/util/StlList.h | 13 +--- .../src/main/decaf/util/concurrent/Executor.h | 2 +- .../src/main/decaf/util/concurrent/FutureTask.h | 2 +- .../util/concurrent/RejectedExecutionHandler.h | 4 +- .../decaf/util/concurrent/ThreadPoolExecutor.h | 15 ++-- .../src/main/decaf/util/logging/ErrorManager.h | 4 +- .../src/main/decaf/util/logging/Formatter.h | 29 +++++--- .../src/main/decaf/util/logging/Logger.h | 3 +- activemq-cpp/src/main/decaf/util/zip/Deflater.h | 2 +- 25 files changed, 160 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h index cf30c0e..2544862 100644 --- a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h +++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h @@ -978,8 +978,9 @@ namespace core { /** * Sets the pointer to the first exception that caused the Connection to become failed. * - * @param pointer to the exception instance that is to be the first failure error if the - * first error is already set this value is deleted. + * @param error + * pointer to the exception instance that is to be the first failure error if the + * first error is already set this value is deleted. */ void setFirstFailureError(decaf::lang::Exception* error); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h index 7fd0918..6f4e21c 100644 --- a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h +++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h @@ -189,7 +189,7 @@ namespace core { /** * Sets the Broker URI that should be used when creating a new connection instance. * - * @param brokerURI + * @param uri * The string form of the Broker URI, this will be converted to a URI object. */ void setBrokerURI(const std::string& uri); @@ -197,7 +197,7 @@ namespace core { /** * Sets the Broker URI that should be used when creating a new connection instance. * - * @param brokerURI + * @param uri * The URI of the broker that this client will connect to. */ void setBrokerURI(const decaf::net::URI& uri); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/activemq/threads/TaskRunner.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/threads/TaskRunner.h b/activemq-cpp/src/main/activemq/threads/TaskRunner.h index 73edcfe..cac1558 100644 --- a/activemq-cpp/src/main/activemq/threads/TaskRunner.h +++ b/activemq-cpp/src/main/activemq/threads/TaskRunner.h @@ -37,7 +37,7 @@ namespace threads { virtual void start() = 0; /** - * @retuns true if the start method has been called. + * @return true if the start method has been called. */ virtual bool isStarted() const = 0; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/activemq/util/ActiveMQMessageTransformation.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/util/ActiveMQMessageTransformation.h b/activemq-cpp/src/main/activemq/util/ActiveMQMessageTransformation.h index 71d2a66..39773ad 100644 --- a/activemq-cpp/src/main/activemq/util/ActiveMQMessageTransformation.h +++ b/activemq-cpp/src/main/activemq/util/ActiveMQMessageTransformation.h @@ -75,6 +75,8 @@ namespace util { * * @param message * CMS Message to be converted into ActiveMQ's implementation. + * @param connection + * The Connection instance where this message was created. * @param amqMessage * Pointer to a pointer where the casted or cloned AMQ message is stored. * http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.h b/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.h index 9529d54..5eee214 100644 --- a/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.h +++ b/activemq-cpp/src/main/decaf/internal/nio/DoubleArrayBuffer.h @@ -28,9 +28,9 @@ #include <decaf/lang/Pointer.h> -namespace decaf{ -namespace internal{ -namespace nio{ +namespace decaf { +namespace internal { +namespace nio { using decaf::internal::util::ByteArrayAdapter; @@ -63,7 +63,7 @@ namespace nio{ * * @throws IllegalArguementException if the capacity value is negative. */ - DoubleArrayBuffer( int capacity, bool readOnly = false ); + DoubleArrayBuffer(int size, bool readOnly = false); /** * Creates a DoubleArrayBuffer object that wraps the given array. If the own flag @@ -83,7 +83,7 @@ namespace nio{ * @throws NullPointerException if buffer is NULL * @throws IndexOutOfBoundsException if offset is greater than array capacity. */ - DoubleArrayBuffer( double* array, int size, int offset, int length, bool readOnly = false ); + DoubleArrayBuffer(double* array, int size, int offset, int length, bool readOnly = false); /** * Creates a byte buffer that wraps the passed ByteArrayAdapter and @@ -102,8 +102,8 @@ namespace nio{ * @throws NullPointerException if array is NULL * @throws IndexOutOfBoundsException if offset + length is greater than array size. */ - DoubleArrayBuffer( const decaf::lang::Pointer<ByteArrayAdapter>& array, - int offset, int length, bool readOnly = false ); + DoubleArrayBuffer(const decaf::lang::Pointer<ByteArrayAdapter>& array, + int offset, int length, bool readOnly = false); /** * Create a DoubleArrayBuffer that mirrors this one, meaning it shares a @@ -113,7 +113,7 @@ namespace nio{ * @param other * The DoubleArrayBuffer this one is to mirror. */ - DoubleArrayBuffer( const DoubleArrayBuffer& other ); + DoubleArrayBuffer(const DoubleArrayBuffer& other); virtual ~DoubleArrayBuffer(); @@ -152,12 +152,14 @@ namespace nio{ /** * {@inheritDoc} */ - virtual double get( int index ) const; + virtual double get(int index) const; /** * {@inheritDoc} */ - virtual bool hasArray() const { return true; } + virtual bool hasArray() const { + return true; + } /** * {@inheritDoc} @@ -169,12 +171,12 @@ namespace nio{ /** * {@inheritDoc} */ - virtual DoubleBuffer& put( double value ); + virtual DoubleBuffer& put(double value); /** * {@inheritDoc} */ - virtual DoubleBuffer& put( int index, double value ); + virtual DoubleBuffer& put(int index, double value); /** * {@inheritDoc} @@ -189,7 +191,7 @@ namespace nio{ * @param value * Boolean value, true if this buffer is to be read-only, false otherwise. */ - virtual void setReadOnly( bool value ) { + virtual void setReadOnly(bool value) { this->readOnly = value; } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.h b/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.h index 35413d7..1488df7 100644 --- a/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.h +++ b/activemq-cpp/src/main/decaf/internal/nio/FloatArrayBuffer.h @@ -28,9 +28,9 @@ #include <decaf/lang/Pointer.h> -namespace decaf{ -namespace internal{ -namespace nio{ +namespace decaf { +namespace internal { +namespace nio { using decaf::internal::util::ByteArrayAdapter; @@ -63,7 +63,7 @@ namespace nio{ * * @throws IllegalArguementException if the capacity value is negative. */ - FloatArrayBuffer( int size, bool readOnly = false ); + FloatArrayBuffer(int size, bool readOnly = false); /** * Creates a FloatArrayBuffer object that wraps the given array. If the own flag @@ -83,7 +83,7 @@ namespace nio{ * @throws NullPointerException if buffer is NULL * @throws IndexOutOfBoundsException if offset is greater than array capacity. */ - FloatArrayBuffer( float* array, int size, int offset, int length, bool readOnly = false ); + FloatArrayBuffer(float* array, int size, int offset, int length, bool readOnly = false); /** * Creates a byte buffer that wraps the passed ByteArrayAdapter and @@ -94,7 +94,7 @@ namespace nio{ * The ByteArrayAdapter to wrap. * @param offset * The position that is this buffers start position. - * @param length + * @param capacity * The limit of how many bytes into the array this Buffer can write. * @param readOnly * Boolean indicating if this buffer should be read-only, default as false. @@ -102,8 +102,8 @@ namespace nio{ * @throws NullPointerException if array is NULL * @throws IndexOutOfBoundsException if offset + length is greater than array size. */ - FloatArrayBuffer( const decaf::lang::Pointer<ByteArrayAdapter>& array, int offset, int capacity, - bool readOnly = false ); + FloatArrayBuffer(const decaf::lang::Pointer<ByteArrayAdapter>& array, int offset, int capacity, + bool readOnly = false); /** * Create a FloatArrayBuffer that mirrors this one, meaning it shares a @@ -113,7 +113,7 @@ namespace nio{ * @param other * The FloatArrayBuffer this one is to mirror. */ - FloatArrayBuffer( const FloatArrayBuffer& other ); + FloatArrayBuffer(const FloatArrayBuffer& other); virtual ~FloatArrayBuffer(); @@ -152,12 +152,14 @@ namespace nio{ /** * {@inheritDoc} */ - virtual float get( int index ) const; + virtual float get(int index) const; /** * {@inheritDoc} */ - virtual bool hasArray() const { return true; } + virtual bool hasArray() const { + return true; + } /** * {@inheritDoc} @@ -169,12 +171,12 @@ namespace nio{ /** * {@inheritDoc} */ - virtual FloatBuffer& put( float value ); + virtual FloatBuffer& put(float value); /** * {@inheritDoc} */ - virtual FloatBuffer& put( int index, float value ); + virtual FloatBuffer& put(int index, float value); /** * {@inheritDoc} @@ -189,7 +191,7 @@ namespace nio{ * @param value * Boolean value, true if this buffer is to be read-only, false otherwise. */ - virtual void setReadOnly( bool value ) { + virtual void setReadOnly(bool value) { this->readOnly = value; } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/net/ServerSocket.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/net/ServerSocket.h b/activemq-cpp/src/main/decaf/net/ServerSocket.h index 3581081..b0f7cc1 100644 --- a/activemq-cpp/src/main/decaf/net/ServerSocket.h +++ b/activemq-cpp/src/main/decaf/net/ServerSocket.h @@ -31,8 +31,8 @@ #include <string> -namespace decaf{ -namespace net{ +namespace decaf { +namespace net { class Socket; class SocketImpl; @@ -65,8 +65,8 @@ namespace net{ private: - ServerSocket( const ServerSocket& ); - ServerSocket& operator= ( const ServerSocket& ); + ServerSocket(const ServerSocket&); + ServerSocket& operator=(const ServerSocket&); public: @@ -91,7 +91,7 @@ namespace net{ * @throws IOException if there is an I/O error while performing this operation. * @throws IllegalArgumentException if the port value is negative or greater than 65535. */ - ServerSocket( int port ); + ServerSocket(int port); /** * Creates a new ServerSocket bound to the specified port, if the value of port is 0, then @@ -112,7 +112,7 @@ namespace net{ * @throws IOException if there is an I/O error while performing this operation. * @throws IllegalArgumentException if the port value is negative or greater than 65535. */ - ServerSocket( int port, int backlog ); + ServerSocket(int port, int backlog); /** * Creates a new ServerSocket bound to the specified port, if the value of port is 0, then @@ -130,13 +130,13 @@ namespace net{ * The port to bind the ServerSocket to. * @param backlog * The the number of incoming connection attempts to queue before connections are refused. - * @param ifAddress + * @param address * The IP Address to bind to on the local machine. * * @throws IOException if there is an I/O error while performing this operation. * @throws IllegalArgumentException if the port value is negative or greater than 65535. */ - ServerSocket( int port, int backlog, const InetAddress* address ); + ServerSocket(int port, int backlog, const InetAddress* address); /** * Releases socket handle if close() hasn't been called. @@ -155,7 +155,7 @@ namespace net{ * * @throws NullPointerException if the passed SocketImpl is Null. */ - ServerSocket( SocketImpl* impl ); + ServerSocket(SocketImpl* impl); public: @@ -172,7 +172,7 @@ namespace net{ * @throws IOException if an I/O error occurs while binding the socket. * @throws IllegalArgumentException if the parameters are not valid. */ - virtual void bind( const std::string& host, int port ); + virtual void bind(const std::string& host, int port); /** * Bind and listen to given local IPAddress and port, if the address is empty @@ -192,7 +192,7 @@ namespace net{ * @throws IOException if an I/O error occurs while binding the socket. * @throws IllegalArgumentException if the parameters are not valid. */ - virtual void bind( const std::string& host, int port, int backlog ); + virtual void bind(const std::string& host, int port, int backlog); /** * Listens for a connection request on the bound IPAddress and Port for this ServerSocket, the @@ -245,7 +245,7 @@ namespace net{ * @throws SocketException if the operation fails. * @throws IllegalArgumentException if the value is zero or negative. */ - virtual void setReceiveBufferSize( int size ); + virtual void setReceiveBufferSize(int size); /** * Gets the reuse address flag, SO_REUSEADDR. @@ -264,7 +264,7 @@ namespace net{ * * @throws SocketException if the operation fails. */ - virtual void setReuseAddress( bool reuse ); + virtual void setReuseAddress(bool reuse); /** * Gets the timeout for socket operations, SO_TIMEOUT. @@ -285,7 +285,7 @@ namespace net{ * @throws SocketException Thrown if unable to set the information. * @throws IllegalArgumentException if the timeout value is negative. */ - virtual void setSoTimeout( int timeout ); + virtual void setSoTimeout(int timeout); /** * Gets the port number on the Local machine that this ServerSocket is bound to. @@ -312,7 +312,7 @@ namespace net{ * @throws IOException if an I/O error occurs while performing this operation. * @throws SocketException if this method has already been called with a valid factory. */ - static void setSocketImplFactory( SocketImplFactory* factory ); + static void setSocketImplFactory(SocketImplFactory* factory); protected: @@ -325,7 +325,7 @@ namespace net{ * * @throws IOException if an I/O error occurs while performing this operation. */ - virtual void implAccept( Socket* socket ); + virtual void implAccept(Socket* socket); /** * Allows a subclass to override what is considered the default backlog. @@ -343,7 +343,7 @@ namespace net{ void ensureCreated() const; // Binds and sets up the Listen for this Server Socket - void setupSocketImpl( int port, int backlog, const InetAddress* ifAddress ); + void setupSocketImpl(int port, int backlog, const InetAddress* ifAddress); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/net/SocketFactory.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/net/SocketFactory.h b/activemq-cpp/src/main/decaf/net/SocketFactory.h index 982b065..cc19a64 100644 --- a/activemq-cpp/src/main/decaf/net/SocketFactory.h +++ b/activemq-cpp/src/main/decaf/net/SocketFactory.h @@ -114,7 +114,7 @@ namespace net{ * @throws IOException if an I/O error occurs while creating the Socket object. * @throws UnknownHostException if the host name is not known. */ - virtual Socket* createSocket(const std::string& name, int port) = 0; + virtual Socket* createSocket(const std::string& host, int port) = 0; /** * Creates a new Socket object and connects it to the specified remote host and @@ -134,7 +134,7 @@ namespace net{ * @throws IOException if an I/O error occurs while creating the Socket object. * @throws UnknownHostException if the host name is not known. */ - virtual Socket* createSocket(const std::string& name, int port, const InetAddress* ifAddress, int localPort) = 0; + virtual Socket* createSocket(const std::string& host, int port, const InetAddress* ifAddress, int localPort) = 0; /** * Returns an pointer to the default SocketFactory for this Application, there is only one http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/net/URL.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/net/URL.h b/activemq-cpp/src/main/decaf/net/URL.h index 138b605..c94c6fe 100644 --- a/activemq-cpp/src/main/decaf/net/URL.h +++ b/activemq-cpp/src/main/decaf/net/URL.h @@ -128,7 +128,7 @@ namespace net { * This constructor is equivalent to a call to the two-argument constructor with * a empty first argument. * - * @param spec + * @param url * the String to parse as a URL. * * @throws MalformedURLException If the string specifies an unknown protocol. @@ -215,8 +215,6 @@ namespace net { * the name of the protocol to use. * @param host * the name of the host. - * @param port - * the port number on the host. * @param file * the file on the host * @@ -261,7 +259,7 @@ namespace net { * * @throws MalformedURLException if an unknown protocol is specified. */ - URL(const URL& context, const decaf::lang::String& spec, URLStreamHandler* streamHandler); + URL(const URL& context, const decaf::lang::String& spec, URLStreamHandler* handler); virtual ~URL(); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/net/ssl/SSLParameters.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/net/ssl/SSLParameters.h b/activemq-cpp/src/main/decaf/net/ssl/SSLParameters.h index 64f636a..9be15d9 100644 --- a/activemq-cpp/src/main/decaf/net/ssl/SSLParameters.h +++ b/activemq-cpp/src/main/decaf/net/ssl/SSLParameters.h @@ -111,7 +111,8 @@ namespace ssl { * Sets whether client authentication should be requested. Calling this method clears the * needClientAuth flag. * - * @param whether client authentication should be requested. + * @param wantClientAuth + * whether client authentication should be requested. */ void setWantClientAuth(bool wantClientAuth) { this->wantClientAuth = wantClientAuth; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/net/ssl/SSLServerSocket.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/net/ssl/SSLServerSocket.h b/activemq-cpp/src/main/decaf/net/ssl/SSLServerSocket.h index e7d20c9..db8118b 100644 --- a/activemq-cpp/src/main/decaf/net/ssl/SSLServerSocket.h +++ b/activemq-cpp/src/main/decaf/net/ssl/SSLServerSocket.h @@ -57,7 +57,7 @@ namespace ssl { * @throws IOException if there is an I/O error while performing this operation. * @throws IllegalArgumentException if the port value is negative or greater than 65535. */ - SSLServerSocket( int port ); + SSLServerSocket(int port); /** * Creates a new ServerSocket bound to the specified port, if the value of port is 0, then @@ -78,7 +78,7 @@ namespace ssl { * @throws IOException if there is an I/O error while performing this operation. * @throws IllegalArgumentException if the port value is negative or greater than 65535. */ - SSLServerSocket( int port, int backlog ); + SSLServerSocket(int port, int backlog); /** * Creates a new ServerSocket bound to the specified port, if the value of port is 0, then @@ -96,13 +96,13 @@ namespace ssl { * The port to bind the ServerSocket to. * @param backlog * The the number of incoming connection attempts to queue before connections are refused. - * @param ifAddress + * @param address * The IP Address to bind to on the local machine. * * @throws IOException if there is an I/O error while performing this operation. * @throws IllegalArgumentException if the port value is negative or greater than 65535. */ - SSLServerSocket( int port, int backlog, const decaf::net::InetAddress* address ); + SSLServerSocket(int port, int backlog, const decaf::net::InetAddress* address); public: @@ -142,7 +142,7 @@ namespace ssl { * * @throws IllegalArgumentException if the vector is empty or one of the names is invalid. */ - virtual void setEnabledCipherSuites( const std::vector<std::string>& suites ) = 0; + virtual void setEnabledCipherSuites(const std::vector<std::string>& suites) = 0; /** * Returns a vector containing the names of all the currently enabled Protocols for @@ -162,7 +162,7 @@ namespace ssl { * * @throws IllegalArgumentException if the vector is empty or one of the names is invalid. */ - virtual void setEnabledProtocols( const std::vector<std::string>& protocols ) = 0; + virtual void setEnabledProtocols(const std::vector<std::string>& protocols) = 0; /** * @return true if the Socket request client Authentication. @@ -177,7 +177,7 @@ namespace ssl { * @param value * Whether the server socket should request client authentication. */ - virtual void setWantClientAuth( bool value ) = 0; + virtual void setWantClientAuth(bool value) = 0; /** * @return true if the Socket requires client Authentication. @@ -192,7 +192,7 @@ namespace ssl { * @param value * Whether the server socket should require client authentication. */ - virtual void setNeedClientAuth( bool value ) = 0; + virtual void setNeedClientAuth(bool value) = 0; }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/security/MessageDigest.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/security/MessageDigest.h b/activemq-cpp/src/main/decaf/security/MessageDigest.h index 47fd9c3..69a0cd0 100644 --- a/activemq-cpp/src/main/decaf/security/MessageDigest.h +++ b/activemq-cpp/src/main/decaf/security/MessageDigest.h @@ -207,14 +207,14 @@ namespace security { * * @param input * The array of bytes. - * @param input + * @param size * The size of the given input buffer. * @param offset * The offset to start from in the array of bytes. * @param length * The number of bytes to use, starting at offset. */ - void update(unsigned char* input, int size, int offset, int len); + void update(unsigned char* input, int size, int offset, int length); /** * Updates the digest using the specified array of bytes. @@ -260,7 +260,7 @@ namespace security { * * @param digesta * The first digest for comparison. - * @param digesta + * @param digestb * The second digest for comparison. * * @return true if the two digests are equal. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/security/SecureRandom.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/security/SecureRandom.cpp b/activemq-cpp/src/main/decaf/security/SecureRandom.cpp index e2f7cf9..58cb680 100644 --- a/activemq-cpp/src/main/decaf/security/SecureRandom.cpp +++ b/activemq-cpp/src/main/decaf/security/SecureRandom.cpp @@ -47,19 +47,19 @@ SecureRandom::SecureRandom( const std::vector<unsigned char>& seed ) : } //////////////////////////////////////////////////////////////////////////////// -SecureRandom::SecureRandom( const unsigned char* seed, int size ) : +SecureRandom::SecureRandom(const unsigned char* seed, int size) : secureRandom(new SecureRandomImpl()) { - if( seed == NULL ) { - throw NullPointerException( __FILE__, __LINE__, "Seed buffer pointer passed was NULL" ); + if (seed == NULL) { + throw NullPointerException( __FILE__, __LINE__, "Seed buffer pointer passed was NULL"); } - if( size < 0 ) { - throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer size was negative." ); + if (size < 0) { + throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer size was negative."); } - if( size > 0 ) { - this->secureRandom->providerSetSeed( seed, size ); + if (size > 0) { + this->secureRandom->providerSetSeed(seed, size); } } @@ -68,32 +68,32 @@ SecureRandom::~SecureRandom() { } //////////////////////////////////////////////////////////////////////////////// -void SecureRandom::nextBytes( std::vector<unsigned char>& buf ) { - if( !buf.empty() ) { - this->secureRandom->providerNextBytes( &buf[0], (int)buf.size() ); +void SecureRandom::nextBytes(std::vector<unsigned char>& buf) { + if (!buf.empty()) { + this->secureRandom->providerNextBytes(&buf[0], (int) buf.size()); } } //////////////////////////////////////////////////////////////////////////////// -void SecureRandom::nextBytes( unsigned char* buf, int size ) { +void SecureRandom::nextBytes(unsigned char* buf, int size) { - if( buf == NULL ) { - throw NullPointerException( __FILE__, __LINE__, "Buffer pointer passed was NULL" ); + if (buf == NULL) { + throw NullPointerException( __FILE__, __LINE__, "Buffer pointer passed was NULL"); } - if( size < 0 ) { - throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer size was negative." ); + if (size < 0) { + throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer size was negative."); } - if( size > 0 ) { - this->secureRandom->providerNextBytes( buf, size ); + if (size > 0) { + this->secureRandom->providerNextBytes(buf, size); } } //////////////////////////////////////////////////////////////////////////////// -void SecureRandom::setSeed( unsigned long long seed ) { +void SecureRandom::setSeed(unsigned long long seed) { - if( seed == 0 ) { + if (seed == 0) { return; } @@ -110,49 +110,49 @@ void SecureRandom::setSeed( unsigned long long seed ) { } //////////////////////////////////////////////////////////////////////////////// -void SecureRandom::setSeed( const std::vector<unsigned char>& seed ) { - if( !seed.empty() ) { - this->secureRandom->providerSetSeed( &seed[0], (int)seed.size() ); +void SecureRandom::setSeed(const std::vector<unsigned char>& seed) { + if (!seed.empty()) { + this->secureRandom->providerSetSeed(&seed[0], (int) seed.size()); } } //////////////////////////////////////////////////////////////////////////////// -void SecureRandom::setSeed( const unsigned char* seed, int size ) { +void SecureRandom::setSeed(const unsigned char* seed, int size) { - if( seed == NULL ) { - throw NullPointerException( __FILE__, __LINE__, "Buffer pointer passed was NULL" ); + if (seed == NULL) { + throw NullPointerException( __FILE__, __LINE__, "Buffer pointer passed was NULL"); } - if( size < 0 ) { - throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer size was negative." ); + if (size < 0) { + throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer size was negative."); } - if( size > 0 ) { - this->secureRandom->providerSetSeed( seed, size ); + if (size > 0) { + this->secureRandom->providerSetSeed(seed, size); } } //////////////////////////////////////////////////////////////////////////////// -int SecureRandom::next( int numBits ) { +int SecureRandom::next(int numBits) { - if( numBits < 0 ) { + if (numBits < 0) { numBits = 0; - } else if(numBits > 32 ) { + } else if (numBits > 32) { numBits = 32; } - int bytes = ( numBits + 7 ) / 8; + int bytes = (numBits + 7) / 8; unsigned char* next = new unsigned char[bytes]; unsigned int ret = 0; - this->nextBytes( next, bytes ); - for( int i = 0; i < bytes; i++ ) { - ret = ( next[i] & 0xFF ) | ( ret << 8 ); + this->nextBytes(next, bytes); + for (int i = 0; i < bytes; i++) { + ret = (next[i] & 0xFF) | (ret << 8); } - ret = ret >> ( ( bytes * 8 ) - numBits ); + ret = ret >> ((bytes * 8) - numBits); - delete [] next; + delete[] next; return ret; } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/security/SecureRandom.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/security/SecureRandom.h b/activemq-cpp/src/main/decaf/security/SecureRandom.h index 2f5e110..0917c7b 100644 --- a/activemq-cpp/src/main/decaf/security/SecureRandom.h +++ b/activemq-cpp/src/main/decaf/security/SecureRandom.h @@ -58,7 +58,7 @@ namespace security { * @param seed * The seed bytes to use to seed this secure random number generator. */ - SecureRandom( const std::vector<unsigned char>& seed ); + SecureRandom(const std::vector<unsigned char>& seed); /** * Creates a new instance of a secure random number generator that implements the @@ -75,26 +75,17 @@ namespace security { * @throw NullPointerException if the seed buffer is NULL. * @throw IllegalArgumentException if the size value is negative. */ - SecureRandom( const unsigned char* seed, int size ); + SecureRandom(const unsigned char* seed, int size); virtual ~SecureRandom(); public: // Virtual Methods - /** - * {@inheritDoc} - */ - virtual void nextBytes( std::vector<unsigned char>& buf ); + virtual void nextBytes(std::vector<unsigned char>& buf); - /** - * {@inheritDoc} - */ - virtual void nextBytes( unsigned char* buf, int size ); + virtual void nextBytes(unsigned char* buf, int size); - /** - * {@inheritDoc} - */ - virtual void setSeed( unsigned long long seed ); + virtual void setSeed(unsigned long long seed); /** * Supplements or sets the seed of this secure random number generator, calls to this @@ -103,7 +94,7 @@ namespace security { * @param seed * A vector of bytes that is used update the seed of the RNG. */ - virtual void setSeed( const std::vector<unsigned char>& seed ); + virtual void setSeed(const std::vector<unsigned char>& seed); /** * Supplements or sets the seed of this secure random number generator, calls to this @@ -117,14 +108,11 @@ namespace security { * @throw NullPointerException if the seed buffer is NULL. * @throw IllegalArgumentException if the size value is negative. */ - virtual void setSeed( const unsigned char* seed, int size ); + virtual void setSeed(const unsigned char* seed, int size); protected: // Virtual method used by all non-virtual methods in Random. - /** - * {@inheritDoc} - */ - virtual int next( int bits ); + virtual int next(int bits); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/HashSet.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/HashSet.h b/activemq-cpp/src/main/decaf/util/HashSet.h index 728f376..c447141 100644 --- a/activemq-cpp/src/main/decaf/util/HashSet.h +++ b/activemq-cpp/src/main/decaf/util/HashSet.h @@ -178,7 +178,7 @@ namespace util { * that (e == e2). If this set already contains the element, the call leaves the set * unchanged and returns false. * - * @param object + * @param value * The object to add. * * @return true when this HashSet did not already contain the object,false otherwise. @@ -200,7 +200,7 @@ namespace util { /** * Searches this {@code HashSet} for the specified object. * - * @param object + * @param value * the object to search for. * @return {@code true} if {@code object} is an element of this * {@code HashSet}, {@code false} otherwise. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/List.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/List.h b/activemq-cpp/src/main/decaf/util/List.h index ee77afd..1e267b2 100644 --- a/activemq-cpp/src/main/decaf/util/List.h +++ b/activemq-cpp/src/main/decaf/util/List.h @@ -27,8 +27,8 @@ #include <decaf/util/AbstractCollection.h> #include <decaf/util/ListIterator.h> -namespace decaf{ -namespace util{ +namespace decaf { +namespace util { /** * An ordered collection (also known as a sequence). The user of this interface has http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/StlList.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/StlList.h b/activemq-cpp/src/main/decaf/util/StlList.h index 3b1a181..7c599cf 100644 --- a/activemq-cpp/src/main/decaf/util/StlList.h +++ b/activemq-cpp/src/main/decaf/util/StlList.h @@ -30,8 +30,8 @@ #include <decaf/util/List.h> #include <decaf/util/AbstractList.h> -namespace decaf{ -namespace util{ +namespace decaf { +namespace util { /** * List class that wraps the STL list object to provide a simpler interface and @@ -430,9 +430,6 @@ namespace util{ return true; } - /** - * {@inheritDoc} - */ virtual bool addAll(int index, const Collection<E>& collection) { if (index < 0 || index > this->size()) { @@ -457,18 +454,12 @@ namespace util{ return true; } - /** - * {@inheritDoc} - */ virtual bool remove(const E& value) { int origSize = this->size(); this->values.remove(value); return origSize != this->size(); } - /** - * {@inheritDoc} - */ virtual E removeAt(int index) { if (index < 0 || index >= this->size()) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/concurrent/Executor.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/concurrent/Executor.h b/activemq-cpp/src/main/decaf/util/concurrent/Executor.h index 8841a71..da8e8bc 100644 --- a/activemq-cpp/src/main/decaf/util/concurrent/Executor.h +++ b/activemq-cpp/src/main/decaf/util/concurrent/Executor.h @@ -79,7 +79,7 @@ namespace concurrent { * implement {@link decaf.util.concurrent.ExecutorService}, which is a more * extensive interface. The {@link decaf.util.concurrent.ThreadPoolExecutor} * class provides an extensible thread pool implementation. The - * {@link decaf.util.concurrentExecutor} class provides convenient factory + * {@link decaf.util.concurrent.Executor} class provides convenient factory * methods for these Executors. * * @since 1.0 http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/concurrent/FutureTask.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/concurrent/FutureTask.h b/activemq-cpp/src/main/decaf/util/concurrent/FutureTask.h index cb55709..ea37db8 100644 --- a/activemq-cpp/src/main/decaf/util/concurrent/FutureTask.h +++ b/activemq-cpp/src/main/decaf/util/concurrent/FutureTask.h @@ -426,7 +426,7 @@ namespace concurrent { * internally by the <tt>run</tt> method upon successful completion of * the computation. * - * @param v + * @param result * The value to return as the result of this Future. */ virtual void set(const T& result) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/concurrent/RejectedExecutionHandler.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/concurrent/RejectedExecutionHandler.h b/activemq-cpp/src/main/decaf/util/concurrent/RejectedExecutionHandler.h index 78135af..0ce9671 100644 --- a/activemq-cpp/src/main/decaf/util/concurrent/RejectedExecutionHandler.h +++ b/activemq-cpp/src/main/decaf/util/concurrent/RejectedExecutionHandler.h @@ -50,14 +50,14 @@ namespace concurrent { * an {@link RejectedExecutionException}, which will be propagated to * the caller of {@link ThreadPoolExecutor#execute execute}. * - * @param r + * @param task * The pointer to the runnable task requested to be executed. * @param executor * The pointer to the executor attempting to execute this task. * * @throws RejectedExecutionException if there is no remedy. */ - virtual void rejectedExecution( decaf::lang::Runnable* r, ThreadPoolExecutor* executer ) = 0; + virtual void rejectedExecution(decaf::lang::Runnable* task, ThreadPoolExecutor* executor) = 0; }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.h b/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.h index c20d4f1..d55e328 100644 --- a/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.h +++ b/activemq-cpp/src/main/decaf/util/concurrent/ThreadPoolExecutor.h @@ -529,7 +529,7 @@ namespace concurrent{ /** * Handler policy for tasks that are rejected upon a call to ThreadPoolExecutor::execute * this class will attempt to run the task in the Thread that called the execute method - * unless the executor is shutdown in which case the task is not run and is destroyed.. + * unless the executor is shutdown in which case the task is not run and is destroyed. * * @since 1.0 */ @@ -549,10 +549,10 @@ namespace concurrent{ return; } - try{ + try { task->run(); delete task; - } catch(decaf::lang::Exception& ex) { + } catch (decaf::lang::Exception& ex) { delete task; throw ex; } @@ -583,7 +583,7 @@ namespace concurrent{ /** * Handler policy for tasks that are rejected upon a call to ThreadPoolExecutor::execute * this class always destroys the oldest unexecuted task in the Queue and then attempts - * to execute the rejected task using the passed in executor.. + * to execute the rejected task using the passed in executor. * * @since 1.0 */ @@ -596,21 +596,20 @@ namespace concurrent{ virtual ~DiscardOldestPolicy() { } - virtual void rejectedExecution( decaf::lang::Runnable* task, ThreadPoolExecutor* executer ) { + virtual void rejectedExecution(decaf::lang::Runnable* task, ThreadPoolExecutor* executer) { if (executer->isShutdown()) { delete task; return; } - try{ - + try { decaf::lang::Runnable* oldest = NULL; executer->getQueue()->poll(oldest); delete oldest; executer->execute(task); - } catch(decaf::lang::Exception& ex) { + } catch (decaf::lang::Exception& ex) { delete task; throw ex; } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/logging/ErrorManager.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/logging/ErrorManager.h b/activemq-cpp/src/main/decaf/util/logging/ErrorManager.h index 47b68f5..c062497 100644 --- a/activemq-cpp/src/main/decaf/util/logging/ErrorManager.h +++ b/activemq-cpp/src/main/decaf/util/logging/ErrorManager.h @@ -88,11 +88,11 @@ namespace logging { * This method may be overridden in subclasses. The default behavior in this base class is * that the first call is reported to System.err, and subsequent calls are ignored. * - * @param msg - a descriptive string (may be empty) + * @param message - a descriptive string (may be empty) * @param ex - an exception (may be NULL) * @param code - an error code defined in ErrorManager */ - virtual void error( const std::string& message, decaf::lang::Exception* ex, int code ); + virtual void error(const std::string& message, decaf::lang::Exception* ex, int code); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/logging/Formatter.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/logging/Formatter.h b/activemq-cpp/src/main/decaf/util/logging/Formatter.h index b99654d..1ee6984 100644 --- a/activemq-cpp/src/main/decaf/util/logging/Formatter.h +++ b/activemq-cpp/src/main/decaf/util/logging/Formatter.h @@ -20,9 +20,9 @@ #include <decaf/util/Config.h> #include <decaf/util/logging/Handler.h> -namespace decaf{ -namespace util{ -namespace logging{ +namespace decaf { +namespace util { +namespace logging { /** * A Formatter provides support for formatting LogRecords. @@ -41,17 +41,23 @@ namespace logging{ /** * Format the given log record and return the formatted string. - * @param record The Log Record to Format + * + * @param record + * The Log Record to Format + * * @return the formatted record. */ - virtual std::string format( const LogRecord& record ) const = 0; + virtual std::string format(const LogRecord& record) const = 0; /** * Format the message string from a log record. - * @param record The Log Record to Format + * + * @param record + * The Log Record to Format + * * @return the formatted message */ - virtual std::string formatMessage( const LogRecord& record ) const; + virtual std::string formatMessage(const LogRecord& record) const; /** * Return the header string for a set of formatted records. In the @@ -62,17 +68,20 @@ namespace logging{ * * @return the head string. */ - virtual std::string getHead( const Handler* handler DECAF_UNUSED ) { + virtual std::string getHead(const Handler* handler DECAF_UNUSED) { return ""; } /** * Return the tail string for a set of formatted records. In the * default implementation this method should return empty string - * @param handler the target handler, can be null + * + * @param handler + * the target handler, can be null + * * @return the tail string */ - virtual std::string getTail( const Handler* handler DECAF_UNUSED ) { + virtual std::string getTail(const Handler* handler DECAF_UNUSED) { return ""; } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/logging/Logger.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/logging/Logger.h b/activemq-cpp/src/main/decaf/util/logging/Logger.h index e0411a3..0a0e896 100644 --- a/activemq-cpp/src/main/decaf/util/logging/Logger.h +++ b/activemq-cpp/src/main/decaf/util/logging/Logger.h @@ -521,9 +521,10 @@ namespace logging{ * If the logger is currently enabled for the given message level * then the given message is forwarded to all the registered output * Handler objects - * @param level the Level to log at + * @param levels the Level to log at * @param file the message to log * @param line the line in the file + * @param message the log message * @param ... variable length argument to format the message string. */ virtual void log( const Level& levels, http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/c312cfe0/activemq-cpp/src/main/decaf/util/zip/Deflater.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/zip/Deflater.h b/activemq-cpp/src/main/decaf/util/zip/Deflater.h index 22cb556..b81edb3 100644 --- a/activemq-cpp/src/main/decaf/util/zip/Deflater.h +++ b/activemq-cpp/src/main/decaf/util/zip/Deflater.h @@ -73,7 +73,7 @@ namespace zip { static const int DEFLATED; /** - * Compression level for no compression. . + * Compression level for no compression. */ static const int NO_COMPRESSION;
