1 files changed, 56 insertions, 61 deletions
diff --git a/js/src/Ice/ObjectFactoryManager.js b/js/src/Ice/ObjectFactoryManager.js
index bffaeaa3070..83594a4d4dc 100644
--- a/js/src/Ice/ObjectFactoryManager.js
+++ b/js/src/Ice/ObjectFactoryManager.js
@@ -7,70 +7,65 @@
 //
 // **********************************************************************
 
-(function(global){
-    require("Ice/Class");
-    require("Ice/HashMap");
-    require("Ice/LocalException");
+var Ice = require("../Ice/ModuleRegistry").Ice;
+Ice.__M.require(module, "Ice", ["../Ice/Class", "../Ice/HashMap", "../Ice/LocalException"]);
     
-    var Ice = global.Ice || {};
-    
-    var HashMap = Ice.HashMap;
-    var AlreadyRegisteredException = Ice.AlreadyRegisteredException;
-    var NotRegisteredException = Ice.NotRegisteredException;
+var HashMap = Ice.HashMap;
+var AlreadyRegisteredException = Ice.AlreadyRegisteredException;
+var NotRegisteredException = Ice.NotRegisteredException;
 
-    //
-    // Only for use by Instance
-    //
-    var ObjectFactoryManager = Ice.Class({
-        __init__: function()
-        {
-            this._factoryMap = new HashMap(); // Map<String, ObjectFactory>
-        },
-        add: function(factory, id)
-        {
-            var o, ex;
-            o = this._factoryMap.get(id);
-            if(o !== undefined)
-            {
-                ex = new AlreadyRegisteredException();
-                ex.id = id;
-                ex.kindOfObject = "object factory";
-                throw ex;
-            }
-            this._factoryMap.set(id, factory);
-        },
-        remove: function(id)
-        {
-            var factory, ex;
-            factory = this._factoryMap.get(id);
-            if(factory === undefined)
-            {
-                ex = new NotRegisteredException();
-                ex.id = id;
-                ex.kindOfObject = "object factory";
-                throw ex;
-            }
-            this._factoryMap.delete(id);
-            factory.destroy();
-        },
-        find: function(id)
+//
+// Only for use by Instance
+//
+var ObjectFactoryManager = Ice.Class({
+    __init__: function()
+    {
+        this._factoryMap = new HashMap(); // Map<String, ObjectFactory>
+    },
+    add: function(factory, id)
+    {
+        var o, ex;
+        o = this._factoryMap.get(id);
+        if(o !== undefined)
         {
-            return this._factoryMap.get(id);
-        },
-        destroy: function()
+            ex = new AlreadyRegisteredException();
+            ex.id = id;
+            ex.kindOfObject = "object factory";
+            throw ex;
+        }
+        this._factoryMap.set(id, factory);
+    },
+    remove: function(id)
+    {
+        var factory, ex;
+        factory = this._factoryMap.get(id);
+        if(factory === undefined)
         {
-            var oldMap = this._factoryMap,
-                e = oldMap.entries;
-            this._factoryMap = new HashMap(); // Map<String, ObjectFactory>
+            ex = new NotRegisteredException();
+            ex.id = id;
+            ex.kindOfObject = "object factory";
+            throw ex;
+        }
+        this._factoryMap.delete(id);
+        factory.destroy();
+    },
+    find: function(id)
+    {
+        return this._factoryMap.get(id);
+    },
+    destroy: function()
+    {
+        var oldMap = this._factoryMap,
+            e = oldMap.entries;
+        this._factoryMap = new HashMap(); // Map<String, ObjectFactory>
 
-            while(e !== null)
-            {
-                e.value.destroy();
-                e = e.next;
-            }
+        while(e !== null)
+        {
+            e.value.destroy();
+            e = e.next;
         }
-    });
-    
-    Ice.ObjectFactoryManager = ObjectFactoryManager;
-    global.Ice = Ice;
-}(typeof (global) === "undefined" ? window : global));
+    }
+});
+
+Ice.ObjectFactoryManager = ObjectFactoryManager;
+module.exports.Ice = Ice;