merging javascript branch

1 files changed, 146 insertions, 0 deletions

diff --git a/js/src/Ice/EndpointFactoryManager.js b/js/src/Ice/EndpointFactoryManager.js
new file mode 100644
index 00000000000..881c9cd998c
--- /dev/null
+++ b/js/src/Ice/EndpointFactoryManager.js
@@ -0,0 +1,146 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+(function(global){
+    require("Ice/Class");
+    require("Ice/BasicStream");
+    require("Ice/Debug");
+    require("Ice/OpaqueEndpointI");
+    require("Ice/Protocol");
+    require("Ice/LocalException");
+
+    var Ice = global.Ice || {};
+
+    //
+    // Local aliases.
+    //
+    var Debug = Ice.Debug;
+    var BasicStream = Ice.BasicStream;
+    var EndpointParseException = Ice.EndpointParseException;
+    var OpaqueEndpointI = Ice.OpaqueEndpointI;
+    var Protocol = Ice.Protocol;
+
+    var EndpointFactoryManager = Ice.Class({
+        __init__: function(instance)
+        {
+            this._instance = instance;
+            this._factories = [];
+        },
+        add: function(factory)
+        {
+            for(var i = 0; i < this._factories.length; ++i)
+            {
+                Debug.assert(this._factories[i].type() != factory.type());
+            }
+
+            this._factories.push(factory);
+        },
+        get: function(type)
+        {
+            for(var i = 0; i < this._factories.length; ++i)
+            {
+                if(this._factories[i].type() === type)
+                {
+                    return this._factories[i];
+                }
+            }
+            return null;
+        },
+        create: function(str, oaEndpoint)
+        {
+            var s = str.trim();
+            if(s.length === 0)
+            {
+                throw new EndpointParseException("value has no non-whitespace characters");
+            }
+
+            var protocol;
+            var rest = "";
+            var i, length;
+            var pos = s.search(/[ \t\n\r]+/);
+            if(pos === -1)
+            {
+                protocol = s;
+            }
+            else
+            {
+                protocol = s.substring(0, pos);
+                if(pos < s.length)
+                {
+                    rest = s.substring(pos);
+                }
+            }
+
+            if(protocol === "default")
+            {
+                protocol = this._instance.defaultsAndOverrides().defaultProtocol;
+            }
+
+            for(i = 0, length = this._factories.length; i < length; ++i)
+            {
+                if(this._factories[i].protocol() === protocol)
+                {
+                    return this._factories[i].create(rest, oaEndpoint);
+                }
+            }
+
+            //
+            // If the stringified endpoint is opaque, create an unknown endpoint,
+            // then see whether the type matches one of the known endpoints.
+            //
+            if(protocol === "opaque")
+            {
+                var ue = OpaqueEndpointI.fromString(rest);
+                for(i = 0, length =  this._factories.length; i < length; ++i)
+                {
+                    if(this._factories[i].type() == ue.type())
+                    {
+                        //
+                        // Make a temporary stream, write the opaque endpoint data into the stream,
+                        // and ask the factory to read the endpoint data from that stream to create
+                        // the actual endpoint.
+                        //
+                        var bs = new BasicStream(this._instance, Protocol.currentProtocolEncoding, true);
+                        ue.streamWrite(bs);
+                        bs.pos = 0;
+                        bs.readShort(); // type
+                        return this._factories[i].read(bs);
+                    }
+                }
+                return ue; // Endpoint is opaque, but we don't have a factory for its type.
+            }
+
+            return null;
+        },
+        read: function(s)
+        {
+            var type = s.readShort();
+
+            for(var i = 0; i < this._factories.length; ++i)
+            {
+                if(this._factories[i].type() == type)
+                {
+                    return this._factories[i].read(s);
+                }
+            }
+            return OpaqueEndpointI.fromStream(type, s);
+        },
+        destroy: function()
+        {
+            for(var i = 0; i < this._factories.length; ++i)
+            {
+                this._factories[i].destroy();
+            }
+            this._factories = [];
+        }
+    });
+    
+    Ice.EndpointFactoryManager = EndpointFactoryManager;
+    global.Ice = Ice;
+}(typeof (global) === "undefined" ? window : global));