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 67f06df0b6a235e342d05cdbaded70571c05d1f0..d19837955de0a23bfa1fa43cd406f0823642d422 100644 (file)
--- 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",
   \r
   construct : function(){\r
                this.base(arguments);\r
+               org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP = {slc:"http://argeo.org/projects/slc/schemas"};\r
   },\r
 \r
   statics : {\r

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 c609ff50cafb40d176819a2a5f1f12ebf9b230b6..5489d061ea322b3a491db5e3f7e18f7511c52471 100644 (file)
--- 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",
   \r
   construct : function(){\r
                this.base(arguments);\r
+               org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP = {slc:"http://argeo.org/projects/slc/schemas"};\r
   },\r
   \r
   statics : {\r

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 792b87c164c2e5b5b6f7f97cb35b0d1c531cab38..0b4fec48761933c61bac08f0fbe0fd6e6c462734 100644 (file)
--- 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", {
        },\r
        members : {\r
                // The URI of the MessageListenerServlet\r
-               uri : '/org.argeo.slc.webapp/amq',              \r
+               uri : '../amq',         \r
 \r
                // Polling. Set to true (default) if waiting poll for messages is needed\r
                poll : true,\r
@@ -24,9 +24,8 @@ qx.Class.define("org.argeo.ria.remote.JmsClient", {
                _handlers : new Array(),\r
 \r
                _messageHandler : function(response) {\r
-                       var doc = response.getContent();\r
-                       var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};\r
-                       var messages = org.argeo.ria.util.Element.selectNodes(doc, "//response", NSMap);\r
+                       var doc = response.getContent();                        \r
+                       var messages = org.argeo.ria.util.Element.selectNodes(doc, "//response");\r
                        for(var i=0;i<messages.length;i++){\r
                                var id = messages[i].getAttribute("id");\r
                                if(id && this._handlers[id]){\r

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 3fbb6f04218fcbd3e8e49cd92ee0b786f40cee6e..23df026c2e4eaf9f27482a232d8c63f100412154 100644 (file)
--- 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",
                \r
   statics :\r
   {\r
+       \r
+       DEFAULT_NAMESPACE_MAP : null,\r
+       \r
      /**\r
      * Selects the first XmlNode that matches the XPath expression.\r
      *\r
@@ -23,7 +26,8 @@ qx.Class.define("org.argeo.ria.util.Element",
     selectSingleNode : qx.core.Variant.select("qx.client",\r
     {\r
       "mshtml|opera": function(element, query, NSMap) {\r
-       if(NSMap){\r
+       NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;\r
+       if(NSMap){                      \r
                var namespaces = [];\r
                var i=0;\r
                for(var prefix in NSMap){                       \r
@@ -40,6 +44,7 @@ qx.Class.define("org.argeo.ria.util.Element",
 \r
       "default": function(element, query, NSMap)\r
       {\r
+       NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;\r
         if(!this.__xpe) {\r
           this.__xpe = new XPathEvaluator();\r
         }\r
@@ -76,6 +81,7 @@ qx.Class.define("org.argeo.ria.util.Element",
     selectNodes : qx.core.Variant.select("qx.client",\r
     {\r
       "mshtml|opera": function(element, query, NSMap) {\r
+       NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;\r
        if(NSMap){\r
                var namespaces = [];\r
                var i=0;\r
@@ -91,6 +97,7 @@ qx.Class.define("org.argeo.ria.util.Element",
 \r
       "default": function(element, query, NSMap)\r
       {\r
+       NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;\r
         var xpe = this.__xpe;\r
 \r
         if(!xpe) {\r
@@ -134,7 +141,7 @@ qx.Class.define("org.argeo.ria.util.Element",
      * @signature function(element, namespaceURI, tagname)\r
      */\r
     getElementsByTagNameNS : qx.core.Variant.select("qx.client",\r
-    {\r
+    {          \r
       "mshtml": function(element, namespaceURI, tagname)\r
       {\r
         var doc = element.ownerDocument || element;\r
@@ -162,7 +169,8 @@ qx.Class.define("org.argeo.ria.util.Element",
      */\r
     getSingleNodeText : function(element, query, NSMap)\r
     {\r
-      var node = this.selectSingleNode(element, query, NSMap);\r
+      NSMap = NSMap || org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP;\r
+      var node = org.argeo.ria.util.Element.selectSingleNode(element, query, NSMap);\r
       return qx.dom.Node.getText(node);\r
     }\r
   }\r