activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r554733 - /activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h
Date Mon, 09 Jul 2007 18:41:29 GMT
Author: tabish
Date: Mon Jul  9 11:41:29 2007
New Revision: 554733

URL: http://svn.apache.org/viewvc?view=rev&rev=554733
Log:
http://issues.apache.org/activemq/browse/AMQCPP-128

Map Class Improvement

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h

Modified: activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h?view=diff&rev=554733&r1=554732&r2=554733
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h Mon Jul  9 11:41:29 2007
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef ACTIVEMQ_UTIL_MAP_H_
-#define ACTIVEMQ_UTIL_MAP_H_
+#ifndef _ACTIVEMQ_UTIL_MAP_H_
+#define _ACTIVEMQ_UTIL_MAP_H_
 
 #include <map>
 #include <vector>
@@ -32,59 +32,74 @@
      * a more user-friendly interface and to provide common
      * functions that do not exist in std::map.
      */
-    template <typename K, typename V> class Map : public concurrent::Synchronizable

+    template <typename K, typename V> class Map : public concurrent::Synchronizable
     {
     private:
-    
+
         std::map<K,V> valueMap;
         concurrent::Mutex mutex;
-        
+
     public:
-    
+
         /**
          * Default constructor - does nothing.
          */
-    	Map(){};
-        
+        Map() {}
+
         /**
          * Copy constructor - copies the content of the given map into this
          * one.
          * @param source The source map.
          */
-        Map( const Map& source ){
+        Map( const Map& source ) {
             copy( source );
         }
-        
-    	virtual ~Map(){};
-        
+
+        virtual ~Map() {}
+
         /**
          * Comparison, equality is dependant on the method of determining
          * if the element are equal.
          * @param source - Map to compare to this one.
          * @returns true if the Map passed is equal in value to this one.
          */
-        virtual bool equals( const Map& source ) const;
-        
+        virtual bool equals( const Map& source ) const {
+            return this->valueMap == source.valueMap;
+        }
+
         /**
          * Copies the content of the source map into this map.  Erases
          * all existing data in this map.
          * @param source The source object to copy from.
          */
-        virtual void copy( const Map& source ); 
-        
+        virtual void copy( const Map& source ) {
+
+            // Erase the content of this object, and copy from the source
+            // all the elements.  We access source's private map since we
+            // are also a Map, this saves us a lot of time.
+            valueMap.clear();
+            valueMap.insert( source.valueMap.begin(), source.valueMap.end() );
+        }
+
         /**
          * Removes all keys and values from this map.
          */
-        virtual void clear();
-        
+        virtual void clear() {
+            valueMap.clear();
+        }
+
         /**
          * Indicates whether or this map contains a value for the
          * given key.
          * @param key The key to look up.
          * @return true if this map contains the value, otherwise false.
          */
-        virtual bool containsKey( const K& key ) const;
-        
+        virtual bool containsKey( const K& key ) const {
+            typename std::map<K,V>::const_iterator iter;
+            iter = valueMap.find(key);
+            return iter != valueMap.end();
+        }
+
         /**
          * Indicates whether or this map contains a value for the
          * given value, i.e. they are equal, this is done by operator==
@@ -92,53 +107,106 @@
          * @param value The Value to look up.
          * @return true if this map contains the value, otherwise false.
          */
-        virtual bool containsValue( const V& value ) const;
+        virtual bool containsValue( const V& value ) const {
+
+            if( valueMap.empty() ){
+                return false;
+            }
+
+            typename std::map<K,V>::const_iterator iter = valueMap.begin();
+            for( ; iter != valueMap.end(); ++iter ){
+                if( (*iter).second == value ) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
 
         /**
          * @return if the Map contains any element or not, TRUE or FALSE
          */
-        virtual bool isEmpty() const;
+        virtual bool isEmpty() const {
+            return valueMap.empty();
+        }
 
         /**
          * @return The number of elements (key/value pairs) in this map.
          */
-        virtual std::size_t size() const;
-        
+        virtual std::size_t size() const {
+            return valueMap.size();
+        }
+
         /**
          * Gets the value for the specified key.
          * @param key The search key.
          * @return The value for the given key.
          * @throws activemq::exceptions::NoSuchElementException
          */
-        virtual V getValue( const K& key ) const 
-            throw(activemq::exceptions::NoSuchElementException);
-            
+        virtual V getValue( const K& key ) const
+            throw(activemq::exceptions::NoSuchElementException) {
+
+            typename std::map<K,V>::const_iterator iter;
+            iter = valueMap.find(key);
+            if( iter == valueMap.end() ){
+                throw activemq::exceptions::NoSuchElementException( __FILE__,
+                    __LINE__,
+                    "Key does not exist in map" );
+            }
+
+            return iter->second;
+        }
+
         /**
          * Sets the value for the specified key.
          * @param key The target key.
          * @param value The value to be set.
          */
-        virtual void setValue( const K& key, V value );
+        virtual void setValue( const K& key, V value ) {
+            valueMap[key] = value;
+        }
 
         /**
-         * Removes the value (key/value pair) for the specified key from 
+         * Removes the value (key/value pair) for the specified key from
          * the map.
          * @param key The search key.
-         */        
-        virtual void remove( const K& key );
-        
+         */
+        virtual void remove( const K& key ) {
+            valueMap.erase( key );
+        }
+
         /**
          * @return the entire set of keys in this map as a std::vector.
          */
-        virtual std::vector<K> getKeys() const;
-        
+        virtual std::vector<K> getKeys() const{
+            std::vector<K> keys( valueMap.size() );
+
+            typename std::map<K,V>::const_iterator iter;
+            iter=valueMap.begin();
+            for( int ix=0; iter != valueMap.end(); ++iter, ++ix ){
+                keys[ix] = iter->first;
+            }
+
+            return keys;
+        }
+
         /**
          * @return the entire set of values in this map as a std::vector.
          */
-        virtual std::vector<V> getValues() const;
-        
+        virtual std::vector<V> getValues() const {
+            std::vector<V> values( valueMap.size() );
+
+            typename std::map<K,V>::const_iterator iter;
+            iter=valueMap.begin();
+            for( int ix=0; iter != valueMap.end(); ++iter, ++ix ){
+                values[ix] = iter->second;
+            }
+
+            return values;
+        }
+
     public:     // Methods from Synchronizable
-    
+
         /**
          * Locks the object.
          * @throws ActiveMQException
@@ -154,7 +222,7 @@
         virtual void unlock() throw(exceptions::ActiveMQException) {
             mutex.unlock();
         }
-    
+
         /**
          * Waits on a signal from this object, which is generated
          * by a call to Notify.  Must have this object locked before
@@ -164,17 +232,17 @@
         virtual void wait() throw(exceptions::ActiveMQException) {
             mutex.wait();
         }
-    
+
         /**
          * Waits on a signal from this object, which is generated
          * by a call to Notify.  Must have this object locked before
          * calling.  This wait will timeout after the specified time
          * interval.
-         * @param millisecs the time in millisecsonds to wait, or 
+         * @param millisecs the time in millisecsonds to wait, or
          * WAIT_INIFINITE
          * @throws ActiveMQException
          */
-        virtual void wait(unsigned long millisecs) 
+        virtual void wait(unsigned long millisecs)
             throw(exceptions::ActiveMQException) {
             mutex.wait(millisecs);
         }
@@ -188,7 +256,7 @@
         virtual void notify() throw( exceptions::ActiveMQException ) {
             mutex.notify();
         }
-    
+
         /**
          * Signals the waiters on this object that it can now wake
          * up and continue.  Must have this object locked before
@@ -200,130 +268,6 @@
         }
     };
 
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>    
-    bool Map<K,V>::equals( const Map& source ) const {
-        return this->valueMap == source.valueMap;        
-    }    
-
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>    
-    void Map<K,V>::copy( const Map<K,V>& source ) {
-        
-        // Get an iterator to the beginning of the source map.
-        typename std::map<K,V>::const_iterator iter;
-        iter = source.valueMap.begin();
-        
-        // Erase the content of this object.
-        clear();
-        
-        // Add all of the entries to this map.
-        for( ; iter != source.valueMap.end(); iter++ ){            
-            setValue( iter->first, iter->second );
-        } 
-        
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    void Map<K,V>::clear(){
-        valueMap.clear();
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    bool Map<K,V>::containsKey(const K& key) const{
-        typename std::map<K,V>::const_iterator iter;
-        iter = valueMap.find(key);
-        return iter != valueMap.end();
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    bool Map<K,V>::containsValue( const V& value ) const {
-
-        if( valueMap.empty() ){
-            return false;
-        }
-
-        typename std::map<K,V>::const_iterator iter = valueMap.begin();        
-        for( ; iter != valueMap.end(); ++iter ){
-            if( (*iter).second == value ) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    bool Map<K,V>::isEmpty() const{
-        return valueMap.empty();
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    std::size_t Map<K,V>::size() const{
-        return valueMap.size();
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    V Map<K,V>::getValue( const K& key ) const 
-        throw(activemq::exceptions::NoSuchElementException){
-            
-        typename std::map<K,V>::const_iterator iter;
-        iter = valueMap.find(key);
-        if( iter == valueMap.end() ){
-            throw activemq::exceptions::NoSuchElementException( __FILE__, 
-                __LINE__, 
-                "Key does not exist in map" );
-        }
-        
-        return iter->second;
-    }
-        
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    void Map<K,V>::setValue( const K& key, V value ){
-        valueMap[key] = value;
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    void Map<K,V>::remove( const K& key ){
-        valueMap.erase(key);
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    std::vector<K> Map<K,V>::getKeys() const{
-        std::vector<K> keys(valueMap.size());
-        
-        typename std::map<K,V>::const_iterator iter;
-        iter=valueMap.begin();
-        for( int ix=0; iter != valueMap.end(); ++iter, ++ix ){
-            keys[ix] = iter->first;
-        }
-        
-        return keys;
-    }
-    
-    ////////////////////////////////////////////////////////////////////////////
-    template <typename K, typename V>
-    std::vector<V> Map<K,V>::getValues() const{
-        std::vector<V> values(valueMap.size());
-        
-        typename std::map<K,V>::const_iterator iter;
-        iter=valueMap.begin();
-        for( int ix=0; iter != valueMap.end(); ++iter, ++ix ){
-            values[ix] = iter->second;
-        }
-        
-        return values;
-    }
-
 }}
 
-#endif /*ACTIVEMQ_UTIL_MAP_H_*/
+#endif /*_ACTIVEMQ_UTIL_MAP_H_*/



Mime
View raw message