code cleanup / local variables

[contrib/cloudeebus.git] / cloudeebus / cloudeebus.js

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index d3fb087..6056811 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -29,7 +29,7 @@ var dbus = { // hook object for dbus types not translated by python-json
 /*****************************************************************************/
 
 var cloudeebus = window.cloudeebus = {
-               version: "0.5.1",
+               version: "0.5.99",
                minVersion: "0.3.2"
 };
 
@@ -166,13 +166,12 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
        var self = this;
        
        var promise = new cloudeebus.Promise(function (resolver) {
-         cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
+               var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
        
                function ServiceAddedSuccessCB(serviceName) {
                        try { // calling dbus hook object function for un-translated types
                                cloudeebusService.isCreated = true;
-                               var result = [ cloudeebusService ];
-                               resolver.fulfill(result[0], true);
+                               resolver.fulfill(cloudeebusService, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -184,7 +183,7 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
                function ServiceAddedErrorCB(error) {
                        var errorStr = cloudeebus.getError(error);
                        cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
-                       self.promise.resolver.reject(errorStr, true);
+                       resolver.reject(errorStr, true);
                }
 
                var arglist = [
@@ -230,9 +229,8 @@ cloudeebus.Service.prototype.remove = function() {
        
        var promise = new cloudeebus.Promise(function (resolver) {
                function ServiceRemovedSuccessCB(serviceName) {
-                       try { // calling dbus hook object function for un-translated types
-                               var result = [ serviceName ];
-                               resolver.fulfill(result[0], true);
+                       try {
+                               resolver.fulfill(serviceName, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -249,7 +247,7 @@ cloudeebus.Service.prototype.remove = function() {
                
                for (var idx in self.agents) {
                        if (self.agents[idx]) {
-                               self.delAgent(self.agents[idx]);
+                               self.removeAgent(self.agents[idx]);
                        }
                }
                
@@ -388,7 +386,7 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
                }
                catch (e) {
                        var errorStr = cloudeebus.getError(e);
-                       alert("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr);
+                       cloudeebus.log("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr);
                        resolver.reject(errorStr, true);
                        return;
                }
@@ -422,11 +420,11 @@ cloudeebus.Service.prototype._deleteWrapper = function(agent) {
        }
 };
 
-cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
+cloudeebus.Service.prototype.removeAgent = function(rmAgent, successCB, errorCB) {
        var self = this;
        
        var promise = new cloudeebus.Promise(function (resolver) {
-               function ServiceDelAgentSuccessCB(agent) {
+               function ServiceRemoveAgentSuccessCB(agent) {
                        try { // calling dbus hook object function for un-translated types
                                self.agents.push(agent);
                                agent.registered = true;
@@ -440,7 +438,7 @@ cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
                        }               
                }
 
-               function ServiceDelAgentErrorCB(error) {
+               function ServiceRemoveAgentErrorCB(error) {
                        var errorStr = cloudeebus.getError(error);
                        cloudeebus.log("Error removing agent : " + rmAgent.objectPath + ", error: " + errorStr);
                        self.promise.resolver.reject(errorStr, true);
@@ -451,7 +449,7 @@ cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
                }
                catch (e) {
                        var errorStr = cloudeebus.getError(e);
-                       alert("Exception removing wrapper of agent " + rmAgent.objectPath + " : " + errorStr);
+                       cloudeebus.log("Exception removing wrapper of agent " + rmAgent.objectPath + " : " + errorStr);
                        errorCB(errorStr);
                }
                
@@ -460,7 +458,7 @@ cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
                    ];
        
                // call dbusSend with bus type, destination, object, message and arguments
-               self.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, ServiceDelAgentErrorCB);
+               self.wampSession.call("serviceDelAgent", arglist).then(ServiceRemoveAgentSuccessCB, ServiceRemoveAgentErrorCB);
        });
        
        return promise;