Merge branch 'master' into development/adding-more-to-actions

Author: VeithMetro

Dictionary/Dictionary.cpp

@@ -288,19 +288,39 @@ namespace Plugin {
             return (result);
     }
 
+    bool Dictionary::IsUnderRegisteredNamespace(const string& registeredPath, const string& changedPath) const
+    {
+        const string& delimiter = Delimiter(); 
+
+        bool result = false;
+
+        if (registeredPath == delimiter) {
+            result = true;
+        } else if (changedPath.compare(0, registeredPath.size(), registeredPath) == 0) {
+            if (changedPath.size() == registeredPath.size()) {
+                result = true;
+            } else if (changedPath.at(registeredPath.size()) == delimiter[0]) {
+                result = true;
+            }
+        }
+
+        return result;
+    }
 
     void Dictionary::NotifyForUpdate(const string& path, const string& key, const string& value) const
     {
         ObserverMap::const_iterator index(_observers.cbegin());
 
         while (index != _observers.cend()) {
-            if (index->first == path) {
+            if (IsUnderRegisteredNamespace(index->first, path)) {
                 index->second->Modified(path, key, value);
             }
             index++;
         }
 
-        Exchange::JDictionary::Event::Modified(*this, path, key, value);
+        Exchange::JDictionary::Event::Modified(*this, path, key, value, [&path, this](const string&, const string& index_) -> bool {
+            return (this->IsUnderRegisteredNamespace(index_, path));
+        });
     }
 
     // Direct method to Set a value for a key in a certain namespace from the dictionary.

Dictionary/Dictionary.h

@@ -321,6 +321,7 @@ namespace Plugin {
         bool CreateInternalDictionary(const string& currentSpace, const NameSpace& data);
         void CreateExternalDictionary(const string& currentSpace, NameSpace& data) const;
         inline void NotifyForUpdate(const string& path, const string& key, const string& value) const;
+        bool IsUnderRegisteredNamespace(const string& registeredPath, const string& changedPath) const;
 
         const string& Delimiter() const {
             static string delimiter{ Exchange::IDictionary::namespaceDelimiter };