Changeset 7395 for code/branches/notifications/src/modules/notifications/NotificationQueue.cc

Timestamp:

Sep 9, 2010, 10:59:01 PM (14 years ago)

Author:

dafrick

Message:

Finished EditMode, needs some polish (no not the language…) though.
Took better advantage of lua tables in NotificationLayer.lua
Fixed a lot of bugs, it really is a miracle that the Notifications worked as well as they did.

File:

• code/branches/notifications/src/modules/notifications/NotificationQueue.cc (modified) (11 diffs)

code/branches/notifications/src/modules/notifications/NotificationQueue.cc

@@ -35 +35 @@
 
 #include <map>
+#include <sstream>
 
 #include "core/CoreIncludes.h"
@@ -62 +63 @@
         this->setDisplayTime(displayTime);
 
+        bool queueRegistered = NotificationManager::getInstance().registerQueue(this);
+        this->registered_ = true;
+        if(!queueRegistered)
+        {
+            this->registered_ = false;
+            COUT(1) << "Error: Notification Queue '" << this->getName() << "' could not be registered." << std::endl;
+            return;
+        }
+
         this->create();
-
-        NotificationManager::getInstance().registerListener(this);
-        this->registered_ = true;
+        
+        bool listenerRegistered = NotificationManager::getInstance().registerListener(this);
+        if(!listenerRegistered)
+        {
+            this->registered_ = false;
+            NotificationManager::getInstance().unregisterQueue(this);
+            COUT(1) << "Error: Notification Queue '" << this->getName() << "' could not be registered." << std::endl;
+            return;
+        }
 
         COUT(3) << "NotificationQueue '" << this->getName() << "' created." << std::endl;
@@ -77 +93 @@
     {
         this->targets_.clear();
-        this->clear();
 
         if(this->registered_)
+        {
+            this->clear();
+            
             NotificationManager::getInstance().unregisterListener(this);
+            NotificationManager::getInstance().unregisterQueue(this);
+        }
     }
 
@@ -100 +120 @@
     void NotificationQueue::create(void)
     {
-        GUIManager::getInstance().getLuaState()->doString("NotificationLayer.createQueue(\"" + this->getName() + "\", " + multi_cast<std::string>(this->getMaxSize()) + ")");
+        GUIManager::getInstance().getLuaState()->doString("NotificationLayer.createQueue(\"" + this->getName() +  "\", " + multi_cast<std::string>(this->getMaxSize()) + ")");
     }
 
@@ -144 +164 @@
         }
 
-        if(notifications->empty())
-            return;
-
-        for(std::multimap<std::time_t, Notification*>::iterator it = notifications->begin(); it != notifications->end(); it++) // Add all Notifications.
-            this->push(it->second, it->first);
+        if(!notifications->empty())
+        {
+            for(std::multimap<std::time_t, Notification*>::iterator it = notifications->begin(); it != notifications->end(); it++) // Add all Notifications.
+            {
+                this->push(it->second, it->first);
+            }
+        }
 
         delete notifications;
 
-        COUT(4) << "NotificationQueue '" << this->getName() << "' updated." << std::endl;
+        COUT(3) << "NotificationQueue '" << this->getName() << "' updated." << std::endl; //TODO: Level 4.
     }
 
@@ -167 +189 @@
         this->push(notification, time);
 
-        COUT(4) << "NotificationQueue '" << this->getName() << "' updated. A new Notification has been added." << std::endl;
+        COUT(3) << "NotificationQueue '" << this->getName() << "' updated. A new Notification has been added." << std::endl; //TODO: Level 4.
     }
 
@@ -253 +275 @@
     bool NotificationQueue::setName(const std::string& name)
     {
-        //TODO: Test uniqueness of name.
         this->name_ = name;
         return true;
@@ -268 +289 @@
     void NotificationQueue::setMaxSize(unsigned int size)
     {
+        if(this->maxSize_ == size)
+            return;
+        
         this->maxSize_ = size;
         this->sizeChanged();
@@ -292 +316 @@
     void NotificationQueue::setDisplayTime(unsigned int time)
     {
+        if(this->displayTime_ == time)
+            return;
+
         this->displayTime_ = time;
-        this->update();
+
+        if(this->registered_)
+            this->update();
     }
 
@@ -299 +328 @@
     @brief
         Produces all targets concatinated as string, with kommas (',') as seperators.
-    @param string
-        Pointer to a string which will be used by the method to fill with the concatination of the targets.
-    @return
-        Returns true if successful.
-    */
-    bool NotificationQueue::getTargets(std::string* string) const
-    {
-        if(string == NULL)
-        {
-            COUT(4) << "Input string must have memory allocated." << std::endl;
-            return false;
-        }
-        string->clear();
+    @return
+        Returns the targets as a string.
+    */
+    const std::string& NotificationQueue::getTargets(void) const
+    {
+        std::stringstream stream;
         bool first = true;
-        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) // Iterate through the set of targets.
+        for(std::set<std::string, NotificationListenerStringCompare>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) // Iterate through the set of targets.
         {
             if(!first)
-                *string += ',';
+                stream << ',';
             else
                 first = false;
-            *string += *it;
-        }
-
-        return true;
+            stream << *it;
+        }
+
+        return *(new std::string(stream.str()));
     }
 
@@ -352 +374 @@
         }
 
+        if(this->registered_)
+        {
+            NotificationManager::getInstance().unregisterListener(this);
+            NotificationManager::getInstance().registerListener(this);
+        }
+
         return true;
     }