activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r959111 [2/2] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main: activemq/transport/ activemq/transport/correlator/ activemq/transport/failover/ activemq/transport/inactivity/ activemq/transport/logging/ activemq/transport/mock/ activ...
Date Tue, 29 Jun 2010 21:26:08 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransport.h Tue Jun 29 21:26:06 2010
@@ -100,31 +100,16 @@ namespace tcp{
          * @param properties
          *      The Properties that have been parsed from the URI or from configuration files.
          */
-        void connect( const decaf::net::URI& uri,
-                      const decaf::util::Properties& properties );
+        void connect( const decaf::net::URI& uri, const decaf::util::Properties& properties );
 
-        /**
-         * Delegates to the superclass and then closes the socket.
-         *
-         * @throws IOException if errors occur.
-         */
-        virtual void close() throw( decaf::io::IOException );
+    public:  // Transport Methods
+
+        virtual void close();
 
-        /**
-         * Is this Transport fault tolerant, meaning that it will reconnect to
-         * a broker on disconnect.
-         *
-         * @returns true if the Transport is fault tolerant.
-         */
         virtual bool isFaultTolerant() const {
             return false;
         }
 
-        /**
-         * Is the Transport Connected to its Broker.
-         *
-         * @returns true if a connection has been made.
-         */
         virtual bool isConnected() const {
             if( this->socket.get() != NULL ) {
                 return this->socket->isConnected();
@@ -133,11 +118,6 @@ namespace tcp{
             return false;
         }
 
-        /**
-         * Has the Transport been shutdown and no longer usable.
-         *
-         * @returns true if the Transport
-         */
         virtual bool isClosed() const {
             return this->closed;
         }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.cpp Tue Jun 29 21:26:06 2010
@@ -39,8 +39,7 @@ using namespace decaf;
 using namespace decaf::lang;
 
 ////////////////////////////////////////////////////////////////////////////////
-Pointer<Transport> TcpTransportFactory::create( const decaf::net::URI& location )
-    throw ( ActiveMQException ) {
+Pointer<Transport> TcpTransportFactory::create( const decaf::net::URI& location ) {
 
     try{
 
@@ -63,8 +62,7 @@ Pointer<Transport> TcpTransportFactory::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Pointer<Transport> TcpTransportFactory::createComposite( const decaf::net::URI& location )
-    throw ( ActiveMQException ) {
+Pointer<Transport> TcpTransportFactory::createComposite( const decaf::net::URI& location ) {
 
     try{
 
@@ -84,8 +82,7 @@ Pointer<Transport> TcpTransportFactory::
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<Transport> TcpTransportFactory::doCreateComposite( const decaf::net::URI& location,
                                                            const Pointer<wireformat::WireFormat>& wireFormat,
-                                                           const decaf::util::Properties& properties )
-    throw ( ActiveMQException ) {
+                                                           const decaf::util::Properties& properties ) {
 
     try {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/tcp/TcpTransportFactory.h Tue Jun 29 21:26:06 2010
@@ -36,41 +36,15 @@ namespace tcp{
 
         virtual ~TcpTransportFactory() {}
 
-        /**
-         * Creates a fully configured Transport instance which could be a chain
-         * of filters and transports.
-         * @param location - URI location to connect to plus any properties to assign.
-         * @throws ActiveMQexception if an error occurs
-         */
-        virtual Pointer<Transport> create( const decaf::net::URI& location )
-            throw ( exceptions::ActiveMQException );
-
-        /**
-         * Creates a slimed down Transport instance which can be used in composite
-         * transport instances.
-         * @param location - URI location to connect to plus any properties to assign.
-         * @throws ActiveMQexception if an error occurs
-         */
-        virtual Pointer<Transport> createComposite( const decaf::net::URI& location )
-            throw ( exceptions::ActiveMQException );
+        virtual Pointer<Transport> create( const decaf::net::URI& location );
+
+        virtual Pointer<Transport> createComposite( const decaf::net::URI& location );
 
     protected:
 
-        /**
-         * Creates a slimed down Transport instance which can be used in composite
-         * transport instances.
-         *
-         * @param location - URI location to connect to.
-         * @param wireFormat - the assigned WireFormat for the new Transport.
-         * @param properties - Properties to apply to the transport.
-         *
-         * @return new Pointer to a TcpTransport.
-         * @throws ActiveMQexception if an error occurs
-         */
         virtual Pointer<Transport> doCreateComposite( const decaf::net::URI& location,
                                                       const Pointer<wireformat::WireFormat>& wireFormat,
-                                                      const decaf::util::Properties& properties )
-            throw ( exceptions::ActiveMQException );
+                                                      const decaf::util::Properties& properties );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Closeable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Closeable.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Closeable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Closeable.h Tue Jun 29 21:26:06 2010
@@ -38,7 +38,7 @@ namespace io{
          *
          * @throws IOException if an error occurs while closing.
          */
-        virtual void close() throw( io::IOException ) = 0;
+        virtual void close() = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Flushable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Flushable.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Flushable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Flushable.h Tue Jun 29 21:26:06 2010
@@ -41,7 +41,7 @@ namespace io {
          *
          * @throws IOException if an I/O error occurs.
          */
-        virtual void flush() throw( decaf::io::IOException ) = 0;
+        virtual void flush() = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Appendable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Appendable.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Appendable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Appendable.h Tue Jun 29 21:26:06 2010
@@ -59,7 +59,7 @@ namespace lang{
          *
          * @throws Exception if an error occurs.
          */
-        virtual Appendable& append( char value ) throw( decaf::lang::Exception ) = 0;
+        virtual Appendable& append( char value ) = 0;
 
         /**
          * Appends the specified character sequence to this Appendable.
@@ -73,8 +73,7 @@ namespace lang{
          *
          * @throws Exception if an error occurs.
          */
-        virtual Appendable& append( const CharSequence* csq )
-            throw ( decaf::lang::Exception ) = 0;
+        virtual Appendable& append( const CharSequence* csq ) = 0;
 
         /**
          * Appends a subsequence of the specified character sequence to this Appendable.
@@ -93,8 +92,7 @@ namespace lang{
          * @throws IndexOutOfBoundsException start is greater than end, or end is
          *         greater than csq.length()
          */
-        virtual Appendable& append( const CharSequence* csq, int start, int end )
-            throw( decaf::lang::Exception ) = 0;
+        virtual Appendable& append( const CharSequence* csq, int start, int end ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/CharSequence.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/CharSequence.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/CharSequence.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/CharSequence.h Tue Jun 29 21:26:06 2010
@@ -46,25 +46,32 @@ namespace lang{
         /**
          * Returns the Char at the specified index so long as the index is not
          * greater than the length of the sequence.
-         * @param index - position to return the char at.
-         * @returns the char at the given position
+         *
+         * @param index
+         *      The position to return the char at.
+         *
+         * @returns the char at the given position.
+         *
          * @throws IndexOutOfBoundsException if index is > than length() or negative
          */
-        virtual char charAt( int index ) const
-            throw( lang::exceptions::IndexOutOfBoundsException ) = 0;
+        virtual char charAt( int index ) const = 0;
 
         /**
          * Returns a new CharSequence that is a subsequence of this sequence. The
          * subsequence starts with the char value at the specified index and ends with
          * the char value at index end - 1. The length (in chars) of the returned
          * sequence is end - start, so if start == end then an empty sequence is returned.
-         * @param start - the start index, inclusive
-         * @param end - the end index, exclusive
+         *
+         * @param start
+         *      The start index, inclusive.
+         * @param end
+         *      The end index, exclusive.
+         *
          * @returns a new CharSequence
+         *
          * @throws IndexOutOfBoundsException if start or end > length() or start or end are negative.
          */
-        virtual CharSequence* subSequence( int start, int end ) const
-            throw( lang::exceptions::IndexOutOfBoundsException ) = 0;
+        virtual CharSequence* subSequence( int start, int end ) const = 0;
 
         /**
          * @returns the string representation of this CharSequence

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Number.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Number.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Number.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Number.h Tue Jun 29 21:26:06 2010
@@ -29,6 +29,8 @@ namespace lang{
      *
      * Subclasses of Number must provide methods to convert the represented
      * numeric value to byte, double, float, int, long, and short.
+     *
+     * @since 1.0
      */
     class DECAF_API Number {
     public:
@@ -71,7 +73,7 @@ namespace lang{
          * Answers the short value which the receiver represents
          * @return short the value of the receiver.
          */
-        virtual short shortValue()  const {
+        virtual short shortValue() const {
             return (short) intValue();
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Readable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Readable.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Readable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Readable.h Tue Jun 29 21:26:06 2010
@@ -52,14 +52,11 @@ namespace lang {
          * @return The number of char values added to the buffer, or -1 if this source of
          *         characters is at its end
          *
-         * @throw IOException - if an I/O error occurs
-         * @throws NullPointerException - if buffer is NULL.
-         * @throw ReadOnlyBufferException - if charBuffer is a read only buffer
+         * @throws IOException if an I/O error occurs.
+         * @throws NullPointerException if buffer is NULL.
+         * @throws ReadOnlyBufferException if charBuffer is a read only buffer.
          */
-        virtual int read( decaf::nio::CharBuffer* charBuffer )
-                 throw( decaf::io::IOException,
-                        decaf::lang::exceptions::NullPointerException,
-                        decaf::nio::ReadOnlyBufferException ) = 0;
+        virtual int read( decaf::nio::CharBuffer* charBuffer ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.cpp?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.cpp Tue Jun 29 21:26:06 2010
@@ -84,8 +84,7 @@ bool String::isEmpty() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-char String::charAt( int index ) const
-    throw( lang::exceptions::IndexOutOfBoundsException ) {
+char String::charAt( int index ) const {
 
     try{
 
@@ -101,8 +100,7 @@ char String::charAt( int index ) const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-CharSequence* String::subSequence( int start DECAF_UNUSED, int end DECAF_UNUSED ) const
-    throw( lang::exceptions::IndexOutOfBoundsException ) {
+CharSequence* String::subSequence( int start DECAF_UNUSED, int end DECAF_UNUSED ) const {
 
     try{
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/String.h Tue Jun 29 21:26:06 2010
@@ -74,14 +74,12 @@ namespace lang {
         /**
          * {@inheritDoc}
          */
-        virtual char charAt( int index ) const
-            throw( lang::exceptions::IndexOutOfBoundsException );
+        virtual char charAt( int index ) const;
 
         /**
          * {@inheritDoc}
          */
-        virtual CharSequence* subSequence( int start, int end ) const
-            throw( lang::exceptions::IndexOutOfBoundsException );
+        virtual CharSequence* subSequence( int start, int end ) const;
 
         /**
          * {@inheritDoc}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Date.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Date.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Date.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Date.h Tue Jun 29 21:26:06 2010
@@ -125,36 +125,12 @@ namespace util{
 
     public:  // Comparable
 
-        /**
-         * Compares this Data object to the one given.
-         *
-         * @param value
-         *      The Date value to compare to this one.
-         *
-         * @returns zero if the Date values are equal, a value less than zero if this
-         *          Data value is earlier than argument value, and a value greater than
-         *          zero if this Date object is later than the argument Date value.
-         */
         virtual int compareTo( const Date& value ) const;
 
-        /**
-         * @return true if this value is considered equal to the passed value.
-         */
         virtual bool equals( const Date& value ) const;
 
-        /**
-         * Compares equality between this object and the one passed.
-         * @param value - the value to be compared to this one.
-         * @return true if this object is equal to the one passed.
-         */
         virtual bool operator==( const Date& value ) const;
 
-        /**
-         * Compares this object to another and returns true if this object
-         * is considered to be less than the one passed.  This
-         * @param value - the value to be compared to this one.
-         * @return true if this object is equal to the one passed.
-         */
         virtual bool operator<( const Date& value ) const;
 
     };

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp Tue Jun 29 21:26:06 2010
@@ -341,10 +341,7 @@ void Properties::selectProperties( StlMa
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Properties::load( decaf::io::InputStream* stream )
-    throw( decaf::io::IOException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::NullPointerException ) {
+void Properties::load( decaf::io::InputStream* stream ) {
 
     try{
 
@@ -506,10 +503,7 @@ void Properties::load( decaf::io::InputS
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Properties::load( decaf::io::Reader* reader )
-    throw( decaf::io::IOException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::NullPointerException ) {
+void Properties::load( decaf::io::Reader* reader ) {
 
     try{
 
@@ -531,9 +525,7 @@ void Properties::load( decaf::io::Reader
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Properties::store( decaf::io::OutputStream* out, const std::string& comments DECAF_UNUSED )
-    throw( decaf::io::IOException,
-           decaf::lang::exceptions::NullPointerException ) {
+void Properties::store( decaf::io::OutputStream* out, const std::string& comments DECAF_UNUSED ) {
 
     try{
 
@@ -582,9 +574,7 @@ void Properties::store( decaf::io::Outpu
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Properties::store( decaf::io::Writer* writer, const std::string& comments DECAF_UNUSED )
-    throw( decaf::io::IOException,
-           decaf::lang::exceptions::NullPointerException ) {
+void Properties::store( decaf::io::Writer* writer, const std::string& comments DECAF_UNUSED ) {
 
     try{
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h Tue Jun 29 21:26:06 2010
@@ -224,10 +224,7 @@ namespace util{
          * @throw IllegalArgumentException if malformed data is found while reading the properties.
          * @throw NullPointerException if the passed stream is Null.
          */
-        void load( decaf::io::InputStream* stream )
-            throw( decaf::io::IOException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::NullPointerException );
+        void load( decaf::io::InputStream* stream );
 
         /**
          * Reads a property list (key and element pairs) from the input character stream in a
@@ -328,10 +325,7 @@ namespace util{
          * @throw IllegalArgumentException if malformed data is found while reading the properties.
          * @throw NullPointerException if the passed stream is Null.
          */
-        void load( decaf::io::Reader* reader )
-            throw( decaf::io::IOException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::NullPointerException );
+        void load( decaf::io::Reader* reader );
 
         /**
          * Writes this property list (key and element pairs) in this Properties table to the
@@ -361,9 +355,7 @@ namespace util{
          * @throw IOException if there is an error while writing from the stream.
          * @throw NullPointerException if the passed stream is Null.
          */
-        void store( decaf::io::OutputStream* out, const std::string& comment )
-            throw( decaf::io::IOException,
-                   decaf::lang::exceptions::NullPointerException );
+        void store( decaf::io::OutputStream* out, const std::string& comment );
 
         /**
          * Writes this property list (key and element pairs) in this Properties table to the output
@@ -401,9 +393,7 @@ namespace util{
          * @throw IOException if there is an error while writing from the stream.
          * @throw NullPointerException if the passed stream is Null.
          */
-        void store( decaf::io::Writer* writer, const std::string& comments )
-            throw( decaf::io::IOException,
-                   decaf::lang::exceptions::NullPointerException );
+        void store( decaf::io::Writer* writer, const std::string& comments );
 
     private:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.cpp?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.cpp Tue Jun 29 21:26:06 2010
@@ -40,8 +40,8 @@ StringTokenizer::~StringTokenizer(){
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int StringTokenizer::countTokens() const
-{
+int StringTokenizer::countTokens() const {
+
     int count = 0;
     string::size_type localPos = pos;
     string::size_type lastPos = pos;
@@ -69,8 +69,7 @@ int StringTokenizer::countTokens() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool StringTokenizer::hasMoreTokens() const
-{
+bool StringTokenizer::hasMoreTokens() const {
     string::size_type nextpos =
         returnDelims ? str.find_first_of( delim, pos ) :
                        str.find_first_not_of( delim, pos );
@@ -79,9 +78,8 @@ bool StringTokenizer::hasMoreTokens() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string StringTokenizer::nextToken()
-   throw ( lang::exceptions::NoSuchElementException )
-{
+std::string StringTokenizer::nextToken() {
+
     if( pos == string::npos ) {
         throw NoSuchElementException(
             __FILE__, __LINE__,
@@ -117,16 +115,15 @@ std::string StringTokenizer::nextToken()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string StringTokenizer::nextToken( const std::string& delim )
-    throw ( lang::exceptions::NoSuchElementException ) {
+std::string StringTokenizer::nextToken( const std::string& delim ) {
 
     this->delim = delim;
     return nextToken();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned int StringTokenizer::toArray( std::vector<std::string>& array )
-{
+unsigned int StringTokenizer::toArray( std::vector<std::string>& array ) {
+
     int count = 0;
 
     while( hasMoreTokens() ) {
@@ -138,10 +135,8 @@ unsigned int StringTokenizer::toArray( s
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void StringTokenizer::reset( const std::string& str,
-                             const std::string& delim,
-                             bool returnDelims )
-{
+void StringTokenizer::reset( const std::string& str, const std::string& delim, bool returnDelims ) {
+
     if( str != "" ) {
         this->str = str;
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StringTokenizer.h Tue Jun 29 21:26:06 2010
@@ -24,8 +24,12 @@
 namespace decaf{
 namespace util{
 
-    class DECAF_API StringTokenizer
-    {
+    /**
+     * Class that allows for parsing of string based on Tokens.
+     *
+     * @since 1.0
+     */
+    class DECAF_API StringTokenizer {
     private:
 
         // String to tokenize
@@ -82,11 +86,12 @@ namespace util{
 
         /**
          * Returns the next token from this string tokenizer.
+         *
          * @return string value of next token
-         * @throws NoSuchElementException
+         *
+         * @throws NoSuchElementException if there are no more tokens in this string.
          */
-        virtual std::string nextToken()
-            throw ( lang::exceptions::NoSuchElementException );
+        virtual std::string nextToken();
 
         /**
          * Returns the next token in this string tokenizer's string. First,
@@ -96,12 +101,15 @@ namespace util{
          * position is returned. The current position is advanced beyond the
          * recognized token. The new delimiter set remains the default after
          * this call.
-         * @param delim - string containing the new set of delimiters
+         *
+         * @param delim
+         *      The string containing the new set of delimiters.
+         *
          * @return next string in the token list
-         * @throw NoSuchElementException
+         *
+         * @throws NoSuchElementException if there are no more tokens in this string.
          */
-        virtual std::string nextToken( const std::string& delim )
-            throw ( lang::exceptions::NoSuchElementException );
+        virtual std::string nextToken( const std::string& delim );
 
         /**
          * Grab all remaining tokens in the String and return them
@@ -116,15 +124,20 @@ namespace util{
          * calls to countToken and nextToken now start back at the beginning.
          * This allows this object to be reused, the caller need not create
          * a new instance every time a String needs tokenizing.
-         * If set the string param will reset the string that this Tokenizer
-         * is working on.  If set to "" no change is made.
-         * If set the delim param will reset the string that this Tokenizer
-         * is using to tokenizer the string.  If set to "", no change is made
-         * If set the return Delims will set if this Tokenizer will return
-         * delimiters as tokens. Defaults to false.
-         * @param str - New String to tokenize or "", defaults to ""
-         * @param delim - New Delimiter String to use or "", defaults to ""
-         * @param returnDelims - Should the Tokenizer return delimiters as Tokens, default false
+         *
+         *   * If set the string param will reset the string that this Tokenizer
+         *     is working on.  If set to "" no change is made.
+         *   * If set the delim param will reset the string that this Tokenizer
+         *     is using to tokenizer the string.  If set to "", no change is made
+         *   * If set the return Delims will set if this Tokenizer will return
+         *     delimiters as tokens. Defaults to false.
+         *
+         * @param str
+         *      New String to tokenize or "", defaults to ""
+         * @param delim
+         *      New Delimiter String to use or "", defaults to ""
+         * @param returnDelims
+         *      Should the Tokenizer return delimiters as Tokens, default false
          */
         virtual void reset( const std::string& str = "",
                             const std::string& delim = "",

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp Tue Jun 29 21:26:06 2010
@@ -216,10 +216,7 @@ std::size_t Timer::purge() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( TimerTask* task, long long delay )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( TimerTask* task, long long delay ) {
 
     if( delay < 0 ) {
         throw IllegalArgumentException(
@@ -247,10 +244,7 @@ void Timer::schedule( TimerTask* task, l
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( const Pointer<TimerTask>& task, long long delay )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( const Pointer<TimerTask>& task, long long delay ) {
 
     if( delay < 0 ) {
         throw IllegalArgumentException(
@@ -262,10 +256,7 @@ void Timer::schedule( const Pointer<Time
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( TimerTask* task, const Date& when )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( TimerTask* task, const Date& when ) {
 
     if( when.getTime() < 0 ) {
         throw IllegalArgumentException(
@@ -294,10 +285,7 @@ void Timer::schedule( TimerTask* task, c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( const Pointer<TimerTask>& task, const Date& when )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( const Pointer<TimerTask>& task, const Date& when ) {
 
     if( when.getTime() < 0 ) {
         throw IllegalArgumentException(
@@ -310,10 +298,7 @@ void Timer::schedule( const Pointer<Time
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( TimerTask* task, long long delay, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( TimerTask* task, long long delay, long long period ) {
 
     if( delay < 0 ) {
         throw IllegalArgumentException(
@@ -347,10 +332,7 @@ void Timer::schedule( TimerTask* task, l
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( const Pointer<TimerTask>& task, long long delay, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( const Pointer<TimerTask>& task, long long delay, long long period ) {
 
     if( delay < 0 ) {
         throw IllegalArgumentException(
@@ -368,10 +350,7 @@ void Timer::schedule( const Pointer<Time
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( TimerTask* task, const Date& when, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( TimerTask* task, const Date& when, long long period ) {
 
     if( when.getTime() < 0 ) {
         throw IllegalArgumentException(
@@ -406,10 +385,7 @@ void Timer::schedule( TimerTask* task, c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::schedule( const Pointer<TimerTask>& task, const Date& when, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::schedule( const Pointer<TimerTask>& task, const Date& when, long long period ) {
 
     if( when.getTime() < 0 ) {
         throw IllegalArgumentException(
@@ -428,10 +404,7 @@ void Timer::schedule( const Pointer<Time
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::scheduleAtFixedRate( TimerTask* task, long long delay, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::scheduleAtFixedRate( TimerTask* task, long long delay, long long period ) {
 
     if( delay < 0 ) {
         throw IllegalArgumentException(
@@ -465,10 +438,7 @@ void Timer::scheduleAtFixedRate( TimerTa
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::scheduleAtFixedRate( const Pointer<TimerTask>& task, long long delay, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::scheduleAtFixedRate( const Pointer<TimerTask>& task, long long delay, long long period ) {
 
     if( delay < 0 ) {
         throw IllegalArgumentException(
@@ -486,10 +456,7 @@ void Timer::scheduleAtFixedRate( const P
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::scheduleAtFixedRate( TimerTask* task, const Date& when, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::scheduleAtFixedRate( TimerTask* task, const Date& when, long long period ) {
 
     if( when.getTime() < 0 ) {
         throw IllegalArgumentException(
@@ -524,10 +491,7 @@ void Timer::scheduleAtFixedRate( TimerTa
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Timer::scheduleAtFixedRate( const Pointer<TimerTask>& task, const Date& when, long long period )
-    throw( decaf::lang::exceptions::NullPointerException,
-           decaf::lang::exceptions::IllegalArgumentException,
-           decaf::lang::exceptions::IllegalStateException ) {
+void Timer::scheduleAtFixedRate( const Pointer<TimerTask>& task, const Date& when, long long period ) {
 
     if( when.getTime() < 0 ) {
         throw IllegalArgumentException(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h Tue Jun 29 21:26:06 2010
@@ -111,10 +111,7 @@ namespace util {
          * @throw IllegalArgumentException - if delay is negative, or delay + System.currentTimeMillis() is negative.
          * @throw IllegalStateException - if task was already scheduled or cancelled, or timer was cancelled.
          */
-        void schedule( TimerTask* task, long long delay )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( TimerTask* task, long long delay );
 
         /**
          * Schedules the specified task for execution after the specified delay.
@@ -126,10 +123,7 @@ namespace util {
          * @throw IllegalArgumentException - if delay is negative, or delay + System.currentTimeMillis() is negative.
          * @throw IllegalStateException - if task was already scheduled or cancelled, or timer was cancelled.
          */
-        void schedule( const decaf::lang::Pointer<TimerTask>& task, long long delay )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( const decaf::lang::Pointer<TimerTask>& task, long long delay );
 
         /**
          * Schedules the specified task for execution at the specified time. If the time is in the past, the
@@ -150,10 +144,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void schedule( TimerTask* task, const Date& time )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( TimerTask* task, const Date& time );
 
         /**
          * Schedules the specified task for execution at the specified time. If the time is in the past, the
@@ -167,10 +158,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void schedule( const decaf::lang::Pointer<TimerTask>& task, const Date& time )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( const decaf::lang::Pointer<TimerTask>& task, const Date& time );
 
         /**
          * Schedules the specified task for repeated fixed-delay execution, beginning after the specified delay.
@@ -204,10 +192,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void schedule( TimerTask* task, long long delay, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( TimerTask* task, long long delay, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-delay execution, beginning after the specified delay.
@@ -234,10 +219,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void schedule( const decaf::lang::Pointer<TimerTask>& task, long long delay, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( const decaf::lang::Pointer<TimerTask>& task, long long delay, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-delay execution, beginning at the specified time.
@@ -271,10 +253,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void schedule( TimerTask* task, const Date& firstTime, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( TimerTask* task, const Date& firstTime, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-delay execution, beginning at the specified time.
@@ -301,10 +280,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void schedule( const decaf::lang::Pointer<TimerTask>& task, const Date& firstTime, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void schedule( const decaf::lang::Pointer<TimerTask>& task, const Date& firstTime, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-rate execution, beginning after the specified delay.
@@ -339,10 +315,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void scheduleAtFixedRate( TimerTask* task, long long delay, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void scheduleAtFixedRate( TimerTask* task, long long delay, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-rate execution, beginning after the specified delay.
@@ -370,10 +343,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void scheduleAtFixedRate( const decaf::lang::Pointer<TimerTask>& task, long long delay, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void scheduleAtFixedRate( const decaf::lang::Pointer<TimerTask>& task, long long delay, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-rate execution, beginning at the specified time.
@@ -408,10 +378,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void scheduleAtFixedRate( TimerTask* task, const Date& firstTime, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void scheduleAtFixedRate( TimerTask* task, const Date& firstTime, long long period );
 
         /**
          * Schedules the specified task for repeated fixed-rate execution, beginning at the specified time.
@@ -439,10 +406,7 @@ namespace util {
          * @throw IllegalStateException - if task was already scheduled or cancelled, timer was cancelled, or
          *                                timer thread terminated.
          */
-        void scheduleAtFixedRate( const decaf::lang::Pointer<TimerTask>& task, const Date& firstTime, long long period )
-            throw( decaf::lang::exceptions::NullPointerException,
-                   decaf::lang::exceptions::IllegalArgumentException,
-                   decaf::lang::exceptions::IllegalStateException );
+        void scheduleAtFixedRate( const decaf::lang::Pointer<TimerTask>& task, const Date& firstTime, long long period );
 
     private:
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.cpp?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.cpp Tue Jun 29 21:26:06 2010
@@ -83,7 +83,7 @@ long long UUID::getMostSignificantBits()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-long long UUID::node() throw ( lang::exceptions::UnsupportedOperationException ) {
+long long UUID::node() {
 
     if( this->version() != 1 ) {
         throw exceptions::UnsupportedOperationException(
@@ -95,7 +95,7 @@ long long UUID::node() throw ( lang::exc
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-long long UUID::timestamp() throw ( lang::exceptions::UnsupportedOperationException ) {
+long long UUID::timestamp() {
 
     if( this->version() != 1 ) {
         throw exceptions::UnsupportedOperationException(
@@ -112,7 +112,7 @@ long long UUID::timestamp() throw ( lang
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int UUID::clockSequence() throw ( lang::exceptions::UnsupportedOperationException ) {
+int UUID::clockSequence() {
 
     if( this->version() != 1 ) {
         throw exceptions::UnsupportedOperationException(
@@ -124,7 +124,7 @@ int UUID::clockSequence() throw ( lang::
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int UUID::variant() throw ( lang::exceptions::UnsupportedOperationException ) {
+int UUID::variant() {
 
     // determine variant field
     if( ( this->leastSigBits & 0x8000000000000000ULL ) == 0 ) {
@@ -140,7 +140,7 @@ int UUID::variant() throw ( lang::except
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int UUID::version() throw ( lang::exceptions::UnsupportedOperationException ) {
+int UUID::version() {
     return this->uuidVersion;
 }
 
@@ -220,8 +220,7 @@ UUID UUID::nameUUIDFromBytes( const char
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-UUID UUID::fromString( const std::string& name )
-    throw ( lang::exceptions::IllegalArgumentException ){
+UUID UUID::fromString( const std::string& name ) {
 
     apr_uuid_t temp;
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.h?rev=959111&r1=959110&r2=959111&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/UUID.h Tue Jun 29 21:26:06 2010
@@ -84,6 +84,7 @@ namespace util{
          * Static factory to retrieve a type 4 (pseudo randomly generated) UUID.
          * The UUID is generated using a cryptographically strong pseudo random
          * number generator.
+         *
          * @return type 4 UUID
          */
         static UUID randomUUID();
@@ -91,7 +92,10 @@ namespace util{
         /**
          * Static factory to retrieve a type 3 (name based) UUID based on the
          * specified byte array.
-         * @param name - a byte array to be used to construct a UUID.
+         *
+         * @param name
+         *      A byte array to be used to construct a UUID.
+         *
          * @return type 3 UUID
          */
         static UUID nameUUIDFromBytes( const std::vector<char>& name );
@@ -99,8 +103,12 @@ namespace util{
         /**
          * Static factory to retrieve a type 3 (name based) UUID based on the
          * specified byte array.
-         * @param name - a byte array to be used to construct a UUID.
-         * @param size - the size of the byte array, or number of bytes to use.
+         *
+         * @param name
+         *      A byte array to be used to construct a UUID.
+         * @param size
+         *      The size of the byte array, or number of bytes to use.
+         *
          * @return type 3 UUID
          */
         static UUID nameUUIDFromBytes( const char* name, std::size_t size );
@@ -108,11 +116,15 @@ namespace util{
         /**
          * Creates a UUID from the string standard representation as described
          * in the toString() method.
-         * @param name - a string to be used to construct a UUID.
+         *
+         * @param name
+         *      A string to be used to construct a UUID.
+         *
          * @return type 3 UUID
+         *
+         * @throws IllegalArgumentException if the UUID string given is invalid.
          */
-        static UUID fromString( const std::string& name )
-            throw ( lang::exceptions::IllegalArgumentException );
+        static UUID fromString( const std::string& name );
 
     public:
 
@@ -120,6 +132,7 @@ namespace util{
          * Constructs a new UUID using the specified data. mostSigBits is used
          * for the most significant 64 bits of the UUID and leastSigBits becomes
          * the least significant 64 bits of the UUID.
+         *
          * @param mostSigBits
          * @param leastSigBits
          */
@@ -134,9 +147,11 @@ namespace util{
         virtual int compareTo( const UUID& value ) const;
 
         /**
-         * Compares this UUID to the one given, returns true if they are
-         * equal
-         * @param value - the UUID to compare to.
+         * Compares this UUID to the one given, returns true if they are equal.
+         *
+         * @param value
+         *      The UUID to compare to.
+         *
          * @return true if UUIDs are the same.
          */
         virtual bool equals( const UUID& value ) const;
@@ -183,11 +198,12 @@ namespace util{
          * The node value is only meaningful in a time-based UUID, which has
          * version type 1. If this UUID is not a time-based UUID then this method
          * throws UnsupportedOperationException.
+         *
          * @returns the node value of this UUID
-         * @throws UnsupportedOperationException
+         *
+         * @throws UnsupportedOperationException if this UUID version does not support this operation.
          */
-        virtual long long node()
-            throw ( lang::exceptions::UnsupportedOperationException );
+        virtual long long node();
 
         /**
          * The timestamp value associated with this UUID.
@@ -200,10 +216,9 @@ namespace util{
          * version type 1. If this UUID is not a time-based UUID then this method
          * throws UnsupportedOperationException.
          * @returns the timestamp associated with a V1 UUID
-         * @throws UnsupportedOperationException
+         * @throws UnsupportedOperationException if this UUID version does not support this operation.
          */
-        virtual long long timestamp()
-            throw ( lang::exceptions::UnsupportedOperationException );
+        virtual long long timestamp();
 
         /**
          * The clock sequence value associated with this UUID.
@@ -216,10 +231,9 @@ namespace util{
          * has version type 1. If this UUID is not a time-based UUID then this
          * method throws UnsupportedOperationException.
          * @returns the clockSequeunce associated with a V1 UUID
-         * @throws UnsupportedOperationException
+         * @throws UnsupportedOperationException if this UUID version does not support this operation.
          */
-        virtual int clockSequence()
-            throw ( lang::exceptions::UnsupportedOperationException );
+        virtual int clockSequence();
 
         /**
          * The variant number associated with this UUID. The variant number describes
@@ -231,10 +245,10 @@ namespace util{
          *     * 7 Reserved for future definition
          *
          * @returns the variant associated with a V1 UUID
-         * @throws UnsupportedOperationException
+         *
+         * @throws UnsupportedOperationException if this UUID version does not support this operation.
          */
-        virtual int variant()
-            throw ( lang::exceptions::UnsupportedOperationException );
+        virtual int variant();
 
         /**
          * The version number associated with this UUID. The version number describes
@@ -246,10 +260,10 @@ namespace util{
          *     * 4 Randomly generated UUID
          *
          * @returns the version associated with a V1 UUID
-         * @throws UnsupportedOperationException
+         *
+         * @throws UnsupportedOperationException if this UUID version does not support this operation.
          */
-        virtual int version()
-            throw ( lang::exceptions::UnsupportedOperationException );
+        virtual int version();
 
     };
 



Mime
View raw message