From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 15 Jan 2009 10:52:13 +0000 (+0000)
Subject: Set DEFAULT_NAMESPACE_MAP instead of passing it in each function call
X-Git-Tag: argeo-slc-2.1.7~2190
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=29739bdb1bc19e728399610e6eefec402b308564;p=gpl%2Fargeo-slc.git

Set DEFAULT_NAMESPACE_MAP instead of passing it in each function call

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js
index 67f06df0b..d19837955 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/LauncherPerspective.js
@@ -8,6 +8,7 @@ qx.Class.define("org.argeo.slc.web.LauncherPerspective",
   
   construct : function(){
 	  	this.base(arguments);
+	  	org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP = {slc:"http://argeo.org/projects/slc/schemas"};
   },
 
   statics : {
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js
index c609ff50c..5489d061e 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/Perspective.js
@@ -8,6 +8,7 @@ qx.Class.define("org.argeo.slc.web.Perspective",
   
   construct : function(){
 	  	this.base(arguments);
+	  	org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP = {slc:"http://argeo.org/projects/slc/schemas"};
   },
   
   statics : {
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/remote/JmsClient.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/remote/JmsClient.js
index 792b87c16..0b4fec487 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/remote/JmsClient.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/remote/JmsClient.js
@@ -8,7 +8,7 @@ qx.Class.define("org.argeo.ria.remote.JmsClient", {
 	},
 	members : {
   		// The URI of the MessageListenerServlet
-		uri : '/org.argeo.slc.webapp/amq',		
+		uri : '../amq',		
 
 		// Polling. Set to true (default) if waiting poll for messages is needed
 		poll : true,
@@ -24,9 +24,8 @@ qx.Class.define("org.argeo.ria.remote.JmsClient", {
 		_handlers : new Array(),
 
 		_messageHandler : function(response) {
-			var doc = response.getContent();
-			var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
-			var messages = org.argeo.ria.util.Element.selectNodes(doc, "//response", NSMap);
+			var doc = response.getContent();			
+			var messages = org.argeo.ria.util.Element.selectNodes(doc, "//response");
 			for(var i=0;i<messages.length;i++){
 				var id = messages[i].getAttribute("id");
 				if(id && this._handlers[id]){
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/util/Element.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/util/Element.js
index 3fbb6f042..23df026c2 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/util/Element.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-src/class/org/argeo/ria/util/Element.js
@@ -11,6 +11,9 @@ qx.Class.define("org.argeo.ria.util.Element",
 		
   statics :
   {
+  	
+  	DEFAULT_NAMESPACE_MAP : null,
+  	
      /**
      * Selects the first XmlNode that matches the XPath expression.
      *
@@ -23,7 +26,8 @@ qx.Class.define("org.argeo.ria.util.Element",
     selectSingleNode : qx.core.Variant.select("qx.client",
     {
       "mshtml|opera": function(element, query, NSMap) {
-      	if(NSMap){
+      	NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;
+      	if(NSMap){      		
       		var namespaces = [];
       		var i=0;
 	      	for(var prefix in NSMap){	      		
@@ -40,6 +44,7 @@ qx.Class.define("org.argeo.ria.util.Element",
 
       "default": function(element, query, NSMap)
       {
+      	NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;
         if(!this.__xpe) {
           this.__xpe = new XPathEvaluator();
         }
@@ -76,6 +81,7 @@ qx.Class.define("org.argeo.ria.util.Element",
     selectNodes : qx.core.Variant.select("qx.client",
     {
       "mshtml|opera": function(element, query, NSMap) {
+      	NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;
       	if(NSMap){
       		var namespaces = [];
       		var i=0;
@@ -91,6 +97,7 @@ qx.Class.define("org.argeo.ria.util.Element",
 
       "default": function(element, query, NSMap)
       {
+      	NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;
         var xpe = this.__xpe;
 
         if(!xpe) {
@@ -134,7 +141,7 @@ qx.Class.define("org.argeo.ria.util.Element",
      * @signature function(element, namespaceURI, tagname)
      */
     getElementsByTagNameNS : qx.core.Variant.select("qx.client",
-    {
+    {    	
       "mshtml": function(element, namespaceURI, tagname)
       {
         var doc = element.ownerDocument || element;
@@ -162,7 +169,8 @@ qx.Class.define("org.argeo.ria.util.Element",
      */
     getSingleNodeText : function(element, query, NSMap)
     {
-      var node = this.selectSingleNode(element, query, NSMap);
+      NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;
+      var node = org.argeo.ria.util.Element.selectSingleNode(element, query, NSMap);
       return qx.dom.Node.getText(node);
     }
   }