Imported Upstream version 0.9.2

[platform/upstream/iotivity.git] / service / protocol-plugin / plugin-manager / src / FelixAdapter.cpp

diff --git a/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp b/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp
index 44df0bf..c747cd7 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp
+++ b/service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp
@@ -173,7 +173,7 @@ std::vector<Plugin> &FelixAdapter::getAllPlugins(void)
         mid = env->GetStaticMethodID(cls, "getValue",
                                      "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
         std::string key = "Name";
-        jstring jname = (jstring)env->CallStaticObjectMethod(cls, mid, jid, 
+        jstring jname = (jstring)env->CallStaticObjectMethod(cls, mid, jid,
                         env->NewStringUTF(key.c_str()));
         std::string name = env->GetStringUTFChars(jname, 0);
         plugin->setValue("Name", name);
@@ -183,6 +183,14 @@ std::vector<Plugin> &FelixAdapter::getAllPlugins(void)
                                 env->NewStringUTF(key.c_str()));
         std::string resourcetype = env->GetStringUTFChars(jresourcetype, 0);
         plugin->setValue("ResourceType", resourcetype);
+
+        // set ResourceURL value
+        key = "Url";
+        jstring juritype = (jstring)env->CallStaticObjectMethod(cls, mid, jid,
+                           env->NewStringUTF(key.c_str()));
+        std::string url = env->GetStringUTFChars(juritype, 0);
+        plugin->setValue("Url", url);
+
         // push the plugin into the vector
         m_plugins.push_back(*plugin);
     }
@@ -200,7 +208,7 @@ std::vector<Plugin> *FelixAdapter::findPlugins(const std::string key, const std:
 
     jclass cls = env->FindClass("org/iotivity/service/ppm/FelixManager");
     jmethodID mid = env->GetStaticMethodID(cls, "findPlugins",
-                        "(Ljava/lang/String;Ljava/lang/String;)[Lorg/osgi/framework/Bundle;");
+                                           "(Ljava/lang/String;Ljava/lang/String;)[Lorg/osgi/framework/Bundle;");
 
     // call findPlugins() function
     jobjectArray jresultArray = (jobjectArray)env->CallStaticObjectMethod(cls, mid, (jstring)jkey,
@@ -235,9 +243,9 @@ std::vector<Plugin> *FelixAdapter::findPlugins(const std::string key, const std:
         // set Name value
         cls = env->FindClass("org/iotivity/service/ppm/FelixManager");
         mid = env->GetStaticMethodID(cls, "getValue",
-                    "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
+                                     "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
         std::string key = "Name";
-        jstring jname = (jstring)env->CallStaticObjectMethod(cls, mid, jid, 
+        jstring jname = (jstring)env->CallStaticObjectMethod(cls, mid, jid,
                         env->NewStringUTF(key.c_str()));
         std::string name = env->GetStringUTFChars(jname, 0);
         plugin->setValue("Name", name);
@@ -326,8 +334,8 @@ const std::string FelixAdapter::getState(const std::string plugID)
 
     jstring jplugID = env->NewStringUTF(plugID.c_str());
     jclass cls = env->FindClass("org/iotivity/service/ppm/FelixManager");
-    jmethodID mid = env->GetStaticMethodID(cls, "getState", 
-                    "(Ljava/lang/String;)Ljava/lang/String;");
+    jmethodID mid = env->GetStaticMethodID(cls, "getState",
+                                           "(Ljava/lang/String;)Ljava/lang/String;");
 
     // call getState() function
     jstring jresult = (jstring)env->CallStaticObjectMethod(cls, mid, jplugID);