Use persistent tree, do not call empty on each view pane any more, this is done by...

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

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js
index 390ba6f23635d4035ac7854d52fc695cdd2910b0..1b9b178bd63f0ad8120db0a0ad2aad6ca77ea258 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js
@@ -70,10 +70,6 @@ qx.Class.define("org.argeo.slc.web.LauncherPerspective",
        },\r
        \r
        remove : function(viewsManager){\r
-               viewsManager.getViewPaneById("main").empty();\r
-               viewsManager.getViewPaneById("batch").empty();\r
-               viewsManager.getViewPaneById("selector").empty();\r
-               viewsManager.getViewPaneById("editor").empty();\r
                viewsManager.getViewPanesContainer().remove(this._splitPane);           \r
        }       \r
        \r

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js
index e2b7ae48232465cf0ae8b4b09d356e93c28473b8..d9cbbd4cf40012dd5e45132f94f0c827d6a73422 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js
@@ -52,8 +52,6 @@ qx.Class.define("org.argeo.slc.web.Perspective",
        },\r
        \r
        remove : function(viewsManager){\r
-               viewsManager.getViewPaneById("list").empty();\r
-               viewsManager.getViewPaneById("applet").empty();\r
                viewsManager.getViewPanesContainer().remove(this._splitPane);           \r
        }\r
        \r

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
index c11d793a6fdb5d4d59d0ae7b3d351b6f959c2a1a..e7d78f589572432e453f679c516064da2053fe62 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
@@ -76,7 +76,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                                                        case "qx.ui.tree.TreeFile" :\r
                                                                this.setEnabled(true);\r
                                                                break;\r
-                                                       case "qx.ui.tree.TreeFolder" :\r
+                                                       case "org.argeo.ria.components.PersistentTreeFolder" :\r
                                                                if (item.getTree().getRoot() == item)\r
                                                                        break;\r
                                                                this.setEnabled(true);\r
@@ -165,7 +165,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                 * Static loader for the "agent" level (first level)\r
                 * \r
                 * @param folder\r
-                *            {qx.ui.tree.TreeFolder} The root Tree Folder.\r
+                *            {org.argeo.ria.components.PersistentTreeFolder} The root Tree Folder.\r
                 */\r
                agentLoader : function(folder) {\r
 \r
@@ -183,13 +183,12 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                                var modulesLoader = org.argeo.slc.ria.FlowsSelectorView.modulesLoader;\r
                                \r
                                for (var i = 0; i < nodes.length; i++) {\r
-                                       var uuid = org.argeo.ria.util.Element.getSingleNodeText(\r
-                                                       nodes[i], "@uuid");\r
+                                       var uuid = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "@uuid");\r
+                                       var host = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "slc:host");\r
                                        if(agents[uuid]){\r
                                                newAgents[uuid] = host;\r
                                                continue;\r
                                        }\r
-                                       var host = org.argeo.ria.util.Element.getSingleNodeText(nodes[i], "slc:host");\r
                                        agents[uuid] = host;\r
                                        if(newAgents) newAgents[uuid] = host;\r
                                        var agentFolder = new org.argeo.ria.components.DynamicTreeFolder(\r
@@ -227,7 +226,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                 * root folder.\r
                 * \r
                 * @param folder\r
-                *            {qx.ui.tree.TreeFolder} The root folder\r
+                *            {org.argeo.ria.components.PersistentTreeFolder} The root folder\r
                 */\r
                modulesLoader : function(folder) {\r
                        var agentId = folder.getUserData("agentUuid");\r
@@ -252,12 +251,14 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                                                var versionFolder = new org.argeo.ria.components.DynamicTreeFolder(\r
                                                                key + ' (' + mods[key][i] + ')', flowLoader,\r
                                                                "Loading Flows", folder.getDragData());\r
-                                               folder.add(versionFolder);\r
                                                versionFolder.setUserData("moduleData", {\r
                                                                        name : key,\r
                                                                        version : mods[key][i]\r
                                                                });\r
                                                versionFolder.setUserData("agentUuid", agentId);\r
+                                               // Warning, we must add it AFTER setting the user data, \r
+                                               // because of the persistent loading mechanism.\r
+                                               folder.add(versionFolder);\r
                                        }\r
                                }\r
                                folder.setLoaded(true);\r
@@ -274,7 +275,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                 * and create its children.\r
                 * \r
                 * @param folder\r
-                *            {qx.ui.tree.TreeFolder} A Tree folder containing in the\r
+                *            {org.argeo.ria.components.PersistentTreeFolder} A Tree folder containing in the\r
                 *            key "moduleData" of its user data a map containing the\r
                 *            keys {name,version}\r
                 */\r
@@ -345,7 +346,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                                        continue;\r
                                crtPath += "/" + parts[i];                              \r
                                if (!model[crtPath]) {\r
-                                       var virtualFolder = new qx.ui.tree.TreeFolder(parts[i]);\r
+                                       var virtualFolder = new org.argeo.ria.components.PersistentTreeFolder(parts[i]);\r
                                        if (userData && qx.lang.Object.getLength(userData)) {\r
                                                for (var key in userData) {\r
                                                        virtualFolder.setUserData(key, userData[key]);\r