From 2fead8208cded30db4fe614be2c4ab497d866fc6 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 13 Jun 2007 22:41:41 +0000 Subject: [PATCH] Let's not confuse terminology between one server proxying for another server and the ProxySubscriber mechanism by which the server proxies for the client. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4730 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/client/Client.java | 2 +- .../com/threerings/presents/client/ClientDObjectMgr.java | 6 +++--- .../com/threerings/presents/peer/server/PeerManager.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index c9bd7ba62..b74f20ac4 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -489,7 +489,7 @@ public class Client * If this client is being used to proxy events from another server, this method can be * overridden to adjust the event in any way needed prior to dispatching the event. */ - protected void adjustForProxy (DObject target, DEvent event) + protected void convertFromRemote (DObject target, DEvent event) { // nothing by default } diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index dc54b0e8b..fa947aaff 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -213,9 +213,9 @@ public class ClientDObjectMgr return; } - // because we might be acting as a proxy between servers, we may need to fiddle with this - // event before we dispatch it - _client.adjustForProxy(target, event); + // because we might be acting as a proxy for a remote server, we may need to fiddle with + // this event before we dispatch it + _client.convertFromRemote(target, event); // if this is a compound event, we need to process its contained events in order if (event instanceof CompoundEvent) { diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 4537f326b..6f461292c 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -704,8 +704,8 @@ public class PeerManager { _record = record; _client = new Client(null, PresentsServer.omgr) { - protected void adjustForProxy (DObject target, DEvent event) { - super.adjustForProxy(target, event); + protected void convertFromRemote (DObject target, DEvent event) { + super.convertFromRemote(target, event); // rewrite the event's target oid using the oid currently configured on the // distributed object (we will have it mapped in our remote server's oid space, // but it may have been remapped into the oid space of the local server)