Move RequestManager to Remote package

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

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 836593b117d27c5f7a98c0b34941c9a1af07cea6..735ab5bde512fdfe698852d9998f9729ef58df4b 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
@@ -72,7 +72,7 @@ qx.Class.define("org.argeo.slc.web.Application",
       commandManager.addToolbarContextMenu(toolbar);\r
 \r
       var stopCommand = commandManager.getCommandById("stop");\r
-      var serviceManager = org.argeo.slc.web.util.RequestManager.getInstance();\r
+      var serviceManager = org.argeo.slc.web.remote.RequestManager.getInstance();\r
       serviceManager.setStopCommand(stopCommand);\r
 \r
       container.add(menuBar);\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Applet.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Applet.js
index 52b7961b30bbe445ab7ff3ee8f635486ff56e531..4ed8ff5beca70ab33eee73f144a6f234d8c59bf2 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Applet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Applet.js
@@ -70,7 +70,7 @@ qx.Class.define("org.argeo.slc.web.custom.Applet",
                this.info("Opening test "+testId);
                this.getView().setViewTitle("Test "+testId);
                service = "../resultViewXml.xslt?uuid="+testId;
-               var serviceManager = org.argeo.slc.web.util.RequestManager.getInstance();
+               var serviceManager = org.argeo.slc.web.remote.RequestManager.getInstance();
                var request = serviceManager.getRequest(service, "GET", "application/xml");
                request.addListener("completed", function(response){
                        this.createXmlGui(response.getContent());

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/TestList.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/TestList.js
index d373663c2e4a392a365073ae0a9e69cbf796867a..945d6ab2839a08621fb66c57e745d2e4189e75c0 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/TestList.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/TestList.js
@@ -181,7 +181,7 @@ qx.Class.define("org.argeo.slc.web.custom.TestList",
                var url = "/org.argeo.slc.webapp/resultList.ui";\r
                var model = this.getModel();\r
                model.removeRows(0, model.getRowCount());\r
-               var serviceManager = org.argeo.slc.web.util.RequestManager.getInstance();\r
+               var serviceManager = org.argeo.slc.web.remote.RequestManager.getInstance();\r
                var commandManager = org.argeo.slc.web.event.CommandsManager.getInstance();\r
                var request = serviceManager.getRequest(\r
                        url, \r

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/remote/RequestManager.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/remote/RequestManager.js
new file mode 100644 (file)
index 0000000..1a0a248
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/remote/RequestManager.js
@@ -0,0 +1,99 @@
+qx.Class.define("org.argeo.slc.web.remote.RequestManager",\r
+{\r
+       type : "singleton",\r
+       extend : qx.core.Object,\r
+  \r
+       events : {\r
+               "reload" : "org.argeo.slc.web.event.ReloadEvent"\r
+       },\r
+       \r
+       construct : function(){\r
+               this.base(arguments);           \r
+       },\r
+       \r
+       members : {\r
+               \r
+               setStopCommand : function(stopCommand){\r
+                       this.command = stopCommand;\r
+               },\r
+               \r
+               getRequest : function(url, method, responseType, fireReloadEventType, iLoadStatusables){\r
+                       var request = new qx.io.remote.Request(url, method, responseType);\r
+                       if(iLoadStatusables){\r
+                               request.setUserData("iLoadStatusables", iLoadStatusables);\r
+                       }\r
+                       if(fireReloadEventType){\r
+                               request.addListener("completed", function(response){\r
+                                       this.fireReloadEvent(fireReloadEventType, response.getContent());\r
+                               }, this);\r
+                       }\r
+                       this.enableCommand(request);\r
+                       request.addListener("timeout", this.requestTerminated, this);\r
+                       request.addListener("failed", this.requestTerminated, this);\r
+                       request.addListener("aborted", this.requestTerminated, this);\r
+                       request.addListener("completed", this.requestCompleted, this);  \r
+                       return request;\r
+               },              \r
+       \r
+               fireReloadEvent : function(dataType, content){\r
+                       this.fireEvent("reload", org.argeo.slc.web.event.ReloadEvent, [dataType, content]);                     \r
+               },\r
+               \r
+               requestCreated : function(e){\r
+                       var request = e.getTarget();\r
+                       this.enableCommand(request);\r
+               },\r
+               \r
+               requestCompleted : function(e){\r
+                       var request = e.getTarget();\r
+                       this.disableCommand(request);\r
+               },\r
+               \r
+               requestTerminated : function(e){\r
+                       var request = e.getTarget();\r
+                       var errorType = e.getType();\r
+                       this.disableCommand(request);\r
+                       var message = "";\r
+                       if(errorType == "aborted"){\r
+                               message = "Request aborted by user";\r
+                       }else if(errorType == "failed"){\r
+                               message = "Request failed!";\r
+                       }else if(errorType == "timeout"){\r
+                               message = "Request timed out!";\r
+                       }\r
+                       this.error(message);\r
+               },\r
+               \r
+               disableCommand : function(request){\r
+                       this.command.setEnabled(false);\r
+                       if(request.getUserData("iLoadStatusables")){\r
+                               this.updateGuiParts(request.getUserData("iLoadStatusables"), false);\r
+                       }\r
+                       var listener = request.getUserData("listener");\r
+                       if(listener){\r
+                               this.command.removeListener("execute", listener);\r
+                       }\r
+               },\r
+               \r
+               enableCommand : function(request){\r
+                       this.command.setEnabled(true);\r
+                       if(request.getUserData("iLoadStatusables")){\r
+                               this.updateGuiParts(request.getUserData("iLoadStatusables"), true);\r
+                       }\r
+                       qx.ui.core.queue.Manager.flush();\r
+                       var listener = request.abort;\r
+                       request.setUserData("listener", listener);\r
+                       this.command.addListener("execute", listener, request);\r
+               },\r
+               \r
+               updateGuiParts : function(iLoadStatusables, loadStatus){\r
+                       for(var i=0;i<iLoadStatusables.length;i++){\r
+                               if(qx.Class.implementsInterface(qx.Class.getByName(iLoadStatusables[i].classname), org.argeo.slc.web.components.ILoadStatusable)){\r
+                                       iLoadStatusables[i].setOnLoad(loadStatus);\r
+                               }else{\r
+                                       this.debug("Does not implement the ILoadStatusable interface! GUIPART type : "+ iLoadStatusables[i].classname);\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+});
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js
deleted file mode 100644 (file)
index db6dd8a..0000000
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/RequestManager.js
+++ /dev/null
@@ -1,99 +0,0 @@
-qx.Class.define("org.argeo.slc.web.util.RequestManager",\r
-{\r
-       type : "singleton",\r
-       extend : qx.core.Object,\r
-  \r
-       events : {\r
-               "reload" : "org.argeo.slc.web.event.ReloadEvent"\r
-       },\r
-       \r
-       construct : function(){\r
-               this.base(arguments);           \r
-       },\r
-       \r
-       members : {\r
-               \r
-               setStopCommand : function(stopCommand){\r
-                       this.command = stopCommand;\r
-               },\r
-               \r
-               getRequest : function(url, method, responseType, fireReloadEventType, iLoadStatusables){\r
-                       var request = new qx.io.remote.Request(url, method, responseType);\r
-                       if(iLoadStatusables){\r
-                               request.setUserData("iLoadStatusables", iLoadStatusables);\r
-                       }\r
-                       if(fireReloadEventType){\r
-                               request.addListener("completed", function(response){\r
-                                       this.fireReloadEvent(fireReloadEventType, response.getContent());\r
-                               }, this);\r
-                       }\r
-                       this.enableCommand(request);\r
-                       request.addListener("timeout", this.requestTerminated, this);\r
-                       request.addListener("failed", this.requestTerminated, this);\r
-                       request.addListener("aborted", this.requestTerminated, this);\r
-                       request.addListener("completed", this.requestCompleted, this);  \r
-                       return request;\r
-               },              \r
-       \r
-               fireReloadEvent : function(dataType, content){\r
-                       this.fireEvent("reload", org.argeo.slc.web.event.ReloadEvent, [dataType, content]);                     \r
-               },\r
-               \r
-               requestCreated : function(e){\r
-                       var request = e.getTarget();\r
-                       this.enableCommand(request);\r
-               },\r
-               \r
-               requestCompleted : function(e){\r
-                       var request = e.getTarget();\r
-                       this.disableCommand(request);\r
-               },\r
-               \r
-               requestTerminated : function(e){\r
-                       var request = e.getTarget();\r
-                       var errorType = e.getType();\r
-                       this.disableCommand(request);\r
-                       var message = "";\r
-                       if(errorType == "aborted"){\r
-                               message = "Request aborted by user";\r
-                       }else if(errorType == "failed"){\r
-                               message = "Request failed!";\r
-                       }else if(errorType == "timeout"){\r
-                               message = "Request timed out!";\r
-                       }\r
-                       this.error(message);\r
-               },\r
-               \r
-               disableCommand : function(request){\r
-                       this.command.setEnabled(false);\r
-                       if(request.getUserData("iLoadStatusables")){\r
-                               this.updateGuiParts(request.getUserData("iLoadStatusables"), false);\r
-                       }\r
-                       var listener = request.getUserData("listener");\r
-                       if(listener){\r
-                               this.command.removeListener("execute", listener);\r
-                       }\r
-               },\r
-               \r
-               enableCommand : function(request){\r
-                       this.command.setEnabled(true);\r
-                       if(request.getUserData("iLoadStatusables")){\r
-                               this.updateGuiParts(request.getUserData("iLoadStatusables"), true);\r
-                       }\r
-                       qx.ui.core.queue.Manager.flush();\r
-                       var listener = request.abort;\r
-                       request.setUserData("listener", listener);\r
-                       this.command.addListener("execute", listener, request);\r
-               },\r
-               \r
-               updateGuiParts : function(iLoadStatusables, loadStatus){\r
-                       for(var i=0;i<iLoadStatusables.length;i++){\r
-                               if(qx.Class.implementsInterface(qx.Class.getByName(iLoadStatusables[i].classname), org.argeo.slc.web.components.ILoadStatusable)){\r
-                                       iLoadStatusables[i].setOnLoad(loadStatus);\r
-                               }else{\r
-                                       this.debug("Does not implement the ILoadStatusable interface! GUIPART type : "+ iLoadStatusables[i].classname);\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-});
\ No newline at end of file