commit b2f91ea68ed4b3d5b4022b798b7f313bff6b19ae
author Jeff Thompson <jeff@thefirst.org> Sun Jan 13 15:59:26 2013 -0800
committer Jeff Thompson <jeff@thefirst.org> Sun Jan 13 15:59:26 2013 -0800
tree 0c110e9a94a74987848fd22641f435759f265bfe
parent 2cc54b4c3d8b1ce06731d385ee764ec7518c5240

In NdnProtocolInfo.jsm, put all functions in the NdnProtocolInfo class instead of being global.

js/ndnProtocol/components/ndnProtocolService.js

diff --git a/js/ndnProtocol/components/ndnProtocolService.js b/js/ndnProtocol/components/ndnProtocolService.js
index ad9bfac..a6f7f01 100644
--- a/js/ndnProtocol/components/ndnProtocolService.js
+++ b/js/ndnProtocol/components/ndnProtocolService.js
@@ -32,13 +32,13 @@
         var uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(Ci.nsIURI);

 

         // We have to trim now because nsIURI converts spaces to %20 and we can't trim in newChannel.

-        var uriParts = splitUri(aSpec);

+        var uriParts = NdnProtocolInfo.splitUri(aSpec);

         if (aBaseURI == null || uriParts.name.length < 1 || uriParts.name[0] == '/')

             // Just reconstruct the trimmed URI.

             uri.spec = "ndn:" + uriParts.name + uriParts.search + uriParts.hash;

         else {

             // Make a URI relative to the base name up to the file name component.

-            var baseUriParts = splitUri(aBaseURI.spec);

+            var baseUriParts = NdnProtocolInfo.splitUri(aBaseURI.spec);

             var baseName = new Name(baseUriParts.name);

             var iFileName = baseName.indexOfFileName();

             

@@ -70,7 +70,7 @@
         var thisNdnProtocol = this;

         

         try {            

-            var uriParts = splitUri(aURI.spec);

+            var uriParts = NdnProtocolInfo.splitUri(aURI.spec);

     

             var template = new Interest(new Name([]));

             // Use the same default as NDN.expressInterest.

@@ -153,7 +153,7 @@
     }

     

     // Now that we're connected, report the host and port.

-    setConnectedNdnHub(this.ndn.host, this.ndn.port);

+    NdnProtocolInfo.setConnectedNdnHub(this.ndn.host, this.ndn.port);

 

     // If !this.uriEndsWithSegmentNumber, we use the segmentNumber to load multiple segments.

     var segmentNumber = null;