New function close() in the IView interface

git-svn-id: https://svn.argeo.org/slc/trunk@2102 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js
index e12457a570303cf9d03d9cbcdacc1b4da36736f7..1830d09acfa3b0b292a8241b1d4ca08a485f450a 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/Applet.js
@@ -66,6 +66,10 @@ qx.Class.define("org.argeo.ria.sample.Applet",
        addScroll : function(){
                return false;
        },
+       
+       close : function(){
+               return false;
+       },
                
        /**
         * Create a simple HtmlElement and and insert the html string..

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js
index 1b2453065283e5811e4cc4340661ba09ce393884..57d2468e38fd7dfbc7d7dab8b25789eacc2da11d 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/sample/class/org/argeo/ria/sample/List.js
@@ -108,6 +108,10 @@ qx.Class.define("org.argeo.ria.sample.List",
                                        \r
        addScroll : function(){\r
                return false;\r
-       }       \r
+       },\r
+       \r
+       close : function(){\r
+               \r
+       }\r
   }\r
 });
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js
index cd7f6d913167943dc1997a75207636fa2782b650..1654755c9a7d50bc91be08dc2dbaf5d973326109 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js
@@ -428,6 +428,13 @@ qx.Class.define("org.argeo.slc.web.TestList",
        \r
        addScroll : function(){\r
                return false;\r
-       }       \r
+       },\r
+       \r
+       close : function(){\r
+               if(this.timer){\r
+                       this.pollListLoading(false);\r
+               }\r
+       }\r
+       \r
   }\r
 });
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js
index 8bc2fed76a5800f930f5cd40ccacb78cf4be5e9a..eae241abe268a750044877f7883ac872a180373a 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js
@@ -39,7 +39,9 @@ qx.Class.define("org.argeo.slc.ria.Applet",
                                toolbar         : "result",
                                callback        : function(e){
                                        // Call service to delete
-                                       this.getView().empty();                                         
+                                       this.getView().empty();
+                                       //alert(this.testId);
+                                       
                                },
                                selectionChange : function(viewId, xmlNode){                                    
                                        if(viewId != "applet") return;
@@ -70,9 +72,9 @@ qx.Class.define("org.argeo.slc.ria.Applet",
                // Load XML or Whatever
                var service;            
                var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
-               var testId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(this.data, "slc:uuid"));           
-               this.getView().setViewTitle("Test "+testId);
-               var request = org.argeo.slc.ria.SlcApi.getLoadResultService(testId);            
+               this.testId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(this.data, "slc:uuid"));          
+               this.getView().setViewTitle("Test "+this.testId);
+               var request = org.argeo.slc.ria.SlcApi.getLoadResultService(this.testId);               
                request.addListener("completed", function(response){
                        this.createXmlGui(response.getContent());
                        this.getView().setOnLoad(false);
@@ -86,6 +88,10 @@ qx.Class.define("org.argeo.slc.ria.Applet",
                return false;
        },
        
+       close : function(){
+               
+       },
+       
        /**
         * Creates the GUI.
         * @param responseXml {Document} The xml response of the "load" query.

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js
index b008aba067d183320b2aa484d053cd0dca761c59..162453861e6d23dc6c3d20f685ff65d9f2d5aff6 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js
@@ -112,7 +112,7 @@ qx.Class.define("org.argeo.slc.ria.LauncherApplet",
                this.add(this.scroll, {edge:'west'});
                
                this.logModel = new qx.ui.table.model.Simple();
-               this.logModel.setColumns(["Date", "Agent Uuid", "Status", "Type"]);
+               this.logModel.setColumns(["Date", "Agent Uuid", "Status"]);
                this.logPane = new qx.ui.table.Table(this.logModel,  {
                        tableColumnModel: function(obj){
                                return new qx.ui.table.columnmodel.Resize(obj)
@@ -129,7 +129,6 @@ qx.Class.define("org.argeo.slc.ria.LauncherApplet",
                });
                var columnModel = this.logPane.getTableColumnModel(); 
                columnModel.getBehavior().setWidth(2, "12%");
-               columnModel.getBehavior().setWidth(3, "12%");           
        },
        
        _createForm : function(){
@@ -153,13 +152,12 @@ qx.Class.define("org.argeo.slc.ria.LauncherApplet",
                serviceManager.addListener("reload", function(reloadEvent){
                        if(reloadEvent.getDataType()!= "agents") return ;
                        var xmlDoc = reloadEvent.getContent();
-                       var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
-                       var nodes = org.argeo.ria.util.Element.selectNodes(xmlDoc, "//slc:slc-agent-descriptor", NSMap);
+                       var nodes = org.argeo.ria.util.Element.selectNodes(xmlDoc, "//slc:slc-agent-descriptor");
                        var newTopics = {};
                        for(var i=0;i<nodes.length;i++){
-                               var uuid = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "@uuid", NSMap);
-                               var host = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "slc:host", NSMap);
-                               newTopics[uuid] = uuid+" ("+host+")";
+                               var uuid = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "@uuid");
+                               var host = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "slc:host");
+                               newTopics[uuid] = host+" ("+uuid+")";
                        }
                        this.setRegisteredTopics(newTopics);
                }, this);
@@ -259,12 +257,11 @@ qx.Class.define("org.argeo.slc.ria.LauncherApplet",
        
        _addAmqListener: function(uuid){
                this._amqClient.addListener("slcExec", "topic://agent."+uuid+".newExecution", function(response){
-                       var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
-                       var message = org.argeo.ria.util.Element.selectSingleNode(response, "slc:slc-execution", NSMap);                                
+                       var message = org.argeo.ria.util.Element.selectSingleNode(response, "slc:slc-execution");                               
                        var slcExec = new org.argeo.slc.ria.SlcExecutionMessage(message.getAttribute("uuid"));
                        slcExec.fromXml(message);
                        this.logModel.addRows([
-                               [new Date().toString(), slcExec.getUuid(), slcExec.getStatus(), slcExec.getType()]
+                               [new Date().toString(), slcExec.getHost()+' ('+slcExec.getUuid()+')', slcExec.getStatus()]
                        ]);                             
                }, this);
        },

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/components/IView.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/components/IView.js
index e4c8be677ee87adc789f1301078486e24df440e0..9968aa8434ef96069537e71d6ea86ccc64fac62f 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/components/IView.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/components/IView.js
@@ -40,6 +40,11 @@ qx.Interface.define("org.argeo.ria.components.IView", {
                 * Whether this component is already contained in a scroller (return false) or not (return true).\r
                 * @return {Boolean}\r
                 */\r
-               addScroll : function(){return true;}\r
+               addScroll : function(){return true;},\r
+               /**\r
+                * Called at destruction time\r
+                * Perform all the clean operations (stopping polling queries, etc.) \r
+                */\r
+               close : function(){return true;}\r
        }\r
 });
\ No newline at end of file