From d87e2f0331afc9d26679f1d6ac69f752c80e0bf8 Mon Sep 17 00:00:00 2001 From: Charles du Jeu Date: Tue, 9 Dec 2008 20:33:21 +0000 Subject: [PATCH] Refactor API git-svn-id: https://svn.argeo.org/slc/trunk@1986 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../source/class/org/argeo/slc/ria/Applet.js | 2 +- .../org/argeo/slc/{web => ria}/SlcApi.js | 24 +++++++++---------- .../class/org/argeo/slc/web/TestList.js | 24 ++++++++++--------- 3 files changed, 26 insertions(+), 24 deletions(-) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/{web => ria}/SlcApi.js (82%) diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/Applet.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/Applet.js index a9715d15a..987e0a8b2 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/Applet.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/Applet.js @@ -60,7 +60,7 @@ qx.Class.define("org.argeo.slc.ria.Applet", 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.web.SlcApi.getLoadResultService(testId); + var request = org.argeo.slc.ria.SlcApi.getLoadResultService(testId); request.addListener("completed", function(response){ this.createXmlGui(response.getContent()); this.getView().setOnLoad(false); diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/SlcApi.js similarity index 82% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/SlcApi.js index 14be9b56d..dd3632594 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/ria/SlcApi.js @@ -1,4 +1,4 @@ -qx.Class.define("org.argeo.slc.web.SlcApi", +qx.Class.define("org.argeo.slc.ria.SlcApi", { extend : qx.core.Object, @@ -21,7 +21,7 @@ qx.Class.define("org.argeo.slc.web.SlcApi", getServiceRequest:function(serviceName, fireReloadEventType, iLoadStatusables){ var serviceManager = org.argeo.ria.remote.RequestManager.getInstance(); return serviceManager.getRequest( - org.argeo.slc.web.SlcApi.DEFAULT_CONTEXT+"/"+serviceName, + org.argeo.slc.ria.SlcApi.DEFAULT_CONTEXT+"/"+serviceName, "GET", "application/xml", fireReloadEventType, @@ -38,8 +38,8 @@ qx.Class.define("org.argeo.slc.web.SlcApi", * @return {qx.io.remote.Request} */ getRemoveResultService : function(collectionId, resultId, fireReloadEventType, iLoadStatusables){ - var request = org.argeo.slc.web.SlcApi.getServiceRequest( - org.argeo.slc.web.SlcApi.REMOVE_RESULT_FROM_COLL_SERVICE, + var request = org.argeo.slc.ria.SlcApi.getServiceRequest( + org.argeo.slc.ria.SlcApi.REMOVE_RESULT_FROM_COLL_SERVICE, fireReloadEventType, iLoadStatusables ); @@ -57,8 +57,8 @@ qx.Class.define("org.argeo.slc.web.SlcApi", * @return {qx.io.remote.Request} */ getAddResultService : function(collectionId, resultId, fireReloadEventType, iLoadStatusables){ - var request = org.argeo.slc.web.SlcApi.getServiceRequest( - org.argeo.slc.web.SlcApi.ADD_RESULT_TO_COLL_SERVICE, + var request = org.argeo.slc.ria.SlcApi.getServiceRequest( + org.argeo.slc.ria.SlcApi.ADD_RESULT_TO_COLL_SERVICE, fireReloadEventType, iLoadStatusables ); @@ -74,8 +74,8 @@ qx.Class.define("org.argeo.slc.web.SlcApi", * @return {qx.io.remote.Request} */ getListCollectionsService : function(fireReloadEventType, iLoadStatusables){ - return org.argeo.slc.web.SlcApi.getServiceRequest( - org.argeo.slc.web.SlcApi.LIST_COLLECTIONS_SERVICE, + return org.argeo.slc.ria.SlcApi.getServiceRequest( + org.argeo.slc.ria.SlcApi.LIST_COLLECTIONS_SERVICE, fireReloadEventType, iLoadStatusables ); @@ -89,8 +89,8 @@ qx.Class.define("org.argeo.slc.web.SlcApi", * @return {qx.io.remote.Request} */ getListResultsService : function(collectionId, fireReloadEventType, iLoadStatusables){ - var request = org.argeo.slc.web.SlcApi.getServiceRequest( - org.argeo.slc.web.SlcApi.LIST_RESULTS_SERVICE, + var request = org.argeo.slc.ria.SlcApi.getServiceRequest( + org.argeo.slc.ria.SlcApi.LIST_RESULTS_SERVICE, fireReloadEventType, iLoadStatusables ); @@ -108,8 +108,8 @@ qx.Class.define("org.argeo.slc.web.SlcApi", * @return {qx.io.remote.Request} */ getLoadResultService : function(resultId, fireReloadEventType, iLoadStatusables){ - var request = org.argeo.slc.web.SlcApi.getServiceRequest( - org.argeo.slc.web.SlcApi.GET_RESULT_SERVICE, + var request = org.argeo.slc.ria.SlcApi.getServiceRequest( + org.argeo.slc.ria.SlcApi.GET_RESULT_SERVICE, fireReloadEventType, iLoadStatusables ); diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js index 17ac3458f..8aaf5e14e 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js @@ -93,7 +93,7 @@ qx.Class.define("org.argeo.slc.web.TestList", toolbar : "selection", callback : function(e){ var viewsManager = org.argeo.ria.components.ViewsManager.getInstance(); - var classObj = org.argeo.slc.web.Applet; + var classObj = org.argeo.slc.ria.Applet; var iView = viewsManager.initIViewClass(classObj, "applet"); var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes(); iView.load(xmlNodes[0]); @@ -184,7 +184,7 @@ qx.Class.define("org.argeo.slc.web.TestList", toolbar : "selection", callback : function(e){ - var request = org.argeo.slc.web.SlcApi.getRemoveResultService(this.getCollectionId(), this.extractTestUuid()); + var request = org.argeo.slc.ria.SlcApi.getRemoveResultService(this.getCollectionId(), this.extractTestUuid()); request.addListener("completed", function(response){ this.loadCollections(); this.loadList(); @@ -222,8 +222,9 @@ qx.Class.define("org.argeo.slc.web.TestList", }, this); var columnModel = this.table.getTableColumnModel(); columnModel.getBehavior().setWidth(0, "60%"); - columnModel.setDataCellRenderer(0, new org.argeo.slc.web.XmlRenderer()); - columnModel.setDataCellRenderer(1, new org.argeo.slc.web.XmlRenderer()); + var renderer = new org.argeo.slc.web.XmlRenderer(); + columnModel.setDataCellRenderer(0, renderer); + columnModel.setDataCellRenderer(1, renderer); this.table.getSelectionManager().getSelectionModel().addListener("changeSelection", function(e){ var viewSelection = viewPane.getViewSelection(); @@ -264,7 +265,7 @@ qx.Class.define("org.argeo.slc.web.TestList", }, loadCollections : function(){ - var request = org.argeo.slc.web.SlcApi.getListCollectionsService(); + var request = org.argeo.slc.ria.SlcApi.getListCollectionsService(); var NSMap = {slc:"http://argeo.org/projects/slc/schemas"}; request.addListener("completed", function(response){ var xml = response.getContent(); @@ -285,16 +286,17 @@ qx.Class.define("org.argeo.slc.web.TestList", var model = this.table.getTableModel(); model.removeRows(0, model.getRowCount()); var commandManager = org.argeo.ria.event.CommandsManager.getInstance(); - var request = org.argeo.slc.web.SlcApi.getListResultsService(this.getCollectionId(), null, [commandManager.getCommandById("loadtestlist"), this.getView()]); + var request = org.argeo.slc.ria.SlcApi.getListResultsService(this.getCollectionId(), null, [commandManager.getCommandById("loadtestlist"), this.getView()]); var NSMap = {slc:"http://argeo.org/projects/slc/schemas"}; request.addListener("completed", function(response){ var xml = response.getContent(); this.debug("Successfully loaded XML"); var nodes = org.argeo.ria.util.Element.selectNodes(xml, "//slc:result-attributes", NSMap); - for(var i=0; i