From d44228348e3af173e5fa2ad33853e64acb0b59ca Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Wed, 28 Apr 2010 10:09:02 +0000
Subject: [PATCH] Tweak nodes, provider and data model objects.

git-svn-id: https://svn.argeo.org/slc/trunk@3511 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../jcr/class/org/argeo/jcr/ria/JcrBrowser.js | 15 +++--
 .../org/argeo/jcr/ria/model/DataModel.js      | 44 ++++++++++++-
 .../jcr/class/org/argeo/jcr/ria/model/Node.js |  3 +-
 .../argeo/jcr/ria/provider/XmlNodeProvider.js | 23 ++++++-
 .../org/argeo/jcr/ria/views/XmlNodeEditor.js  | 66 ++++++++++++++++---
 5 files changed, 130 insertions(+), 21 deletions(-)

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
index 4e36ba1a0..fd8d933f7 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
@@ -41,12 +41,17 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
   	
   	initViews : function(viewsManager){
   		var nodeProvider = new org.argeo.jcr.ria.provider.XmlNodeProvider();
-  		nodeProvider.initProvider({xmlSrc : "/org.argeo.slc.webapp/getJcrItem.jcr?path=/slc/testresults"})  		
-  		var rootNode = new org.argeo.jcr.ria.model.Node("Root", true);  		
+  		nodeProvider.initProvider({
+  			xmlSrc : "/org.argeo.slc.webapp/getJcrItem.jcr?",
+  			dynamic : true,
+  			pathParameter:"path"
+  			});  		
+  		var rootNode = new org.argeo.jcr.ria.model.Node("Root", true);
+  		rootNode.setPath('/slc');
   		rootNode.setNodeProvider(nodeProvider);
-  		//rootNode.load();
-		var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.XmlNodeEditor, "fulltree");
-		testView.load(rootNode);
+  		var dataModel = new org.argeo.jcr.ria.model.DataModel(rootNode);
+		var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.XmlNodeEditor, "fulltree", dataModel);
+		testView.load();
   	},
   	
   	remove : function(viewsManager){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
index 5cb49bab6..9ed620539 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
@@ -1,14 +1,17 @@
 qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 	extend : qx.core.Object,
 	
+	events : {
+		"changeContextNode" : "qx.event.type.Data"
+	},
+	
 	properties : {
 		rootNode : {
 			check : "org.argeo.jcr.ria.model.Node",
 			event : "changeRootNode"			
 		},
 		contextNode : {
-			check : "org.argeo.jcr.ria.model.Node",
-			event : "changeContextNode"
+			check : "org.argeo.jcr.ria.model.Node"
 		},
 		selection : {
 			check : "org.argeo.jcr.ria.model.Node[]",
@@ -19,6 +22,43 @@ qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 	construct : function(rootNode){
 		this.base(arguments);
 		this.setRootNode(rootNode);
+	},
+	
+	members : {
+		requireContextChange : function(path){
+			var targetNode;
+			var rootNode = this.getRootNode();
+			if(!path){
+				targetNode = rootNode;
+			}else{
+				// Create a fake node
+				if(path[path.length-1] == '/'){
+					path = path.substring(0, path.length-1);
+				}
+				var base = path.substring(path.lastIndexOf("/")+1);
+				targetNode = new org.argeo.jcr.ria.model.Node(base);
+				rootNode.addChild(targetNode);
+				targetNode.setNodeProvider(rootNode.getNodeProvider());
+				targetNode.setPath(path);				
+			}
+			var observer = function(event){
+				var state = event.getData();
+				if(state == "loading"){
+					targetNode.loadingNode = new org.argeo.jcr.ria.model.Node("loading"); 
+					targetNode.addChild(targetNode.loadingNode);
+				}else if(state == "loaded"){
+					if(targetNode.loadingNode) {
+						targetNode.loadingNode.remove();
+						targetNode.loadingNode = null;
+					}
+					targetNode.removeListener("changeLoadState", observer, this);
+				}				
+				this.setContextNode(targetNode);
+				this.fireDataEvent("changeContextNode", targetNode);
+			};
+			targetNode.addListener("changeLoadState", observer, this);
+			targetNode.load();
+		}
 	}
 	
 });
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
index c5e45f7f2..fcd5e6d22 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
@@ -66,7 +66,8 @@ qx.Class.define("org.argeo.jcr.ria.model.Node", {
 				var jcrChild = new org.argeo.jcr.ria.model.Node(child.nodeName);
 				this.addChild(jcrChild);
 				jcrChild.fromDomElement(child);
-			}			
+			}
+			this.setLoadState("loaded");
 		},
 		
 		toXmlString : function(recurse, childrenWriter){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
index a7f7d1b31..0f7057a37 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
@@ -33,22 +33,39 @@ qx.Class.define("org.argeo.jcr.ria.provider.XmlNodeProvider", {
 			if(this.getXmlDocLoaded()){
 				// Parse document and load
 				node.setName(this._xmlDoc.documentElement.nodeName);
+				var properties = this.getSettings();				
+				// STUB : prune sub children, load only level 1
+				/*
+				var children = this._xmlDoc.documentElement.childNodes;
+				for(var i=0;i<children.length;i++){
+					var subchildren = children[i].childNodes;
+					for(var j=0;j<subchildren.length;j++){
+						children[i].removeChild(subchildren[j]);
+					}
+				}
+				*/
+				// END STUB
 				node.fromDomElement(this._xmlDoc.documentElement);
-				node.setLoadState("loaded");
+				if(properties.dynamic){
+					this.setXmlDocLoaded(false);
+				}
 			}else{
 				this.addListenerOnce("changeXmlDocLoaded", function(){
 					this.loadNode(node, nodeCallback, childCallback);
 				}, this);
 				node.setLoadState("loading");
-				this.loadXmlDoc();
+				this.loadXmlDoc(node);
 			}
 		},
 				
-		loadXmlDoc : function(){
+		loadXmlDoc : function(node){
 			var properties = this.getSettings();
 			if(!properties.xmlSrc && !properties.xmlString) return;
 			if(properties.xmlSrc){
 				var request = new org.argeo.ria.remote.Request(properties.xmlSrc, 'GET', 'application/xml');
+				if(properties.dynamic && properties.pathParameter){
+					request.setParameter(properties.pathParameter, (node.getPath()|| "/"));
+				}
 				request.addListener("completed", function(response){
 					this._xmlDoc = response.getContent();
 					this.setXmlDocLoaded(true);
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/XmlNodeEditor.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/XmlNodeEditor.js
index 2c1b25955..28a2bc544 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/XmlNodeEditor.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/XmlNodeEditor.js
@@ -21,15 +21,14 @@ qx.Class.define("org.argeo.jcr.ria.views.XmlNodeEditor", {
 	  	instanceLabel : {
 	  		init:"Xml Editor",
 	  		event : "changeInstanceLabel"
+	  	},
+	  	dataModel : {
+	  		
 	  	}
 	},
 	
 	construct : function(){
 		this.base(arguments);
-		this.setLayout(new qx.ui.layout.VBox());
-		this.htmlPane = new qx.ui.embed.Html();
-		this.htmlPane.setOverflow("auto", "auto");
-		this.add(this.htmlPane, {flex:1});
 	},
 	
 	members : {
@@ -41,17 +40,29 @@ qx.Class.define("org.argeo.jcr.ria.views.XmlNodeEditor", {
 		 * @param data {Mixed} Any object or data passed by the initiator of the view
 		 * @return {Boolean}
 		 */
-		init : function(viewPane, data){
+		init : function(viewPane, dataModel){
 			this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));	  			
+			this.setLayout(new qx.ui.layout.VBox());
+			this.setDataModel(dataModel);
+			
+			this.input = new qx.ui.form.TextField();
+			this.add(this.input);
+			
+			this._attachInputToDM();
+			
+			this.htmlPane = new qx.ui.embed.Html();
+			this.htmlPane.setOverflow("auto", "auto");
+			this.add(this.htmlPane, {flex:1});
+			
 		},
 		/**
 		 * The implementation should contain the real data loading (i.o. query...)
 		 * @return {Boolean}
 		 */
-		load : function(rootNode){
-			rootNode.load();
-			rootNode.addListener("changeLoadState", function(){
-				var xmlString = rootNode.toXmlString(true);
+		load : function(){
+			var dataModel = this.getDataModel();
+			dataModel.addListener("changeContextNode", function(event){
+				var xmlString = event.getData().toXmlString(true);
 			    var TAG_START_PATTERN = new RegExp("<([0-9a-zA-Z\.]+)([^>]*)>", "gi");
 			    var TAG_END_PATTERN = new RegExp("</([0-9a-zA-Z\.]+)>", "gi");
 			    var TAG_CLOSE_PATTERN = new RegExp("(/?>)", "gi");
@@ -68,7 +79,7 @@ qx.Class.define("org.argeo.jcr.ria.views.XmlNodeEditor", {
 			    xmlString = xmlString.replace(TAG_ATTRIBUTE, ' xml_attname_begin$1xml_attname_end="xml_attvalue_begin$2xml_attvalue_end"');
 				
 				//xmlString = qx.xml.String.escape(xmlString);
-				xmlString = xmlString.replace(new RegExp("(xml_div_begin)", "g"), '<div style="padding-top:2px;padding-left:15px;">');
+				xmlString = xmlString.replace(new RegExp("(xml_div_begin)", "g"), '<div style="padding:1px;line-height:17px;padding-left:15px;">');
 				xmlString = xmlString.replace(new RegExp("(xml_div_end)", "g"), '</div>');
 				xmlString = xmlString.replace(new RegExp("(xml_tagname_begin)", "g"), '<b style="color:rgb(63,127,127);">');
 				xmlString = xmlString.replace(new RegExp("(xml_tagname_end)", "g"), '</b>');
@@ -78,8 +89,43 @@ qx.Class.define("org.argeo.jcr.ria.views.XmlNodeEditor", {
 				xmlString = xmlString.replace(new RegExp("(xml_attvalue_end)", "g"), '</span>');
 				xmlString = '<div style="margin-left:-10px;">' + xmlString + '</div>';
 				this.htmlPane.setHtml(xmlString);
+				/*
+				var call = new qx.util.DeferredCall(function(){
+					var htmlDom = this.htmlPane.getContentElement().getDomElement();
+					var spans = qx.bom.Selector.query("span", htmlDom);
+					for(var i=0;i<spans.length;i++){
+						var oThis = this;
+						spans[i].onclick = function(){oThis._setAttributesSpanEditable(this)};
+					}
+				}, this);
+				call.schedule();
+				*/
 			}, this);
+			dataModel.requireContextChange();			
+		},
+		
+		_setAttributesSpanEditable : function(span){
+			var width = qx.bom.element.Dimension.getWidth(span);
+			var value = span.innerHTML;
+			qx.bom.element.Style.set(span, "display", "none");
+			var input = qx.bom.Element.create("input", {value:value, style:'width:'+width+'px;'});
+			qx.dom.Element.insertAfter(input, span);			
+		},
+		
+		_attachInputToDM : function(){
+			var dm = this.getDataModel();
+			this.input.addListener("keypress", function(event){
+				if(event.getKeyIdentifier() != "Enter") return;
+				var path = this.input.getValue();
+				dm.requireContextChange(path);
+			}, this);
+			dm.addListener("changeContextNode", function(event){
+				var ctxtNode = event.getData();
+				this.input.setValue(ctxtNode.getPath());
+			}, this);
+			
 		},
+		
 		/**
 		 * Whether this component is already contained in a scroller (return false) or not (return true).
 		 * @return {Boolean}
-- 
2.39.2