From 8f4e4722a346442a8ed1ca84efa24b60bfaf3d19 Mon Sep 17 00:00:00 2001 From: Charles du Jeu Date: Sat, 6 Dec 2008 19:21:52 +0000 Subject: [PATCH] Refactoring part I (src move) git-svn-id: https://svn.argeo.org/slc/trunk@1900 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/{slc/web => ria}/Application.js | 16 +- .../web => ria}/components/ILoadStatusable.js | 2 +- .../web => ria}/components/IPerspective.js | 2 +- .../{slc/web => ria}/components/IView.js | 2 +- .../{slc/web => ria}/components/Logger.js | 4 +- .../{slc/web => ria}/components/Modal.js | 4 +- .../{slc/web => ria}/components/ViewPane.js | 8 +- .../web => ria}/components/ViewSelection.js | 2 +- .../web => ria}/components/ViewsManager.js | 6 +- .../web => ria}/components/XmlRenderer.js | 7 +- .../argeo/{slc/web => ria}/event/Command.js | 4 +- .../{slc/web => ria}/event/CommandsManager.js | 8 +- .../{slc/web => ria}/event/ReloadEvent.js | 2 +- .../{slc/web => ria}/remote/RequestManager.js | 8 +- .../argeo/{slc/web => ria}/test/DemoTest.js | 2 +- .../argeo/{slc/web => ria}/util/Element.js | 2 +- .../web => ria}/util/TreeDataCellRenderer.js | 6 +- .../class/org/argeo/slc/web/custom/Applet.js | 202 ----------------- .../org/argeo/slc/web/custom/Perspective.js | 42 ---- .../org/argeo/slc/web/custom/TestList.js | 210 ------------------ 20 files changed, 43 insertions(+), 496 deletions(-) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/Application.js (80%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/ILoadStatusable.js (56%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/IPerspective.js (67%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/IView.js (73%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/Logger.js (93%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/Modal.js (83%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/ViewPane.js (92%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/ViewSelection.js (88%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/ViewsManager.js (81%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/components/XmlRenderer.js (80%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/event/Command.js (92%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/event/CommandsManager.js (92%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/event/ReloadEvent.js (85%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/remote/RequestManager.js (87%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/test/DemoTest.js (93%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/util/Element.js (96%) rename org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/{slc/web => ria}/util/TreeDataCellRenderer.js (95%) delete mode 100644 org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Applet.js delete mode 100644 org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Perspective.js delete mode 100644 org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/TestList.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/ria/Application.js similarity index 80% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Application.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/Application.js index da4cecb96..d754a1978 100644 --- 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/ria/Application.js @@ -17,11 +17,11 @@ /** * This is the main application class of your custom application "slc" */ -qx.Class.define("org.argeo.slc.web.Application", +qx.Class.define("org.argeo.ria.Application", { extend : qx.application.Standalone, settings : { - //"slc.Perspective" : "org.argeo.slc.web.custom.Perspective" + //"slc.Perspective" : "org.argeo.ria.custom.Perspective" }, /* @@ -42,7 +42,7 @@ qx.Class.define("org.argeo.slc.web.Application", this.base(arguments); this.views = {}; - var viewsManager = org.argeo.slc.web.components.ViewsManager.getInstance(); + var viewsManager = org.argeo.ria.components.ViewsManager.getInstance(); viewsManager.setApplicationRoot(this.getRoot()); // Enable logging in debug variant @@ -51,7 +51,7 @@ qx.Class.define("org.argeo.slc.web.Application", qx.log.appender.Native; qx.log.appender.Console; } - var winLogger = org.argeo.slc.web.components.Logger.getInstance(); + var winLogger = org.argeo.ria.components.Logger.getInstance(); this.getRoot().add(winLogger); qx.log.Logger.register(winLogger); @@ -64,7 +64,7 @@ qx.Class.define("org.argeo.slc.web.Application", var menuBar = new qx.ui.menubar.MenuBar(); var toolbar = new qx.ui.toolbar.ToolBar(); - var commandManager = org.argeo.slc.web.event.CommandsManager.getInstance(); + var commandManager = org.argeo.ria.event.CommandsManager.getInstance(); commandManager.createCommands(); commandManager.registerMenuBar(menuBar); commandManager.registerToolBar(toolbar); @@ -72,7 +72,7 @@ qx.Class.define("org.argeo.slc.web.Application", commandManager.addToolbarContextMenu(toolbar); var stopCommand = commandManager.getCommandById("stop"); - var serviceManager = org.argeo.slc.web.remote.RequestManager.getInstance(); + var serviceManager = org.argeo.ria.remote.RequestManager.getInstance(); serviceManager.setStopCommand(stopCommand); container.add(menuBar); @@ -81,7 +81,7 @@ qx.Class.define("org.argeo.slc.web.Application", /** * Call GuiLoader to load default perspective and associated views. */ - var perspectiveClassName = qx.core.Setting.get("slc.Perspective") + var perspectiveClassName = qx.core.Setting.get("ria.Perspective") if(!perspectiveClassName){ this.error("Cannot find default perspective setting ! Please check your config.json file! (CUSTOM_PERSPECTIVE, line 23)."); return; @@ -96,7 +96,7 @@ qx.Class.define("org.argeo.slc.web.Application", perspective.initViews(viewsManager); // Test - org.argeo.slc.web.remote.RequestManager.getInstance().addListener("reload", function(e){ + org.argeo.ria.remote.RequestManager.getInstance().addListener("reload", function(e){ qx.log.Logger.info("Received reload event for data type : "+ e.getDataType()); }); diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ILoadStatusable.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ILoadStatusable.js similarity index 56% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ILoadStatusable.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ILoadStatusable.js index ec3e5a032..11f4e10ec 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ILoadStatusable.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ILoadStatusable.js @@ -2,7 +2,7 @@ * @author Charles du Jeu * */ -qx.Interface.define("org.argeo.slc.web.components.ILoadStatusable", { +qx.Interface.define("org.argeo.ria.components.ILoadStatusable", { members : { setOnLoad : function(status){ diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/IPerspective.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/IPerspective.js similarity index 67% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/IPerspective.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/IPerspective.js index 0e42b2318..cf19ee12d 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/IPerspective.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/IPerspective.js @@ -2,7 +2,7 @@ * @author Charles du Jeu * */ -qx.Interface.define("org.argeo.slc.web.components.IPerspective", { +qx.Interface.define("org.argeo.ria.components.IPerspective", { members : { initViewPanes : function(viewsManager){return true;}, diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/IView.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/IView.js similarity index 73% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/IView.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/IView.js index ed9897eaa..619aecad4 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/IView.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/IView.js @@ -2,7 +2,7 @@ * @author Charles du Jeu * */ -qx.Interface.define("org.argeo.slc.web.components.IView", { +qx.Interface.define("org.argeo.ria.components.IView", { properties : { commands : {} diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/Logger.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/Logger.js similarity index 93% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/Logger.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/Logger.js index 529dda729..ab9a7a29c 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/Logger.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/Logger.js @@ -7,7 +7,7 @@ Authors: Charles du Jeu ************************************************************************ */ -qx.Class.define("org.argeo.slc.web.components.Logger", +qx.Class.define("org.argeo.ria.components.Logger", { type : "singleton", extend : qx.ui.window.Window, @@ -74,7 +74,7 @@ qx.Class.define("org.argeo.slc.web.components.Logger", var label = new qx.ui.basic.Label('
'+wrapper.innerHTML+'
'); label.setRich(true); if(entry.level == "error"){ - var alert = new org.argeo.slc.web.components.Modal("Error"); + var alert = new org.argeo.ria.components.Modal("Error"); alert.addContent(label.clone()); alert.attachAndShow(); } diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/Modal.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/Modal.js similarity index 83% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/Modal.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/Modal.js index 805948cbe..690659943 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/Modal.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/Modal.js @@ -7,7 +7,7 @@ Authors: Charles du Jeu ************************************************************************ */ -qx.Class.define("org.argeo.slc.web.components.Modal", +qx.Class.define("org.argeo.ria.components.Modal", { extend : qx.ui.window.Window, @@ -41,7 +41,7 @@ qx.Class.define("org.argeo.slc.web.components.Modal", this.add(panel, {edge:'center', width:'100%'}); }, attachAndShow:function(){ - org.argeo.slc.web.components.ViewsManager.getInstance().getApplicationRoot().add(this); + org.argeo.ria.components.ViewsManager.getInstance().getApplicationRoot().add(this); this.show(); } } diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewPane.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewPane.js similarity index 92% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewPane.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewPane.js index c03b3e701..25e8f10e6 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewPane.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewPane.js @@ -4,10 +4,10 @@ /** * This is the main application class of your custom application "sparta" */ -qx.Class.define("org.argeo.slc.web.components.ViewPane", +qx.Class.define("org.argeo.ria.components.ViewPane", { extend : qx.ui.container.Composite, - implement : [org.argeo.slc.web.components.ILoadStatusable], + implement : [org.argeo.ria.components.ILoadStatusable], construct : function(application, viewId, viewTitle, splitPaneData){ this.base(arguments); @@ -15,7 +15,7 @@ qx.Class.define("org.argeo.slc.web.components.ViewPane", this.setViewId(viewId); this._defaultViewTitle = viewTitle; this.setViewTitle(viewTitle); - var viewSelection = new org.argeo.slc.web.components.ViewSelection(viewId); + var viewSelection = new org.argeo.ria.components.ViewSelection(viewId); this.setViewSelection(viewSelection); if(splitPaneData){ this.setSplitPaneData(splitPaneData); @@ -114,7 +114,7 @@ qx.Class.define("org.argeo.slc.web.components.ViewPane", this.remove(this.content); } if(this.getCommands()){ - org.argeo.slc.web.event.CommandsManager.getInstance().removeCommands(this.getCommands()); + org.argeo.ria.event.CommandsManager.getInstance().removeCommands(this.getCommands()); this.setCommands(null); } this.setViewTitle(this._defaultViewTitle); diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewSelection.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewSelection.js similarity index 88% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewSelection.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewSelection.js index bd78734f5..fd9058875 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewSelection.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewSelection.js @@ -1,4 +1,4 @@ -qx.Class.define("org.argeo.slc.web.components.ViewSelection", +qx.Class.define("org.argeo.ria.components.ViewSelection", { extend : qx.core.Object, diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewsManager.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewsManager.js similarity index 81% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewsManager.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewsManager.js index e021cb8b2..2678eba51 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/ViewsManager.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/ViewsManager.js @@ -1,7 +1,7 @@ /** * @author Charles du Jeu */ -qx.Class.define("org.argeo.slc.web.components.ViewsManager", +qx.Class.define("org.argeo.ria.components.ViewsManager", { type : "singleton", extend : qx.core.Object, @@ -25,7 +25,7 @@ qx.Class.define("org.argeo.slc.web.components.ViewsManager", viewPane.empty(); if(commands){ viewPane.setCommands(commands); - org.argeo.slc.web.event.CommandsManager.getInstance().addCommands(commands, iView); + org.argeo.ria.event.CommandsManager.getInstance().addCommands(commands, iView); } viewPane.setContent(iView); return iView; @@ -34,7 +34,7 @@ qx.Class.define("org.argeo.slc.web.components.ViewsManager", registerViewPane : function(viewPane){ this.views[viewPane.getViewId()] = viewPane; viewPane.getViewSelection().addListener("changeSelection", function(e){ - org.argeo.slc.web.event.CommandsManager.getInstance().refreshCommands(e.getData()); + org.argeo.ria.event.CommandsManager.getInstance().refreshCommands(e.getData()); }); }, getViewPaneById : function(viewPaneId){ diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/XmlRenderer.js similarity index 80% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/XmlRenderer.js index 6e58a00e7..e3c557912 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/components/XmlRenderer.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/components/XmlRenderer.js @@ -1,4 +1,4 @@ -qx.Class.define("org.argeo.slc.web.components.XmlRenderer", +qx.Class.define("org.argeo.ria.components.XmlRenderer", { extend : qx.ui.table.cellrenderer.String, @@ -11,6 +11,7 @@ qx.Class.define("org.argeo.slc.web.components.XmlRenderer", members : { // overridden + // TODO : Put this in org.argeo.slc.ria _getContentHtml : function(cellInfo) { var xmlNode = cellInfo.rowData; if(!xmlNode) return ""; @@ -18,12 +19,12 @@ qx.Class.define("org.argeo.slc.web.components.XmlRenderer", switch(cellInfo.col){ case 0 : xPath = "param[@name='testName']"; - var nameParam = org.argeo.slc.web.util.Element.selectSingleNode(xmlNode, xPath); + var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath); var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || "Not Found"); break; case 1 : xPath = 'param[@name="date"]'; - var nameParam = org.argeo.slc.web.util.Element.selectSingleNode(xmlNode, xPath); + var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath); //qx.log.Logger.info(nameParam); var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || 0); var splits = value.split("."); diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js similarity index 92% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js index 251fe9cc9..b18918963 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/Command.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js @@ -1,7 +1,7 @@ -qx.Class.define("org.argeo.slc.web.event.Command", +qx.Class.define("org.argeo.ria.event.Command", { extend : qx.event.Command, - implement : [org.argeo.slc.web.components.ILoadStatusable], + implement : [org.argeo.ria.components.ILoadStatusable], properties : { id : {init:""}, diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/CommandsManager.js similarity index 92% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/CommandsManager.js index f3ac430e1..280df7578 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/CommandsManager.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/CommandsManager.js @@ -2,7 +2,7 @@ * @author Charles * */ -qx.Class.define("org.argeo.slc.web.event.CommandsManager", +qx.Class.define("org.argeo.ria.event.CommandsManager", { type : "singleton", extend : qx.core.Object, @@ -46,7 +46,7 @@ qx.Class.define("org.argeo.slc.web.event.CommandsManager", menuPosition: "last", toolbar : false, callback : function(e){ - org.argeo.slc.web.components.Logger.getInstance().toggle(); + org.argeo.ria.components.Logger.getInstance().toggle(); }, command : null }, @@ -58,7 +58,7 @@ qx.Class.define("org.argeo.slc.web.event.CommandsManager", menu : "Help", toolbar : false, callback : function(e){ - var win = new org.argeo.slc.web.components.Modal("About SLC", null, "SLC is a product from Argeo."); + var win = new org.argeo.ria.components.Modal("About SLC", null, "SLC is a product from Argeo."); win.attachAndShow(); }, command : null @@ -90,7 +90,7 @@ qx.Class.define("org.argeo.slc.web.event.CommandsManager", var definition = defs[key]; var command; if(!definition.command){ - command = new org.argeo.slc.web.event.Command(key, definition.label, definition.icon, definition.shortcut); + command = new org.argeo.ria.event.Command(key, definition.label, definition.icon, definition.shortcut); if(definition.submenu){ var menu = new qx.ui.menu.Menu(); command.setMenu(menu); diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/ReloadEvent.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/ReloadEvent.js similarity index 85% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/ReloadEvent.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/ReloadEvent.js index 8ea2c7770..d86b0d1fe 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/event/ReloadEvent.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/ReloadEvent.js @@ -7,7 +7,7 @@ Authors: Charles du Jeu ************************************************************************ */ -qx.Class.define("org.argeo.slc.web.event.ReloadEvent", +qx.Class.define("org.argeo.ria.event.ReloadEvent", { extend : qx.event.type.Event, 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/ria/remote/RequestManager.js similarity index 87% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/remote/RequestManager.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/remote/RequestManager.js index 1a0a24894..d6173b62a 100644 --- 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/ria/remote/RequestManager.js @@ -1,10 +1,10 @@ -qx.Class.define("org.argeo.slc.web.remote.RequestManager", +qx.Class.define("org.argeo.ria.remote.RequestManager", { type : "singleton", extend : qx.core.Object, events : { - "reload" : "org.argeo.slc.web.event.ReloadEvent" + "reload" : "org.argeo.ria.event.ReloadEvent" }, construct : function(){ @@ -36,7 +36,7 @@ qx.Class.define("org.argeo.slc.web.remote.RequestManager", }, fireReloadEvent : function(dataType, content){ - this.fireEvent("reload", org.argeo.slc.web.event.ReloadEvent, [dataType, content]); + this.fireEvent("reload", org.argeo.ria.event.ReloadEvent, [dataType, content]); }, requestCreated : function(e){ @@ -88,7 +88,7 @@ qx.Class.define("org.argeo.slc.web.remote.RequestManager", updateGuiParts : function(iLoadStatusables, loadStatus){ for(var i=0;itest folder. */ -qx.Class.define("org.argeo.slc.web.test.DemoTest", +qx.Class.define("org.argeo.ria.test.DemoTest", { extend : qx.dev.unit.TestCase, diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/Element.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/util/Element.js similarity index 96% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/Element.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/util/Element.js index 4719daf5c..bfa90fee2 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/Element.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/util/Element.js @@ -10,7 +10,7 @@ * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/xmlsdk/html/81f3de54-3b79-46dc-8e01-73ca2d94cdb5.asp * http://developer.mozilla.org/en/docs/Parsing_and_serializing_XML */ -qx.Class.define("org.argeo.slc.web.util.Element", +qx.Class.define("org.argeo.ria.util.Element", { statics : diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/TreeDataCellRenderer.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/util/TreeDataCellRenderer.js similarity index 95% rename from org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/TreeDataCellRenderer.js rename to org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/util/TreeDataCellRenderer.js index 1e2a2d837..4d53295cf 100644 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/util/TreeDataCellRenderer.js +++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/util/TreeDataCellRenderer.js @@ -29,7 +29,7 @@ /** * A data cell renderer for the tree column of a simple tree */ -qx.Class.define("org.argeo.slc.web.util.TreeDataCellRenderer", +qx.Class.define("org.argeo.ria.util.TreeDataCellRenderer", { extend : qx.ui.treevirtual.SimpleTreeDataCellRenderer, @@ -482,7 +482,7 @@ qx.Class.define("org.argeo.slc.web.util.TreeDataCellRenderer", bAlwaysShowOpenCloseSymbol, bExcludeFirstLevelTreeLines) { - var STDCR = org.argeo.slc.web.util.TreeDataCellRenderer; + var STDCR = org.argeo.ria.util.TreeDataCellRenderer; // If we're in column 0 and excludeFirstLevelTreeLines is enabled, then // we treat this as if no tree lines were requested. @@ -601,7 +601,7 @@ qx.Class.define("org.argeo.slc.web.util.TreeDataCellRenderer", // Ensure that the theme is initialized qx.theme.manager.Meta.getInstance().initialize(); - var STDCR = org.argeo.slc.web.util.TreeDataCellRenderer; + var STDCR = org.argeo.ria.util.TreeDataCellRenderer; var ImageLoader = qx.io2.ImageLoader; 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 deleted file mode 100644 index 4ed8ff5be..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/custom/Applet.js +++ /dev/null @@ -1,202 +0,0 @@ -/** - * @author Charles - */ -qx.Class.define("org.argeo.slc.web.custom.Applet", -{ - extend : qx.ui.container.Composite, - implement : [org.argeo.slc.web.components.IView], - - construct : function(){ - this.base(arguments); - this.setLayout(new qx.ui.layout.VBox()); - this.passedStatus = "
"; - this.failedStatus = "
"; - }, - - properties : - { - view : { - init : null - }, - commands : { - init : { - "close" : { - label : "Close Result", - icon : "resource/slc/window-close.png", - shortcut : "Control+w", - enabled : true, - menu : "Test", - toolbar : "result", - callback : function(e){ - // Call service to delete - //org.argeo.slc.web.components.ViewsManager.getInstance().getViewPaneById("applet").empty(); - this.getView().empty(); - }, - selectionChange : function(viewId, xmlNode){ - if(viewId != "applet") return; - /* - if(xmlNode){ - this.setEnabled(true); - }else{ - this.setEnabled(false); - } - */ - }, - command : null - } - } - } - }, - - /* - ***************************************************************************** - MEMBERS - ***************************************************************************** - */ - - members : - { - init : function(viewPane){ - this.setView(viewPane); - }, - - load : function(xmlNode){ - this.data = xmlNode; - if(!xmlNode) return; - // Load XML or Whatever - //var testType = qx.dom.Node.getText(qx.xml.Element.selectSingleNode(this.data, "param[@name='testType']")); - var service; - var testId = qx.dom.Node.getText(org.argeo.slc.web.util.Element.selectSingleNode(this.data, "param[@name='uuid']")); - this.info("Opening test "+testId); - this.getView().setViewTitle("Test "+testId); - service = "../resultViewXml.xslt?uuid="+testId; - 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()); - this.getView().setOnLoad(false); - }, this); - this.getView().setOnLoad(true); - request.send(); - - }, - - addScroll : function(){ - return false; - }, - - createXmlGui : function(responseXml){ - var NSMap = { - "slc" : "http://argeo.org/projects/slc/schemas" - } - if(!qx.Class.hasMixin(qx.ui.treevirtual.TreeVirtual, qx.ui.treevirtual.MNode)){ - qx.Class.include(qx.ui.treevirtual.TreeVirtual,qx.ui.treevirtual.MNode); - } - this.tree = new qx.ui.treevirtual.TreeVirtual(["Test", "State", "Message", "Id"]); - this.tree.getTableColumnModel().setDataCellRenderer(0, new org.argeo.slc.web.util.TreeDataCellRenderer()); - this.tree.setRowHeight(18); - this.tree.setStatusBarVisible(false); - this.tree.setDecorator(new qx.ui.decoration.Background("#fff")); - var model = this.tree.getDataModel(); - var resNodes = org.argeo.slc.web.util.Element.selectNodes(responseXml, "//slc:result-part", NSMap); - window.result = responseXml; - var resultParts = {}; - var addedPaths = {}; - for(var i=0;i