summaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
Diffstat (limited to 'js/src')
-rw-r--r--js/src/Ice/Communicator.js4
-rw-r--r--js/src/Ice/IncomingAsync.js2
-rw-r--r--js/src/Ice/Instance.js9
-rw-r--r--js/src/Ice/LocatorInfo.js12
-rw-r--r--js/src/Ice/ObjectAdapterI.js2
-rw-r--r--js/src/Ice/Operation.js2
-rw-r--r--js/src/Ice/Reference.js4
-rw-r--r--js/src/Ice/ServantManager.js6
-rw-r--r--js/src/Ice/TraceUtil.js2
9 files changed, 17 insertions, 26 deletions
diff --git a/js/src/Ice/Communicator.js b/js/src/Ice/Communicator.js
index f80d3e56576..9d1d7ed3102 100644
--- a/js/src/Ice/Communicator.js
+++ b/js/src/Ice/Communicator.js
@@ -70,11 +70,11 @@ var Communicator = Ice.Class({
},
stringToIdentity: function(s)
{
- return this._instance.stringToIdentity(s);
+ return Ice.stringToIdentity(s);
},
identityToString: function(ident)
{
- return this._instance.identityToString(ident);
+ return Ice.identityToString(ident);
},
createObjectAdapter: function(name)
{
diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js
index a788fccd4f4..619ffd70892 100644
--- a/js/src/Ice/IncomingAsync.js
+++ b/js/src/Ice/IncomingAsync.js
@@ -136,7 +136,7 @@ var IncomingAsync = Ice.Class({
var s = [];
s.push("dispatch exception:");
- s.push("\nidentity: " + this._instance.identityToString(this._current.id));
+ s.push("\nidentity: " + Ice.identityToString(this._current.id));
s.push("\nfacet: " + StringUtil.escapeString(this._current.facet, ""));
s.push("\noperation: " + this._current.operation);
if(this._connection !== null)
diff --git a/js/src/Ice/Instance.js b/js/src/Ice/Instance.js
index fa09b168058..c094704f27f 100644
--- a/js/src/Ice/Instance.js
+++ b/js/src/Ice/Instance.js
@@ -237,15 +237,6 @@ var Instance = Ice.Class({
{
return this._implicitContext;
},
- stringToIdentity: function(s)
- {
- return Ice.stringToIdentity(s);
- },
- identityToString: function(ident)
- {
- return Ice.identityToString(ident);
- },
-
setDefaultLocator: function(locator)
{
if(this._state == StateDestroyed)
diff --git a/js/src/Ice/LocatorInfo.js b/js/src/Ice/LocatorInfo.js
index 97cfb1bb649..1624727fca9 100644
--- a/js/src/Ice/LocatorInfo.js
+++ b/js/src/Ice/LocatorInfo.js
@@ -194,7 +194,7 @@ var LocatorInfo = Class({
else
{
s.push("object = ");
- s.push(ref.getInstance().identityToString(ref.getIdentity()));
+ s.push(Ice.identityToString(ref.getIdentity()));
s.push("\n");
}
@@ -245,13 +245,13 @@ var LocatorInfo = Class({
s = [];
s.push("object not found\n");
s.push("object = ");
- s.push(instance.identityToString(ref.getIdentity()));
+ s.push(Ice.identityToString(ref.getIdentity()));
instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.join(""));
}
e = new Ice.NotRegisteredException();
e.kindOfObject = "object";
- e.id = instance.identityToString(ref.getIdentity());
+ e.id = Ice.identityToString(ref.getIdentity());
throw e;
}
else if(ex instanceof Ice.NotRegisteredException)
@@ -273,7 +273,7 @@ var LocatorInfo = Class({
else
{
s.push("object = ");
- s.push(instance.identityToString(ref.getIdentity()));
+ s.push(Ice.identityToString(ref.getIdentity()));
s.push("\n");
}
s.push("reason = " + ex.toString());
@@ -316,7 +316,7 @@ var LocatorInfo = Class({
{
s.push("object\n");
s.push("object = ");
- s.push(instance.identityToString(ref.getIdentity()));
+ s.push(Ice.identityToString(ref.getIdentity()));
s.push("\n");
}
instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.join(""));
@@ -351,7 +351,7 @@ var LocatorInfo = Class({
var s = [];
s.push("searching for object by id\n");
s.push("object = ");
- s.push(instance.identityToString(ref.getIdentity()));
+ s.push(Ice.identityToString(ref.getIdentity()));
instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.join(""));
}
diff --git a/js/src/Ice/ObjectAdapterI.js b/js/src/Ice/ObjectAdapterI.js
index c711441c3d1..3d556a51235 100644
--- a/js/src/Ice/ObjectAdapterI.js
+++ b/js/src/Ice/ObjectAdapterI.js
@@ -184,7 +184,7 @@ var ObjectAdapterI = Ice.Class({
{
throw new Ice.AlreadyRegisteredException(
"object adapter with router",
- this._instance.identityToString(router.ice_getIdentity()));
+ Ice.identityToString(router.ice_getIdentity()));
}
//
diff --git a/js/src/Ice/Operation.js b/js/src/Ice/Operation.js
index b32cac1f168..bc115ba8c0e 100644
--- a/js/src/Ice/Operation.js
+++ b/js/src/Ice/Operation.js
@@ -374,7 +374,7 @@ var __dispatchImpl = function(servant, op, incomingAsync, current)
if(method === undefined || typeof(method) !== "function")
{
var comm = current.adapter.getCommunicator();
- var msg = "servant for identity " + comm.identityToString(current.id) +
+ var msg = "servant for identity " + Ice.identityToString(current.id) +
" does not define operation `" + op.servantMethod + "'";
throw new Ice.UnknownException(msg);
}
diff --git a/js/src/Ice/Reference.js b/js/src/Ice/Reference.js
index e548b6c4117..1234387099d 100644
--- a/js/src/Ice/Reference.js
+++ b/js/src/Ice/Reference.js
@@ -178,7 +178,7 @@ var ReferenceFactory = Class({
//
// Parsing the identity may raise IdentityParseException.
//
- var ident = this._instance.stringToIdentity(idstr);
+ var ident = Ice.stringToIdentity(idstr);
if(ident.name.length === 0)
{
@@ -1239,7 +1239,7 @@ var Reference = Class({
// the reference parser uses as separators, then we enclose
// the identity string in quotes.
//
- var id = this._instance.identityToString(this._identity);
+ var id = Ice.identityToString(this._identity);
if(id.search(/[ :@]/) != -1)
{
s.push('"');
diff --git a/js/src/Ice/ServantManager.js b/js/src/Ice/ServantManager.js
index 02877feedfa..ef71975cbb2 100644
--- a/js/src/Ice/ServantManager.js
+++ b/js/src/Ice/ServantManager.js
@@ -53,7 +53,7 @@ var ServantManager = Ice.Class({
if(m.has(facet))
{
var ex = new Ice.AlreadyRegisteredException();
- ex.id = this._instance.identityToString(ident);
+ ex.id = Ice.identityToString(ident);
ex.kindOfObject = "servant";
if(facet.length > 0)
{
@@ -93,7 +93,7 @@ var ServantManager = Ice.Class({
if(m === undefined || !m.has(facet))
{
var ex = new Ice.NotRegisteredException();
- ex.id = this._instance.identityToString(ident);
+ ex.id = Ice.identityToString(ident);
ex.kindOfObject = "servant";
if(facet.length > 0)
{
@@ -136,7 +136,7 @@ var ServantManager = Ice.Class({
if(m === undefined)
{
var ex = new Ice.NotRegisteredException();
- ex.id = this._instance.identityToString(ident);
+ ex.id = Ice.identityToString(ident);
ex.kindOfObject = "servant";
throw ex;
}
diff --git a/js/src/Ice/TraceUtil.js b/js/src/Ice/TraceUtil.js
index a6b50d234cc..f341bb20232 100644
--- a/js/src/Ice/TraceUtil.js
+++ b/js/src/Ice/TraceUtil.js
@@ -184,7 +184,7 @@ function printIdentityFacetOperation(s, stream)
{
var identity = new Identity();
identity.__read(stream);
- s.push("\nidentity = " + stream.instance.identityToString(identity));
+ s.push("\nidentity = " + Ice.identityToString(identity));
var facet = Ice.StringSeqHelper.read(stream);
s.push("\nfacet = ");
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 17:10:05 +0000