Changeset 8374 for code/branches/tutoriallevel2/src/orxonox

Timestamp:

May 2, 2011, 10:20:45 AM (14 years ago)

Author:

dafrick

Message:

Changes in notifications module structure. Notifications can now be sent through the NotificationListener, meaning, they can be sent from anywhere within orxonox (and the modules of course).

Location:

code/branches/tutoriallevel2/src/orxonox/interfaces

Files:

• CMakeLists.txt (modified) (1 diff)
• InterfaceCompilation.cc (modified) (1 diff)
• NotificationListener.h (modified) (1 diff)

code/branches/tutoriallevel2/src/orxonox/interfaces/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   InterfaceCompilation.cc
+  NotificationListener.cc
   Pickupable.cc
   PickupCarrier.cc

code/branches/tutoriallevel2/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -86 +86 @@
         RegisterRootObject(Rewardable);
     }
-
-    //----------------------------
-    // NotificationListener
-    //----------------------------
-    NotificationListener::NotificationListener()
-    {
-        RegisterRootObject(NotificationListener);
-    }
 }

code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h

@@ -67 +67 @@
             NotificationListener();
             virtual ~NotificationListener() {}
-
-            /**
-            @brief Get the senders that are targets of this NotificationListener.
-            @return Returns the set of senders that are targets of this NotificationListener.
-            */
-            virtual const std::set<std::string> & getTargetsSet(void) = 0;
-
-            /**
-            @brief Updates the whole NotificationListener.
-                   This is called by the @ref orxonox::NotificationManager "NotificationManager" when the @ref orxonox::Notification "Notifications" have changed so much, that the NotificationListener may have to re-initialize his operations.
-            */
-            virtual void update(void) = 0;
-            /**
-            @brief Updates the NotificationListener, when a new Notification has come in at the specified time.
-            @param notification A pointer to the @ref orxonox::Notification "Notification".
-            @param time The time the @ref orxonox::Notification "Notification" has come in.
-            */
-            virtual void update(Notification* notification, const std::time_t & time) = 0;
+            
+            static const std::string ALL; //!< Static string to indicate a sender that sends to all NotificationListeners.
+            static const std::string NONE; //!< Static string to indicare a sender that sends to no specific NotificationListener.
+            
+            static void sendNotification(const std::string& message, unsigned int clientId, const std::string& sender = NotificationListener::NONE, bool isLocal = false);
+            
+            virtual bool registerNotification(const std::string& message, const std::string& sender)
+                { return false; }
     };
 }