Canonical view

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / source / class / org / argeo / slc / web / Application.js

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Application.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Application.js
index 33939256391b819dab25d806669fbda29c6bdd73..a7764cc4a7f632dec14b19d3ef4dd09d8fc2d3fc 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Application.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Application.js
@@ -67,6 +67,10 @@ qx.Class.define("org.argeo.slc.web.Application",
       toolbar.setShow("icon");\r
       this.commandManager.addToolbarContextMenu(toolbar);\r
 \r
+      var stopCommand = this.commandManager.getCommandById("stop");\r
+      var serviceManager = org.argeo.slc.web.util.RequestManager.getInstance();\r
+      serviceManager.setStopCommand(stopCommand);\r
+      \r
       var splitPane = new qx.ui.splitpane.Pane("horizontal");\r
          var splitLeft = new qx.ui.splitpane.Pane("vertical").set({\r
            width: 300,\r
@@ -84,7 +88,7 @@ qx.Class.define("org.argeo.slc.web.Application",
          splitLeft.add(bottomLeft, 0);\r
          \r
          splitPane.add(splitLeft, 0);\r
-         this.rightPane = new org.argeo.slc.web.components.View("applet", "Test");\r
+         this.rightPane = new org.argeo.slc.web.components.View("applet", "Test");       \r
          this.registerView(this.rightPane);\r
          splitPane.add(this.rightPane, 1);\r
       \r
@@ -167,25 +171,20 @@ qx.Class.define("org.argeo.slc.web.Application",
     },\r
     \r
     loadTable : function(url){\r
-       \r
-      this.baseUrl = "http://localhost:7070/com.capco.sparta.web/";\r
-      this.resultListService = "resultList.xml";\r
-       \r
+               \r
                var model = this.getModel();\r
                model.removeRows(0, model.getRowCount());\r
-               var request = new qx.io2.HttpRequest(url);              \r
-               request.addListener("load", function(e){\r
-                       var xml = this.getResponseXml();\r
-                       if(xml == null){\r
-                               var txt = this.getResponseText();\r
-                               xml = new qx.xml.Document.fromString(txt);\r
-                       }\r
+               var serviceManager = org.argeo.slc.web.util.RequestManager.getInstance();\r
+               var request = serviceManager.getRequest(url, "GET", "application/xml");         \r
+               request.addListener("completed", function(response){\r
+                       xml = response.getContent();\r
                        qx.log.Logger.info("Successfully loaded XML");\r
                        var nodes = qx.xml.Element.selectNodes(xml, "//data");\r
                        for(var i=0; i<nodes.length;i++){\r
                                var rowData = nodes[i];\r
                                model.addRows([rowData]);\r
                        }\r
+                       serviceManager.requestCompleted(this);\r
                }, request);\r
                request.send();\r
     },\r
@@ -194,7 +193,7 @@ qx.Class.define("org.argeo.slc.web.Application",
                var applet = new org.argeo.slc.web.components.Applet();\r
                applet.initData(xmlNode);\r
                this.rightPane.empty();\r
-               this.rightPane.setContent(applet, true);                \r
+               this.rightPane.setContent(applet, false);               \r
        }       \r
   }\r
 });
\ No newline at end of file