X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fsrc%2Fargeo-ria-lib%2Fslc%2Fclass%2Forg%2Fargeo%2Fslc%2Fria%2FFlowsSelectorView.js;h=755fc1d0eca7472f315714dcff097013c4eaf2d1;hb=6e162ed05016679a19bf4da38b835d15684cb232;hp=d15b71a1d265a3310c0cdbb57f97580d422f182c;hpb=bf8e1e07e652e0838e7444d890b4b1a44ae70a24;p=gpl%2Fargeo-slc.git

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 d15b71a1d..755fc1d0e 100644
--- 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
@@ -41,7 +41,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 			init : {
 				"addtobatch" : {
 					label : "Add to batch",
-					icon : "org.argeo.slc.ria/list-add.png",
+					icon : "org/argeo/slc/ria/list-add.png",
 					shortcut : null,
 					enabled : true,
 					menu : null,
@@ -133,19 +133,20 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 				},
 				"reloadfull" : {
 					label : "Reload Agents",
-					icon : "org.argeo.slc.ria/view-refresh.png",
+					icon : "org/argeo/slc/ria/view-refresh.png",
 					shortcut : "control+h",
 					enabled : true,
 					menu : "Launcher",
 					toolbar : "list",
 					callback : function(e) {
-						this.rootNode.reload();
+						this.rootNode.setState("loading");
+						this.rootNode.load();
 					},
 					command : null
 				},				
 				"reloadtree" : {
 					label : "Reload Node",
-					icon : "org.argeo.slc.ria/view-refresh.png",
+					icon : "org/argeo/slc/ria/view-refresh.png",
 					shortcut : null,
 					enabled : false,
 					menu : null,
@@ -235,7 +236,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 			}
 			var req = org.argeo.slc.ria.SlcApi.getListAgentsService("agents");			
 			var agents = {};
-			if(folder.getState() == "loaded" && folder.getUserData("agentsMap")){
+			if(folder.getUserData("agentsMap")){
 				// Diff loading, just add new nodes.
 				agents = folder.getUserData("agentsMap");
 				var newAgents = {};
@@ -263,10 +264,10 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					agentFolder.setUserData("agentUuid", uuid);
 					if(preferredHosts && preferredHosts instanceof Array && qx.lang.Array.contains(preferredHosts, host)){
 						folder.addAtBegin(agentFolder);
-						agentFolder.setIcon("org.argeo.slc.ria/computer_bookmarked.png");
+						agentFolder.setIcon("org/argeo/slc/ria/computer_bookmarked.png");
 					}else{
 						folder.add(agentFolder);
-						agentFolder.setIcon("org.argeo.slc.ria/computer.png");
+						agentFolder.setIcon("org/argeo/slc/ria/computer.png");
 					}
 				}
 				if(newAgents){
@@ -283,7 +284,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 				}
 				folder.setUserData("agentsMap", agents);
 				folder.setLoaded(true);
-				folder.getTree().fireEvent("changeSelection");				
+				folder.getTree().fireDataEvent("changeSelection", folder.getTree().getSelection());				
 			});
 			req.addListener("failed", function(response) {
 						folder.setLoaded(true);
@@ -331,7 +332,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 									name : key,
 									version : module.getVersion()
 								});
-						versionFolder.setIcon("org.argeo.slc.ria/archive.png");
+						versionFolder.setIcon("org/argeo/slc/ria/archive.png");
 						versionFolder.setUserData("agentUuid", agentId);
 						var sep = (module.getDescription()!=""?" - ":"");
 						org.argeo.slc.ria.FlowsSelectorView.attachToolTip(versionFolder, key + ' (' + module.getVersion() + ')'+sep+module.getDescription());
@@ -341,7 +342,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					}
 				}
 				folder.setLoaded(true);
-				folder.getTree().fireEvent("changeSelection");
+				folder.getTree().fireDataEvent("changeSelection", folder.getTree().getSelection());
 			});
 			req.addListener("failed", function(response) {
 				folder.setLoaded(true);
@@ -391,7 +392,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					if(execFlows[key].getDescription() != ""){
 						org.argeo.slc.ria.FlowsSelectorView.attachToolTip(file, execFlows[key].getDescription());
 					}
-					file.setIcon("org.argeo.slc.ria/system.png");
+					file.setIcon("org/argeo/slc/ria/system.png");
 					file.setUserData("executionModule",	executionModule);
 					file.setUserData("executionFlow", execFlows[key]);
 					file.setUserData("agentUuid", agentUuid);
@@ -401,7 +402,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					folder.appendDragData(file);
 				}
 				folder.setLoaded(true);
-				folder.getTree().fireEvent("changeSelection");
+				folder.getTree().fireDataEvent("changeSelection", folder.getTree().getSelection());
 			});
 			req.addListener("failed", function(response) {
 				folder.setLoaded(true);
@@ -551,10 +552,10 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 			}
 			if(qx.lang.Array.contains(prefArray, hostName)){
 				qx.lang.Array.remove(prefArray, hostName);
-				agentNode.setIcon("org.argeo.slc.ria/computer.png");
+				agentNode.setIcon("org/argeo/slc/ria/computer.png");
 			}else{
 				prefArray.push(hostName);
-				agentNode.setIcon("org.argeo.slc.ria/computer_bookmarked.png");
+				agentNode.setIcon("org/argeo/slc/ria/computer_bookmarked.png");
 				var parent = agentNode.getParent();
 				parent.remove(agentNode);
 				parent.addAtBegin(agentNode);
@@ -586,7 +587,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					"Loading Agents", dragData);
 			this.tree.setRoot(this.rootNode);
 			this.tree.setHideRoot(true);
-			this.rootNode.setPersistentTreeID("org.argeo.slc.ria.FlowsSelector")
+			this.rootNode.setPersistentTreeID("org/argeo/slc/ria.FlowsSelector")
 			this.rootNode.setOpen(true);
 			this.tree.setContextMenu(org.argeo.ria.event.CommandsManager
 					.getInstance().createMenuFromIds(["addtobatch",