Remove EnvironmentListener

kornerr · kornerr · commit 9a51fbee5957 · 2017-08-01T12:11:34.000+07:00
diff --git a/app/Environment.h b/app/Environment.h
@@ -2,7 +2,6 @@
 #ifndef CPP_CALLBACK_SCRIPT_ENVIRONMENT_H
 #define CPP_CALLBACK_SCRIPT_ENVIRONMENT_H
 
-#include "EnvironmentListener.h"
 #include "EnvironmentProvider.h"
 
 #include <map>
@@ -13,34 +12,38 @@ class Environment
         Environment() { }
         ~Environment() { }
 
-        void addListener(const String &key, EnvironmentListener *listener)
+        void addProvider(const String &key, EnvironmentProvider *provider)
         {
-            this->listeners.insert(
-                std::pair<String, EnvironmentListener *>(key, listener));
+            this->providers.insert(
+                std::pair<String, EnvironmentProvider *>(key, provider));
         }
 
         Strings get(const String &key)
         {
+            for (auto it : this->providers)
+            {
+                if (it.second->hasGetter(key))
+                {
+                    return it.second->get(key);
+                }
+            }
             Strings stub;
-            // TODO
             return stub;
         }
-        //void report(const String &key, const Strings &values);
         void set(const String &key, const Strings &values)
         {
-            // TODO
-
-        }
-        void setProvider(const String &key, EnvironmentProvider *provider)
-        {
-            // TODO
-
+            for (auto it : this->providers)
+            {
+                if (it.second->hasSetter(key))
+                {
+                    it.second->set(key, values);
+                }
+            }
         }
 
     private:
-        std::map<String, EnvironmentListener *> listeners;
-        std::map<String, EnvironmentProvider *> providers;
-
+        typedef std::map<String, EnvironmentProvider *> Providers;
+        Providers providers;
 };
 
 #endif // CPP_CALLBACK_SCRIPT_ENVIRONMENT_H
diff --git a/app/EnvironmentListener.h b/app/EnvironmentListener.h
diff --git a/app/EnvironmentProvider.h b/app/EnvironmentProvider.h
@@ -18,10 +18,21 @@ class EnvironmentProvider
             printf("EnvironmentProvider.destructor\n");
         }
 
+        virtual bool hasGetter(const String &key)
+        {
+            printf("EnvironmentProvider.hasGetter(%s)\n", key.c_str());
+            return false;
+        }
         virtual Strings get(const String &key)
         {
             printf("EnvironmentProvider.get(%s)\n", key.c_str());
         }
+
+        virtual bool hasSetter(const String &key)
+        {
+            printf("EnvironmentProvider.hasSetter(%s)\n", key.c_str());
+            return false;
+        }
         virtual void set(const String &key, const Strings &values)
         {
             printf(
diff --git a/cpp/module.h b/cpp/module.h
@@ -0,0 +1,14 @@
+
+#ifndef CPP_CALLBACK_SCRIPT_MODULE_H
+#define CPP_CALLBACK_SCRIPT_MODULE_H
+
+#include "EnvironmentListener.h"
+#include "EnvironmentProvider.h"
+
+class ModuleListener : public EnvironmentListener
+{
+
+};
+
+#endif // CPP_CALLBACK_SCRIPT_MODULE_H
+

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,21 @@ class EnvironmentProvider`
`18`	`18`	`printf("EnvironmentProvider.destructor\n");`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ virtual bool hasGetter(const String &key)`
	`22`	`+ {`
	`23`	`+ printf("EnvironmentProvider.hasGetter(%s)\n", key.c_str());`
	`24`	`+ return false;`
	`25`	`+ }`
`21`	`26`	`virtual Strings get(const String &key)`
`22`	`27`	`{`
`23`	`28`	`printf("EnvironmentProvider.get(%s)\n", key.c_str());`
`24`	`29`	`}`
	`30`	`+`
	`31`	`+ virtual bool hasSetter(const String &key)`
	`32`	`+ {`
	`33`	`+ printf("EnvironmentProvider.hasSetter(%s)\n", key.c_str());`
	`34`	`+ return false;`
	`35`	`+ }`
`25`	`36`	`virtual void set(const String &key, const Strings &values)`
`26`	`37`	`{`
`27`	`38`	`printf(`